diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..f95b67a
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,61 @@
+##General Overview
+
+We have three branches where all the work happens: 
+
+* **master** - This is the stable branch based on which we do releases. This branch is for production. 
+* **develop** - This is an unstable branch for development purposes, it has bleeding edge features and fixes, but it's not recommended for production. Bug fixes and new features go here. 
+* **hotfix** - This is a branch dedicated to hotfixes on the master branch. Urgent bug fixes go here. 
+
+
+Once we deem the develop branch to be stable, we merge it into the master and do a major release. The hotfix branch is solely for making urgent bug fixes on the current master branch, which we then merge into master.
+
+We almost never push directly to master.
+
+
+***
+
+
+##Workflow
+
+Contributing to ERPNext is not very different from the usual Pull Request workflow on GitHub.
+
+###Prerequisites : 
+
+* You need to know [Git and Github basics](https://try.github.io/levels/1/challenges/1)
+* You need to have a Fork of the [ERPNext repo](https://github.com/frappe/erpnext) in your personal Github account 
+* You need to add a [remote](#glossary) for your Forked repository. `git remote add origin [your-erpnext-repo-url]`
+
+
+###The Process: 
+
+1. Make sure you're in the right branch. **develop** for adding features /  fixing issues and **hotfix** for urgent bug fixes
+2. Make your changes
+3. Create and checkout a new branch for the changes you've made. `git checkout -b [branch-name]`
+4. Add and commit your changes `git commit -am "[commit-message]"
+5. If you have been working on sometime for a long time, you should [rebase](#glossary) your branch with our develop branch. `git pull upstream develop --rebase` where `upstream` is the remote name of our repo
+6. Now, push your changes to your fork. `git push origin [branch-name]`   
+If you rebased your commits, you will have to [force push](http://vignette2.wikia.nocookie.net/starwars/images/e/ea/Yodapush.png/revision/latest?cb=20130205190454) `git push origin [branch-name] --force`
+7. You should now be able to see your pushed branch on Github, now create a pull request against the branch that you want to merge to.
+8. Wait for us to review it
+
+###Common Problems: 
+
+* During rebase you might face _merge conflicts_. A merge conflict occurs when you have made changes to the same file that someone else has, in the commits you're pulling. You need to resolve these conflicts by picking which code you want to keep, yours or theirs. You can use `git mergetool` for help.
+* Sometimes you don't have a local branch to which you want to make changes to. In that case you first run `git fetch` followed by `git checkout --track -b upstream/[branch-name]`
+ 
+
+###Good practices: 
+
+* You should rebase your branch with the branch you plan to make a Pull Request to as often as you can. 
+* Your commit messages should be precise and explain exactly what the commit does. Same goes for the Pull Request title.
+* When making a PR make sure that all your code is committed properly by checking the diffs.
+* If you're working on different things at the same time, make sure you make separate branches for each.
+* Don't create new DocTypes unless absolutely necessary. If you find that there is a another DocType with a similar functionality, then please try and extend that functionality.
+* DRY. Don't Repeat Yourself. Before writing up a similar function /feature make sure it doesn't exist in the codebase already. 
+* Tabs, not spaces.
+
+
+###Glossary
+
+* remote - A remote is a connection to a Github repo. You should have two remotes, one that points to your repo and one to ours. 
+* rebase - When you rebase a branch, you pull commits from your remote branch and move your commits on top of it. This allows you to update your branch with the latest changes without losing  your changes.
diff --git a/.travis.yml b/.travis.yml
index 966dfd3..287fe2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@
 install:
   - sudo apt-get purge -y mysql-common
   - wget https://raw.githubusercontent.com/frappe/bench/master/install_scripts/setup_frappe.sh
-  - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis
+  - sudo bash setup_frappe.sh --skip-setup-bench --mysql-root-password travis --bench-branch develop
   - sudo pip install --upgrade pip
   - rm $TRAVIS_BUILD_DIR/.git/shallow
   - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh
@@ -25,7 +25,6 @@
   - bench use test_site
   - bench reinstall
   - bench build
-  - bench build-website
   - bench start &
   - sleep 10
   - bench --verbose run-tests --driver Firefox
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ed2d7c5..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributing to Frappe / ERPNext
-
-## Questions
-
-If you have questions on how to use ERPNext or want help in customization or debugging of your scripts, please post on https://discuss.erpnext.com. This is only for bug reports and feature requests.
-
-## Reporting issues
-
-We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems. Please read the following guidelines before opening any issue.
-
-1. **Search for existing issues:** We want to avoid duplication, and you'd help us out a lot by first checking if someone else has reported the same issue. The issue may have already been resolved with a fix available.
-1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
-1. **Mention the version number:** Please mention the application, browser and platform version numbers.
-
-### Issues
-
-1. **Share as much information as possible:** Include operating system and version, browser and version, when did you last update ERPNext, how is it customized, etc. where appropriate. Also include steps to reproduce the bug.
-1. **Include Screenshots if possible:** Consider adding screenshots annotated with what goes wrong.
-1. **Find and post the trace for bugs:** If you are reporting an issue from the browser, Open the Javascript Console and paste us any error messages you see.
-1. **Security Issues:** If you are reporting a security issue, please send a private email to <info@frappe.io>.
-
-
-### Feature Requests
-
-1. We need as much information you can to consider a feature request. 
-1. Think about **how** you want us to build the feature. Consider including:
-	1. Mockups (wireframes of features)
-	1. Screenshots (annotated with what should change)
-	1. Screenshots from other products if you want us to implement features present in other products.
-1. Basically, the more you help us, the faster your request is likely to be completed.
-1. A one line feature request like **Implement Capacity Planning** will be closed.
-
-## Pull Requests
-
-General guidelines for sending pull requests:
-
-#### Don't Repeat Yourself (DRY)
-
-We believe that the most effective way to manage a product like this is to ensure that
-there is minimum repetition of code. So before contributing a function, please make sure
-that such a feature or function does not exist else where. If it does, the try and extend
-that function to accommodate your use case.
-
-#### Don't create new DocTypes Unless Absolutely Necessary
-
-DocTypes are easy to create but hard to maintain. If you find that there is a another DocType with a similar functionality, then please try and extend that functionality. For example, by adding a "type" field to classify the new type of record.
-
-#### Tabs or spaces?
-
-Tabs!
-
-#### Release Checklist
-
-- Describe, in detail, what is in the pull request
-- How to use the new feature?
-- Test cases
-- Change log
-- Manual Pull Request Link
-- Screencast. Should include:
-	- New Forms
-	- Linked Forms
-	- Linked Reports
-	- Print Views
-
-### Copyright
-
-Please see README.md
-
diff --git a/README.md b/README.md
index a17ee9f..dbb88ac 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 [https://erpnext.com](https://erpnext.com)
 
-Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Requires MariaDB.
+Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
 
 ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 7fcbabe..2a30f12 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -1,4 +1,26 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+import frappe
 
-__version__ = '6.27.26'
\ No newline at end of file
+__version__ = '7.0.0-beta'
+
+def get_default_company(user=None):
+	'''Get default company for user'''
+	from frappe.defaults import get_user_default_as_list
+
+	if not user:
+		user = frappe.session.user
+
+	companies = get_user_default_as_list(user, 'company')
+	if companies:
+		default_company = companies[0]
+	else:
+		default_company = frappe.db.get_single_value('Global Defaults', 'default_company')
+
+	return default_company
+
+def get_default_currency():
+	'''Returns the currency of the default company'''
+	company = get_default_company()
+	if company:
+		return frappe.db.get_value('Company', company, 'default_currency')
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index 703397e..c3a01b9 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.list_route = "Accounts Browser/Account";
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	if(doc.__islocal) {
@@ -42,13 +41,13 @@
 cur_frm.cscript.account_type = function(doc, cdt, cdn) {
 	if(doc.is_group==0) {
 		cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax');
-		cur_frm.toggle_display('warehouse', doc.account_type=='Warehouse');
+		cur_frm.toggle_display('warehouse', doc.account_type=='Stock');
 	}
 }
 
 cur_frm.cscript.add_toolbar_buttons = function(doc) {
 	cur_frm.add_custom_button(__('Chart of Accounts'),
-		function() { frappe.set_route("Accounts Browser", "Account"); }, __("View"))
+		function() { frappe.set_route("Tree", "Account"); }, __("View"))
 
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Group to Non-Group'),
@@ -64,7 +63,7 @@
 			frappe.set_route("query-report", "General Ledger");
 		}, __("View"));
 
-		cur_frm.add_custom_button(__('Group to Group'),
+		cur_frm.add_custom_button(__('Non-Group to Group'),
 			function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
 	}
 }
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index ce03877..f11a664 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -2,6 +2,7 @@
  "allow_copy": 1, 
  "allow_import": 1, 
  "allow_rename": 1, 
+ "beta": 0, 
  "creation": "2013-01-30 12:49:46", 
  "custom": 0, 
  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
@@ -17,6 +18,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -41,6 +43,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -64,6 +67,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account Name", 
@@ -90,6 +94,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Group", 
@@ -114,6 +119,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -140,6 +146,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Root Type", 
@@ -164,6 +171,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Report Type", 
@@ -189,6 +197,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
@@ -214,6 +223,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -237,6 +247,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Account", 
@@ -264,6 +275,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Account Type", 
@@ -271,7 +283,7 @@
    "no_copy": 0, 
    "oldfieldname": "account_type", 
    "oldfieldtype": "Select", 
-   "options": "\nBank\nCash\nDepreciation\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary", 
+   "options": "\nAccumulated Depreciation\nBank\nCash\nChargeable\nCost of Goods Sold\nDepreciation\nEquity\nExpense Account\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nPayable\nReceivable\nRound Off\nStock\nStock Adjustment\nStock Received But Not Billed\nTax\nTemporary", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -291,6 +303,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
@@ -317,6 +330,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Frozen", 
@@ -343,6 +357,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse", 
@@ -367,6 +382,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Balance must be", 
@@ -391,6 +407,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lft", 
@@ -414,6 +431,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rgt", 
@@ -437,6 +455,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Old Parent", 
@@ -457,13 +476,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-money", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-12 10:19:54.365839", 
+ "modified": "2016-06-24 13:33:45.504882", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -570,7 +590,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": ""
+ "search_fields": "", 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index acc4884..ced1e85 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -16,7 +16,7 @@
 		frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",
 			"frozen_accounts_modifier")
 		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
-			self.get("__onload").can_freeze_account = True
+			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
 		# first validate if company exists
@@ -91,11 +91,11 @@
 			return
 
 		existing_is_group = frappe.db.get_value("Account", self.name, "is_group")
-		if self.is_group != existing_is_group:
+		if cint(self.is_group) != cint(existing_is_group):
 			if self.check_gle_exists():
 				throw(_("Account with existing transaction cannot be converted to ledger"))
 			elif self.is_group:
-				if self.account_type:
+				if self.account_type and not self.flags.exclude_account_type_check:
 					throw(_("Cannot covert to Group because Account Type is selected."))
 			elif self.check_if_child_exists():
 				throw(_("Account with child nodes cannot be set as ledger"))
@@ -139,7 +139,7 @@
 	def convert_ledger_to_group(self):
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be converted to group."))
-		elif self.account_type:
+		elif self.account_type and not self.flags.exclude_account_type_check:
 			throw(_("Cannot covert to Group because Account Type is selected."))
 		else:
 			self.is_group = 1
@@ -164,23 +164,28 @@
 	def validate_warehouse_account(self):
 		if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
 			return
-
-		if self.account_type == "Warehouse":
+			
+		if self.account_type == "Stock" and not cint(self.is_group):
 			if not self.warehouse:
-				throw(_("Warehouse is mandatory if account type is Warehouse"))
-
+				throw(_("Warehouse is mandatory"))
+				
 			old_warehouse = cstr(frappe.db.get_value("Account", self.name, "warehouse"))
 			if old_warehouse != cstr(self.warehouse):
 				if old_warehouse:
 					self.validate_warehouse(old_warehouse)
 				if self.warehouse:
 					self.validate_warehouse(self.warehouse)
+					
 		elif self.warehouse:
 			self.warehouse = None
-
+	
 	def validate_warehouse(self, warehouse):
-		if frappe.db.get_value("Stock Ledger Entry", {"warehouse": warehouse}):
-			throw(_("Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse").format(warehouse))
+		lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
+
+		if lft and rgt:
+			if frappe.db.sql_list("""select sle.name from `tabStock Ledger Entry` sle where exists (select wh.name from
+				tabWarehouse wh where lft >= %s and rgt <= %s and sle.warehouse = wh.name)""", (lft, rgt)):
+				throw(_("Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it").format(warehouse))
 
 	def update_nsm_model(self):
 		"""update lft, rgt indices for nested set model"""
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
new file mode 100644
index 0000000..db15eef
--- /dev/null
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -0,0 +1,52 @@
+frappe.treeview_settings["Account"] = {
+	breadcrumbs: "Accounts",
+	title: __("Chart Of Accounts"),
+	get_tree_root: false,
+	filters: [{
+		fieldname: "company",
+		fieldtype:"Select",
+		options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
+		label: __("Company"),
+		default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+	}],
+	root_label: "Accounts",
+	get_tree_nodes: 'erpnext.accounts.utils.get_children',
+	add_tree_node: 'erpnext.accounts.utils.add_ac',
+	menu_items:[
+		{
+			label: __('New Company'),
+			action: function() { frappe.new_doc("Company", true) },
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+		}
+	],
+	fields: [
+		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
+			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', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+			description: __("Optional. This setting will be used to filter in various transactions.")
+		},
+		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
+			depends_on: 'eval:doc.is_group==1&&doc.account_type=="Tax"'},
+		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
+			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Warehouse")'},
+		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
+			description: __("Optional. Sets company's default currency, if not specified.")}
+	],
+	onrender: function(node) {
+		var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
+		if (node.data && node.data.balance!==undefined) {
+			$('<span class="balance-area pull-right text-muted small">'
+				+ (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);
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 91469d9..5c82142 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -37,12 +37,15 @@
 						"root_type": root_type,
 						"report_type": report_type,
 						"account_type": child.get("account_type"),
-						"account_currency": frappe.db.get_value("Company", company, "default_currency")
+						"account_currency": frappe.db.get_value("Company", company, "default_currency"),
+						"tax_rate": child.get("tax_rate")
 					})
 
 					if root_account or frappe.local.flags.allow_unverified_charts:
 						account.flags.ignore_mandatory = True
 						
+					account.flags.ignore_permissions = True
+					
 					account.insert()
 
 					accounts.append(account_name_in_db)
@@ -86,8 +89,9 @@
 	def _get_chart_name(content):
 		if content:
 			content = json.loads(content)
-			if content and content.get("disabled", "No") == "No":
-				charts.append(content["name"])
+			if (content and content.get("disabled", "No") == "No") \
+				or frappe.local.flags.allow_unverified_charts:
+					charts.append(content["name"])
 
 	country_code = frappe.db.get_value("Country", country, "code")
 	if country_code:
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
index 5d7fcc4..0dfd1bd 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ar_ar_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ar",
-    "name": "Plan de Cuentas",
-	"disabled": "Yes",
+    "name": "Argentina - Plan de Cuentas",
     "tree": {
         "Cuentas Patrimoniales": {
             "ACTIVO": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
index 051e554..7fc58ce 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/be_l10nbe_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "be",
-    "name": "Belgian PCMN",
+    "name": "Belgian - PCMN",
     "tree": {
         "CLASSE 1": {
             "BENEFICE (PERTE) REPORTE(E)": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
index 65f5f3b..0ac6588 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "br",
-    "name": "Planilha de Contas Brasileira",
+    "name": "Brasileira - Planilha de Contas",
     "tree": {
         "ATIVO": {
             "CIRCULANTE": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
index ed4cd40..02c4609 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_en_chart_template_en.json
@@ -1,6 +1,6 @@
 {
     "country_code": "ca",
-    "name": "Chart of Accounts for english-speaking provinces",
+    "name": "Canada - Chart of Accounts for english-speaking provinces",
     "tree": {
         "ASSETS": {
             "CURRENT ASSETS": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
index 41fe453..de3ad67 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
@@ -1,6 +1,6 @@
 {
     "country_code": "ca",
-    "name": "Plan comptable pour les provinces francophones",
+    "name": "Canada - Plan comptable pour les provinces francophones",
     "tree": {
         "ACTIF": {
             "ACTIFS COURANTS": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
index f8d467c..5b5547f 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ch_l10nch_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ch",
-    "name": "Plan comptable STERCHI",
-	"disabled": "Yes",
+    "name": "Switzerland - Plan comptable STERCHI",
     "tree": {
         "Actif": {
             "Actifs circulants": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cl_cl_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cl_cl_chart_template.json
index 63b56dc..92a0f4f 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cl_cl_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cl_cl_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "cl",
-    "name": "Plan de Cuentas",
-	"disabled": "Yes",
+    "name": "Chile - Plan de Cuentas",
     "tree": {
         "Cuentas de Movimiento": {
             "Compras": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china.json
index b7db811..9b9c24c 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china.json
@@ -1,7 +1,6 @@
 {
     "country_code": "cn",
-	"disabled": "Yes",
-    "name": "\u4e2d\u56fd\u4f1a\u8ba1\u79d1\u76ee\u8868  \uff08\u8d22\u4f1a[2006]3\u53f7\u300a\u4f01\u4e1a\u4f1a\u8ba1\u51c6\u5219\u300b\uff09",
+    "name": "China - \u4e2d\u56fd\u4f1a\u8ba1\u79d1\u76ee\u8868  \uff08\u8d22\u4f1a[2006]3\u53f7\u300a\u4f01\u4e1a\u4f1a\u8ba1\u51c6\u5219\u300b\uff09",
     "tree": {
         "\u4e3b\u8425\u4e1a\u52a1\u6210\u672c": {
             "root_type": ""
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json
deleted file mode 100644
index 9125b87..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cn_l10n_chart_china_small_business.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-    "country_code": "cn",
-	"disabled": "Yes",
-    "name": "\u5c0f\u4f01\u4e1a\u4f1a\u8ba1\u79d1\u76ee\u8868\uff08\u8d22\u4f1a[2011]17\u53f7\u300a\u5c0f\u4f01\u4e1a\u4f1a\u8ba1\u51c6\u5219\u300b\uff09",
-    "tree": {
-        "\u4e3b\u8425\u4e1a\u52a1\u6210\u672c": {
-            "root_type": ""
-        },
-        "\u4e3b\u8425\u4e1a\u52a1\u6536\u5165": {
-            "root_type": ""
-        },
-        "\u5176\u4ed6\u4e1a\u52a1\u6210\u672c": {
-            "root_type": ""
-        },
-        "\u5176\u4ed6\u4e1a\u52a1\u6536\u5165": {
-            "root_type": ""
-        },
-        "\u5176\u4ed6\u5e94\u6536\u6b3e": {
-            "root_type": ""
-        },
-        "\u5176\u4ed6\u8d27\u5e01\u8d44\u91d1": {
-            "root_type": ""
-        },
-        "\u5229\u6da6\u5206\u914d": {
-            "root_type": ""
-        },
-        "\u5236\u9020\u8d39\u7528": {
-            "root_type": ""
-        },
-        "\u539f\u6750\u6599": {
-            "root_type": ""
-        },
-        "\u5468\u8f6c\u6750\u6599": {
-            "root_type": ""
-        },
-        "\u5546\u54c1\u8fdb\u9500\u5dee\u4ef7": {
-            "root_type": ""
-        },
-        "\u56fa\u5b9a\u8d44\u4ea7": {
-            "root_type": ""
-        },
-        "\u56fa\u5b9a\u8d44\u4ea7\u6e05\u7406": {
-            "root_type": ""
-        },
-        "\u5728\u5efa\u5de5\u7a0b": {
-            "root_type": ""
-        },
-        "\u5728\u9014\u7269\u8d44": {
-            "root_type": ""
-        },
-        "\u59d4\u6258\u52a0\u5de5\u7269\u8d44": {
-            "root_type": ""
-        },
-        "\u5b9e\u6536\u8d44\u672c": {
-            "root_type": ""
-        },
-        "\u5de5\u7a0b\u65bd\u5de5": {
-            "root_type": ""
-        },
-        "\u5de5\u7a0b\u7269\u8d44": {
-            "root_type": ""
-        },
-        "\u5e93\u5b58\u5546\u54c1": {
-            "root_type": ""
-        },
-        "\u5e94\u4ea4\u7a0e\u8d39": {
-            "root_type": ""
-        },
-        "\u5e94\u4ed8\u5229\u606f": {
-            "root_type": ""
-        },
-        "\u5e94\u4ed8\u5229\u6da6": {
-            "root_type": ""
-        },
-        "\u5e94\u4ed8\u7968\u636e": {
-            "root_type": ""
-        },
-        "\u5e94\u4ed8\u804c\u5de5\u85aa\u916c": {
-            "root_type": ""
-        },
-        "\u5e94\u4ed8\u8d26\u6b3e": {
-            "root_type": ""
-        },
-        "\u5e94\u6536\u5229\u606f": {
-            "root_type": ""
-        },
-        "\u5e94\u6536\u7968\u636e": {
-            "root_type": ""
-        },
-        "\u5e94\u6536\u80a1\u5229": {
-            "root_type": ""
-        },
-        "\u5e94\u6536\u8d26\u6b3e": {
-            "root_type": ""
-        },
-        "\u5f85\u5904\u7406\u8d22\u4ea7\u635f\u6ea2": {
-            "root_type": ""
-        },
-        "\u6240\u5f97\u7a0e": {
-            "root_type": ""
-        },
-        "\u6295\u8d44\u6536\u76ca": {
-            "root_type": ""
-        },
-        "\u65e0\u5f62\u8d44\u4ea7": {
-            "root_type": ""
-        },
-        "\u672c\u5e74\u5229\u6da6": {
-            "root_type": ""
-        },
-        "\u673a\u68b0\u4f5c\u4e1a": {
-            "root_type": ""
-        },
-        "\u6750\u6599\u6210\u672c\u5dee\u5f02": {
-            "root_type": ""
-        },
-        "\u6750\u6599\u91c7\u8d2d": {
-            "root_type": ""
-        },
-        "\u6d88\u8017\u6027\u751f\u7269\u8d44\u4ea7": {
-            "root_type": ""
-        },
-        "\u73b0\u91d1": {
-            "root_type": ""
-        },
-        "\u751f\u4ea7\u6027\u751f\u7269\u8d44\u4ea7": {
-            "root_type": ""
-        },
-        "\u751f\u4ea7\u6027\u751f\u7269\u8d44\u4ea7\u7d2f\u8ba1\u6298\u65e7": {
-            "root_type": ""
-        },
-        "\u751f\u4ea7\u6210\u672c": {
-            "root_type": ""
-        },
-        "\u76c8\u4f59\u516c\u79ef": {
-            "root_type": ""
-        },
-        "\u77ed\u671f\u501f\u6b3e": {
-            "root_type": ""
-        },
-        "\u77ed\u671f\u6295\u8d44": {
-            "root_type": ""
-        },
-        "\u7814\u53d1\u652f\u51fa": {
-            "root_type": ""
-        },
-        "\u7ba1\u7406\u8d39\u7528": {
-            "root_type": ""
-        },
-        "\u7d2f\u8ba1\u644a\u9500": {
-            "root_type": ""
-        },
-        "\u8425\u4e1a\u5916\u652f\u51fa": {
-            "root_type": ""
-        },
-        "\u8425\u4e1a\u5916\u6536\u5165": {
-            "root_type": ""
-        },
-        "\u8425\u4e1a\u7a0e\u91d1\u53ca\u9644\u52a0": {
-            "root_type": ""
-        },
-        "\u8d22\u52a1\u8d39\u7528": {
-            "root_type": ""
-        },
-        "\u8d44\u672c\u516c\u79ef": {
-            "root_type": ""
-        },
-        "\u9012\u5ef6\u6536\u76ca": {
-            "root_type": ""
-        },
-        "\u94f6\u884c\u5b58\u6b3e": {
-            "root_type": ""
-        },
-        "\u9500\u552e\u8d39\u7528": {
-            "root_type": ""
-        },
-        "\u957f\u671f\u501f\u6b3e": {
-            "root_type": ""
-        },
-        "\u957f\u671f\u503a\u5238\u6295\u8d44": {
-            "root_type": ""
-        },
-        "\u957f\u671f\u5e94\u4ed8\u6b3e": {
-            "root_type": ""
-        },
-        "\u957f\u671f\u5f85\u644a\u8d39\u7528": {
-            "root_type": ""
-        },
-        "\u957f\u671f\u80a1\u6743\u6295\u8d44": {
-            "root_type": ""
-        },
-        "\u9884\u4ed8\u8d26\u6b3e": {
-            "root_type": ""
-        },
-        "\u9884\u6536\u8d26\u6b3e": {
-            "root_type": ""
-        }
-    }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
index 4ac3465..aa7d551 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/co_vauxoo_mx_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "co",
-    "name": "Unique Account Chart - PUC",
+    "name": "Colombia - Unique Account Chart - PUC",
     "tree": {
         "ACTIVO": {
             "DEUDORES": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
index f81d1e3..ca71496 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_0.json
@@ -1,6 +1,6 @@
 {
     "country_code": "cr",
-    "name": "Costa Rica - Company 0",
+    "name": "Costa Rica - Chart of Accounts 1",
     "tree": {
         "0-Activo": {
             "0-Activo circulante": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
index a36586e..51160b3 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/cr_account_chart_template_x.json
@@ -1,6 +1,6 @@
 {
     "country_code": "cr",
-    "name": "Costa Rica - Company 1",
+    "name": "Costa Rica - Chart of Accounts 2",
     "tree": {
         "xActivo": {
             "root_type": "Asset",
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
index c8ed2ee..5ff76e6 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
@@ -1,7 +1,6 @@
 {
     "country_code": "de",
-    "name": "Deutscher Kontenplan SKR04",
-	"disabled": "Yes",
+    "name": "Germany - Kontenplan SKR04",
     "tree": {
         "Bilanz - Aktiva": {
             "Anlageverm\u00f6gen": {
@@ -222,24 +221,8 @@
                         "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr": {},
                         "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
                     },
-                    "Forderungen geg. Untern.- m. d. e. Beteiligungsverh\u00e4ltnis besteht od. Verbindl. gegen Untern. - mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                        "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                            "Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {},
-                            "Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit bis 1 Jahr": {},
-                            "Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
-                            "Besitzwechsel gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht- bundesbankf\u00e4hig": {},
-                            "Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                                "account_type": "Receivable"
-                            },
-                            "Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit bis 1 Jahr": {},
-                            "Forderungen aus Lieferungen und Leistungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
-                            "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit bis 1 Jahr": {},
-                            "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
-                        }
-                    },
                     "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht H-Saldo": {
-                        "Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen Unternhemen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {},
-                        "Wertberichtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr gegen Unternhemen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {}
+                    	"is_group": 1
                     },
                     "Forderungen gegen verbundene Unternehmen H-Saldo": {
                         "Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen verbundene Unternehmen": {},
@@ -459,7 +442,7 @@
                         "Gezeichnetes Kapital": {}
                     },
                     "Nicht eingeforderte ausstehende Einlagen": {
-                        "Ausstehende Einlagen auf das gezeichnete Kapital- nicht eingefordert (Passivausweis- von gezeichnetem Kapital offen abgesetzt eingeforderte ausstehende Einlagen s. Konto 1298)": {}
+						"is_group": 1
                     }
                 },
                 "Kapital Teilhaber": {
@@ -758,19 +741,6 @@
                             "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
                         }
                     },
-                    "Verbindlichkeiten gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht oder Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                        "Verbindlichkeiten gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht ": {
-                            "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
-                                "account_type": "Payable"
-                            },
-                            "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit 1 bis 5 Jahre": {},
-                            "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit bis 1 Jahr": {},
-                            "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
-                            "Verbindlichkeiten gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht Restlaufzeit 1 bis 5 Jahre": {},
-                            "Verbindlichkeiten gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht Restlaufzeit bis 1 Jahr": {},
-                            "Verbindlichkeiten gegen\u00fcber Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
-                        }
-                    },
                     "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen oder Forderungen gegen verbundene Unternehmen": {
                         "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {
                             "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen": {
@@ -884,10 +854,6 @@
                 "Statistische Konten f\u00fcr den Gewinnzuschlag nach \u00a7\u00a7 6b- 6c und 7g EStG (Haben-Buchung)": {},
                 "Statistische Konten f\u00fcr den Gewinnzuschlag- Gegenkonto zu 9890": {}
             },
-            "Statistische Konten f\u00fcr den GuV-Ausweis in \"Gutschrift bzw. Belastung auf Verbindlichkeitskonten\" bei den Zuordnungstabellen f\u00fcr PersHG nach KapCoRiLiG": {
-                "Anteil f\u00fcr Verbindlichkeitskonten": {},
-                "Verrechnungskonto f\u00fcr Anteil Verbindlichkeitskonten": {}
-            },
             "Statistische Konten f\u00fcr den Kennziffernteil der Bilanz": {
                 "Besch\u00e4ftigte Personen": {},
                 "Gegenkonto zu 9200": {},
@@ -1028,7 +994,6 @@
                 "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen": {},
                 "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen gegen\u00fcber verbundenen Unternehmen": {},
                 "Verbindlichkeiten aus der Begebung und \u00fcbertragung von Wechseln": {},
-                "Verbindlichkeiten aus der Begebung und \u00fcbertragung von Wechseln gegen\u00fcber verbundenen Unternehmen": {},
                 "Verpflichtungen aus Treuhandverm\u00f6gen": {}
             },
             "Statistische Konten zu \u00a7 4 (4a) EStG": {
@@ -1110,30 +1075,6 @@
                         "Vorwegnahme k\u00fcnftiger Wertschwankungen im Umlaufverm\u00f6gen (soweit un\u00fcblich hoch)": {}
                     }
                 },
-                "Abschreibungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde des Anlageverm\u00f6gens und Sachanlagen sowie auf aktivierte Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
-                    "Abschreibungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde des Anlageverm\u00f6gens und Sachanlagen sowie auf aktivierte Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
-                        "Abschreibungen auf Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {},
-                        "Abschreibungen auf Aufwendungen f\u00fcr die W\u00e4hrungsumstellung auf den Euro": {},
-                        "Abschreibungen auf Geb\u00e4ude": {},
-                        "Abschreibungen auf Geb\u00e4udeteil des h\u00e4uslischen Arbeitszimmers": {},
-                        "Abschreibungen auf Kfz": {},
-                        "Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Geb\u00e4ude)": {},
-                        "Abschreibungen auf Sachanlagen auf Grund steuerlicher Sondervorschriften ": {},
-                        "Abschreibungen auf aktivierte- geringwertige Wirtschaftsg\u00fcter": {},
-                        "Abschreibungen auf den Gesch\u00e4fts- oder Firmenwert": {},
-                        "Abschreibungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde": {},
-                        "Absetzung f\u00fcr Au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung der Geb\u00e4ude": {},
-                        "Absetzung f\u00fcr Au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung des Kfz": {},
-                        "Absetzung f\u00fcr Au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung sonstiger Wirtschaftsg\u00fcter": {},
-                        "Au\u00dferplanma\u00dfige Abschreibungen auf aktivierte- geringwertige Wirtschaftsg\u00fcter": {},
-                        "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf Sachanlagen": {},
-                        "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde": {},
-                        "Kaufleasing": {},
-                        "Sofortabschreibungen geringwertiger Wirtschaftsg\u00fcter": {},
-                        "Sonderabschreibungen nach \u00a7 7g Abs. 1 u. 2 EStG (f\u00fcr Kfz)": {},
-                        "Sonderabschreibungen nach \u00a7 7g Abs. 1 u. 2 EStG (ohne Kfz)": {}
-                    }
-                },
                 "Kalkulatorische Kosten": {
                     "Sonstige betriebliche Aufwendungen": {
                         "Kalkulatorische Abschreibungen": {},
@@ -1369,16 +1310,6 @@
                         "Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
                     }
                 },
-                "Aufwendungen aus Verlust\u00fcbernahme und auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags abgef\u00fchrte Gewinne": {
-                    "Auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags abgef\u00fchrte Gewinne": {
-                        "Abgef\u00fchrte Gewinnanteile an stille Gesellschafter \u00a7 8 GewStG": {},
-                        "Abgef\u00fchrte Gewinne auf Grund einer Gewinngemeinschaft": {},
-                        "Abgef\u00fchrte Gewinne auf Grund eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags": {}
-                    },
-                    "Aufwendungen aus Verlust\u00fcbernahme": {
-                        "Aufwendungen aus Verlust\u00fcbernahme": {}
-                    }
-                },
                 "Au\u00dferordentliche Aufwendungen": {
                     "Au\u00dferordentliche Aufwendungen": {
                         "Au\u00dferordentliche Aufwendungen": {},
@@ -1494,18 +1425,13 @@
                         "Anlagenabg\u00e4nge immaterielle Verm\u00f6gensgegenst\u00e4nde (Restbuchwert bei Buchgewinn)": {},
                         "Bank Bewertungsertrag": {},
                         "Bank Waehrungsverlust (Konto)": {},
-                        "Erl. a. Verk. v. Wirtschaftsg. d. Umlaufv.- umsatzsteuerf. \u00a7 4 Nr. 8 ff UStG i. V. m. \u00a7 4 Abs. 3 Satz 4 EStG- 100%/50% steuerf.(inlandische Kap. Ges.)": {},
-                        "Erl\u00f6se aus Verkauen von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 19% USt f\u00fcr \u00a7 4 Abs. 3 Satz 4 EStG": {},
-                        "Erl\u00f6se aus Verkauen von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens- umsatzsteuerfrei \u00a7 4 Nr. 8 ff UStG i. V. m. \u00a7 4 Abs. 3 Satz 4 EStG": {},
                         "Erl\u00f6se aus Verkauf immaterieller Verm\u00f6gensgegenst\u00e4nde (bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {},
-                        "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen 100% / 50% steuerfrei (inlandische Kap.Ges.)(bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 16% USt (bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19% USt (bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchgewinn)": {},
                         "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchgewinn)": {},
-                        "Erl\u00f6se aus Verk\u00e4ufen von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
                         "Ertraege a. Waehrungsumstellung auf Euro": {},
                         "Ertr\u00e4ge aus Bewertung Finanzmittelfonds": {},
                         "Ertr\u00e4ge aus Kursdifferenzen": {},
@@ -1715,27 +1641,11 @@
                         "Ertr\u00e4ge aus Beteiligungen": {},
                         "Ertr\u00e4ge aus Beteiligungen an verbundenen Unternehmen": {},
                         "Gewinnanteile aus Mitunternehmerschaften \u00a7 9 GewStG": {},
-                        "Gewinne aus Anteilen an nicht steuerbefreiten inl\u00e4ndischen Kapitalgesellschaften \u00a7 9 Nr. 2a GewStG": {},
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Beteiligung) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {}
-                    }
-                },
-                "Ertr\u00e4ge aus Verlust\u00fcbernahme und auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags erhaltene Gewinne": {
-                    "Auf Grund einer Gewinngemeinschaft- eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags erhaltene ": {
-                        "Erhaltene Gewinne auf Grund einer Gewinngemeinschaft": {},
-                        "Erhaltene Gewinne auf Grund eines Gewinn- oder Teilgewinnabf\u00fchrungsvertrags": {}
-                    },
-                    "Ertr\u00e4ge aus Verlust\u00fcbernahme ": {
-                        "Ertr\u00e4ge aus Verlust\u00fcbernahme": {}
+                        "Gewinne aus Anteilen an nicht steuerbefreiten inl\u00e4ndischen Kapitalgesellschaften \u00a7 9 Nr. 2a GewStG": {}
                     }
                 },
                 "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
-                    "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
-                        "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {},
-                        "Etr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens aus verbundenen Unternehmen": {},
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Finanzanlageverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {}
-                    }
+                    "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {}
                 },
                 "Gewinnvortrag": {
                     "Gewinnvortrag nach Verwendung": {}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
index 2f9782a..fcd6922 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_de_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "de",
-    "name": "Deutscher Kontenplan SKR03",
-	"disabled": "Yes",
+    "name": "Germany - Kontenplan SKR03",
     "tree": {
         "Aktiva": {
             "Abgrenzung latenter Steuern": {
@@ -399,8 +398,7 @@
                 "Jahres\u00fcberschuss Jahresfehlbetrag": {}
             },
             "Rechnungsabgrenzungsposten": {
-                "Passive Rechnungsabgrenzung": {},
-                "Verbindlichkeiten aus der Begebung und \u00dcbertragung von Wechseln, aus B\u00fcrgschaften, Wechsel- und Scheckb\u00fcrgschaften und aus Gew\u00e4hrleistungsvertr\u00e4gen sowie Haftung aus Bestellung von Sicherheiten f\u00fcr fremde Verbindlichkeiten": {}
+                "Passive Rechnungsabgrenzung": {}
             },
             "R\u00fcckstellungen": {
                 "R\u00fcckstellungen f\u00fcr Pensionen und \u00e4hnliche Verpflichtungen": {
@@ -1346,10 +1344,6 @@
                 "Statistische Konten f\u00fcr den Gewinnzuschlag nach \u00a7\u00a7 6b- 6c und 7g EStG (Haben-Buchung)": {},
                 "Statistische Konten f\u00fcr den Gewinnzuschlag- Gegenkonto zu 9890": {}
             },
-            "Statistische Konten f\u00fcr den GuV-Ausweis in \"Gutschrift bzw. Belastung auf Verbindlichkeitskonten\" bei den Zuordnungstabellen f\u00fcr PersHG nach KapCoRiLiG": {
-                "Anteil f\u00fcr Verbindlichkeitskonten": {},
-                "Verrechnungskonto f\u00fcr Anteil Verbindlichkeitskonten": {}
-            },
             "Statistische Konten f\u00fcr den Kennziffernteil der Bilanz": {
                 "Besch\u00e4ftigte Personen": {},
                 "Gegenkonto zu 9200": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
index 122edaa..0910a71 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/es_account_chart_template_common.json
@@ -1,7 +1,6 @@
 {
     "country_code": "es", 
-    "name": "PGCE com\u00fan", 
-	"disabled": "Yes",
+    "name": "Spain - PGCE com\u00fan", 
     "tree": {
         "Acreedores y deudores por operaciones comerciales": {
             "Acreedores varios": {
@@ -1482,10 +1481,7 @@
                 }
             }, 
             "Deterioro del valor de inversiones financieras a corto plazo y de activos no corrientes mantenidos para la venta": {
-                "Deterioro de valor de activos no corrientes mantenidos para la venta": {
-                    "Deterioro de valor de existencias, deudores comerciales y otras cuentas a cobrar integrados en un grupo enajenable mantenido para la venta": {
-                        "Deterioro de valor de existencias, deudores comerciales y otras cuentas a cobrar integrados en un grupo enajenable mantenido para la venta": {}
-                    }, 
+                "Deterioro de valor de activos no corrientes mantenidos para la venta": { 
                     "Deterioro de valor de inmovilizado no corriente mantenido para la venta": {
                         "Deterioro de valor de inmovilizado no corriente mantenido para la venta": {}
                     }, 
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
index d7b1964..20b6f4c 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/et_l10n_et.json
@@ -1,6 +1,6 @@
 {
     "country_code": "et",
-    "name": "Ethiopia Tax and Account Chart Template",
+    "name": "Ethiopia - Chart of Accounts",
     "tree": {
         "ASSETS": {
             "Cash and Cash Equivalents": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
index c05a45b..d98a6a0 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "fr", 
-    "name": "Plan Comptable G\u00e9n\u00e9ral (France)", 
+    "name": "France - Plan Comptable G\u00e9n\u00e9ral", 
     "tree": {
         "Comptes de bilan": {
             "Comptes d'immobilisations": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gr_l10n_gr_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gr_l10n_gr_chart_template.json
index fe2268e..c541eb6 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gr_l10n_gr_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gr_l10n_gr_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "gr", 
-    "name": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03bf\u03cd \u039b\u03bf\u03b3\u03b9\u03c3\u03c4\u03b9\u03ba\u03bf\u03cd \u03a3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5", 
+    "name": "Greece - \u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03bf\u03cd \u039b\u03bf\u03b3\u03b9\u03c3\u03c4\u03b9\u03ba\u03bf\u03cd \u03a3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5", 
     "tree": {
         "\u0391\u03a0\u0391\u0399\u03a4\u0397\u03a3\u0395\u0399\u03a3 \u039a\u0391\u0399 \u0394\u0399\u0391\u0398\u0395\u03a3\u0399\u039c\u0391": {
             "root_type": "", 
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
deleted file mode 100644
index 5b4f352..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/gt_cuentas_plantilla.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "country_code": "gt",
-    "name": "Plantilla de cuentas de Guatemala (sencilla)",
-    "tree": {
-        "Activo": {
-            "Activo Corriente": {
-                "Caja y Bancos": {
-                    "Caja Chica": {}
-                },
-                "Cuentas y Documentos por Cobrar": {
-                    "Cuentas por Cobrar Empresas Afilidas": {},
-                    "Cuentas por Cobrar Generales": {},
-                    "Otras Cuentas por Cobrar": {},
-                    "Prestamos al Personal": {}
-                },
-                "IVA por Cobrar": {
-                    "IVA por Cobrar": {},
-                    "Retenciones de IVA recibidas": {}
-                },
-                "Inventario": {}
-            },
-            "Diferido": {
-                "Gastos Anticipados": {
-                    "Gastos Anticipados": {}
-                },
-                "Gastos de Organizaci\u00f3n": {
-                    "Gastos de Organizaci\u00f3n": {}
-                },
-                "Gastos por Amortizar": {
-                    "Gastos por Amortizar": {}
-                },
-                "Otros Activos": {
-                    "Otros Activos": {}
-                }
-            },
-            "No Corriente": {
-                "Depreciaciones Acumuladas": {
-                    "Depreciaciones Acumuladas": {}
-                },
-                "Propiedad, Planta y Equipo": {
-                    "Propiedad, Planta y Equipo": {}
-                }
-            },
-			"root_type": "Asset"
-        },
-        "Pasivo": {
-            "Cr\u00e9ditos Diferidos": {
-                "Cr\u00e9ditos Diferidos": {
-                    "Anticipos": {}
-                }
-            },
-            "Pasivo Corto Plazo": {
-                "Cuentas y Documentos por Pagar": {
-                    "Cuentas y Documentos por Pagar": {}
-                },
-                "IVA por Pagar": {
-                    "IVA por Pagar": {}
-                },
-                "Impuestos": {
-                    "Impuestos": {}
-                }
-            },
-            "Pasivo a Largo Plazo": {
-                "Provisi\u00f3n para Indemnizaciones": {
-                    "Provisi\u00f3n para Indemnizaciones": {}
-                }
-            },
-			"root_type": "Liability"
-        },
-        "Patrimonio": {
-            "Patrimonio de los Accionistas": {
-                "Patrimonio de los Accionistas": {
-                    "Capital Autorizado, Suscr\u00edto y Pagado": {},
-                    "Perdidas y Ganancias": {},
-                    "Reservas": {}
-                }
-            },
-			"root_type": "Asset"
-        },
-        "Egresos": {
-            "Costos": {
-                "Costos de Ventas": {
-                    "Costos de Ventas": {}
-                }
-            },
-			"root_type": "Expense"
-        },
-        "Gastos": {
-            "Gastos de Operaci\u00f3n": {
-                "Gastos de Administraci\u00f3n": {
-                    "Gastos de Administraci\u00f3n": {}
-                },
-                "Otros Gastos de Operaci\u00f3n": {
-                    "Otros Gastos de Operaci\u00f3n": {}
-                }
-            },
-            "Gastos de Ventas": {
-                "Gastos de Ventas": {
-                    "Gastos de Ventas": {}
-                }
-            },
-            "Gastos no Deducibles": {
-                "Gastos no Deducibles": {
-                    "Gastos no Deducibles": {}
-                }
-            },
-			"root_type": "Expense"
-        },
-        "Ingresos": {
-            "Otros Ingresos": {
-                "Otros Ingresos": {
-                    "Otros Ingresos": {}
-                }
-            },
-            "Ventas": {
-                "Ventas Netas": {
-                    "Descuentos Sobre Ventas": {},
-                    "Ventas": {}
-                }
-            },
-			"root_type": "Income"
-        },
-        "Otros Gastos y Productos Financieros": {
-            "Otros Gastos y Productos Financieros": {
-                "Otros Gastos y Productos Financieros": {
-                    "Intereses": {},
-                    "Otros Gastos Financieros": {}
-                }
-            },
-			"root_type": "Expense"
-        }
-    }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
index 1c06a2e..0d37e44 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hn_cuentas_plantilla.json
@@ -1,6 +1,6 @@
 {
     "country_code": "hn",
-    "name": "Plantilla de cuentas de Honduras (sencilla)",
+    "name": "Honduras - Plantilla de cuentas de",
     "tree": {
         "Activo": {
             "Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hr_l10n_hr_chart_template_rrif.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hr_l10n_hr_chart_template_rrif.json
index ffdec54..abea96c 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hr_l10n_hr_chart_template_rrif.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hr_l10n_hr_chart_template_rrif.json
@@ -1,6 +1,6 @@
 {
     "country_code": "hr", 
-    "name": "RRIF-ov ra\u010dunski plan za poduzetnike", 
+    "name": "Croatia - RRIF-ov ra\u010dunski plan za poduzetnike", 
     "tree": {
         "FINANCIJSKI REZULTAT POSLOVANJA": {
             "DOBITAK ILI GUBITAK RAZDOBLJA": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
index 7e9dfb8..85a49c5 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/hu_hungarian_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "hu", 
-    "name": "Magyar f\u0151k\u00f6nyvi kivonat", 
+    "name": "Hungary - Magyar f\u0151k\u00f6nyvi kivonat", 
     "tree": {
         "Eredm\u00e9ny sz\u00e1ml\u00e1k": {
             "AZ \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE, BEV\u00c9TELEK": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/it_l10n_it_chart_template_generic.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/it_l10n_it_chart_template_generic.json
index 182bfd5..2cdf3f3 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/it_l10n_it_chart_template_generic.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/it_l10n_it_chart_template_generic.json
@@ -1,6 +1,6 @@
 {
     "country_code": "it",
-    "name": "Generic Chart of Accounts",
+    "name": "Italy - Generic Chart of Accounts",
     "tree": {
         "ATTIVO": {
             "CREDITI COMMERCIALI": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
deleted file mode 100644
index c304684..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/lu_lu_2011_chart_1.json
+++ /dev/null
@@ -1,1455 +0,0 @@
-{
-    "country_code": "lu", 
-    "name": "PCMN Luxembourg", 
-	"disabled": "Yes",
-    "tree": {
-        "TOTAL CLASSES 1 A 5": {
-            "CLASSE 1 - COMPTES DE CAPITAUX, DE PROVISIONS ET DE DETTES FINANCIERES": {
-                "Acomptes sur dividendes": {}, 
-                "Capital ou dotation des succursales et comptes de l'exploitant": {
-                    "Capital des entreprises commer\u00e7ants personnes physiques et des soci\u00e9t\u00e9s de personnes": {
-                        "Commer\u00e7ants personnes physiques": {}, 
-                        "Soci\u00e9t\u00e9s de personnes": {}
-                    }, 
-                    "Capital souscrit (Soci\u00e9t\u00e9s de capitaux - Montant total)": {}, 
-                    "Capital souscrit appel\u00e9 et non vers\u00e9 (Soci\u00e9t\u00e9s de capitaux)": {}, 
-                    "Capital souscrit non appel\u00e9 (Soci\u00e9t\u00e9s de capitaux)": {}, 
-                    "Comptes de l'exploitant ou des coexploitants": {
-                        "Pr\u00e9l\u00e8vements priv\u00e9s de l'exploitant ou des coexploitants": {
-                            "Acquisitions": {
-                                "Autres acquisitions": {}, 
-                                "Immeubles priv\u00e9s": {}, 
-                                "Mobilier priv\u00e9": {}, 
-                                "Titres priv\u00e9s": {}, 
-                                "Voiture priv\u00e9e": {}
-                            }, 
-                            "Cotisations": {
-                                "Allocations familiales": {}, 
-                                "Assurances sociales (assurance d\u00e9pendance)": {}, 
-                                "Autres cotisations": {}, 
-                                "Caisse de d\u00e9c\u00e8s, m\u00e9dico-chirurgicale, Prestaplus": {}, 
-                                "Cotisations pour mutuelles": {}
-                            }, 
-                            "Imp\u00f4ts": {
-                                "Autres imp\u00f4ts": {}, 
-                                "Imp\u00f4t commercial - arri\u00e9r\u00e9s pay\u00e9s": {}, 
-                                "Imp\u00f4t sur la fortune pay\u00e9": {}, 
-                                "Imp\u00f4t sur le revenu pay\u00e9": {}
-                            }, 
-                            "Part personnelle des frais de maladie": {}, 
-                            "Primes d'assurances priv\u00e9es": {
-                                "Accident": {}, 
-                                "Autres primes d'assurances priv\u00e9es": {}, 
-                                "Incendie": {}, 
-                                "Multirisques": {}, 
-                                "Responsabilit\u00e9 civile": {}, 
-                                "Vie": {}
-                            }, 
-                            "Pr\u00e9l\u00e8vements en nature (quote-part priv\u00e9e dans les frais g\u00e9n\u00e9raux)": {
-                                "Autres pr\u00e9l\u00e8vements en nature": {}, 
-                                "Chauffage, gaz, \u00e9lectricit\u00e9": {}, 
-                                "Eau": {}, 
-                                "Loyer": {}, 
-                                "Salaires": {}, 
-                                "T\u00e9l\u00e9phone": {}, 
-                                "Voiture": {}
-                            }, 
-                            "Pr\u00e9l\u00e8vements en nature de marchandises, de produits finis et services (au prix de revient)": {}, 
-                            "Pr\u00e9l\u00e8vements en num\u00e9raire (train de vie)": {}, 
-                            "Pr\u00e9l\u00e8vements priv\u00e9s particuliers": {
-                                "Autres pr\u00e9l\u00e8vements priv\u00e9s particuliers": {}, 
-                                "Dons et dotations aux enfants": {}, 
-                                "Droits de succession et droits de mutation par d\u00e9c\u00e8s": {}, 
-                                "Placements sur comptes financiers priv\u00e9s": {}, 
-                                "Remboursements de dettes priv\u00e9es": {}, 
-                                "R\u00e9parations aux immeubles priv\u00e9s": {}
-                            }
-                        }, 
-                        "Suppl\u00e9ments d'apports priv\u00e9s de l'exploitant ou des coexploitants": {
-                            "Allocations familiales re\u00e7ues": {}, 
-                            "Avoirs priv\u00e9s": {}, 
-                            "Cessions": {
-                                "Autres cessions": {}, 
-                                "Immeubles priv\u00e9s": {}, 
-                                "Mobilier priv\u00e9": {}, 
-                                "Titres priv\u00e9s": {}, 
-                                "Voiture priv\u00e9e": {}
-                            }, 
-                            "Emprunts priv\u00e9s": {}, 
-                            "H\u00e9ritage ou donation": {}, 
-                            "Loyers encaiss\u00e9s": {}, 
-                            "Quote-part professionnelle de frais priv\u00e9s": {}, 
-                            "Remboursements d'imp\u00f4ts": {
-                                "Autres remboursements d'imp\u00f4ts": {}, 
-                                "Imp\u00f4t commercial": {}, 
-                                "Imp\u00f4t sur la fortune": {}, 
-                                "Imp\u00f4t sur le revenu": {}
-                            }, 
-                            "Salaires ou rentes touch\u00e9s": {}
-                        }
-                    }, 
-                    "Dotation des succursales": {}
-                }, 
-                "Dettes financi\u00e8res et dettes assimil\u00e9es": {
-                    "Autres emprunts et dettes assimil\u00e9es": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Autres dettes assimil\u00e9es": {}, 
-                            "Autres emprunts": {}, 
-                            "Int\u00e9r\u00eats courus sur autres emprunts et dettes assimil\u00e9es": {}, 
-                            "Rentes viag\u00e8res capitalis\u00e9es": {}
-                        }, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Autres dettes assimil\u00e9es": {}, 
-                            "Autres emprunts": {}, 
-                            "Int\u00e9r\u00eats courus sur autres emprunts et dettes assimil\u00e9es": {}, 
-                            "Rentes viag\u00e8res capitalis\u00e9es": {}
-                        }
-                    }, 
-                    "Dettes de leasing financier": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {}, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {}
-                    }, 
-                    "Dettes envers des \u00e9tablissements de cr\u00e9dit": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }
-                    }, 
-                    "Dettes subordonn\u00e9es": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }
-                    }, 
-                    "Emprunts obligataires convertibles": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }
-                    }, 
-                    "Emprunts obligataires non convertibles": {
-                        "dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }
-                    }
-                }, 
-                "Plus-values immunis\u00e9es": {
-                    "Plus-values immunis\u00e9es r\u00e9investies": {}, 
-                    "Plus-values immunis\u00e9es \u00e0 r\u00e9investir": {}
-                }, 
-                "Primes d'\u00e9mission et primes assimil\u00e9es": {
-                    "Apport en capitaux propres non r\u00e9mun\u00e9r\u00e9 par des titres (\"Capital contribution\")": {}, 
-                    "Primes d'apport": {}, 
-                    "Primes d'\u00e9mission": {}, 
-                    "Primes de conversion d'obligations en actions": {}, 
-                    "Primes de fusion": {}
-                }, 
-                "Provisions": {
-                    "Autres provisions": {
-                        "Provisions d'exploitation": {}, 
-                        "Provisions exceptionnelles": {}, 
-                        "Provisions financi\u00e8res": {}
-                    }, 
-                    "Provisions pour imp\u00f4ts": {
-                        "Autres provisions pour imp\u00f4ts": {}, 
-                        "Provisions pour imp\u00f4t commercial": {}, 
-                        "Provisions pour imp\u00f4t sur la fortune": {}, 
-                        "Provisions pour imp\u00f4t sur le revenu des collectivit\u00e9s": {}
-                    }, 
-                    "Provisions pour imp\u00f4ts diff\u00e9r\u00e9s": {}, 
-                    "Provisions pour pensions et obligations similaires": {}
-                }, 
-                "R\u00e9serves": {
-                    "Autres r\u00e9serves": {
-                        "Autres r\u00e9serves disponibles": {}, 
-                        "Autres r\u00e9serves indisponibles": {}, 
-                        "R\u00e9serve pour l'imp\u00f4t sur la fortune": {}
-                    }, 
-                    "R\u00e9serve l\u00e9gale": {}, 
-                    "R\u00e9serve pour actions propres ou parts propres": {}, 
-                    "R\u00e9serves statutaires": {}
-                }, 
-                "R\u00e9serves de r\u00e9\u00e9valuation": {
-                    "Autres r\u00e9serves de r\u00e9\u00e9valuation": {}, 
-                    "Plus-values sur \u00e9carts de conversion immunis\u00e9es": {}, 
-                    "R\u00e9serves de mise en \u00e9quivalence (Participations valoris\u00e9es suivant l'art. 58)": {}, 
-                    "R\u00e9serves de r\u00e9\u00e9valuation en application de la juste valeur": {}
-                }, 
-                "R\u00e9sultats": {
-                    "R\u00e9sultat de l'exercice": {}, 
-                    "R\u00e9sultats report\u00e9s": {}
-                }, 
-                "Subventions d'investissement en capital": {
-                    "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {}, 
-                    "Autres subventions d'investissement en capital": {}, 
-                    "Installations techniques et machines": {}, 
-                    "Terrains et constructions": {}
-                }
-            }, 
-            "CLASSE 2 - COMPTES DE FRAIS D\u2019ETABLISSEMENT ET D\u2019ACTIFS IMMOBILISES": {
-                "Frais d'\u00e9tablissement et frais assimil\u00e9s": {
-                    "Autres frais assimil\u00e9s": {}, 
-                    "Frais d'augmentation de capital et d'op\u00e9rations diverses (fusions, scissions, transformations)": {}, 
-                    "Frais d'\u00e9mission d'emprunts": {}, 
-                    "Frais de constitution": {}, 
-                    "Frais de premier \u00e9tablissement": {
-                        "Frais de prospection": {}, 
-                        "Frais de publicit\u00e9": {}
-                    }
-                }, 
-                "Immobilisations corporelles": {
-                    "Acomptes vers\u00e9s et immobilisations corporelles en cours": {
-                        "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {}, 
-                        "Installations techniques et machines": {}, 
-                        "Terrains et constructions": {
-                            "Agencements et am\u00e9nagements de terrains": {}, 
-                            "Constructions": {}, 
-                            "Terrains": {}
-                        }
-                    }, 
-                    "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {
-                        "Autres installations": {}, 
-                        "Cheptel": {}, 
-                        "Emballages r\u00e9cup\u00e9rables": {}, 
-                        "Equipement de transport et de manutention": {}, 
-                        "Mat\u00e9riel informatique (hardware)": {}, 
-                        "Mobilier": {}, 
-                        "Outillage": {}, 
-                        "V\u00e9hicules de transport": {}
-                    }, 
-                    "Installations techniques et machines": {
-                        "Installations techniques": {}, 
-                        "Machines": {}
-                    }, 
-                    "Terrains et constructions": {
-                        "Agencements et am\u00e9nagements de terrains": {
-                            "Agencements et am\u00e9nagements d'autres terrains": {}, 
-                            "Agencements et am\u00e9nagements de sous-sols et sursols": {}, 
-                            "Agencements et am\u00e9nagements de terrains am\u00e9nag\u00e9s": {}, 
-                            "Agencements et am\u00e9nagements de terrains b\u00e2tis": {}, 
-                            "Agencements et am\u00e9nagements de terrains de gisement": {}, 
-                            "Agencements et am\u00e9nagements de terrains nus": {}
-                        }, 
-                        "Constructions": {
-                            "Constructions sur sol d'autrui": {}, 
-                            "Constructions sur sol propre": {}
-                        }, 
-                        "Terrains": {
-                            "Autres terrains": {}, 
-                            "Sous-sols et sursols": {}, 
-                            "Terrains am\u00e9nag\u00e9s": {}, 
-                            "Terrains b\u00e2tis": {}, 
-                            "Terrains de gisement": {}, 
-                            "Terrains nus": {}
-                        }
-                    }
-                }, 
-                "Immobilisations financi\u00e8res": {
-                    "Actions propres ou parts propres": {}, 
-                    "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                    "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                    "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                    "Parts dans des entreprises li\u00e9es": {}, 
-                    "Pr\u00eats et cr\u00e9ances immobilis\u00e9es": {
-                        "Cr\u00e9ances immobilis\u00e9es": {}, 
-                        "D\u00e9p\u00f4ts et cautionnements vers\u00e9s": {
-                            "Cautionnements": {}, 
-                            "D\u00e9p\u00f4ts": {}
-                        }, 
-                        "Pr\u00eats": {
-                            "Autres pr\u00eats": {}, 
-                            "Pr\u00eats au personnel": {}, 
-                            "Pr\u00eats aux associ\u00e9s": {}, 
-                            "Pr\u00eats participatifs": {}
-                        }
-                    }, 
-                    "Titres ayant le caract\u00e8re d'immobilisations": {
-                        "Autres titres ayant le caract\u00e8re d'immobilisations": {}, 
-                        "Titres immobilis\u00e9s (droit de cr\u00e9ance)": {
-                            "Autres titres immobilis\u00e9s (droit de cr\u00e9ance)": {}, 
-                            "Obligations": {}
-                        }, 
-                        "Titres immobilis\u00e9s (droit de propri\u00e9t\u00e9)": {
-                            "Actions": {}, 
-                            "Autres titres immobilis\u00e9s (droit de propri\u00e9t\u00e9)": {}
-                        }
-                    }
-                }, 
-                "Immobilisations incorporelles": {
-                    "Acomptes vers\u00e9s et immobilisations incorporelles en cours": {
-                        "Concessions, brevets, licences, marques ainsi que droits et valeurs similaires": {}, 
-                        "Fonds de commerce": {}, 
-                        "Frais de recherche et de d\u00e9veloppement": {}
-                    }, 
-                    "Concessions, brevets, licences, marques ainsi que droits et valeurs similaires": {
-                        "Acquis \u00e0 titre on\u00e9reux (Actifs incorporels non produits)": {
-                            "Brevets": {}, 
-                            "Concessions": {}, 
-                            "Droits et valeurs similaires acquis \u00e0 titre on\u00e9reux": {
-                                "Autres droits et valeurs similaires acquis \u00e0 titre on\u00e9reux": {}, 
-                                "Droits d'auteur et de reproduction": {}, 
-                                "Droits d'\u00e9mission": {}
-                            }, 
-                            "Licences informatiques (logiciels et progiciels informatiques)": {}, 
-                            "Marques et franchises": {}
-                        }, 
-                        "Cr\u00e9\u00e9s par l'entreprise elle-m\u00eame (Actifs incorporels produits)": {
-                            "Brevets": {}, 
-                            "Concessions": {}, 
-                            "Droits et valeurs similaires cr\u00e9\u00e9s par l'entreprise elle-m\u00eame": {
-                                "Autres droits et valeurs similaires cr\u00e9\u00e9s par l'entreprise elle-m\u00eame": {}, 
-                                "Droits d'auteur et de reproduction": {}, 
-                                "Droits d'\u00e9mission": {}
-                            }, 
-                            "Licences informatiques (logiciels et progiciels informatiques)": {}, 
-                            "Marques et franchises": {}
-                        }
-                    }, 
-                    "Fonds de commerce, dans la mesure o\u00f9 il a \u00e9t\u00e9 acquis \u00e0 titre on\u00e9reux": {}, 
-                    "Frais de recherche et de d\u00e9veloppement": {}
-                }
-            }, 
-            "CLASSE 3 - COMPTES DE STOCKS": {
-                "Acomptes vers\u00e9s": {
-                    "Acomptes vers\u00e9s sur mati\u00e8res premi\u00e8res et consommables": {}, 
-                    "Acomptes vers\u00e9s sur produits en cours de fabrication et commandes en cours": {}, 
-                    "Acomptes vers\u00e9s sur produits finis et marchandises": {}, 
-                    "Acomptes vers\u00e9s sur terrains et immeubles destin\u00e9s \u00e0 la revente": {}
-                }, 
-                "Mati\u00e8res premi\u00e8res et consommables": {
-                    "Approvisionnements": {}, 
-                    "Emballages": {
-                        "Emballages non-r\u00e9cup\u00e9rables": {}, 
-                        "Emballages r\u00e9cup\u00e9rables": {}, 
-                        "Emballages \u00e0 usage mixte": {}
-                    }, 
-                    "Fournitures consommables": {
-                        "Autres fournitures consommables": {}, 
-                        "Carburants": {}, 
-                        "Combustibles": {}, 
-                        "Fournitures d'atelier et d'usine": {}, 
-                        "Fournitures de bureau": {}, 
-                        "Fournitures de magasin": {}, 
-                        "Lubrifiants": {}, 
-                        "Produits d'entretien": {}
-                    }, 
-                    "Mati\u00e8res consommables": {}, 
-                    "Mati\u00e8res premi\u00e8res": {}
-                }, 
-                "Produits en cours de fabrication et commandes en cours": {
-                    "Commandes en cours \u2013 Prestations de services": {}, 
-                    "Commandes en cours \u2013 Produits": {}, 
-                    "Immeubles en construction": {}, 
-                    "Produits en cours de fabrication": {}
-                }, 
-                "Produits finis et marchandises": {
-                    "Marchandises": {}, 
-                    "Marchandises en voie d'acheminement, mises en d\u00e9p\u00f4t ou donn\u00e9es en consignation": {}, 
-                    "Produits finis": {}, 
-                    "Produits interm\u00e9diaires": {}, 
-                    "Produits r\u00e9siduels": {
-                        "D\u00e9chets": {}, 
-                        "Mati\u00e8res de r\u00e9cup\u00e9ration": {}, 
-                        "Rebuts": {}
-                    }
-                }, 
-                "Terrains et immeubles destin\u00e9s \u00e0 la revente": {
-                    "Immeubles": {
-                        "Immeubles acquis": {}, 
-                        "Immeubles construits": {}
-                    }, 
-                    "Terrains": {}
-                }
-            }, 
-            "CLASSE 4 - COMPTES DE TIERS": {
-                "Acomptes re\u00e7us sur commandes pour autant qu'ils ne sont pas d\u00e9duits des stocks de fa\u00e7on distincte": {
-                    "Acomptes re\u00e7us dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {}, 
-                    "Acomptes re\u00e7us dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {}
-                }, 
-                "Autres cr\u00e9ances": {
-                    "Autres cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                        "Administration de l'Enregistrement et des Domaines (AED)": {
-                            "AED \u2013 Autres cr\u00e9ances": {}, 
-                            "Imp\u00f4ts indirects": {
-                                "Autres imp\u00f4ts indirects": {}, 
-                                "Droits d'enregistrement": {}, 
-                                "Droits d'hypoth\u00e8ques": {}, 
-                                "Droits de timbre": {}, 
-                                "Taxe d'abonnement": {}
-                            }, 
-                            "Taxe sur la valeur ajout\u00e9e \u2013 TVA": {
-                                "TVA acomptes vers\u00e9s": {}, 
-                                "TVA en amont": {}, 
-                                "TVA \u00e0 recevoir": {}, 
-                                "TVA \u2013 Autres cr\u00e9ances": {}
-                            }
-                        }, 
-                        "Administration des Contributions Directes (ACD)": {}, 
-                        "Administration des Douanes et Accises (ADA)": {}, 
-                        "Cr\u00e9ances diverses": {
-                            "Autres cr\u00e9ances diverses": {}, 
-                            "Corrections de valeur": {}, 
-                            "Imp\u00f4ts \u00e9trangers": {
-                                "Autres imp\u00f4ts \u00e9trangers": {}, 
-                                "TVA \u00e9trang\u00e8res": {}
-                            }
-                        }, 
-                        "Cr\u00e9ances sur associ\u00e9s ou actionnaires": {
-                            "Corrections de valeur sur cr\u00e9ances": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "Cr\u00e9ances sur la s\u00e9curit\u00e9 sociale et autres organismes sociaux": {
-                            "Autres organismes sociaux": {}, 
-                            "Centre Commun de S\u00e9curit\u00e9 Sociale (CCSS)": {}, 
-                            "Mutualit\u00e9 des employeurs": {}
-                        }, 
-                        "Etat \u2013 Subventions \u00e0 recevoir": {
-                            "Autres subventions": {}, 
-                            "Subventions d'exploitation": {}, 
-                            "Subventions d'investissement": {}
-                        }, 
-                        "Personnel \u2013 Avances et acomptes": {
-                            "Avances et acomptes": {}, 
-                            "Corrections de valeur": {}
-                        }
-                    }, 
-                    "Autres cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                        "Administration de l'Enregistrement et des Domaines (AED)": {
-                            "Imp\u00f4ts indirects": {
-                                "Autres imp\u00f4ts indirects": {}, 
-                                "Droits d'enregistrement": {}, 
-                                "Droits d'hypoth\u00e8ques": {}, 
-                                "Droits de timbre": {}, 
-                                "Taxe d'abonnement": {}
-                            }, 
-                            "Taxe sur la valeur ajout\u00e9e \u2013 TVA": {
-                                "TVA acomptes vers\u00e9s": {}, 
-                                "TVA en amont": {
-                                    "TVA en amont \u2013 Exon\u00e9rations sp\u00e9ciales": {}, 
-                                    "TVA en amont \u2013 Extracommunautaire": {}, 
-                                    "TVA en amont \u2013 Intracommunautaire": {}, 
-                                    "TVA en amont \u2013 Pays": {}, 
-                                    "TVA en amont \u2013 Triangulaire": {}
-                                }, 
-                                "TVA \u00e0 recevoir": {}, 
-                                "TVA \u2013 Autres cr\u00e9ances": {}
-                            }
-                        }, 
-                        "Administration des Contributions Directes (ACD)": {}, 
-                        "Administration des Douanes et Accises (ADA)": {}, 
-                        "Associ\u00e9s ou actionnaires": {
-                            "Corrections de valeur sur cr\u00e9ances": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "Cr\u00e9ances diverses": {
-                            "Autres cr\u00e9ances diverses": {}, 
-                            "Corrections de valeur sur autres cr\u00e9ances diverses": {}, 
-                            "Imp\u00f4ts \u00e9trangers": {
-                                "Autres imp\u00f4ts \u00e9trangers": {}, 
-                                "TVA \u00e9trang\u00e8res": {}
-                            }
-                        }, 
-                        "Cr\u00e9ances sur la s\u00e9curit\u00e9 sociale et autres organismes sociaux": {
-                            "Autres organismes sociaux": {}, 
-                            "Centre Commun de S\u00e9curit\u00e9 Sociale (CCSS)": {}, 
-                            "Mutualit\u00e9 des employeurs": {}
-                        }, 
-                        "Etat \u2013 Subventions \u00e0 recevoir": {
-                            "Autres subventions": {}, 
-                            "Subventions d'exploitation": {}, 
-                            "Subventions d'investissement": {}
-                        }, 
-                        "Personnel \u2013 Avances et acomptes": {
-                            "Avances et acomptes": {}, 
-                            "Corrections de valeur": {}
-                        }
-                    }
-                }, 
-                "Autres dettes": {
-                    "Autres dettes dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                        "Autres dettes diverses": {}, 
-                        "Dettes envers administrateurs, g\u00e9rants et commissaires": {}, 
-                        "Dettes envers associ\u00e9s et actionnaires": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "Dettes envers le personnel": {
-                            "Personnel \u2013 Autres": {}, 
-                            "Personnel \u2013 D\u00e9p\u00f4ts": {}, 
-                            "Personnel \u2013 Oppositions, saisies": {}, 
-                            "Personnel \u2013 R\u00e9mun\u00e9rations dues": {}
-                        }, 
-                        "D\u00e9p\u00f4ts et cautionnements re\u00e7us": {
-                            "Cautionnements": {}, 
-                            "D\u00e9p\u00f4ts": {}, 
-                            "Int\u00e9r\u00eats courus": {}
-                        }, 
-                        "Etat \u2013 Droits d'\u00e9mission \u00e0 restituer": {}
-                    }, 
-                    "Autres dettes dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                        "Autres dettes diverses": {}, 
-                        "Dettes envers administrateurs, g\u00e9rants et commissaires": {}, 
-                        "Dettes envers associ\u00e9s et actionnaires": {
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Montant principal": {}
-                        }, 
-                        "Dettes envers le personnel": {
-                            "Personnel \u2013 Autres": {}, 
-                            "Personnel \u2013 D\u00e9p\u00f4ts": {}, 
-                            "Personnel \u2013 Oppositions, saisies": {}, 
-                            "Personnel \u2013 R\u00e9mun\u00e9rations dues": {}
-                        }, 
-                        "D\u00e9p\u00f4ts et cautionnements re\u00e7us": {
-                            "Cautionnements": {}, 
-                            "D\u00e9p\u00f4ts": {}, 
-                            "Int\u00e9r\u00eats courus": {}
-                        }, 
-                        "Etat \u2013 Droits d'\u00e9mission \u00e0 restituer": {}
-                    }
-                }, 
-                "Comptes de r\u00e9gularisation": {
-                    "Charges \u00e0 reporter": {}, 
-                    "Comptes de liaison \u2013 Actif": {}, 
-                    "Comptes de liaison \u2013 Passif": {}, 
-                    "Comptes transitoires ou d'attente \u2013 Actif": {}, 
-                    "Comptes transitoires ou d'attente \u2013 Passif": {}, 
-                    "Etat - Droits d'\u00e9mission allou\u00e9s": {}, 
-                    "Produits \u00e0 reporter": {}
-                }, 
-                "Cr\u00e9ances r\u00e9sultant de ventes et prestations de services": {
-                    "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                        "Clients": {}, 
-                        "Clients cr\u00e9diteurs": {}, 
-                        "Clients douteux ou litigieux": {}, 
-                        "Clients \u2013 Effets \u00e0 recevoir": {}, 
-                        "Clients \u2013 Factures \u00e0 \u00e9tablir": {}, 
-                        "Corrections de valeur": {}
-                    }, 
-                    "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                        "Clients": {}, 
-                        "Clients cr\u00e9diteurs": {}, 
-                        "Clients douteux ou litigieux": {}, 
-                        "Clients \u2013 Effets \u00e0 recevoir": {}, 
-                        "Clients \u2013 Factures \u00e0 \u00e9tablir": {}, 
-                        "Corrections de valeur": {}
-                    }
-                }, 
-                "Cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {
-                    "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {
-                        "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Autres cr\u00e9ances": {}, 
-                            "Corrections de valeur": {}, 
-                            "Dividendes \u00e0 recevoir": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de service": {}
-                        }, 
-                        "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Autres cr\u00e9ances": {}, 
-                            "Corrections de valeur": {}, 
-                            "Dividendes \u00e0 recevoir": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de service": {}
-                        }
-                    }, 
-                    "Cr\u00e9ances sur des entreprises li\u00e9es": {
-                        "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Autres cr\u00e9ances": {}, 
-                            "Corrections de valeur": {}, 
-                            "Dividendes \u00e0 recevoir": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }, 
-                        "Cr\u00e9ances dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Autres cr\u00e9ances": {}, 
-                            "Corrections de valeur": {}, 
-                            "Dividendes \u00e0 recevoir": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }
-                    }
-                }, 
-                "Dettes envers des entreprises li\u00e9es et des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {
-                    "Dettes envers des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {
-                        "Dettes envers des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Autres dettes": {}, 
-                            "Dividendes \u00e0 payer": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }, 
-                        "Dettes envers des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Autres dettes": {}, 
-                            "Dividendes \u00e0 payer": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }
-                    }, 
-                    "Dettes envers des entreprises li\u00e9es": {
-                        "Dettes envers des entreprises li\u00e9es dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Autres dettes": {}, 
-                            "Dividendes \u00e0 payer": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }, 
-                        "Dettes envers des entreprises li\u00e9es dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Autres dettes": {}, 
-                            "Dividendes \u00e0 payer": {}, 
-                            "Int\u00e9r\u00eats courus": {}, 
-                            "Pr\u00eats et avances": {}, 
-                            "Ventes de marchandises et de prestations de services": {}
-                        }
-                    }
-                }, 
-                "Dettes fiscales et dettes envers la s\u00e9curit\u00e9 sociale": {
-                    "Dettes au titre de la s\u00e9curit\u00e9 sociale": {
-                        "Autres organismes sociaux": {}, 
-                        "Centre Commun de S\u00e9curit\u00e9 Sociale (CCSS)": {}, 
-                        "Organismes de s\u00e9curit\u00e9 sociale \u00e9trangers": {}
-                    }, 
-                    "Dettes fiscales": {
-                        "Administration de l'Enregistrement et des Domaines (AED)": {
-                            "Imp\u00f4ts indirects": {
-                                "Autres imp\u00f4ts indirects": {}, 
-                                "Droits d'enregistrement": {}, 
-                                "Droits d'hypoth\u00e8ques": {}, 
-                                "Droits de timbre": {}, 
-                                "Taxe d'abonnement": {}
-                            }, 
-                            "Taxe sur la valeur ajout\u00e9e \u2013 TVA": {
-                                "TVA acomptes re\u00e7us": {}, 
-                                "TVA due": {}, 
-                                "TVA en aval": {
-                                    "TVA en aval \u2013 Exon\u00e9rations sp\u00e9ciales": {}, 
-                                    "TVA en aval \u2013 Extracommunautaire": {}, 
-                                    "TVA en aval \u2013 Intracommunautaire": {}, 
-                                    "TVA en aval \u2013 Pays": {}, 
-                                    "TVA en aval \u2013 Triangulaire": {}
-                                }, 
-                                "TVA \u2013 Autres dettes": {}
-                            }
-                        }, 
-                        "Administration des Contributions Directes (ACD)": {
-                            "ACD \u2013 Autres dettes": {}, 
-                            "Imp\u00f4t commercial": {
-                                "Imp\u00f4t commercial \u2013 charge fiscale estim\u00e9e": {}, 
-                                "Imp\u00f4t commercial \u2013 dette fiscale \u00e0 payer": {}
-                            }, 
-                            "Imp\u00f4t sur la fortune": {
-                                "Imp\u00f4t sur la fortune \u2013 charge fiscale estim\u00e9e": {}, 
-                                "Imp\u00f4t sur la fortune \u2013 dette fiscale \u00e0 payer": {}
-                            }, 
-                            "Imp\u00f4t sur le revenu des collectivit\u00e9s": {
-                                "Imp\u00f4t sur le revenu des collectivit\u00e9s \u2013 charge fiscale estim\u00e9e": {}, 
-                                "Imp\u00f4t sur le revenu des collectivit\u00e9s \u2013 dette fiscale \u00e0 payer": {}
-                            }, 
-                            "Retenue d'imp\u00f4t sur les tanti\u00e8mes": {}, 
-                            "Retenue d'imp\u00f4t sur revenus de capitaux mobiliers": {}, 
-                            "Retenue d'imp\u00f4t sur traitements et salaires": {}
-                        }, 
-                        "Administration des Douanes et Accises (ADA)": {
-                            "ADA \u2013 Autres dettes": {}, 
-                            "Droits d'accises et taxe de consommation": {}, 
-                            "Taxe sur les v\u00e9hicules automoteurs": {}
-                        }, 
-                        "Administrations communales": {
-                            "Imp\u00f4ts communaux": {}, 
-                            "Taxes communales": {}
-                        }, 
-                        "Administrations fiscales \u00e9trang\u00e8res": {}
-                    }
-                }, 
-                "Dettes sur achats et prestations de services et dettes repr\u00e9sent\u00e9es par des effets de commerce": {
-                    "Dettes repr\u00e9sent\u00e9es par des effets de commerce": {
-                        "Dettes repr\u00e9sent\u00e9es par des effets de commerce dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {}, 
-                        "Dettes repr\u00e9sent\u00e9es par des effets de commerce dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {}
-                    }, 
-                    "Dettes sur achats et prestations de services": {
-                        "Dettes sur achats et prestations de services dont la dur\u00e9e r\u00e9siduelle est inf\u00e9rieure ou \u00e9gale \u00e0 un an": {
-                            "Fournisseurs": {}, 
-                            "Fournisseurs d\u00e9biteurs": {
-                                "Fournisseurs \u2013 Autres avoirs": {}, 
-                                "Fournisseurs \u2013 Avances et acomptes vers\u00e9s sur commandes": {}, 
-                                "Fournisseurs \u2013 Cr\u00e9ances pour emballages et mat\u00e9riel \u00e0 rendre": {}, 
-                                "Rabais, remises, ristournes \u00e0 obtenir et autres avoirs non encore re\u00e7us": {}
-                            }, 
-                            "Fournisseurs \u2013 Factures non parvenues": {}
-                        }, 
-                        "Dettes sur achats et prestations de services dont la dur\u00e9e r\u00e9siduelle est sup\u00e9rieure \u00e0 un an": {
-                            "Fournisseurs": {}, 
-                            "Fournisseurs d\u00e9biteurs": {
-                                "Fournisseurs \u2013 Autres avoirs": {}, 
-                                "Fournisseurs \u2013 Avances et acomptes vers\u00e9s sur commandes": {}, 
-                                "Fournisseurs \u2013 Cr\u00e9ances pour emballages et mat\u00e9riel \u00e0 rendre": {}, 
-                                "Rabais, remises, ristournes \u00e0 obtenir et autres avoirs non encore re\u00e7us": {}
-                            }, 
-                            "Fournisseurs \u2013 Factures non parvenues": {}
-                        }
-                    }
-                }
-            }, 
-            "CLASSE 5 - COMPTES FINANCIERS": {
-                "Avoirs en banques, avoirs en comptes de ch\u00e8ques postaux, ch\u00e8ques et encaisse": {
-                    "Autres avoirs": {}, 
-                    "Banques": {
-                        "Banques comptes courants": {}, 
-                        "Banques comptes \u00e0 terme": {}
-                    }, 
-                    "Caisse": {}, 
-                    "Ch\u00e8ques \u00e0 encaisser": {}, 
-                    "Compte ch\u00e8que postal": {}, 
-                    "Valeurs \u00e0 l'encaissement": {}, 
-                    "Virements internes": {}
-                }, 
-                "Valeurs mobili\u00e8res": {
-                    "Actions propres ou parts propres": {}, 
-                    "Autres valeurs mobili\u00e8res": {
-                        "Actions \u2013 Titres cot\u00e9s": {}, 
-                        "Actions \u2013 Titres non cot\u00e9s": {}, 
-                        "Autres valeurs mobili\u00e8res diverses": {}, 
-                        "Obligations et autres titres de cr\u00e9ance \u00e9mis par la soci\u00e9t\u00e9 et rachet\u00e9s par elle": {}, 
-                        "Obligations \u2013 Titres cot\u00e9s": {}, 
-                        "Obligations \u2013 Titres non cot\u00e9s": {}
-                    }, 
-                    "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                    "Parts dans des entreprises li\u00e9es": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "TOTAL CLASSES 6 ET 7": {
-            "CLASSE 6 - COMPTES DE CHARGES": {
-                "Autres charges d'exploitation": {
-                    "Autres charges d'exploitation diverses": {}, 
-                    "Dotations aux plus-values immunis\u00e9es": {}, 
-                    "Dotations aux provisions d'exploitation": {}, 
-                    "Imp\u00f4ts, taxes et versements assimil\u00e9s": {
-                        "Autres droits et imp\u00f4ts": {}, 
-                        "Dotations aux provisions pour imp\u00f4ts": {}, 
-                        "Droits d'accises \u00e0 la production et taxe de consommation": {}, 
-                        "Droits d'enregistrement et de timbre, droits d'hypoth\u00e8ques": {
-                            "Autres droits d'enregistrement et de timbre, droits d'hypoth\u00e8ques": {}, 
-                            "Droits d'enregistrement": {}, 
-                            "Droits d'hypoth\u00e8ques": {}, 
-                            "Droits de timbre": {}, 
-                            "Taxe d'abonnement": {}
-                        }, 
-                        "Droits sur les marchandises en provenance de l'\u00e9tranger": {
-                            "Droits d'accises et taxe de consommation sur marchandises en provenance de l'\u00e9tranger": {}, 
-                            "Droits de douane": {}, 
-                            "Montants compensatoires": {}
-                        }, 
-                        "Imp\u00f4t foncier": {}, 
-                        "TVA non d\u00e9ductible": {}, 
-                        "Taxe de cabaretage": {}, 
-                        "Taxes sur les v\u00e9hicules": {}
-                    }, 
-                    "Indemnit\u00e9s": {}, 
-                    "Jetons de pr\u00e9sence": {}, 
-                    "Pertes sur cr\u00e9ances irr\u00e9couvrables": {
-                        "Autres cr\u00e9ances": {}, 
-                        "Cr\u00e9ances r\u00e9sultant de ventes et de prestations de services": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires": {
-                        "Brevets": {}, 
-                        "Concessions": {}, 
-                        "Droits et valeurs similaires": {
-                            "Autres droits et valeurs similaires": {}, 
-                            "Droits d'auteur et de reproduction": {}
-                        }, 
-                        "Licences informatiques": {}, 
-                        "Marques et franchises": {}
-                    }, 
-                    "Tanti\u00e8mes": {}
-                }, 
-                "Autres charges externes": {
-                    "Charges externes diverses": {
-                        "Autres charges externes diverses": {}, 
-                        "Cotisations aux associations professionnelles": {}, 
-                        "Documentation": {
-                            "Documentation g\u00e9n\u00e9rale": {}, 
-                            "Documentation technique": {}
-                        }, 
-                        "Elimination de d\u00e9chets non industriels": {}, 
-                        "Elimination des d\u00e9chets industriels": {}, 
-                        "Evacuation des eaux us\u00e9es": {}, 
-                        "Frais de colloques, s\u00e9minaires, conf\u00e9rences": {}, 
-                        "Frais de surveillance": {}
-                    }, 
-                    "Frais de marketing et de communication": {
-                        "Frais de d\u00e9placements et de repr\u00e9sentation": {
-                            "Frais de d\u00e9m\u00e9nagement de l'entreprise": {}, 
-                            "Missions": {}, 
-                            "R\u00e9ceptions et frais de repr\u00e9sentation": {}, 
-                            "Voyages et d\u00e9placements": {
-                                "Direction (respectivement exploitant et associ\u00e9s)": {}, 
-                                "Personnel": {}
-                            }
-                        }, 
-                        "Frais de marketing et de publicit\u00e9": {
-                            "Annonces et insertions": {}, 
-                            "Autres achats de services publicitaires": {}, 
-                            "Cadeaux \u00e0 la client\u00e8le": {}, 
-                            "Catalogues et imprim\u00e9s et publications": {}, 
-                            "Dons courants": {}, 
-                            "Echantillons": {}, 
-                            "Foires et expositions": {}, 
-                            "Sponsoring": {}
-                        }, 
-                        "Frais postaux et frais de t\u00e9l\u00e9communications": {
-                            "Autres frais postaux (location de bo\u00eetes postales, etc.)": {}, 
-                            "Timbres": {}, 
-                            "T\u00e9l\u00e9phone et autres frais de t\u00e9l\u00e9communication": {}
-                        }
-                    }, 
-                    "Loyers et charges locatives": {
-                        "Charges locatives et de copropri\u00e9t\u00e9": {}, 
-                        "Leasing immobilier": {
-                            "B\u00e2timents": {}, 
-                            "Terrains": {}
-                        }, 
-                        "Leasing mobilier": {
-                            "Autres installations, outillages et machines": {}, 
-                            "Installations techniques et machines": {}, 
-                            "Mat\u00e9riel roulant": {}
-                        }, 
-                        "Locations immobili\u00e8res": {
-                            "B\u00e2timents": {}, 
-                            "Terrains": {}
-                        }, 
-                        "Locations mobili\u00e8res": {
-                            "Autres installations, outillages et machines": {}, 
-                            "Installations techniques et machines": {}, 
-                            "Mat\u00e9riel roulant": {}
-                        }, 
-                        "Malis sur emballages": {}
-                    }, 
-                    "Personnel ext\u00e9rieur \u00e0 l'entreprise": {
-                        "Personnel int\u00e9rimaire": {}, 
-                        "Personnel pr\u00eat\u00e9 \u00e0 l'entreprise": {}
-                    }, 
-                    "Primes d'assurance": {
-                        "Assurance insolvabilit\u00e9 clients": {}, 
-                        "Assurance responsabilit\u00e9 civile": {}, 
-                        "Assurance risque d'exploitation": {}, 
-                        "Assurance-transport": {
-                            "sur achats": {}, 
-                            "sur autres biens": {}, 
-                            "sur ventes": {}
-                        }, 
-                        "Assurances sur biens de l'actif": {
-                            "B\u00e2timents": {}, 
-                            "Installations": {}, 
-                            "Sur autres biens de l'actif": {}, 
-                            "V\u00e9hicules": {}
-                        }, 
-                        "Assurances sur biens pris en location": {}, 
-                        "Autres assurances": {}
-                    }, 
-                    "Rabais, remises et ristournes obtenus sur autres charges externes": {}, 
-                    "R\u00e9mun\u00e9rations d'interm\u00e9diaires et honoraires": {
-                        "Autres r\u00e9mun\u00e9rations d'interm\u00e9diaires et honoraires": {}, 
-                        "Commissions et courtages": {
-                            "Commissions et courtages sur achats": {}, 
-                            "Commissions et courtages sur ventes": {}, 
-                            "R\u00e9mun\u00e9rations des transitaires": {}
-                        }, 
-                        "Frais d'actes et de contentieux": {}, 
-                        "Frais de recrutement de personnel": {}, 
-                        "Honoraires": {
-                            "Autres honoraires": {}, 
-                            "Honoraires comptables et d'audit": {}, 
-                            "Honoraires fiscaux": {}, 
-                            "Honoraires juridiques": {}
-                        }, 
-                        "Services bancaires et assimil\u00e9s": {
-                            "Autres frais et commissions bancaires (hors int\u00e9r\u00eats et frais assimil\u00e9s)": {}, 
-                            "Commissions et frais sur \u00e9mission d'emprunts": {}, 
-                            "Frais de compte": {}, 
-                            "Frais sur cartes de cr\u00e9dit": {}, 
-                            "Frais sur effets": {}, 
-                            "Frais sur titres (achat, vente, garde)": {}, 
-                            "Location de coffres": {}, 
-                            "R\u00e9mun\u00e9rations d'affacturage": {}
-                        }, 
-                        "Traitement informatique": {}
-                    }, 
-                    "Sous-traitance, entretiens et r\u00e9parations": {
-                        "Contrats de maintenance": {}, 
-                        "Entretien et r\u00e9parations": {
-                            "Sur autres installations, outillages et machines": {}, 
-                            "Sur installations techniques et machines": {}, 
-                            "Sur mat\u00e9riel roulant": {}
-                        }, 
-                        "Etudes et recherches (non incorpor\u00e9es dans les produits)": {}, 
-                        "Sous-traitance g\u00e9n\u00e9rale (non incorpor\u00e9e directement aux ouvrages, travaux et produits)": {}
-                    }, 
-                    "Transports de biens et transports collectifs du personnel": {
-                        "Autres transports": {}, 
-                        "Transports administratifs": {}, 
-                        "Transports collectifs du personnel": {}, 
-                        "Transports entre \u00e9tablissements ou chantiers": {}, 
-                        "Transports sur achats": {}, 
-                        "Transports sur ventes": {}
-                    }
-                }, 
-                "Autres imp\u00f4ts ne figurant pas sous le poste ci-dessus": {
-                    "Autres imp\u00f4ts et taxes": {}, 
-                    "Dotations aux provisions pour autres imp\u00f4ts": {}, 
-                    "Imp\u00f4t sur la fortune": {
-                        "Exercice courant": {}, 
-                        "Exercices ant\u00e9rieurs": {}
-                    }, 
-                    "Imp\u00f4ts \u00e9trangers": {}, 
-                    "Taxe d'abonnement": {}
-                }, 
-                "Charges exceptionnelles": {
-                    "Autres charges exceptionnelles": {
-                        "Amendes et p\u00e9nalit\u00e9s fiscales, sociales et p\u00e9nales": {}, 
-                        "Autres charges exceptionnelles diverses": {}, 
-                        "Dommages et int\u00e9r\u00eats": {}, 
-                        "Malis provenant de clauses d'indexation": {}, 
-                        "P\u00e9nalit\u00e9s sur march\u00e9s et d\u00e9dits pay\u00e9s sur achats et ventes": {}
-                    }, 
-                    "Dotations aux corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles": {
-                        "Sur immobilisations corporelles": {}, 
-                        "Sur immobilisations incorporelles": {}
-                    }, 
-                    "Dotations aux corrections de valeur exceptionnelles sur \u00e9l\u00e9ments de l'actif circulant": {
-                        "Sur cr\u00e9ances": {}, 
-                        "Sur stocks": {}
-                    }, 
-                    "Dotations aux provisions exceptionnelles": {}, 
-                    "Valeur comptable des cr\u00e9ances de l'actif circulant financier c\u00e9d\u00e9es": {
-                        "Sur autres cr\u00e9ances": {}, 
-                        "Sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Valeur comptable des immobilisations financi\u00e8res c\u00e9d\u00e9es": {
-                        "Actions propres ou parts propres": {}, 
-                        "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                        "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Parts dans des entreprises li\u00e9es": {}, 
-                        "Pr\u00eats et cr\u00e9ances immobilis\u00e9es": {}, 
-                        "Titres ayant le caract\u00e8re d'immobilisations": {}
-                    }, 
-                    "Valeur comptable des immobilisations incorporelles et corporelles c\u00e9d\u00e9es": {
-                        "Immobilisations corporelles": {}, 
-                        "Immobilisations incorporelles": {}
-                    }
-                }, 
-                "Charges financi\u00e8res": {
-                    "Autres charges financi\u00e8res": {}, 
-                    "Dotations aux corrections de valeur et ajustements pour juste valeur sur immobilisations financi\u00e8res": {
-                        "Ajustements pour juste valeur sur immobilisations financi\u00e8res": {}, 
-                        "Dotations aux corrections de valeur sur immobilisations financi\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}, 
-                            "Pr\u00eats et cr\u00e9ances immobilis\u00e9es": {}, 
-                            "Titres ayant le caract\u00e8re d'immobilisations": {}
-                        }
-                    }, 
-                    "Dotations aux corrections de valeur et ajustements pour juste valeur sur \u00e9l\u00e9ments financiers de l'actif circulant": {
-                        "Ajustements pour juste valeur sur \u00e9l\u00e9ments financiers de l'actif circulant": {}, 
-                        "Dotations aux corrections de valeur sur autres cr\u00e9ances": {}, 
-                        "Dotations aux corrections de valeur sur cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Dotations aux corrections de valeur sur valeurs mobili\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Autres valeurs mobili\u00e8res": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}
-                        }
-                    }, 
-                    "Dotations aux provisions financi\u00e8res": {}, 
-                    "Int\u00e9r\u00eats et escomptes": {
-                        "Escomptes accord\u00e9s": {}, 
-                        "Escomptes et frais sur effets": {}, 
-                        "Int\u00e9r\u00eats bancaires et assimil\u00e9s": {
-                            "Int\u00e9r\u00eats bancaires sur comptes courants": {}, 
-                            "Int\u00e9r\u00eats bancaires sur op\u00e9rations de financement": {}, 
-                            "Int\u00e9r\u00eats sur leasings financiers": {}
-                        }, 
-                        "Int\u00e9r\u00eats des dettes financi\u00e8res": {
-                            "Int\u00e9r\u00eats des dettes subordonn\u00e9es": {}, 
-                            "Int\u00e9r\u00eats des emprunts obligataires": {}
-                        }, 
-                        "Int\u00e9r\u00eats sur autres emprunts et dettes": {}, 
-                        "Int\u00e9r\u00eats sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Int\u00e9r\u00eats sur dettes commerciales": {}
-                    }, 
-                    "Moins-values de cession de valeurs mobili\u00e8res": {
-                        "Actions propres ou parts propres": {}, 
-                        "Autres valeurs mobili\u00e8res": {}, 
-                        "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Parts dans des entreprises li\u00e9es": {}
-                    }, 
-                    "Pertes de change": {}, 
-                    "Quote-part de perte dans les entreprises collectives (autres que les soci\u00e9t\u00e9s de capitaux)": {}
-                }, 
-                "Consommation de marchandises et de mati\u00e8res premi\u00e8res et consommables": {
-                    "Achats de biens destin\u00e9s \u00e0 la revente": {
-                        "Immeubles": {}, 
-                        "Marchandises": {}, 
-                        "Terrains": {}
-                    }, 
-                    "Achats non stock\u00e9s et achats incorpor\u00e9s aux ouvrages et produits": {
-                        "Achats incorpor\u00e9s aux ouvrages et produits": {
-                            "Achats d'\u00e9tudes et prestations de service (incorpor\u00e9s aux ouvrages et produits)": {
-                                "Frais d'architectes et d'ing\u00e9nieurs": {}, 
-                                "Recherche et d\u00e9veloppement": {}, 
-                                "Travail \u00e0 fa\u00e7on": {}
-                            }, 
-                            "Achats de mat\u00e9riel, \u00e9quipements, pi\u00e8ces d\u00e9tach\u00e9es et travaux (incorpor\u00e9s aux ouvrages et produits)": {}, 
-                            "Autres achats d'\u00e9tudes et de prestations de service": {}
-                        }, 
-                        "Achats non stock\u00e9s de mati\u00e8res et fournitures": {
-                            "Autres mati\u00e8res et fournitures non stock\u00e9es": {}, 
-                            "Carburants": {}, 
-                            "Fournitures administratives": {}, 
-                            "Fournitures d'entretien et de petit \u00e9quipement": {}, 
-                            "Fournitures non stockables": {
-                                "Eau": {}, 
-                                "Electricit\u00e9": {}, 
-                                "Gaz de canalisation": {}
-                            }, 
-                            "Lubrifiants": {}, 
-                            "V\u00eatements professionnels": {}
-                        }
-                    }, 
-                    "Approvisionnements": {}, 
-                    "Emballages": {
-                        "Emballages non r\u00e9cup\u00e9rables": {}, 
-                        "Emballages r\u00e9cup\u00e9rables": {}, 
-                        "Emballages \u00e0 usage mixte": {}
-                    }, 
-                    "Fournitures consommables": {
-                        "Autres fournitures consommables": {}, 
-                        "Carburants": {}, 
-                        "Combustibles": {
-                            "Gaz comprim\u00e9": {}, 
-                            "Liquides": {}, 
-                            "Solides": {}
-                        }, 
-                        "Fournitures d'atelier et d'usine": {}, 
-                        "Fournitures de bureau": {}, 
-                        "Fournitures de magasin": {}, 
-                        "Lubrifiants": {}, 
-                        "Produits d'entretien": {}
-                    }, 
-                    "Mati\u00e8res consommables": {}, 
-                    "Mati\u00e8res premi\u00e8res": {}, 
-                    "Rabais, remises et ristournes obtenus": {
-                        "Achats de biens destin\u00e9s \u00e0 la revente": {}, 
-                        "Achats non stock\u00e9s et achats incorpor\u00e9s aux ouvrages et produits": {}, 
-                        "Approvisionnements": {}, 
-                        "Emballages": {}, 
-                        "Fournitures consommables": {}, 
-                        "Mati\u00e8res consommables": {}, 
-                        "Mati\u00e8res premi\u00e8res": {}, 
-                        "Rabais, remises et ristournes non affect\u00e9s": {}
-                    }, 
-                    "Variation des stocks": {
-                        "Variation des stocks d'approvisionnements": {}, 
-                        "Variation des stocks d'emballages": {}, 
-                        "Variation des stocks de biens destin\u00e9s \u00e0 la revente": {}, 
-                        "Variation des stocks de fournitures consommables": {}, 
-                        "Variation des stocks de mati\u00e8res consommables": {}, 
-                        "Variation des stocks de mati\u00e8res premi\u00e8res": {}
-                    }
-                }, 
-                "Dotations aux corrections de valeur des \u00e9l\u00e9ments d'actif non financiers": {
-                    "Dotations aux corrections de valeur sur cr\u00e9ances de l'actif circulant": {
-                        "Autres cr\u00e9ances": {}, 
-                        "Cr\u00e9ances r\u00e9sultant de ventes et prestations de services": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es et des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Dotations aux corrections de valeur sur frais d'\u00e9tablissement et frais assimil\u00e9s": {
-                        "Autres frais assimil\u00e9s": {}, 
-                        "Frais d'augmentation de capital et d'op\u00e9rations diverses": {}, 
-                        "Frais d'\u00e9mission d'emprunts": {}, 
-                        "Frais de constitution": {}, 
-                        "Frais de premier \u00e9tablissement": {}
-                    }, 
-                    "Dotations aux corrections de valeur sur immobilisations corporelles": {
-                        "Acomptes vers\u00e9s et immobilisations corporelles en cours": {}, 
-                        "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {}, 
-                        "Installations techniques et machines": {}, 
-                        "Terrains et constructions": {
-                            "Agencements et am\u00e9nagements de terrains": {}, 
-                            "Constructions": {}, 
-                            "Terrains": {}
-                        }
-                    }, 
-                    "Dotations aux corrections de valeur sur immobilisations incorporelles": {
-                        "Acomptes vers\u00e9s et immobilisations incorporelles en cours": {}, 
-                        "Concessions, brevets, licences, marques ainsi que droits et valeurs similaires": {}, 
-                        "Fonds de commerce dans la mesure o\u00f9 il a \u00e9t\u00e9 acquis \u00e0 titre on\u00e9reux": {}, 
-                        "Frais de recherche et de d\u00e9veloppement": {}
-                    }, 
-                    "Dotations aux corrections de valeur sur stocks": {
-                        "Acomptes vers\u00e9s": {}, 
-                        "Mati\u00e8res premi\u00e8res et consommables": {}, 
-                        "Produits en cours de fabrication et commandes en cours": {}, 
-                        "Produits finis et marchandises": {}, 
-                        "Terrains et immeubles destin\u00e9s \u00e0 la revente": {}
-                    }
-                }, 
-                "Frais de personnel": {
-                    "Autre personnel": {
-                        "Autre personnel temporaire": {}, 
-                        "Etudiants": {}, 
-                        "Salaires occasionnels": {}
-                    }, 
-                    "Autres charges sociales": {
-                        "Autres charges sociales diverses": {}, 
-                        "M\u00e9decine du travail": {}
-                    }, 
-                    "Charges sociales (part patronale)": {
-                        "Assurance accidents du travail": {}, 
-                        "Autres charges sociales patronales": {}, 
-                        "Charges sociales salari\u00e9s": {
-                            "Caisse Nationale d'Assurance-Pension": {}, 
-                            "Caisse Nationale de Sant\u00e9": {}, 
-                            "Cotisations patronales compl\u00e9mentaires": {}
-                        }, 
-                        "Remboursements de charges sociales": {}, 
-                        "Service de sant\u00e9 au travail": {}
-                    }, 
-                    "Pensions compl\u00e9mentaires": {
-                        "Dotation aux provisions pour pensions compl\u00e9mentaires": {}, 
-                        "Pensions compl\u00e9mentaires vers\u00e9es par l'employeur": {}, 
-                        "Prime d'assurance insolvabilit\u00e9": {}, 
-                        "Primes \u00e0 des fonds de pensions ext\u00e9rieurs": {}, 
-                        "Retenue d'imp\u00f4t sur pension compl\u00e9mentaire": {}
-                    }, 
-                    "R\u00e9mun\u00e9rations des salari\u00e9s": {
-                        "Autres avantages": {}, 
-                        "Remboursements sur salaires": {
-                            "Remboursements mutualit\u00e9": {}, 
-                            "Remboursements pour cong\u00e9 politique, sportif, culturel, \u00e9ducatif et mandats sociaux": {}, 
-                            "Remboursements trimestre de faveur": {}
-                        }, 
-                        "Salaires bruts": {
-                            "Avantages en nature": {}, 
-                            "Gratifications, primes et commissions": {}, 
-                            "Indemnit\u00e9s de licenciement": {}, 
-                            "Primes de m\u00e9nage": {}, 
-                            "Salaires de base": {}, 
-                            "Suppl\u00e9ments pour travail": {
-                                "Autres suppl\u00e9ments": {}, 
-                                "Dimanche": {}, 
-                                "Heures suppl\u00e9mentaires": {}, 
-                                "Jours f\u00e9ri\u00e9s l\u00e9gaux": {}
-                            }, 
-                            "Trimestre de faveur": {}
-                        }
-                    }
-                }, 
-                "Imp\u00f4ts sur le r\u00e9sultat": {
-                    "Dotations aux provisions pour imp\u00f4ts sur le r\u00e9sultat": {
-                        "Dotations aux provisions pour imp\u00f4ts": {}, 
-                        "Dotations aux provisions pour imp\u00f4ts diff\u00e9r\u00e9s": {}
-                    }, 
-                    "Imp\u00f4t commercial": {
-                        "Exercice courant": {}, 
-                        "Exercices ant\u00e9rieurs": {}
-                    }, 
-                    "Imp\u00f4t sur le revenu des collectivit\u00e9s": {
-                        "Exercice courant": {}, 
-                        "Exercices ant\u00e9rieurs": {}
-                    }, 
-                    "Imp\u00f4ts \u00e9trangers sur le r\u00e9sultat": {
-                        "Autres imp\u00f4ts \u00e9trangers": {}, 
-                        "Imp\u00f4ts support\u00e9s par les entreprises non r\u00e9sidentes": {}, 
-                        "Imp\u00f4ts support\u00e9s par les \u00e9tablissements stables": {
-                            "Exercice courant": {}, 
-                            "Exercices ant\u00e9rieurs": {}
-                        }, 
-                        "Retenues d'imp\u00f4t \u00e0 la source": {}
-                    }
-                }
-            }, 
-            "CLASSE 7 - COMPTES DE PRODUITS": {
-                "Autres produits d'exploitation": {
-                    "Autres produits d'exploitation divers": {}, 
-                    "Indemnit\u00e9s d'assurance touch\u00e9es": {}, 
-                    "Jetons de pr\u00e9sence, tanti\u00e8mes et r\u00e9mun\u00e9rations assimil\u00e9es": {}, 
-                    "Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires": {
-                        "Brevets": {}, 
-                        "Concessions": {}, 
-                        "Droits et valeurs similaires": {
-                            "Autres droits et valeurs similaires": {}, 
-                            "Droits d'auteur et de reproduction": {}
-                        }, 
-                        "Licences informatiques": {}, 
-                        "Marques et franchises": {}
-                    }, 
-                    "Reprises de plus-values immunis\u00e9es et de subventions d'investissement en capital": {
-                        "Plus-values immunis\u00e9es non r\u00e9investies": {}, 
-                        "Plus-values immunis\u00e9es r\u00e9investies": {}, 
-                        "Subventions d'investissement en capital": {}
-                    }, 
-                    "Reprises sur provisions d'exploitation": {}, 
-                    "Revenus des immeubles non affect\u00e9s aux activit\u00e9s professionnelles": {}, 
-                    "Ristournes per\u00e7ues des coop\u00e9ratives (provenant des exc\u00e9dents)": {}, 
-                    "Subventions d'exploitation": {
-                        "Autres subventions d'exploitation": {}, 
-                        "Bonifications d'int\u00e9r\u00eat": {}, 
-                        "Montants compensatoires": {}, 
-                        "Subventions destin\u00e9es \u00e0 promouvoir l'emploi": {
-                            "Autres subventions destin\u00e9es \u00e0 promouvoir l'emploi": {}, 
-                            "Primes d'apprentissage re\u00e7ues": {}
-                        }, 
-                        "Subventions sur produits": {}
-                    }
-                }, 
-                "Montant net du chiffre d'affaires": {
-                    "Autres \u00e9l\u00e9ments du chiffre d'affaires": {
-                        "Autres \u00e9l\u00e9ments divers du chiffre d'affaires": {}, 
-                        "Commissions et courtages": {}, 
-                        "Locations": {
-                            "Loyer immobilier": {}, 
-                            "Loyer mobilier": {}
-                        }, 
-                        "Ventes d'emballages": {}
-                    }, 
-                    "Prestations de services": {}, 
-                    "Rabais, remises et ristournes accord\u00e9s par l'entreprise": {
-                        "Sur autres \u00e9l\u00e9ments du chiffre d'affaires": {}, 
-                        "Sur prestations de services": {}, 
-                        "Sur ventes d'\u00e9l\u00e9ments destin\u00e9s \u00e0 la revente": {}, 
-                        "Sur ventes de produits finis": {}, 
-                        "Sur ventes de produits interm\u00e9diaires": {}, 
-                        "Sur ventes de produits r\u00e9siduels": {}, 
-                        "Sur ventes sur commandes en cours": {}
-                    }, 
-                    "Ventes d'\u00e9l\u00e9ments destin\u00e9s \u00e0 la revente": {
-                        "Ventes d'autres \u00e9l\u00e9ments destin\u00e9s \u00e0 la revente": {}, 
-                        "Ventes de marchandises": {}, 
-                        "Ventes de terrains et d'immeubles existants (promotion immobili\u00e8re)": {}
-                    }, 
-                    "Ventes de produits finis": {}, 
-                    "Ventes de produits interm\u00e9diaires": {}, 
-                    "Ventes de produits r\u00e9siduels": {}, 
-                    "Ventes sur commandes en cours": {
-                        "Immeubles en construction": {}, 
-                        "Prestations de services": {}, 
-                        "Produits": {}
-                    }
-                }, 
-                "Production immobilis\u00e9e": {
-                    "Immobilisations corporelles": {
-                        "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {}, 
-                        "Installations techniques et machines": {}, 
-                        "Terrains et constructions": {}
-                    }, 
-                    "Immobilisations incorporelles": {
-                        "Concessions, brevets, licences, marques, droits et valeurs similaires": {
-                            "Brevets": {}, 
-                            "Concessions": {}, 
-                            "Droits et valeurs similaires": {
-                                "Autres droits et valeurs similaires": {}, 
-                                "Droits d'auteur et de reproduction": {}
-                            }, 
-                            "Licences informatiques": {}, 
-                            "Marques et franchises": {}
-                        }, 
-                        "Frais de recherche et d\u00e9veloppement": {}
-                    }
-                }, 
-                "Produits exceptionnels": {
-                    "Autres produits exceptionnels": {
-                        "Autres produits exceptionnels divers": {}, 
-                        "Bonis provenant de clauses d'indexation": {}, 
-                        "Bonis provenant du rachat par l'entreprise d'actions et d'obligations \u00e9mises par elle-m\u00eame": {}, 
-                        "Lib\u00e9ralit\u00e9s re\u00e7ues": {}, 
-                        "P\u00e9nalit\u00e9s sur march\u00e9s et d\u00e9dits per\u00e7us sur achats et sur ventes": {}, 
-                        "Rentr\u00e9es sur cr\u00e9ances amorties": {}, 
-                        "Subventions exceptionnelles": {}
-                    }, 
-                    "Produits de cession d'immobilisations financi\u00e8res": {
-                        "Actions propres ou parts propres": {}, 
-                        "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                        "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Parts dans des entreprises li\u00e9es": {}, 
-                        "Pr\u00eats et cr\u00e9ances immobilis\u00e9s": {}, 
-                        "Titres ayant le caract\u00e8re d'immobilisations": {}
-                    }, 
-                    "Produits de cession d'immobilisations incorporelles et corporelles": {
-                        "Immobilisations corporelles": {}, 
-                        "Immobilisations incorporelles": {}
-                    }, 
-                    "Produits de cession sur cr\u00e9ances de l'actif circulant financier": {
-                        "Autres cr\u00e9ances": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Reprises sur corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles": {
-                        "Immobilisations corporelles": {}, 
-                        "Immobilisations incorporelles": {}
-                    }, 
-                    "Reprises sur corrections de valeur exceptionnelles sur \u00e9l\u00e9ments de l'actif circulant": {
-                        "Sur cr\u00e9ances de l'actif circulant": {}, 
-                        "Sur stocks": {}
-                    }, 
-                    "Reprises sur provisions exceptionnelles": {}
-                }, 
-                "Produits financiers": {
-                    "Autres int\u00e9r\u00eats et escomptes": {
-                        "Escomptes d'effets de commerce": {}, 
-                        "Escomptes obtenus": {}, 
-                        "Int\u00e9r\u00eats bancaires et assimil\u00e9s": {
-                            "Int\u00e9r\u00eats sur comptes courants": {}, 
-                            "Int\u00e9r\u00eats sur comptes \u00e0 terme": {}, 
-                            "Int\u00e9r\u00eats sur leasings financiers": {}
-                        }, 
-                        "Int\u00e9r\u00eats sur autres cr\u00e9ances": {}, 
-                        "Int\u00e9r\u00eats sur cr\u00e9ances commerciales": {}, 
-                        "Int\u00e9r\u00eats sur des entreprises li\u00e9es et des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Autres produits financiers": {}, 
-                    "Gains de change": {}, 
-                    "Plus-value de cession et autres produits de valeurs mobili\u00e8res": {
-                        "Autres produits de valeurs mobili\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Autres valeurs mobili\u00e8res": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}
-                        }, 
-                        "Plus-value de cession de valeurs mobili\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Autres valeurs mobili\u00e8res": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}
-                        }
-                    }, 
-                    "Quote-part de b\u00e9n\u00e9fice dans les entreprises collectives (autres que les soci\u00e9t\u00e9s de capitaux)": {}, 
-                    "Reprises sur corrections de valeur et ajustements pour juste valeur sur immobilisations financi\u00e8res": {
-                        "Ajustements pour juste valeur sur immobilisations financi\u00e8res": {}, 
-                        "Reprises sur corrections de valeur sur immobilisations financi\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}, 
-                            "Pr\u00eats et cr\u00e9ances immobilis\u00e9es": {}, 
-                            "Titres ayant le caract\u00e8re d'immobilisations": {}
-                        }
-                    }, 
-                    "Reprises sur corrections de valeur et ajustements pour juste valeur sur \u00e9l\u00e9ments financiers de l'actif circulant": {
-                        "Ajustements pour juste valeur sur \u00e9l\u00e9ments financiers de l'actif circulant": {}, 
-                        "Reprises sur corrections de valeur sur autres cr\u00e9ances": {}, 
-                        "Reprises sur corrections de valeur sur cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Reprises sur corrections de valeur sur valeurs mobili\u00e8res": {
-                            "Actions propres ou parts propres": {}, 
-                            "Autres valeurs mobili\u00e8res": {}, 
-                            "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                            "Parts dans des entreprises li\u00e9es": {}
-                        }
-                    }, 
-                    "Reprises sur provisions financi\u00e8res": {}, 
-                    "Revenus des immobilisations financi\u00e8res": {
-                        "Actions propres ou parts propres": {}, 
-                        "Cr\u00e9ances sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es": {}, 
-                        "Parts dans des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}, 
-                        "Parts dans des entreprises li\u00e9es": {}, 
-                        "Pr\u00eats et cr\u00e9ances immobilis\u00e9es": {}, 
-                        "Titres ayant le caract\u00e8re d'immobilisations": {}
-                    }
-                }, 
-                "Reprises de corrections de valeur des \u00e9l\u00e9ments d'actif non financiers": {
-                    "Reprises de corrections de valeur sur cr\u00e9ances de l'actif circulant": {
-                        "Autres cr\u00e9ances": {}, 
-                        "Cr\u00e9ances r\u00e9sultant de ventes et prestations de services": {}, 
-                        "Cr\u00e9ances sur des entreprises li\u00e9es et sur des entreprises avec lesquelles la soci\u00e9t\u00e9 a un lien de participation": {}
-                    }, 
-                    "Reprises de corrections de valeur sur immobilisations corporelles": {
-                        "Acomptes vers\u00e9s et immobilisations corporelles en cours": {}, 
-                        "Autres installations, outillage, mobilier et mat\u00e9riel roulant": {}, 
-                        "Installations techniques et machines": {}, 
-                        "Terrains et constructions": {
-                            "Agencements et am\u00e9nagements de terrains": {}, 
-                            "Constructions": {}, 
-                            "Constructions sur sol d'autrui": {}, 
-                            "Terrains": {}
-                        }
-                    }, 
-                    "Reprises de corrections de valeur sur immobilisations incorporelles": {
-                        "Acomptes vers\u00e9s et immobilisations incorporelles en cours": {}, 
-                        "Concessions, brevets, licences, marques ainsi que droits et valeurs similaires": {}, 
-                        "Fonds de commerce, dans la mesure o\u00f9 il a \u00e9t\u00e9 acquis \u00e0 titre on\u00e9reux": {}, 
-                        "Frais de recherche et de d\u00e9veloppement": {}
-                    }, 
-                    "Reprises de corrections de valeur sur stocks": {
-                        "Acomptes vers\u00e9s": {}, 
-                        "Mati\u00e8res premi\u00e8res et consommables": {}, 
-                        "Produits en cours de fabrication et commandes en cours": {}, 
-                        "Produits finis et marchandises": {}, 
-                        "Terrains et immeubles destin\u00e9s \u00e0 la revente": {}
-                    }
-                }, 
-                "R\u00e9gularisations d'autres imp\u00f4ts ne figurant pas sous le poste ci-dessus": {
-                    "Reprises sur provisions pour autres imp\u00f4ts": {}, 
-                    "R\u00e9gularisations d'autres imp\u00f4ts et taxes": {}, 
-                    "R\u00e9gularisations d'imp\u00f4t sur la fortune": {}, 
-                    "R\u00e9gularisations d'imp\u00f4ts \u00e9trangers": {}, 
-                    "R\u00e9gularisations de taxes d'abonnement": {}
-                }, 
-                "R\u00e9gularisations d'imp\u00f4ts sur le r\u00e9sultat": {
-                    "Reprises sur provisions pour imp\u00f4ts sur le r\u00e9sultat": {
-                        "Reprises sur provisions pour imp\u00f4ts": {}, 
-                        "Reprises sur provisions pour imp\u00f4ts diff\u00e9r\u00e9s": {}
-                    }, 
-                    "R\u00e9gularisations d'imp\u00f4t commercial": {}, 
-                    "R\u00e9gularisations d'imp\u00f4t sur le revenu des collectivit\u00e9s": {}, 
-                    "R\u00e9gularisations d'imp\u00f4ts \u00e9trangers sur le r\u00e9sultat": {}
-                }, 
-                "Variation des stocks de produits finis, d'en cours de fabrication et des commandes en cours": {
-                    "Variation des stocks de produits en cours de fabrication et de commandes en cours": {
-                        "Variation des stocks d'immeubles en construction": {}, 
-                        "Variation des stocks de commandes en cours \u2013 prestations de services": {}, 
-                        "Variation des stocks de commandes en cours \u2013 produits": {}, 
-                        "Variation des stocks de produits en cours": {}
-                    }, 
-                    "Variation des stocks de produits finis et marchandises": {
-                        "Variation des stocks de marchandises": {}, 
-                        "Variation des stocks de marchandises en voie d'acheminement, mises en d\u00e9p\u00f4t ou donn\u00e9es en consignation": {}, 
-                        "Variation des stocks de produits finis": {}, 
-                        "Variation des stocks de produits interm\u00e9diaires": {}, 
-                        "Variation des stocks de produits r\u00e9siduels": {}
-                    }
-                }
-            }, 
-            "root_type": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ma_l10n_kzc_temp_chart.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ma_l10n_kzc_temp_chart.json
index 870d6d7..4d4bfcb 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ma_l10n_kzc_temp_chart.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ma_l10n_kzc_temp_chart.json
@@ -1,6 +1,6 @@
 {
     "country_code": "ma", 
-    "name": "compta Kazacube", 
+    "name": "Morocco - Compta Kazacube", 
     "tree": {
         "COMPTES DE BILAN": {
             "COMPTES D'ACTIF CIRCULANT (HORS TRESORERIE)": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
index 56135d8..3df8dfc 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "mx", 
-    "name": "Plan de Cuentas para Mexico", 
+    "name": "Mexico - Plan de Cuentas", 
     "tree": {
         "ACTIVO": {
             "ACTIVO CIRCULANTE": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
index 1c5138b..8009a10 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/nl_l10nnl_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "nl", 
-    "name": "Nederlands Grootboekschema", 
+    "name": "Nederlands - Grootboekschema", 
     "tree": {
         "FABRIKAGEREKENINGEN": {
             "root_type": ""
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
index de16044..6123902 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pa_l10npa_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "pa",
-    "name": "Plan de Cuentas",
+    "name": "Panama - Plan de Cuentas",
     "tree": {
         "ACTIVOS": {
             "Activo Fijo": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pe_pe_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pe_pe_chart_template.json
index d976e3d..7709195 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pe_pe_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pe_pe_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "pe",
-    "name": "Plan de Cuentas 2011",
+    "name": "Peru - Plan de Cuentas",
     "tree": {
         "Cuentas de Balance": {
             "Acciones de inversi\u00f3n   ": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pl_pl_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pl_pl_chart_template.json
index a0b0acf..f5d85f9 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pl_pl_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pl_pl_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "pl",
-    "name": "Plan kont",
+    "name": "Poland - Plan kont",
     "tree": {
         "Aktywa Trwa\u0142e": {
             "D\u0142ugoterminowe aktywa finansowe": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pt_pt_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pt_pt_chart_template.json
index f448f06..d845cc5 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pt_pt_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/pt_pt_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "pt",
-    "name": "Template do Plano de Contas SNC",
+    "name": "Portugal - Template do Plano de Contas SNC",
     "tree": {
         "Capital, reservas e resultados transitados": {
             "Ac\u00e7\u00f5es (quotas) pr\u00f3prias": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
index ef43897..5260daf 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ro_ro_chart_template.json
@@ -1,7 +1,6 @@
 {
     "country_code": "ro",
     "name": "Romania - Chart of Accounts",
-	"disabled": "Yes",
     "tree": {
         "CONTURI FINANCIARE": {
             "CONTURI DE BILANT": {
@@ -91,7 +90,6 @@
                         "Rezultatul reportat": {
                             "Rezultatul reportat provenit din adoptarea pentru prima data a IAS, mai pu\u00fein IAS 29": {},
                             "Rezultatul reportat provenit din corectarea erorilor contabile": {},
-                            "Rezultatul reportat provenit din trecerea la aplicarea Reglementarilor contabile conforme cu Directiva a patra a Comunitatilor Economice Europene": {},
                             "Rezultatul reportat reprezentand profitul nerepartizat sau pierderea neacoperita": {}
                         }
                     }
@@ -154,8 +152,7 @@
                         }
                     },
                     "IMOBILIZARI CORPORALE IN CURS DE APROVIZIONARE": {
-                        "Instalatii tehnice, mijloace de transport, animale si plantatii in curs de aprovizionare": {},
-                        "Mobilier, aparatura birotica, echipamente de protectie a valorilor umane si materiale si alte active corporale in curs de aprovizionare": {}
+                        "Instalatii tehnice, mijloace de transport, animale si plantatii in curs de aprovizionare": {}
                     },
                     "IMOBILIZARI FINANCIARE": {
                         "Actiuni detinute la entitatile afiliate": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
deleted file mode 100644
index 3f687dc..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/si_gd_chart.json
+++ /dev/null
@@ -1,1341 +0,0 @@
-{
-    "country_code": "si", 
-    "name": "Kontni na\u010drt za gospodarske dru\u017ebe", 
-	"disabled": "Yes",
-    "tree": {
-        "DOLGORO\u010cNA SREDSTVA": {
-            "DANA DOLGORO\u010cNA POSOJILA IN TERJATVE ZA NEVPLA\u010cANI VPOKLICANI KAPITAL": {
-                "DANI DOLGORO\u010cNI DEPOZITI": {
-                    "DANI DOLGORO\u010cNI DEPOZITI": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA DRUGIM, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {
-                    "DOLGORO\u010cNA POSOJILA, DANA DRUGIM, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB DRU\u017dBAM V SKUPINI, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {
-                    "DOLGORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB DRU\u017dBAM V SKUPINI, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB PRIDRU\u017dENIM DRU\u017dBAM IN SKUPAJ OBVLADOVANIM DRU\u017dBAM, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {
-                    "DOLGORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB PRIDRU\u017dENIM DRU\u017dBAM IN SKUPAJ OBVLADOVANIM DRU\u017dBAM, VKLJU\u010cNO Z DOLGORO\u010cNIMI TERJATVAMI IZ FINAN\u010cNEGA NAJEMA": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD DRUGIH": {
-                    "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD DRUGIH": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD DRU\u017dB V SKUPINI": {
-                    "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD DRU\u017dB V SKUPINI": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB": {
-                    "DOLGORO\u010cNA POSOJILA, DANA Z ODKUPOM OBVEZNIC OD PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB": {}
-                }, 
-                "DOLGORO\u010cNE TERJATVE ZA NEVPLA\u010cANI VPOKLICANI KAPITAL": {
-                    "DOLGORO\u010cNE TERJATVE ZA NEVPLA\u010cANI VPOKLICANI KAPITAL": {}
-                }, 
-                "DRUGA DOLGORO\u010cNO VLO\u017dENA SREDSTVA": {
-                    "DRUGA DOLGORO\u010cNO VLO\u017dENA SREDSTVA": {}
-                }, 
-                "OSLABITEV VREDNOSTI DANIH DOLGORO\u010cNIH POSOJIL": {
-                    "OSLABITEV VREDNOSTI DANIH DOLGORO\u010cNIH POSOJIL": {}
-                }
-            }, 
-            "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZEN POSOJIL": {
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "DRUGE DOLGORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "OSLABITEV VREDNOSTI DOLGORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {
-                    "OSLABITEV VREDNOSTI DOLGORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {}
-                }
-            }, 
-            "DOLGORO\u010cNE POSLOVNE TERJATVE": {
-                "DANE DOLGORO\u010cNE VAR\u0160\u010cINE": {
-                    "DANE DOLGORO\u010cNE VAR\u0160\u010cINE": {}
-                }, 
-                "DANI DOLGORO\u010cNI POTRO\u0160NI\u0160KI KREDITI": {
-                    "DANI DOLGORO\u010cNI POTRO\u0160NI\u0160KI KREDITI": {}
-                }, 
-                "DANI DOLGORO\u010cNI PREDUJMI": {
-                    "DANI DOLGORO\u010cNI PREDUJMI": {}
-                }, 
-                "DOLGORO\u010cNI BLAGOVNI KREDITI, DANI V DR\u017dAVI": {
-                    "DOLGORO\u010cNI BLAGOVNI KREDITI, DANI V DR\u017dAVI": {}
-                }, 
-                "DOLGORO\u010cNI BLAGOVNI KREDITI, DANI V TUJINI": {
-                    "DOLGORO\u010cNI BLAGOVNI KREDITI, DANI V TUJINI": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE POSLOVNE TERJATVE": {
-                    "DRUGE DOLGORO\u010cNE POSLOVNE TERJATVE": {}
-                }, 
-                "OSLABITEV VREDNOSTI DOLGORO\u010cNIH POSLOVNIH TERJATEV": {
-                    "OSLABITEV VREDNOSTI DOLGORO\u010cNIH POSLOVNIH TERJATEV": {}
-                }
-            }, 
-            "NALO\u017dBENE NEPREMI\u010cNINE": {
-                "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI": {
-                    "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI": {}
-                }, 
-                "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU PO\u0160TENE VREDNOSTI": {
-                    "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU PO\u0160TENE VREDNOSTI": {}
-                }, 
-                "OSLABITEV VREDNOSTI NALO\u017dBENIH NEPREMI\u010cNIN": {
-                    "OSLABITEV VREDNOSTI NALO\u017dBENIH NEPREMI\u010cNIN": {}
-                }, 
-                "POPRAVEK VREDNOSTI NALO\u017dBENIH NEPREMI\u010cNIN ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI NALO\u017dBENIH NEPREMI\u010cNIN ZARADI AMORTIZIRANJA": {}
-                }
-            }, 
-            "NEOPREDMETENA SREDSTVA IN DOLGORO\u010cNE AKTIVNE \u010cASOVNE RAZMEJITVE": {
-                "DOBRO IME": {
-                    "DOBRO IME": {}
-                }, 
-                "DOLGORO\u010cNE AKTIVNE \u010cASOVNE RAZMEJITVE": {
-                    "DOLGORO\u010cNE AKTIVNE \u010cASOVNE RAZMEJITVE": {}
-                }, 
-                "DRUGA NEOPREDMETENA SREDSTVA (TUDI EMISIJSKI KUPONI)": {
-                    "DRUGA NEOPREDMETENA SREDSTVA (TUDI EMISIJSKI KUPONI)": {}
-                }, 
-                "ODLO\u017dENI STRO\u0160KI RAZVIJANJA": {
-                    "ODLO\u017dENI STRO\u0160KI RAZVIJANJA": {}
-                }, 
-                "OSLABITEV VREDNOSTI NEOPREDMETENIH SREDSTEV": {
-                    "OSLABITEV VREDNOSTI NEOPREDMETENIH SREDSTEV": {}
-                }, 
-                "POPRAVEK VREDNOSTI NEOPREDMETENIH SREDSTEV ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI NEOPREDMETENIH SREDSTEV ZARADI AMORTIZIRANJA": {}
-                }, 
-                "PREMO\u017dENJSKE PRAVICE": {
-                    "PREMO\u017dENJSKE PRAVICE": {}
-                }
-            }, 
-            "NEPREMI\u010cNINE": {
-                "NEPREMI\u010cNINE V GRADNJI OZIROMA IZDELAVI": {
-                    "NEPREMI\u010cNINE V GRADNJI OZIROMA IZDELAVI": {}
-                }, 
-                "ZEMLJI\u0160\u010cA, VREDNOTENA PO MODELU NABAVNE VREDNOSTI": {
-                    "ZEMLJI\u0160\u010cA, VREDNOTENA PO MODELU NABAVNE VREDNOSTI": {}
-                }, 
-                "ZEMLJI\u0160\u010cA, VREDNOTENA PO MODELU PREVREDNOTENJA": {
-                    "ZEMLJI\u0160\u010cA, VREDNOTENA PO MODELU PREVREDNOTENJA": {}
-                }, 
-                "ZGRADBE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI": {
-                    "ZGRADBE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI": {}
-                }, 
-                "ZGRADBE, VREDNOTENE PO MODELU PREVREDNOTENJA": {
-                    "ZGRADBE, VREDNOTENE PO MODELU PREVREDNOTENJA": {}
-                }
-            }, 
-            "OPREMA IN DRUGA OPREDMETENA OSNOVNA SREDSTVA": {
-                "BIOLO\u0160KA SREDSTVA": {
-                    "BIOLO\u0160KA SREDSTVA": {}
-                }, 
-                "DROBNI INVENTAR": {
-                    "DROBNI INVENTAR": {}
-                }, 
-                "DRUGA OPREDMETENA OSNOVNA SREDSTVA": {
-                    "DRUGA OPREDMETENA OSNOVNA SREDSTVA": {}
-                }, 
-                "OPREMA IN DRUGA OPREDMETENA OSNOVNA SREDSTVA V GRADNJI OZIROMA IZDELAVI": {
-                    "OPREMA IN DRUGA OPREDMETENA OSNOVNA SREDSTVA V GRADNJI OZIROMA IZDELAVI": {}
-                }, 
-                "OPREMA IN NADOMESTNI DELI, VREDNOTENI PO MODELU NABAVNE VREDNOSTI": {
-                    "OPREMA IN NADOMESTNI DELI, VREDNOTENI PO MODELU NABAVNE VREDNOSTI": {}
-                }, 
-                "OPREMA IN NADOMESTNI DELI, VREDNOTENI PO MODELU PREVREDNOTENJA": {
-                    "OPREMA IN NADOMESTNI DELI, VREDNOTENI PO MODELU PREVREDNOTENJA": {}
-                }, 
-                "VLAGANJA V OPREDMETENA OSNOVNA SREDSTVA V TUJI LASTI": {
-                    "VLAGANJA V OPREDMETENA OSNOVNA SREDSTVA V TUJI LASTI": {}
-                }
-            }, 
-            "POPRAVEK IN OSLABITEV VREDNOSTI NEPREMI\u010cNIN": {
-                "OSLABITEV VREDNOSTI ZEMLJI\u0160\u010c": {
-                    "OSLABITEV VREDNOSTI ZEMLJI\u0160\u010c": {}
-                }, 
-                "OSLABITEV VREDNOSTI ZGRADB": {
-                    "OSLABITEV VREDNOSTI ZGRADB": {}
-                }, 
-                "POPRAVEK VREDNOSTI ZEMLJI\u0160\u010c ZARADI AMORTIZIRANJA (KAMNOLOMI, ODLAGALI\u0160\u010cA ODPADKOV)": {
-                    "POPRAVEK VREDNOSTI ZEMLJI\u0160\u010c ZARADI AMORTIZIRANJA (KAMNOLOMI, ODLAGALI\u0160\u010cA ODPADKOV)": {}
-                }, 
-                "POPRAVEK VREDNOSTI ZGRADB ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI ZGRADB ZARADI AMORTIZIRANJA": {}
-                }
-            }, 
-            "POPRAVEK IN OSLABITEV VREDNOSTI OPREME IN DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV": {
-                "OSLABITEV VREDNOSTI DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV": {
-                    "OSLABITEV VREDNOSTI DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV": {}
-                }, 
-                "OSLABITEV VREDNOSTI OPREME IN NADOMESTNIH DELOV": {
-                    "OSLABITEV VREDNOSTI OPREME IN NADOMESTNIH DELOV": {}
-                }, 
-                "POPRAVEK VREDNOSTI BIOLO\u0160KIH SREDSTEV": {
-                    "POPRAVEK VREDNOSTI BIOLO\u0160KIH SREDSTEV": {}
-                }, 
-                "POPRAVEK VREDNOSTI DROBNEGA INVENTARJA ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI DROBNEGA INVENTARJA ZARADI AMORTIZIRANJA": {}
-                }, 
-                "POPRAVEK VREDNOSTI DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV ZARADI AMORTIZIRANJA": {}
-                }, 
-                "POPRAVEK VREDNOSTI OPREME IN NADOMESTNIH DELOV ZARADI AMORTIZIRANJA": {
-                    "POPRAVEK VREDNOSTI OPREME IN NADOMESTNIH DELOV ZARADI AMORTIZIRANJA": {}
-                }, 
-                "POPRAVEK VREDNOSTI VLAGANJ V OPREDMETENA OSNOVNA SREDSTVA V TUJI LASTI": {
-                    "POPRAVEK VREDNOSTI VLAGANJ V OPREDMETENA OSNOVNA SREDSTVA V TUJI LASTI": {}
-                }
-            }, 
-            "TERJATVE ZA ODLO\u017dENI DAVEK": {
-                "TERJATVE ZA ODLO\u017dENI DAVEK IZ DAV\u010cNIH DOBROPISOV, PRENESENIH V NASLEDNJA DAV\u010cNA OBDOBJA": {
-                    "TERJATVE ZA ODLO\u017dENI DAVEK IZ DAV\u010cNIH DOBROPISOV, PRENESENIH V NASLEDNJA DAV\u010cNA OBDOBJA": {}
-                }, 
-                "TERJATVE ZA ODLO\u017dENI DAVEK IZ NEIZRABLJENIH DAV\u010cNIH IZGUB, PRENESENIH V NASLEDNJA DAV\u010cNA OBDOBJA": {
-                    "TERJATVE ZA ODLO\u017dENI DAVEK IZ NEIZRABLJENIH DAV\u010cNIH IZGUB, PRENESENIH V NASLEDNJA DAV\u010cNA OBDOBJA": {}
-                }, 
-                "TERJATVE ZA ODLO\u017dENI DAVEK IZ ODBITNIH ZA\u010cASNIH RAZLIK": {
-                    "TERJATVE ZA ODLO\u017dENI DAVEK IZ ODBITNIH ZA\u010cASNIH RAZLIK": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "KAPITAL, DOLGORO\u010cNE OBVEZNOSTI (DOLGOVI) IN DOLGORO\u010cNE REZERVACIJE": {
-            "DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {
-                "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V DR\u017dAVI": {
-                    "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V DR\u017dAVI": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V TUJINI": {
-                    "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V TUJINI": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI DRU\u017dBAH V SKUPINI": {
-                    "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI DRU\u017dBAH V SKUPINI": {}
-                }, 
-                "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI PRIDRU\u017dENIH DRU\u017dBAH": {
-                    "DOLGORO\u010cNA POSOJILA, DOBLJENA PRI PRIDRU\u017dENIH DRU\u017dBAH": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI DO FIZI\u010cNIH OSEB": {
-                    "DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI DO FIZI\u010cNIH OSEB": {}
-                }, 
-                "DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI V ZVEZI Z OBVEZNICAMI": {
-                    "DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI V ZVEZI Z OBVEZNICAMI": {}
-                }, 
-                "DOLGORO\u010cNI DOLGOVI IZ FINAN\u010cNEGA NAJEMA": {
-                    "DOLGORO\u010cNI DOLGOVI IZ FINAN\u010cNEGA NAJEMA": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {
-                    "DRUGE DOLGORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {}
-                }
-            }, 
-            "DOLGORO\u010cNE POSLOVNE OBVEZNOSTI": {
-                "DOLGORO\u010cNE MENI\u010cNE OBVEZNOSTI": {
-                    "DOLGORO\u010cNE MENI\u010cNE OBVEZNOSTI": {}
-                }, 
-                "DOLGORO\u010cNI DOBLJENI PREDUJMI IN VAR\u0160\u010cINE": {
-                    "DOLGORO\u010cNI DOBLJENI PREDUJMI IN VAR\u0160\u010cINE": {}
-                }, 
-                "DOLGORO\u010cNI KREDITI, DOBLJENI NA PODLAGI KREDITNIH POGODB OD DRU\u017dB V SKUPINI": {
-                    "DOLGORO\u010cNI KREDITI, DOBLJENI NA PODLAGI KREDITNIH POGODB OD DRU\u017dB V SKUPINI": {}
-                }, 
-                "DOLGORO\u010cNI KREDITI, DOBLJENI NA PODLAGI KREDITNIH POGODB OD PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB": {
-                    "DOLGORO\u010cNI KREDITI, DOBLJENI NA PODLAGI KREDITNIH POGODB OD PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB": {}
-                }, 
-                "DOLGORO\u010cNI KREDITI, DOBLJENI OD DRUGIH DOMA\u010cIH DOBAVITELJEV": {
-                    "DOLGORO\u010cNI KREDITI, DOBLJENI OD DRUGIH DOMA\u010cIH DOBAVITELJEV": {}
-                }, 
-                "DOLGORO\u010cNI KREDITI, DOBLJENI OD DRUGIH TUJIH DOBAVITELJEV": {
-                    "DOLGORO\u010cNI KREDITI, DOBLJENI OD DRUGIH TUJIH DOBAVITELJEV": {}
-                }, 
-                "DRUGE DOLGORO\u010cNE POSLOVNE OBVEZNOSTI": {
-                    "DRUGE DOLGORO\u010cNE POSLOVNE OBVEZNOSTI": {}
-                }, 
-                "OBVEZNOSTI ZA ODLO\u017dENI DAVEK": {
-                    "OBVEZNOSTI ZA ODLO\u017dENI DAVEK": {}
-                }
-            }, 
-            "KAPITALSKE REZERVE": {
-                "DRUGA VPLA\u010cILA KAPITALA NA PODLAGI STATUTA": {
-                    "DRUGA VPLA\u010cILA KAPITALA NA PODLAGI STATUTA": {}
-                }, 
-                "SPLO\u0160NI PREVREDNOTOVALNI POPRAVEK KAPITALA": {
-                    "SPLO\u0160NI PREVREDNOTOVALNI POPRAVEK KAPITALA": {}
-                }, 
-                "VPLA\u010cILA NAD KNJIGOVODSKO VREDNOSTJO PRI ODTUJITVI ZA\u010cASNO ODKUPLJENIH LASTNIH DELNIC OZIROMA DELE\u017dEV": {
-                    "VPLA\u010cILA NAD KNJIGOVODSKO VREDNOSTJO PRI ODTUJITVI ZA\u010cASNO ODKUPLJENIH LASTNIH DELNIC OZIROMA DELE\u017dEV": {}
-                }, 
-                "VPLA\u010cILA NAD NAJMANJ\u0160IM EMISIJSKIM ZNESKOM KAPITALA, PRIDOBLJENA Z IZDAJO ZAMENLJIVIH OBVEZNIC IN OBVEZNIC Z DELNI\u0160KO NAKUPNO OPCIJO": {
-                    "VPLA\u010cILA NAD NAJMANJ\u0160IM EMISIJSKIM ZNESKOM KAPITALA, PRIDOBLJENA Z IZDAJO ZAMENLJIVIH OBVEZNIC IN OBVEZNIC Z DELNI\u0160KO NAKUPNO OPCIJO": {}
-                }, 
-                "VPLA\u010cILA NAD NAJMANJ\u0160IMI EMISIJSKIMI ZNESKI DELNIC OZIROMA DELE\u017dEV (VPLA\u010cANI PRESE\u017dEK KAPITALA)": {
-                    "VPLA\u010cILA NAD NAJMANJ\u0160IMI EMISIJSKIMI ZNESKI DELNIC OZIROMA DELE\u017dEV (VPLA\u010cANI PRESE\u017dEK KAPITALA)": {}
-                }, 
-                "VPLA\u010cILA ZA PRIDOBITEV DODATNIH PRAVIC IZ DELNIC OZIROMA DELE\u017dEV": {
-                    "VPLA\u010cILA ZA PRIDOBITEV DODATNIH PRAVIC IZ DELNIC OZIROMA DELE\u017dEV": {}
-                }, 
-                "ZNESKI IZ POENOSTAVLJENEGA ZMANJ\u0160ANJA OSNOVNEGA KAPITALA IN ZNESKI ZMANJ\u0160ANJA OSNOVNEGA KAPITALA Z UMIKOM DELNIC OZIROMA DELE\u017dEV": {
-                    "ZNESKI IZ POENOSTAVLJENEGA ZMANJ\u0160ANJA OSNOVNEGA KAPITALA IN ZNESKI ZMANJ\u0160ANJA OSNOVNEGA KAPITALA Z UMIKOM DELNIC OZIROMA DELE\u017dEV": {}
-                }, 
-                "ZNESKI IZ U\u010cINKOV POTRJENE PRISILNE PORAVNAVE": {
-                    "ZNESKI IZ U\u010cINKOV POTRJENE PRISILNE PORAVNAVE": {}
-                }
-            }, 
-            "PRESE\u017dEK IZ PREVREDNOTENJA": {
-                "POPRAVEK VREDNOSTI PRESE\u017dKOV IZ PREVREDNOTENJA ZA ODLO\u017dENI DAVEK": {
-                    "POPRAVEK VREDNOSTI PRESE\u017dKOV IZ PREVREDNOTENJA ZA ODLO\u017dENI DAVEK": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA DOLGORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA DOLGORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA KRATKORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA KRATKORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA NEOPREDMETENIH SREDSTEV": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA NEOPREDMETENIH SREDSTEV": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA OPREME": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA OPREME": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA ZEMLJI\u0160\u010c": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA ZEMLJI\u0160\u010c": {}
-                }, 
-                "PRESE\u017dEK IZ PREVREDNOTENJA ZGRADB": {
-                    "PRESE\u017dEK IZ PREVREDNOTENJA ZGRADB": {}
-                }
-            }, 
-            "REZERVACIJE IN DOLGORO\u010cNE PASIVNE \u010cASOVNE RAZMEJITVE": {
-                "DRUGE DOLGORO\u010cNE PASIVNE \u010cASOVNE RAZMEJITVE": {
-                    "DRUGE DOLGORO\u010cNE PASIVNE \u010cASOVNE RAZMEJITVE": {}
-                }, 
-                "DRUGE REZERVACIJE IZ NASLOVA DOLGORO\u010cNO VNAPREJ VRA\u010cUNANIH STRO\u0160KOV": {
-                    "DRUGE REZERVACIJE IZ NASLOVA DOLGORO\u010cNO VNAPREJ VRA\u010cUNANIH STRO\u0160KOV": {}
-                }, 
-                "PREJETE DONACIJE": {
-                    "PREJETE DONACIJE": {}
-                }, 
-                "PREJETE DR\u017dAVNE PODPORE": {
-                    "PREJETE DR\u017dAVNE PODPORE": {}
-                }, 
-                "REZERVACIJE ZA DANA JAMSTVA": {
-                    "REZERVACIJE ZA DANA JAMSTVA": {}
-                }, 
-                "REZERVACIJE ZA KO\u010cLJIVE POGODBE": {
-                    "REZERVACIJE ZA KO\u010cLJIVE POGODBE": {}
-                }, 
-                "REZERVACIJE ZA POKOJNINE, JUBILEJNE NAGRADE IN ODPRAVNINE OB UPOKOJITVI": {
-                    "REZERVACIJE ZA POKOJNINE, JUBILEJNE NAGRADE IN ODPRAVNINE OB UPOKOJITVI": {}
-                }, 
-                "REZERVACIJE ZA POKRIVANJE PRIHODNJIH STRO\u0160KOV OZIROMA ODHODKOV ZARADI RAZGRADNJE IN PONOVNE VZPOSTAVITVE PRVOTNEGA STANJA TER DRUGE PODOBNE REZERVACIJE": {
-                    "REZERVACIJE ZA POKRIVANJE PRIHODNJIH STRO\u0160KOV OZIROMA ODHODKOV ZARADI RAZGRADNJE IN PONOVNE VZPOSTAVITVE PRVOTNEGA STANJA TER DRUGE PODOBNE REZERVACIJE": {}
-                }, 
-                "REZERVACIJE ZA STRO\u0160KE REORGANIZACIJE PODJETJA": {
-                    "REZERVACIJE ZA STRO\u0160KE REORGANIZACIJE PODJETJA": {}
-                }
-            }, 
-            "REZERVE IZ DOBI\u010cKA": {
-                "DRUGE REZERVE IZ DOBI\u010cKA": {
-                    "DRUGE REZERVE IZ DOBI\u010cKA": {}
-                }, 
-                "PRIDOBLJENE LASTNE DELNICE OZIROMA LASTNI POSLOVNI DELE\u017dI (ODBITNA POSTAVKA)": {
-                    "PRIDOBLJENE LASTNE DELNICE OZIROMA LASTNI POSLOVNI DELE\u017dI (ODBITNA POSTAVKA)": {}
-                }, 
-                "REZERVE ZA LASTNE DELNICE OZIROMA LASTNE POSLOVNE DELE\u017dE": {
-                    "REZERVE ZA LASTNE DELNICE OZIROMA LASTNE POSLOVNE DELE\u017dE": {}
-                }, 
-                "STATUTARNE REZERVE": {
-                    "STATUTARNE REZERVE": {}
-                }, 
-                "ZAKONSKE REZERVE": {
-                    "ZAKONSKE REZERVE": {}
-                }
-            }, 
-            "VPOKLICANI KAPITAL": {
-                "NEVPOKLICANI KAPITAL (ODBITNA POSTAVKA)": {
-                    "NEVPOKLICANI KAPITAL (ODBITNA POSTAVKA)": {}
-                }, 
-                "OSNOVNI DELNI\u0160KI KAPITAL - NAVADNE DELNICE": {
-                    "OSNOVNI DELNI\u0160KI KAPITAL - NAVADNE DELNICE": {}
-                }, 
-                "OSNOVNI DELNI\u0160KI KAPITAL - PREDNOSTNE DELNICE": {
-                    "OSNOVNI DELNI\u0160KI KAPITAL - PREDNOSTNE DELNICE": {}
-                }, 
-                "OSNOVNI KAPITAL - KAPITALSKA VLOGA": {
-                    "OSNOVNI KAPITAL - KAPITALSKA VLOGA": {}
-                }, 
-                "OSNOVNI KAPITAL - KAPITALSKI DELE\u017dI": {
-                    "OSNOVNI KAPITAL - KAPITALSKI DELE\u017dI": {}
-                }
-            }, 
-            "ZUNAJBILAN\u010cNI KONTI": {
-                "BLAGO, PREJETO V KOMISIJSKO IN KONSIGNACIJSKO PRODAJO": {
-                    "BLAGO, PREJETO V KOMISIJSKO IN KONSIGNACIJSKO PRODAJO": {}
-                }, 
-                "DOL\u017dNIKI, KI SO ZAVAROVALI PLA\u010cILA Z MENICAMI IN DRUGIMI VREDNOSTNIMI PAPIRJI": {
-                    "DOL\u017dNIKI, KI SO ZAVAROVALI PLA\u010cILA Z MENICAMI IN DRUGIMI VREDNOSTNIMI PAPIRJI": {}
-                }, 
-                "DRUGI AKTIVNI ZUNAJBILAN\u010cNI KONTI": {
-                    "DRUGI AKTIVNI ZUNAJBILAN\u010cNI KONTI": {}
-                }, 
-                "DRUGI PASIVNI ZUNAJBILAN\u010cNI KONTI": {
-                    "DRUGI PASIVNI ZUNAJBILAN\u010cNI KONTI": {}
-                }, 
-                "LASTNIKI NAJETIH, IZPOSOJENIH IN ZAKUPLJENIH SREDSTEV": {
-                    "LASTNIKI NAJETIH, IZPOSOJENIH IN ZAKUPLJENIH SREDSTEV": {}
-                }, 
-                "MENICE IN DRUGI VREDNOSTNI PAPIRJI, PREJETI ZA ZAVAROVANJE PLA\u010cIL": {
-                    "MENICE IN DRUGI VREDNOSTNI PAPIRJI, PREJETI ZA ZAVAROVANJE PLA\u010cIL": {}
-                }, 
-                "NAJETA, IZPOSOJENA IN ZAKUPLJENA (TUJA) SREDSTVA": {
-                    "NAJETA, IZPOSOJENA IN ZAKUPLJENA (TUJA) SREDSTVA": {}
-                }, 
-                "NOMINALNA VREDNOST VREDNOTNIC, IZDANIH ZA OBRA\u010cUNAVANJE ZNOTRAJ PRAVNE OSEBE": {
-                    "NOMINALNA VREDNOST VREDNOTNIC, IZDANIH ZA OBRA\u010cUNAVANJE ZNOTRAJ PRAVNE OSEBE": {}
-                }, 
-                "OBVEZNOSTI IZ BLAGA, PREJETEGA V KOMISIJSKO IN KONSIGNACIJSKO PRODAJO": {
-                    "OBVEZNOSTI IZ BLAGA, PREJETEGA V KOMISIJSKO IN KONSIGNACIJSKO PRODAJO": {}
-                }, 
-                "VREDNOTNICE, IZDANE ZA OBRA\u010cUNAVANJE ZNOTRAJ PRAVNE OSEBE": {
-                    "VREDNOTNICE, IZDANE ZA OBRA\u010cUNAVANJE ZNOTRAJ PRAVNE OSEBE": {}
-                }
-            }, 
-            "root_type": "", 
-            "\u010cISTI DOBI\u010cEK ALI \u010cISTA IZGUBA": {
-                "NEUPORABLJENI DEL \u010cISTEGA DOBI\u010cKA POSLOVNEGA LETA": {
-                    "NEUPORABLJENI DEL \u010cISTEGA DOBI\u010cKA POSLOVNEGA LETA": {}
-                }, 
-                "PRENESENA \u010cISTA IZGUBA IZ PREJ\u0160NJIH LET": {
-                    "PRENESENA \u010cISTA IZGUBA IZ PREJ\u0160NJIH LET": {}
-                }, 
-                "PRENESENI \u010cISTI DOBI\u010cEK IZ PREJ\u0160NJIH LET": {
-                    "PRENESENI \u010cISTI DOBI\u010cEK IZ PREJ\u0160NJIH LET": {}
-                }, 
-                "PRENOS IZ PRESE\u017dKA IZ PREVREDNOTENJA": {
-                    "PRENOS IZ PRESE\u017dKA IZ PREVREDNOTENJA": {}
-                }, 
-                "\u010cISTA IZGUBA POSLOVNEGA LETA": {
-                    "\u010cISTA IZGUBA POSLOVNEGA LETA": {}
-                }
-            }
-        }, 
-        "KRATKORO\u010cNA SREDSTVA, RAZEN ZALOG, IN KRATKORO\u010cNE AKTIVNE \u010cASOVNE RAZMEJITVE": {
-            "DANI KRATKORO\u010cNI PREDUJMI IN VAR\u0160\u010cINE": {
-                "DANE KRATKORO\u010cNE VAR\u0160\u010cINE": {
-                    "DANE KRATKORO\u010cNE VAR\u0160\u010cINE": {}
-                }, 
-                "DRUGI DANI KRATKORO\u010cNI PREDUJMI IN PREPLA\u010cILA": {
-                    "DRUGI DANI KRATKORO\u010cNI PREDUJMI IN PREPLA\u010cILA": {
-                        "account_type": "Receivable"
-                    }, 
-                    "account_type": "Receivable"
-                }, 
-                "KRATKORO\u010cNI PREDUJMI, DANI ZA NEOPREDMETENA SREDSTVA": {
-                    "KRATKORO\u010cNI PREDUJMI, DANI ZA NEOPREDMETENA SREDSTVA": {}
-                }, 
-                "KRATKORO\u010cNI PREDUJMI, DANI ZA OPREDMETENA OSNOVNA SREDSTVA": {
-                    "KRATKORO\u010cNI PREDUJMI, DANI ZA OPREDMETENA OSNOVNA SREDSTVA": {}
-                }, 
-                "KRATKORO\u010cNI PREDUJMI, DANI ZA ZALOGE MATERIALA IN BLAGA TER \u0160E NE OPRAVLJENE STORITVE": {
-                    "KRATKORO\u010cNI PREDUJMI, DANI ZA ZALOGE MATERIALA IN BLAGA TER \u0160E NE OPRAVLJENE STORITVE": {}
-                }, 
-                "OSLABITEV VREDNOSTI DANIH KRATKORO\u010cNIH PREDUJMOV IN VAR\u0160\u010cIN": {
-                    "OSLABITEV VREDNOSTI DANIH KRATKORO\u010cNIH PREDUJMOV IN VAR\u0160\u010cIN": {}
-                }
-            }, 
-            "DENARNA SREDSTVA V BLAGAJNI IN TAKOJ UDENARLJIVI VREDNOSTNI PAPIRJI": {
-                "DENAR NA POTI": {
-                    "DENAR NA POTI": {}
-                }, 
-                "DENARNA SREDSTVA V BLAGAJNI, RAZEN DEVIZNIH SREDSTEV": {
-                    "DENARNA SREDSTVA V BLAGAJNI, RAZEN DEVIZNIH SREDSTEV": {}
-                }, 
-                "DEVIZNA SREDSTVA V BLAGAJNI": {
-                    "DEVIZNA SREDSTVA V BLAGAJNI": {}
-                }, 
-                "IZDANI \u010cEKI (ODBITNA POSTAVKA)": {
-                    "IZDANI \u010cEKI (ODBITNA POSTAVKA)": {}
-                }, 
-                "NETVEGANI TAKOJ UDENARLJIVI DOL\u017dNI\u0160KI VREDNOSTNI PAPIRJI": {
-                    "NETVEGANI TAKOJ UDENARLJIVI DOL\u017dNI\u0160KI VREDNOSTNI PAPIRJI": {}
-                }, 
-                "PREJETI \u010cEKI": {
-                    "PREJETI \u010cEKI": {}
-                }
-            }, 
-            "DOBROIMETJE PRI BANKAH IN DRUGIH FINAN\u010cNIH IN\u0160TITUCIJAH": {
-                "DENARNA SREDSTVA NA POSEBNIH RA\u010cUNIH OZIROMA ZA POSEBNE NAMENE": {
-                    "DENARNA SREDSTVA NA POSEBNIH RA\u010cUNIH OZIROMA ZA POSEBNE NAMENE": {}
-                }, 
-                "DENARNA SREDSTVA NA RA\u010cUNIH, RAZEN DEVIZNIH": {
-                    "DENARNA SREDSTVA NA RA\u010cUNIH, RAZEN DEVIZNIH": {}
-                }, 
-                "DEVIZNA SREDSTVA NA RA\u010cUNIH": {
-                    "DEVIZNA SREDSTVA NA RA\u010cUNIH": {}
-                }, 
-                "KRATKORO\u010cNI DEPOZITI OZIROMA DEPOZITI NA ODPOKLIC, RAZEN DEVIZNIH": {
-                    "KRATKORO\u010cNI DEPOZITI OZIROMA DEPOZITI NA ODPOKLIC, RAZEN DEVIZNIH": {}
-                }, 
-                "KRATKORO\u010cNI DEVIZNI DEPOZITI OZIROMA DEVIZNI DEPOZITI NA ODPOKLIC": {
-                    "KRATKORO\u010cNI DEVIZNI DEPOZITI OZIROMA DEVIZNI DEPOZITI NA ODPOKLIC": {}
-                }
-            }, 
-            "DRUGE KRATKORO\u010cNE TERJATVE": {
-                "DRUGE KRATKORO\u010cNE TERJATVE DO DR\u017dAVNIH IN DRUGIH IN\u0160TITUCIJ": {
-                    "DRUGE KRATKORO\u010cNE TERJATVE DO DR\u017dAVNIH IN DRUGIH IN\u0160TITUCIJ": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA DAVEK OD DOHODKOV PRAVNIH OSEB, VKLJU\u010cNO Z DAVKOM, PLA\u010cANIM V TUJINI": {
-                    "KRATKORO\u010cNE TERJATVE ZA DAVEK OD DOHODKOV PRAVNIH OSEB, VKLJU\u010cNO Z DAVKOM, PLA\u010cANIM V TUJINI": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA DDV, PLA\u010cAN V TUJINI": {
-                    "KRATKORO\u010cNE TERJATVE ZA DDV, PLA\u010cAN V TUJINI": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA DDV, VRNJEN TUJCEM": {
-                    "KRATKORO\u010cNE TERJATVE ZA DDV, VRNJEN TUJCEM": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV": {
-                    "KRATKORO\u010cNE TERJATVE ZA NEODBITNI DDV": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 20%": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 20% IZVEN EU": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 20% UVOZ": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 20% V EU": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 8,5%": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 8,5% IZVEN EU": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 8,5% UVOZ": {}, 
-                    "KRATKORO\u010cNE TERJATVE ZA ODBITNI DDV 8,5% V EU": {}
-                }, 
-                "OSLABITEV VREDNOSTI DRUGIH KRATKORO\u010cNIH TERJATEV": {
-                    "OSLABITEV VREDNOSTI DRUGIH KRATKORO\u010cNIH TERJATEV": {}
-                }, 
-                "OSTALE KRATKORO\u010cNE TERJATVE": {
-                    "OSTALE KRATKORO\u010cNE TERJATVE": {}
-                }
-            }, 
-            "KRATKORO\u010cNA POSOJILA IN KRATKORO\u010cNE TERJATVE ZA NEVPLA\u010cANI KAPITAL": {
-                "KRATKORO\u010cNA POSOJILA, DANA DRUGIM": {
-                    "KRATKORO\u010cNA POSOJILA, DANA DRUGIM": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB DRU\u017dBAM V SKUPINI": {
-                    "KRATKORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB DRU\u017dBAM V SKUPINI": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB PRIDRU\u017dENIM DRU\u017dBAM IN SKUPAJ OBVLADOVANIM DRU\u017dBAM": {
-                    "KRATKORO\u010cNA POSOJILA, DANA NA PODLAGI POSOJILNIH POGODB PRIDRU\u017dENIM DRU\u017dBAM IN SKUPAJ OBVLADOVANIM DRU\u017dBAM": {}
-                }, 
-                "KRATKORO\u010cNI DEPOZITI V BANKAH IN DRUGIH FINAN\u010cNIH ORGANIZACIJAH": {
-                    "KRATKORO\u010cNI DEPOZITI V BANKAH IN DRUGIH FINAN\u010cNIH ORGANIZACIJAH": {}
-                }, 
-                "KRATKORO\u010cNO DANA POSOJILA Z ODKUPOM DRUGIH DOL\u017dNI\u0160KIH VREDNOSTNIH PAPIRJEV": {
-                    "KRATKORO\u010cNO DANA POSOJILA Z ODKUPOM DRUGIH DOL\u017dNI\u0160KIH VREDNOSTNIH PAPIRJEV": {}
-                }, 
-                "KRATKORO\u010cNO DANA POSOJILA Z ODKUPOM OBVEZNIC": {
-                    "KRATKORO\u010cNO DANA POSOJILA Z ODKUPOM OBVEZNIC": {}
-                }, 
-                "KRATKORO\u010cNO NEVPLA\u010cANI VPOKLICANI KAPITAL": {
-                    "KRATKORO\u010cNO NEVPLA\u010cANI VPOKLICANI KAPITAL": {}
-                }, 
-                "OSLABITEV VREDNOSTI KRATKORO\u010cNIH POSOJIL": {
-                    "OSLABITEV VREDNOSTI KRATKORO\u010cNIH POSOJIL": {}
-                }, 
-                "PREJETE MENICE": {
-                    "PREJETE MENICE": {}
-                }
-            }, 
-            "KRATKORO\u010cNE AKTIVNE \u010cASOVNE RAZMEJITVE": {
-                "DDV OD PREJETIH PREDUJMOV": {
-                    "DDV OD PREJETIH PREDUJMOV": {}
-                }, 
-                "KRATKORO\u010cNO NEZARA\u010cUNANI PRIHODKI": {
-                    "KRATKORO\u010cNO NEZARA\u010cUNANI PRIHODKI": {}
-                }, 
-                "KRATKORO\u010cNO ODLO\u017dENI STRO\u0160KI OZIROMA ODHODKI": {
-                    "KRATKORO\u010cNO ODLO\u017dENI STRO\u0160KI OZIROMA ODHODKI": {}
-                }, 
-                "VREDNOTNICE": {
-                    "VREDNOTNICE": {}
-                }
-            }, 
-            "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZEN POSOJIL": {
-                "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "DRUGE KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE DRU\u017dB V SKUPINI, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO NABAVNI VREDNOSTI": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK KAPITALA": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "KRATKORO\u010cNE FINAN\u010cNE NALO\u017dBE V DELNICE IN DELE\u017dE PRIDRU\u017dENIH DRU\u017dB IN SKUPAJ OBVLADOVANIH DRU\u017dB, RAZPOREJENE IN IZMERJENE PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "OSLABITEV VREDNOSTI KRATKORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {
-                    "OSLABITEV VREDNOSTI KRATKORO\u010cNIH FINAN\u010cNIH NALO\u017dB": {}
-                }
-            }, 
-            "KRATKORO\u010cNE TERJATVE DO KUPCEV": {
-                "KRATKORO\u010cNE TERJATVE DO KUPCEV V DR\u017dAVI": {
-                    "KRATKORO\u010cNE TERJATVE DO KUPCEV V DR\u017dAVI": {
-                        "account_type": "Receivable"
-                    }, 
-                    "account_type": "Receivable"
-                }, 
-                "KRATKORO\u010cNE TERJATVE DO KUPCEV V TUJINI": {
-                    "KRATKORO\u010cNE TERJATVE DO KUPCEV V TUJINI": {
-                        "account_type": "Receivable"
-                    }, 
-                    "account_type": "Receivable"
-                }, 
-                "KRATKORO\u010cNI BLAGOVNI KREDITI, DANI KUPCEM V DR\u017dAVI": {
-                    "KRATKORO\u010cNI BLAGOVNI KREDITI, DANI KUPCEM V DR\u017dAVI": {}
-                }, 
-                "KRATKORO\u010cNI BLAGOVNI KREDITI, DANI KUPCEM V TUJINI": {
-                    "KRATKORO\u010cNI BLAGOVNI KREDITI, DANI KUPCEM V TUJINI": {}
-                }, 
-                "KRATKORO\u010cNI POTRO\u0160NI\u0160KI KREDITI, DANI KUPCEM V DR\u017dAVI": {
-                    "KRATKORO\u010cNI POTRO\u0160NI\u0160KI KREDITI, DANI KUPCEM V DR\u017dAVI": {}
-                }, 
-                "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV DO KUPCEV": {
-                    "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV DO KUPCEV": {}
-                }
-            }, 
-            "KRATKORO\u010cNE TERJATVE IZ POSLOVANJA ZA TUJ RA\u010cUN": {
-                "DRUGE KRATKORO\u010cNE TERJATVE IZ POSLOVANJA ZA TUJ RA\u010cUN": {
-                    "DRUGE KRATKORO\u010cNE TERJATVE IZ POSLOVANJA ZA TUJ RA\u010cUN": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE DO IZVOZNIKOV": {
-                    "KRATKORO\u010cNE TERJATVE DO IZVOZNIKOV": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE IZ KOMISIJSKE IN KONSIGNACIJSKE PRODAJE": {
-                    "KRATKORO\u010cNE TERJATVE IZ KOMISIJSKE IN KONSIGNACIJSKE PRODAJE": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE IZ UVOZA ZA TUJ RA\u010cUN": {
-                    "KRATKORO\u010cNE TERJATVE IZ UVOZA ZA TUJ RA\u010cUN": {}
-                }, 
-                "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV IZ POSLOVANJA ZA TUJ RA\u010cUN": {
-                    "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV IZ POSLOVANJA ZA TUJ RA\u010cUN": {}
-                }
-            }, 
-            "KRATKORO\u010cNE TERJATVE, POVEZANE S FINAN\u010cNIMI PRIHODKI": {
-                "DRUGE KRATKORO\u010cNE TERJATVE, POVEZANE S FINAN\u010cNIMI PRIHODKI": {
-                    "DRUGE KRATKORO\u010cNE TERJATVE, POVEZANE S FINAN\u010cNIMI PRIHODKI": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA DIVIDENDE": {
-                    "KRATKORO\u010cNE TERJATVE ZA DIVIDENDE": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA DRUGE DELE\u017dE V DOBI\u010cKU": {
-                    "KRATKORO\u010cNE TERJATVE ZA DRUGE DELE\u017dE V DOBI\u010cKU": {}
-                }, 
-                "KRATKORO\u010cNE TERJATVE ZA OBRESTI": {
-                    "KRATKORO\u010cNE TERJATVE ZA OBRESTI": {}
-                }, 
-                "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV, POVEZANIH S FINAN\u010cNIMI PRIHODKI": {
-                    "OSLABITEV VREDNOSTI KRATKORO\u010cNIH TERJATEV, POVEZANIH S FINAN\u010cNIMI PRIHODKI": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) IN KRATKORO\u010cNE PASIVNE \u010cASOVNE RAZMEJITVE": {
-            "DRUGE KRATKORO\u010cNE OBVEZNOSTI": {
-                "KRATKORO\u010cNE MENI\u010cNE OBVEZNOSTI": {
-                    "KRATKORO\u010cNE MENI\u010cNE OBVEZNOSTI": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI V ZVEZI Z ODTEGLJAJI OD PLA\u010c IN NADOMESTIL PLA\u010c ZAPOSLENCEM": {
-                    "KRATKORO\u010cNE OBVEZNOSTI V ZVEZI Z ODTEGLJAJI OD PLA\u010c IN NADOMESTIL PLA\u010c ZAPOSLENCEM": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA OBRESTI": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA OBRESTI": {}
-                }, 
-                "OSTALE KRATKORO\u010cNE POSLOVNE OBVEZNOSTI": {
-                    "OSTALE KRATKORO\u010cNE POSLOVNE OBVEZNOSTI": {}
-                }
-            }, 
-            "KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {
-                "DRUGE KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {
-                    "DRUGE KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V DR\u017dAVI": {
-                    "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V DR\u017dAVI": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V TUJINI": {
-                    "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI BANKAH IN DRU\u017dBAH V TUJINI": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI DRU\u017dBAH V SKUPINI": {
-                    "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI DRU\u017dBAH V SKUPINI": {}
-                }, 
-                "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI PRIDRU\u017dENIH DRU\u017dBAH IN SKUPAJ OBVLADOVANIH DRU\u017dBAH": {
-                    "KRATKORO\u010cNA POSOJILA, DOBLJENA PRI PRIDRU\u017dENIH DRU\u017dBAH IN SKUPAJ OBVLADOVANIH DRU\u017dBAH": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI DO FIZI\u010cNIH OSEB": {
-                    "KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI DO FIZI\u010cNIH OSEB": {}
-                }, 
-                "KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI V ZVEZI Z OBVEZNICAMI": {
-                    "KRATKORO\u010cNE FINAN\u010cNE OBVEZNOSTI V ZVEZI Z OBVEZNICAMI": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI V ZVEZI Z RAZDELITVIJO POSLOVNEGA IZIDA": {
-                    "KRATKORO\u010cNE OBVEZNOSTI V ZVEZI Z RAZDELITVIJO POSLOVNEGA IZIDA": {}
-                }, 
-                "OBVEZNOSTI IZ VPLA\u010cILA KAPITALA DO VPISA V SODNI REGISTER": {
-                    "OBVEZNOSTI IZ VPLA\u010cILA KAPITALA DO VPISA V SODNI REGISTER": {}
-                }
-            }, 
-            "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) DO DOBAVITELJEV": {
-                "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) DO DOBAVITELJEV V DR\u017dAVI": {
-                    "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) DO DOBAVITELJEV V DR\u017dAVI": {
-                        "account_type": "Payable"
-                    }, 
-                    "account_type": "Payable"
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) DO DOBAVITELJEV V TUJINI": {
-                    "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) DO DOBAVITELJEV V TUJINI": {
-                        "account_type": "Payable"
-                    }, 
-                    "account_type": "Payable"
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) ZA NEZARA\u010cUNANE BLAGO IN STORITVE": {
-                    "KRATKORO\u010cNE OBVEZNOSTI (DOLGOVI) ZA NEZARA\u010cUNANE BLAGO IN STORITVE": {}
-                }, 
-                "KRATKORO\u010cNI BLAGOVNI KREDITI, PREJETI V DR\u017dAVI": {
-                    "KRATKORO\u010cNI BLAGOVNI KREDITI, PREJETI V DR\u017dAVI": {}
-                }, 
-                "KRATKORO\u010cNI BLAGOVNI KREDITI, PREJETI V TUJINI": {
-                    "KRATKORO\u010cNI BLAGOVNI KREDITI, PREJETI V TUJINI": {}
-                }
-            }, 
-            "KRATKORO\u010cNE OBVEZNOSTI DO ZAPOSLENCEV": {
-                "KRATKORO\u010cNE OBVEZNOSTI ZA DAVEK IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRA\u010cUNAVAJO SKUPAJ S PLA\u010cAMI": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA DAVEK IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRA\u010cUNAVAJO SKUPAJ S PLA\u010cAMI": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA DAVKE IZ KOSMATIH PLA\u010c IN NADOMESTIL PLA\u010c": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA DAVKE IZ KOSMATIH PLA\u010c IN NADOMESTIL PLA\u010c": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA DRUGE PREJEMKE IZ DELOVNEGA RAZMERJA": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA DRUGE PREJEMKE IZ DELOVNEGA RAZMERJA": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA PRISPEVKE IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRA\u010cUNAVAJO SKUPAJ S PLA\u010cAMI": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA PRISPEVKE IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRA\u010cUNAVAJO SKUPAJ S PLA\u010cAMI": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA PRISPEVKE IZ KOSMATIH PLA\u010c IN NADOMESTIL PLA\u010c": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA PRISPEVKE IZ KOSMATIH PLA\u010c IN NADOMESTIL PLA\u010c": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA VRA\u010cUNANE IN NEOBRA\u010cUNANE PLA\u010cE": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA VRA\u010cUNANE IN NEOBRA\u010cUNANE PLA\u010cE": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI ZA \u010cISTE PLA\u010cE IN NADOMESTILA PLA\u010c": {
-                    "KRATKORO\u010cNE OBVEZNOSTI ZA \u010cISTE PLA\u010cE IN NADOMESTILA PLA\u010c": {}
-                }
-            }, 
-            "KRATKORO\u010cNE OBVEZNOSTI IZ POSLOVANJA ZA TUJ RA\u010cUN": {
-                "DRUGE KRATKORO\u010cNE OBVEZNOSTI IZ POSLOVANJA ZA TUJ RA\u010cUN": {
-                    "DRUGE KRATKORO\u010cNE OBVEZNOSTI IZ POSLOVANJA ZA TUJ RA\u010cUN": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI DO UVOZNIKOV": {
-                    "KRATKORO\u010cNE OBVEZNOSTI DO UVOZNIKOV": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI IZ IZVOZA ZA TUJ RA\u010cUN": {
-                    "KRATKORO\u010cNE OBVEZNOSTI IZ IZVOZA ZA TUJ RA\u010cUN": {}
-                }, 
-                "KRATKORO\u010cNE OBVEZNOSTI IZ KOMISIJSKE IN KONSIGNACIJSKE PRODAJE": {
-                    "KRATKORO\u010cNE OBVEZNOSTI IZ KOMISIJSKE IN KONSIGNACIJSKE PRODAJE": {}
-                }
-            }, 
-            "KRATKORO\u010cNE PASIVNE \u010cASOVNE RAZMEJITVE": {
-                "DDV OD DANIH PREDUJMOV": {
-                    "DDV OD DANIH PREDUJMOV": {}
-                }, 
-                "KRATKORO\u010cNO ODLO\u017dENI PRIHODKI": {
-                    "KRATKORO\u010cNO ODLO\u017dENI PRIHODKI": {}
-                }, 
-                "VNAPREJ VRA\u010cUNANI STRO\u0160KI OZIROMA ODHODKI": {
-                    "VNAPREJ VRA\u010cUNANI STRO\u0160KI OZIROMA ODHODKI": {}
-                }
-            }, 
-            "OBVEZNOSTI DO DR\u017dAVNIH IN DRUGIH IN\u0160TITUCIJ": {
-                "DRUGE KRATKORO\u010cNE OBVEZNOSTI DO DR\u017dAVNIH IN DRUGIH IN\u0160TITUCIJ": {
-                    "DRUGE KRATKORO\u010cNE OBVEZNOSTI DO DR\u017dAVNIH IN DRUGIH IN\u0160TITUCIJ": {}
-                }, 
-                "OBVEZNOSTI ZA DAVEK OD DOHODKOV": {
-                    "OBVEZNOSTI ZA DAVEK OD DOHODKOV": {}
-                }, 
-                "OBVEZNOSTI ZA DAVEK OD IZPLA\u010cANIH PLA\u010c": {
-                    "OBVEZNOSTI ZA DAVEK OD IZPLA\u010cANIH PLA\u010c": {}
-                }, 
-                "OBVEZNOSTI ZA DAV\u010cNI ODTEGLJAJ": {
-                    "OBVEZNOSTI ZA DAV\u010cNI ODTEGLJAJ": {}
-                }, 
-                "OBVEZNOSTI ZA DDV, CARINO IN DRUGE DAJATVE OD UVO\u017dENEGA BLAGA": {
-                    "OBVEZNOSTI ZA DDV, CARINO IN DRUGE DAJATVE OD UVO\u017dENEGA BLAGA": {}
-                }, 
-                "OBVEZNOSTI ZA OBRA\u010cUNANI DDV": {
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 20%": {}, 
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 20% IZVEN EU": {}, 
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 20% V EU": {}, 
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 8,5%": {}, 
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 8,5% IZVEN EU": {}, 
-                    "OBVEZNOSTI ZA ZARA\u010cUNANI DDV 8,5% V EU": {}
-                }, 
-                "OBVEZNOSTI ZA PRISPEVKE IZPLA\u010cEVALCA": {
-                    "OBVEZNOSTI ZA PRISPEVKE IZPLA\u010cEVALCA": {}
-                }
-            }, 
-            "OBVEZNOSTI, VKLJU\u010cENE V SKUPINE ZA ODTUJITEV": {
-                "OBVEZNOSTI, VKLJU\u010cENE V SKUPINE ZA ODTUJITEV": {
-                    "OBVEZNOSTI, VKLJU\u010cENE V SKUPINE ZA ODTUJITEV": {}
-                }
-            }, 
-            "PREJETI KRATKORO\u010cNI PREDUJMI IN VAR\u0160\u010cINE": {
-                "PREJETE KRATKORO\u010cNE VAR\u0160\u010cINE": {
-                    "PREJETE KRATKORO\u010cNE VAR\u0160\u010cINE": {}
-                }, 
-                "PREJETI KRATKORO\u010cNI PREDUJMI": {
-                    "PREJETI KRATKORO\u010cNI PREDUJMI": {
-                        "account_type": "Payable"
-                    }, 
-                    "account_type": "Payable"
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "ODHODKI IN PRIHODKI": {
-            "DRUGI FINAN\u010cNI ODHODKI IN OSTALI ODHODKI": {
-                "DENARNE KAZNI": {
-                    "DENARNE KAZNI": {}
-                }, 
-                "ODHODKI IZ ODTUJITVE NALO\u017dBENIH NEPREMI\u010cNIN, IZMERJENIH PO PO\u0160TENI VREDNOSTI": {
-                    "ODHODKI IZ ODTUJITVE NALO\u017dBENIH NEPREMI\u010cNIN, IZMERJENIH PO PO\u0160TENI VREDNOSTI": {}
-                }, 
-                "ODHODKI IZ VREDNOTENJA NALO\u017dBENIH NEPREMI\u010cNIN PO MODELU PO\u0160TENE VREDNOSTI": {
-                    "ODHODKI IZ VREDNOTENJA NALO\u017dBENIH NEPREMI\u010cNIN PO MODELU PO\u0160TENE VREDNOSTI": {}
-                }, 
-                "OD\u0160KODNINE": {
-                    "OD\u0160KODNINE": {}
-                }, 
-                "OSTALI ODHODKI": {
-                    "OSTALI ODHODKI": {}
-                }
-            }, 
-            "DRUGI FINAN\u010cNI PRIHODKI IN OSTALI PRIHODKI": {
-                "OSTALI PRIHODKI": {
-                    "OSTALI PRIHODKI": {}
-                }, 
-                "PREJETE KAZNI": {
-                    "PREJETE KAZNI": {}
-                }, 
-                "PREJETE OD\u0160KODNINE": {
-                    "PREJETE OD\u0160KODNINE": {}
-                }, 
-                "PRIHODKI IZ ODTUJITVE NALO\u017dBENIH NEPREMI\u010cNIN, IZMERJENIH PO PO\u0160TENI VREDNOSTI": {
-                    "PRIHODKI IZ ODTUJITVE NALO\u017dBENIH NEPREMI\u010cNIN, IZMERJENIH PO PO\u0160TENI VREDNOSTI": {}
-                }, 
-                "PRIHODKI IZ VREDNOTENJA NALO\u017dBENIH NEPREMI\u010cNIN PO PO\u0160TENI VREDNOSTI": {
-                    "PRIHODKI IZ VREDNOTENJA NALO\u017dBENIH NEPREMI\u010cNIN PO PO\u0160TENI VREDNOSTI": {}
-                }, 
-                "SUBVENCIJE, DOTACIJE IN PODOBNI PRIHODKI, KI NISO POVEZANI S POSLOVNIMI U\u010cINKI": {
-                    "SUBVENCIJE, DOTACIJE IN PODOBNI PRIHODKI, KI NISO POVEZANI S POSLOVNIMI U\u010cINKI": {}
-                }
-            }, 
-            "FINAN\u010cNI ODHODKI IZ FINAN\u010cNIH NALO\u017dB": {
-                "ODHODKI IZ DRUGIH FINAN\u010cNIH OBVEZNOSTI": {
-                    "ODHODKI IZ DRUGIH FINAN\u010cNIH OBVEZNOSTI": {}
-                }, 
-                "ODHODKI IZ DRUGIH POSLOVNIH OBVEZNOSTI": {
-                    "ODHODKI IZ DRUGIH POSLOVNIH OBVEZNOSTI": {}
-                }, 
-                "ODHODKI IZ IZDANIH OBVEZNIC": {
-                    "ODHODKI IZ IZDANIH OBVEZNIC": {}
-                }, 
-                "ODHODKI IZ OBVEZNOSTI DO DOBAVITELJEV IN MENI\u010cNIH OBVEZNOSTI": {
-                    "ODHODKI IZ OBVEZNOSTI DO DOBAVITELJEV IN MENI\u010cNIH OBVEZNOSTI": {}
-                }, 
-                "ODHODKI IZ ODPRAVE PRIPOZNANJA FINAN\u010cNIH NALO\u017dB": {
-                    "ODHODKI IZ ODPRAVE PRIPOZNANJA FINAN\u010cNIH NALO\u017dB": {}
-                }, 
-                "ODHODKI IZ OSLABITVE FINAN\u010cNIH NALO\u017dB": {
-                    "ODHODKI IZ OSLABITVE FINAN\u010cNIH NALO\u017dB": {}
-                }, 
-                "ODHODKI IZ POSLOVNIH OBVEZNOSTI DO DRU\u017dB V SKUPINI": {
-                    "ODHODKI IZ POSLOVNIH OBVEZNOSTI DO DRU\u017dB V SKUPINI": {}
-                }, 
-                "ODHODKI IZ POSOJIL, PREJETIH OD BANK": {
-                    "ODHODKI IZ POSOJIL, PREJETIH OD BANK": {}
-                }, 
-                "ODHODKI IZ POSOJIL, PREJETIH OD DRU\u017dB V SKUPINI": {
-                    "ODHODKI IZ POSOJIL, PREJETIH OD DRU\u017dB V SKUPINI": {}
-                }, 
-                "ODHODKI IZ SREDSTEV, RAZPOREJENIH PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "ODHODKI IZ SREDSTEV, RAZPOREJENIH PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }
-            }, 
-            "FINAN\u010cNI PRIHODKI IZ FINAN\u010cNIH NALO\u017dB": {
-                "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V DRUGIH DRU\u017dBAH": {
-                    "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V DRUGIH DRU\u017dBAH": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V DRU\u017dBAH V SKUPINI": {
-                    "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V DRU\u017dBAH V SKUPINI": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V PRIDRU\u017dENIH DRU\u017dBAH IN SKUPAJ OBVLADOVANIH DRU\u017dBAH": {
-                    "FINAN\u010cNI PRIHODKI IZ DELE\u017dEV V PRIDRU\u017dENIH DRU\u017dBAH IN SKUPAJ OBVLADOVANIH DRU\u017dBAH": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ DRUGIH NALO\u017dB": {
-                    "FINAN\u010cNI PRIHODKI IZ DRUGIH NALO\u017dB": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ FINAN\u010cNIH SREDSTEV, RAZPOREJENIH PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {
-                    "FINAN\u010cNI PRIHODKI IZ FINAN\u010cNIH SREDSTEV, RAZPOREJENIH PO PO\u0160TENI VREDNOSTI PREK POSLOVNEGA IZIDA": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ POSLOVNIH TERJATEV DO DRUGIH": {
-                    "FINAN\u010cNI PRIHODKI IZ POSLOVNIH TERJATEV DO DRUGIH": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ POSLOVNIH TERJATEV DO DRU\u017dB V SKUPINI": {
-                    "FINAN\u010cNI PRIHODKI IZ POSLOVNIH TERJATEV DO DRU\u017dB V SKUPINI": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ POSOJIL, DANIH DRUGIM (TUDI OD DEPOZITOV)": {
-                    "FINAN\u010cNI PRIHODKI IZ POSOJIL, DANIH DRUGIM (TUDI OD DEPOZITOV)": {}
-                }, 
-                "FINAN\u010cNI PRIHODKI IZ POSOJIL, DANIH DRU\u017dBAM V SKUPINI": {
-                    "FINAN\u010cNI PRIHODKI IZ POSOJIL, DANIH DRU\u017dBAM V SKUPINI": {}
-                }
-            }, 
-            "POSLOVNI ODHODKI (I. RAZLI\u010cICA IZKAZA POSLOVNEGA IZIDA)": {
-                "DRUGI POSLOVNI ODHODKI": {
-                    "DRUGI POSLOVNI ODHODKI": {}
-                }, 
-                "NABAVNA VREDNOST PRODANIH MATERIALA IN BLAGA": {
-                    "NABAVNA VREDNOST PRODANIH MATERIALA IN BLAGA": {}
-                }, 
-                "VREDNOST PRODANIH POSLOVNIH U\u010cINKOV": {
-                    "VREDNOST PRODANIH POSLOVNIH U\u010cINKOV": {}
-                }, 
-                "VREDNOST USREDSTVENIH LASTNIH PROIZVODOV IN STORITEV": {
-                    "VREDNOST USREDSTVENIH LASTNIH PROIZVODOV IN STORITEV": {}
-                }
-            }, 
-            "POSLOVNI ODHODKI (II. RAZLI\u010cICA IZKAZA POSLOVNEGA IZIDA)": {
-                "DRUGI STRO\u0160KI, KI SE NE ZADR\u017dUJEJO V ZALOGAH": {
-                    "DRUGI STRO\u0160KI, KI SE NE ZADR\u017dUJEJO V ZALOGAH": {}
-                }, 
-                "NABAVNA VREDNOST PRODANIH MATERIALA IN BLAGA": {
-                    "NABAVNA VREDNOST PRODANIH MATERIALA IN BLAGA": {}
-                }, 
-                "STRO\u0160KI PRODAJANJA": {
-                    "STRO\u0160KI PRODAJANJA": {}
-                }, 
-                "STRO\u0160KI SPLO\u0160NIH DEJAVNOSTI (NABAVE IN UPRAVE)": {
-                    "STRO\u0160KI SPLO\u0160NIH DEJAVNOSTI (NABAVE IN UPRAVE)": {}
-                }, 
-                "VREDNOST PRODANIH POSLOVNIH U\u010cINKOV": {
-                    "VREDNOST PRODANIH POSLOVNIH U\u010cINKOV": {}
-                }
-            }, 
-            "POSLOVNI PRIHODKI": {
-                "DRUGI PRIHODKI, POVEZANI S POSLOVNIMI U\u010cINKI (SUBVENCIJE, DOTACIJE, REGRESI, KOMPENZACIJE, PREMIJE ...)": {
-                    "DRUGI PRIHODKI, POVEZANI S POSLOVNIMI U\u010cINKI (SUBVENCIJE, DOTACIJE, REGRESI, KOMPENZACIJE, PREMIJE ...)": {}
-                }, 
-                "PREVREDNOTOVALNI POSLOVNI PRIHODKI": {
-                    "PREVREDNOTOVALNI POSLOVNI PRIHODKI": {}
-                }, 
-                "PRIHODKI OD NAJEMNIN": {
-                    "PRIHODKI OD NAJEMNIN": {}
-                }, 
-                "PRIHODKI OD ODPRAVE REZERVACIJ": {
-                    "PRIHODKI OD ODPRAVE REZERVACIJ": {}
-                }, 
-                "PRIHODKI OD POSLOVNIH ZDRU\u017dITEV (PRESE\u017dEK IZ PREVREDNOTENJA - SLABO IME)": {
-                    "PRIHODKI OD POSLOVNIH ZDRU\u017dITEV (PRESE\u017dEK IZ PREVREDNOTENJA - SLABO IME)": {}
-                }, 
-                "PRIHODKI OD PRODAJE PROIZVODOV IN STORITEV NA DOMA\u010cEM TRGU": {
-                    "PRIHODKI OD PRODAJE PROIZVODOV IN STORITEV NA DOMA\u010cEM TRGU": {}
-                }, 
-                "PRIHODKI OD PRODAJE PROIZVODOV IN STORITEV NA TUJEM TRGU": {
-                    "PRIHODKI OD PRODAJE PROIZVODOV IN STORITEV NA TUJEM TRGU": {}
-                }, 
-                "PRIHODKI OD PRODAJE TRGOVSKEGA BLAGA IN MATERIALA NA DOMA\u010cEM TRGU": {
-                    "PRIHODKI OD PRODAJE TRGOVSKEGA BLAGA IN MATERIALA NA DOMA\u010cEM TRGU": {}
-                }, 
-                "PRIHODKI OD PRODAJE TRGOVSKEGA BLAGA IN MATERIALA NA TUJEM TRGU": {
-                    "PRIHODKI OD PRODAJE TRGOVSKEGA BLAGA IN MATERIALA NA TUJEM TRGU": {}
-                }
-            }, 
-            "PREVREDNOTOVALNI POSLOVNI ODHODKI": {
-                "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI S KRATKORO\u010cNIMI SREDSTVI, RAZEN S FINAN\u010cNIMI NALO\u017dBAMI": {
-                    "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI S KRATKORO\u010cNIMI SREDSTVI, RAZEN S FINAN\u010cNIMI NALO\u017dBAMI": {}
-                }, 
-                "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI S STRO\u0160KI DELA": {
-                    "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI S STRO\u0160KI DELA": {}
-                }, 
-                "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI Z NEOPREDMETENIMI SREDSTVI, OPREDMETENIMI OSNOVNIMI SREDSTVI IN NALO\u017dBENIMI NEPREMI\u010cNINAMI RAZPOREJENIMI IN IZMERJENIMI PO MODELU NABAVNE VREDNOSTI": {
-                    "PREVREDNOTOVALNI POSLOVNI ODHODKI V ZVEZI Z NEOPREDMETENIMI SREDSTVI, OPREDMETENIMI OSNOVNIMI SREDSTVI IN NALO\u017dBENIMI NEPREMI\u010cNINAMI RAZPOREJENIMI IN IZMERJENIMI PO MODELU NABAVNE VREDNOSTI": {}
-                }
-            }, 
-            "USREDSTVENI LASTNI PROIZVODI IN LASTNE STORITVE": {}, 
-            "root_type": ""
-        }, 
-        "POSLOVNI IZID": {
-            "DOBI\u010cEK ALI IZGUBA PRED OBDAV\u010cITVIJO": {
-                "DOBI\u010cEK ALI IZGUBA PRED OBDAV\u010cITVIJO": {
-                    "DOBI\u010cEK ALI IZGUBA PRED OBDAV\u010cITVIJO": {}
-                }
-            }, 
-            "IZGUBA IN PRENOS IZGUBE": {
-                "IZGUBA TEKO\u010cEGA LETA": {
-                    "IZGUBA TEKO\u010cEGA LETA": {}
-                }, 
-                "PRENOS IZGUBE TEKO\u010cEGA LETA": {
-                    "PRENOS IZGUBE TEKO\u010cEGA LETA": {}
-                }
-            }, 
-            "RAZPOREDITEV DOBI\u010cKA": {
-                "DAVEK OD DOHODKA": {
-                    "DAVEK OD DOHODKA": {}
-                }, 
-                "DRUGI DAVKI, KI NISO IZKAZANI V DRUGIH POSTAVKAH": {
-                    "DRUGI DAVKI, KI NISO IZKAZANI V DRUGIH POSTAVKAH": {}
-                }, 
-                "PRIHODKI (ODHODKI) IZ NASLOVA ODLO\u017dENEGA DAVKA": {
-                    "PRIHODKI (ODHODKI) IZ NASLOVA ODLO\u017dENEGA DAVKA": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK POSLOVNEGA LETA": {
-                    "\u010cISTI DOBI\u010cEK POSLOVNEGA LETA": {}
-                }
-            }, 
-            "RAZPOREDITEV \u010cISTEGA DOBI\u010cKA POSLOVNEGA LETA": {
-                "PRENOS NEUPORABLJENEGA DELA \u010cISTEGA DOBI\u010cKA POSLOVNEGA LETA": {
-                    "PRENOS NEUPORABLJENEGA DELA \u010cISTEGA DOBI\u010cKA POSLOVNEGA LETA": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK ZA DRUGE REZERVE IZ DOBI\u010cKA": {
-                    "\u010cISTI DOBI\u010cEK ZA DRUGE REZERVE IZ DOBI\u010cKA": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK ZA KRITJE PRENESENIH IZGUB": {
-                    "\u010cISTI DOBI\u010cEK ZA KRITJE PRENESENIH IZGUB": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE REZERV ZA LASTNE DELNICE OZIROMA DELE\u017dE": {
-                    "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE REZERV ZA LASTNE DELNICE OZIROMA DELE\u017dE": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE STATUTARNIH REZERV": {
-                    "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE STATUTARNIH REZERV": {}
-                }, 
-                "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE ZAKONSKIH REZERV": {
-                    "\u010cISTI DOBI\u010cEK ZA OBLIKOVANJE ZAKONSKIH REZERV": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "PROSTO": {
-            "root_type": ""
-        }, 
-        "STRO\u0160KI": {
-            "AMORTIZACIJA": {
-                "AMORTIZACIJA DROBNEGA INVENTARJA": {
-                    "AMORTIZACIJA DROBNEGA INVENTARJA": {}
-                }, 
-                "AMORTIZACIJA DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV": {
-                    "AMORTIZACIJA DRUGIH OPREDMETENIH OSNOVNIH SREDSTEV": {}
-                }, 
-                "AMORTIZACIJA NALO\u017dBENIH NEPREMI\u010cNIN": {
-                    "AMORTIZACIJA NALO\u017dBENIH NEPREMI\u010cNIN": {}
-                }, 
-                "AMORTIZACIJA NEOPREDMETENIH SREDSTEV": {
-                    "AMORTIZACIJA NEOPREDMETENIH SREDSTEV": {}
-                }, 
-                "AMORTIZACIJA OPREME IN NADOMESTNIH DELOV": {
-                    "AMORTIZACIJA OPREME IN NADOMESTNIH DELOV": {}
-                }, 
-                "AMORTIZACIJA ZGRADB": {
-                    "AMORTIZACIJA ZGRADB": {}
-                }
-            }, 
-            "DRUGI STRO\u0160KI": {
-                "DAJATVE, KI NISO ODVISNE OD STRO\u0160KOV DELA ALI DRUGIH VRST STRO\u0160KOV": {
-                    "DAJATVE, KI NISO ODVISNE OD STRO\u0160KOV DELA ALI DRUGIH VRST STRO\u0160KOV": {}
-                }, 
-                "IZDATKI ZA VARSTVO OKOLJA": {
-                    "IZDATKI ZA VARSTVO OKOLJA": {}
-                }, 
-                "NAGRADE DIJAKOM IN \u0160TUDENTOM NA DELOVNI PRAKSI SKUPAJ Z DAJATVAMI": {
-                    "NAGRADE DIJAKOM IN \u0160TUDENTOM NA DELOVNI PRAKSI SKUPAJ Z DAJATVAMI": {}
-                }, 
-                "OSTALI STRO\u0160KI": {
-                    "OSTALI STRO\u0160KI": {}
-                }, 
-                "\u0160TIPENDIJE DIJAKOM IN \u0160TUDENTOM": {
-                    "\u0160TIPENDIJE DIJAKOM IN \u0160TUDENTOM": {}
-                }
-            }, 
-            "PRENOS STRO\u0160KOV": {
-                "PRENOS STRO\u0160KOV NEPOSREDNO V ODHODKE": {
-                    "PRENOS STRO\u0160KOV NEPOSREDNO V ODHODKE": {}
-                }, 
-                "PRENOS STRO\u0160KOV V ZALOGE": {
-                    "PRENOS STRO\u0160KOV V ZALOGE": {}
-                }
-            }, 
-            "REZERVACIJE": {
-                "REZERVACIJE ZA DANA JAMSTVA": {
-                    "REZERVACIJE ZA DANA JAMSTVA": {}
-                }, 
-                "REZERVACIJE ZA KO\u010cLJIVE POGODBE": {
-                    "REZERVACIJE ZA KO\u010cLJIVE POGODBE": {}
-                }, 
-                "REZERVACIJE ZA POKOJNINE, JUBILEJNE NAGRADE IN ODPRAVNINE OB UPOKOJITVI": {
-                    "REZERVACIJE ZA POKOJNINE, JUBILEJNE NAGRADE IN ODPRAVNINE OB UPOKOJITVI": {}
-                }, 
-                "REZERVACIJE ZA POKRIVANJE DRUGIH OBVEZNOSTI IZ PRETEKLEGA POSLOVANJA": {
-                    "REZERVACIJE ZA POKRIVANJE DRUGIH OBVEZNOSTI IZ PRETEKLEGA POSLOVANJA": {}
-                }, 
-                "REZERVACIJE ZA STRO\u0160KE REORGANIZACIJE PODJETJA": {
-                    "REZERVACIJE ZA STRO\u0160KE REORGANIZACIJE PODJETJA": {}
-                }
-            }, 
-            "STRO\u0160KI DELA": {
-                "DELODAJAL\u010cEVI PRISPEVKI OD PLA\u010c, NADOMESTIL PLA\u010c, BONITET, POVRA\u010cIL IN DRUGIH PREJEMKOV ZAPOSLENCEV": {
-                    "DELODAJAL\u010cEVI PRISPEVKI OD PLA\u010c, NADOMESTIL PLA\u010c, BONITET, POVRA\u010cIL IN DRUGIH PREJEMKOV ZAPOSLENCEV": {}
-                }, 
-                "DRUGE DELODAJAL\u010cEVE DAJATVE OD PLA\u010c, NADOMESTIL PLA\u010c, BONITET, POVRA\u010cIL IN DRUGIH PREJEMKOV ZAPOSLENCEV": {
-                    "DRUGE DELODAJAL\u010cEVE DAJATVE OD PLA\u010c, NADOMESTIL PLA\u010c, BONITET, POVRA\u010cIL IN DRUGIH PREJEMKOV ZAPOSLENCEV": {}
-                }, 
-                "NADOMESTILA PLA\u010c ZAPOSLENCEV": {
-                    "NADOMESTILA PLA\u010c ZAPOSLENCEV": {}
-                }, 
-                "NAGRADE VAJENCEM SKUPAJ Z DAJATVAMI, KI BREMENIJO PODJETJE": {
-                    "NAGRADE VAJENCEM SKUPAJ Z DAJATVAMI, KI BREMENIJO PODJETJE": {}
-                }, 
-                "PLA\u010cE ZAPOSLENCEV": {
-                    "PLA\u010cE ZAPOSLENCEV": {}
-                }, 
-                "REGRES ZA LETNI DOPUST, BONITETE, POVRA\u010cILA (ZA PREVOZ NA DELO IN Z NJEGA, ZA PREHRANO, ZA LO\u010cENO \u017dIVLJENJE) IN DRUGI PREJEMKI ZAPOSLENCEV": {
-                    "REGRES ZA LETNI DOPUST, BONITETE, POVRA\u010cILA (ZA PREVOZ NA DELO IN Z NJEGA, ZA PREHRANO, ZA LO\u010cENO \u017dIVLJENJE) IN DRUGI PREJEMKI ZAPOSLENCEV": {}
-                }, 
-                "STRO\u0160KI DODATNEGA POKOJNINSKEGA ZAVAROVANJA ZAPOSLENCEV": {
-                    "STRO\u0160KI DODATNEGA POKOJNINSKEGA ZAVAROVANJA ZAPOSLENCEV": {}
-                }
-            }, 
-            "STRO\u0160KI MATERIALA": {
-                "DRUGI STRO\u0160KI MATERIALA": {
-                    "DRUGI STRO\u0160KI MATERIALA": {}
-                }, 
-                "ODPIS DROBNEGA INVENTARJA IN EMBALA\u017dE": {
-                    "ODPIS DROBNEGA INVENTARJA IN EMBALA\u017dE": {}
-                }, 
-                "STRO\u0160KI ENERGIJE": {
-                    "STRO\u0160KI ENERGIJE": {}
-                }, 
-                "STRO\u0160KI MATERIALA": {
-                    "STRO\u0160KI MATERIALA": {}
-                }, 
-                "STRO\u0160KI NADOMESTNIH DELOV ZA OSNOVNA SREDSTVA IN MATERIALA ZA VZDR\u017dEVANJE OSNOVNIH SREDSTEV": {
-                    "STRO\u0160KI NADOMESTNIH DELOV ZA OSNOVNA SREDSTVA IN MATERIALA ZA VZDR\u017dEVANJE OSNOVNIH SREDSTEV": {}
-                }, 
-                "STRO\u0160KI PISARNI\u0160KEGA MATERIALA IN STROKOVNE LITERATURE": {
-                    "STRO\u0160KI PISARNI\u0160KEGA MATERIALA IN STROKOVNE LITERATURE": {}
-                }, 
-                "STRO\u0160KI POMO\u017dNEGA MATERIALA": {
-                    "STRO\u0160KI POMO\u017dNEGA MATERIALA": {}
-                }, 
-                "USKLADITEV STRO\u0160KOV MATERIALA IN DROBNEGA INVENTARJA ZARADI UGOTOVLJENIH POPISNIH RAZLIK": {
-                    "USKLADITEV STRO\u0160KOV MATERIALA IN DROBNEGA INVENTARJA ZARADI UGOTOVLJENIH POPISNIH RAZLIK": {}
-                }
-            }, 
-            "STRO\u0160KI OBRESTI": {
-                "STRO\u0160KI OBRESTI": {
-                    "STRO\u0160KI OBRESTI": {}
-                }
-            }, 
-            "STRO\u0160KI STORITEV": {
-                "NAJEMNINE": {
-                    "NAJEMNINE": {}
-                }, 
-                "POVRA\u010cILA STRO\u0160KOV ZAPOSLENCEM V ZVEZI Z DELOM": {
-                    "POVRA\u010cILA STRO\u0160KOV ZAPOSLENCEM V ZVEZI Z DELOM": {}
-                }, 
-                "STRO\u0160KI DRUGIH STORITEV": {
-                    "STRO\u0160KI DRUGIH STORITEV": {}
-                }, 
-                "STRO\u0160KI INTELEKTUALNIH IN OSEBNIH STORITEV": {
-                    "STRO\u0160KI INTELEKTUALNIH IN OSEBNIH STORITEV": {}
-                }, 
-                "STRO\u0160KI PLA\u010cILNEGA PROMETA, STRO\u0160KI BAN\u010cNIH STORITEV, STRO\u0160KI POSLOV IN ZAVAROVALNE PREMIJE": {
-                    "STRO\u0160KI PLA\u010cILNEGA PROMETA, STRO\u0160KI BAN\u010cNIH STORITEV, STRO\u0160KI POSLOV IN ZAVAROVALNE PREMIJE": {}
-                }, 
-                "STRO\u0160KI SEJMOV, REKLAME IN REPREZENTANCE": {
-                    "STRO\u0160KI SEJMOV, REKLAME IN REPREZENTANCE": {}
-                }, 
-                "STRO\u0160KI STORITEV FIZI\u010cNIH OSEB, KI NE OPRAVLJAJO DEJAVNOSTI, SKUPAJ Z DAJATVAMI, KI BREMENIJO PODJETJE (STRO\u0160KI PO POGODBAH O DELU, AVTORSKIH POGODBAH, SEJNINE ZAPOSLENCEM IN DRUGIM OSEBAM \u2026)": {
-                    "STRO\u0160KI STORITEV FIZI\u010cNIH OSEB, KI NE OPRAVLJAJO DEJAVNOSTI, SKUPAJ Z DAJATVAMI, KI BREMENIJO PODJETJE (STRO\u0160KI PO POGODBAH O DELU, AVTORSKIH POGODBAH, SEJNINE ZAPOSLENCEM IN DRUGIM OSEBAM \u2026)": {}
-                }, 
-                "STRO\u0160KI STORITEV PRI USTVARJANJU PROIZVODOV IN OPRAVLJANJU STORITEV": {
-                    "STRO\u0160KI STORITEV PRI USTVARJANJU PROIZVODOV IN OPRAVLJANJU STORITEV": {}
-                }, 
-                "STRO\u0160KI STORITEV V ZVEZI Z VZDR\u017dEVANJEM": {
-                    "STRO\u0160KI STORITEV V ZVEZI Z VZDR\u017dEVANJEM": {}
-                }, 
-                "STRO\u0160KI TRANSPORTNIH STORITEV": {
-                    "STRO\u0160KI TRANSPORTNIH STORITEV": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "ZALOGE PROIZVODOV, STORITEV, BLAGA IN NEKRATKORO\u010cNIH SREDSTEV (SKUPINE ZA ODTUJITEV) ZA PRODAJO": {
-            "NEDOKON\u010cANE PROIZVODNJA IN STORITVE": {
-                "NEDOKON\u010cANA PROIZVODNJA": {
-                    "NEDOKON\u010cANA PROIZVODNJA": {}
-                }, 
-                "NEDOKON\u010cANE STORITVE": {
-                    "NEDOKON\u010cANE STORITVE": {}
-                }, 
-                "ODMIKI OD CEN NEDOKON\u010cANIH PROIZVODNJE IN STORITEV": {
-                    "ODMIKI OD CEN NEDOKON\u010cANIH PROIZVODNJE IN STORITEV": {}
-                }, 
-                "POLIZDELKI": {
-                    "POLIZDELKI": {}
-                }, 
-                "PROIZVODNJA V DODELAVI IN PREDELAVI": {
-                    "PROIZVODNJA V DODELAVI IN PREDELAVI": {}
-                }
-            }, 
-            "NEKRATKORO\u010cNA SREDSTVA (SKUPINE ZA ODTUJITEV) ZA PRODAJO": {
-                "DRUGA NEKRATKORO\u010cNA SREDSTVA, NAMENJENA PRODAJI": {
-                    "DRUGA NEKRATKORO\u010cNA SREDSTVA, NAMENJENA PRODAJI": {}
-                }, 
-                "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI, NAMENJENE PRODAJI": {
-                    "NALO\u017dBENE NEPREMI\u010cNINE, VREDNOTENE PO MODELU NABAVNE VREDNOSTI, NAMENJENE PRODAJI": {}
-                }, 
-                "OPREDMETENA OSNOVNA SREDSTVA, NAMENJENA PRODAJI": {
-                    "OPREDMETENA OSNOVNA SREDSTVA, NAMENJENA PRODAJI": {}
-                }, 
-                "SREDSTVA DELA DENAR USTVARJAJO\u010cE ENOTE, NAMENJENA PRODAJI": {
-                    "SREDSTVA DELA DENAR USTVARJAJO\u010cE ENOTE, NAMENJENA PRODAJI": {}
-                }, 
-                "SREDSTVA DENAR USTVARJAJO\u010cE ENOTE, NAMENJENA PRODAJI": {
-                    "SREDSTVA DENAR USTVARJAJO\u010cE ENOTE, NAMENJENA PRODAJI": {}
-                }
-            }, 
-            "OBRA\u010cUN NABAVE BLAGA": {
-                "OBRA\u010cUN NABAVE BLAGA": {
-                    "OBRA\u010cUN NABAVE BLAGA": {}
-                }, 
-                "ODVISNI STRO\u0160KI NABAVE BLAGA": {
-                    "ODVISNI STRO\u0160KI NABAVE BLAGA": {}
-                }, 
-                "VREDNOST BLAGA PO OBRA\u010cUNIH DOBAVITELJEV": {
-                    "VREDNOST BLAGA PO OBRA\u010cUNIH DOBAVITELJEV": {}
-                }
-            }, 
-            "PROIZVODI": {
-                "ODMIKI OD CEN PROIZVODOV": {
-                    "ODMIKI OD CEN PROIZVODOV": {}
-                }, 
-                "PROIZVODI NA POTI": {
-                    "PROIZVODI NA POTI": {}
-                }, 
-                "PROIZVODI V DODELAVI IN PREDELAVI": {
-                    "PROIZVODI V DODELAVI IN PREDELAVI": {}
-                }, 
-                "PROIZVODI V LASTNEM SKLADI\u0160\u010cU": {
-                    "PROIZVODI V LASTNEM SKLADI\u0160\u010cU": {}
-                }, 
-                "PROIZVODI V LASTNI PRODAJALNI": {
-                    "PROIZVODI V LASTNI PRODAJALNI": {}
-                }, 
-                "PROIZVODI V TUJEM SKLADI\u0160\u010cU": {
-                    "PROIZVODI V TUJEM SKLADI\u0160\u010cU": {}
-                }, 
-                "VRA\u010cUNANI DDV OD PROIZVODOV V PRODAJALNI": {
-                    "VRA\u010cUNANI DDV OD PROIZVODOV V PRODAJALNI": {}
-                }
-            }, 
-            "ZALOGE BLAGA": {
-                "BLAGO NA POTI": {
-                    "BLAGO NA POTI": {}
-                }, 
-                "BLAGO V LASTNEM SKLADI\u0160\u010cU": {
-                    "BLAGO V LASTNEM SKLADI\u0160\u010cU": {}
-                }, 
-                "BLAGO V LASTNI PRODAJALNI": {
-                    "BLAGO V LASTNI PRODAJALNI": {}
-                }, 
-                "BLAGO V TUJEM SKLADI\u0160\u010cU": {
-                    "BLAGO V TUJEM SKLADI\u0160\u010cU": {}
-                }, 
-                "DDV, VRA\u010cUNAN V ZALOGAH BLAGA": {
-                    "DDV, VRA\u010cUNAN V ZALOGAH BLAGA": {}
-                }, 
-                "VRA\u010cUNANA RAZLIKA V CENAH ZALOG BLAGA": {
-                    "VRA\u010cUNANA RAZLIKA V CENAH ZALOG BLAGA": {}
-                }
-            }, 
-            "root_type": ""
-        }, 
-        "ZALOGE SUROVIN IN MATERIALA": {
-            "OBRA\u010cUN NABAVE SUROVIN IN MATERIALA (TUDI DROBNEGA INVENTARJA IN EMBALA\u017dE)": {
-                "CARINA IN DRUGE UVOZNE DAV\u0160\u010cINE OD SUROVIN IN MATERIALA": {
-                    "CARINA IN DRUGE UVOZNE DAV\u0160\u010cINE OD SUROVIN IN MATERIALA": {}
-                }, 
-                "DDV IN DRUGE DAV\u0160\u010cINE OD SUROVIN IN MATERIALA": {
-                    "DDV IN DRUGE DAV\u0160\u010cINE OD SUROVIN IN MATERIALA": {}
-                }, 
-                "OBRA\u010cUN NABAVE SUROVIN IN MATERIALA": {
-                    "OBRA\u010cUN NABAVE SUROVIN IN MATERIALA": {}
-                }, 
-                "ODVISNI STRO\u0160KI NABAVE SUROVIN IN MATERIALA": {
-                    "ODVISNI STRO\u0160KI NABAVE SUROVIN IN MATERIALA": {}
-                }, 
-                "VREDNOST SUROVIN IN MATERIALA PO OBRA\u010cUNIH DOBAVITELJEV": {
-                    "VREDNOST SUROVIN IN MATERIALA PO OBRA\u010cUNIH DOBAVITELJEV": {}
-                }
-            }, 
-            "ZALOGE DROBNEGA INVENTARJA IN EMBALA\u017dE": {
-                "ODMIKI OD CEN DROBNEGA INVENTARJA IN EMBALA\u017dE": {
-                    "ODMIKI OD CEN DROBNEGA INVENTARJA IN EMBALA\u017dE": {}
-                }, 
-                "ZALOGE DROBNEGA INVENTARJA IN EMBALA\u017dE V SKLADI\u0160\u010cU": {
-                    "ZALOGE DROBNEGA INVENTARJA IN EMBALA\u017dE V SKLADI\u0160\u010cU": {}
-                }, 
-                "ZALOGE DROBNEGA INVENTARJA IN EMBALA\u017dE, DANE V UPORABO": {
-                    "ZALOGE DROBNEGA INVENTARJA IN EMBALA\u017dE, DANE V UPORABO": {}
-                }
-            }, 
-            "ZALOGE SUROVIN IN MATERIALA": {
-                "ODMIKI OD CEN ZALOG SUROVIN IN MATERIALA": {
-                    "ODMIKI OD CEN ZALOG SUROVIN IN MATERIALA": {}
-                }, 
-                "ZALOGE SUROVIN IN MATERIALA NA POTI": {
-                    "ZALOGE SUROVIN IN MATERIALA NA POTI": {}
-                }, 
-                "ZALOGE SUROVIN IN MATERIALA V DODELAVI IN PREDELAVI": {
-                    "ZALOGE SUROVIN IN MATERIALA V DODELAVI IN PREDELAVI": {}
-                }, 
-                "ZALOGE SUROVIN IN MATERIALA V SKLADI\u0160\u010cU": {
-                    "ZALOGE SUROVIN IN MATERIALA V SKLADI\u0160\u010cU": {}
-                }
-            }, 
-            "root_type": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/syscohada_syscohada_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/syscohada_syscohada_chart_template.json
index 6068f7e..ce6d15f 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/syscohada_syscohada_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/syscohada_syscohada_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "syscohada",
-    "name": "Plan de compte",
+    "name": "Syscohada - Plan de compte",
     "tree": {
         "Comptes de bilan": {
             "Comptes d'immobilisations": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
index dffcf35..7ada97e 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/th_chart.json
@@ -1,6 +1,6 @@
 {
     "country_code": "th",
-    "name": "Thailand Chart of Accounts",
+    "name": "Thailand - Chart of Accounts",
     "tree": {
         "Assets": {
             "Account Receivable": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json
index ba220d8..dfc821e 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/tr_l10ntr_tek_duzen_hesap.json
@@ -1,6 +1,6 @@
 {
     "country_code": "tr", 
-    "name": "Tek D\u00fczen Hesap Plan\u0131", 
+    "name": "Turkey - Tek D\u00fczen Hesap Plan\u0131", 
     "tree": {
         "Duran Varl\u0131klar": {
             "Di\u011fer Alacaklar": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
index 04633cc..35a8be6 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/uy_uy_chart_template.json
@@ -1,6 +1,6 @@
 {
     "country_code": "uy",
-    "name": "Plan de Cuentas",
+    "name": "Uruguay - Plan de Cuentas",
     "tree": {
         "ACTIVO": {
             "ACTIVO CORRIENTE": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ve_ve_chart_template_amd.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ve_ve_chart_template_amd.json
index 8699fe6..2994dec 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ve_ve_chart_template_amd.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ve_ve_chart_template_amd.json
@@ -1,6 +1,6 @@
 {
     "country_code": "ve",
-    "name": "Venezuelan - Account",
+    "name": "Venezuelan - Chart of Accounts",
     "tree": {
         "ACTIVO": {
             "ACTIVO CIRCULANTE": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
index 734e4d0..4fa889d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
@@ -1,6 +1,6 @@
 {
     "country_code": "ae",
-    "name": "U.A.E Chart of Accounts",
+    "name": "U.A.E - Chart of Accounts",
     "tree": {
         "Assets": {
             "Current Assets": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
index 296be76..3b9dce0 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
@@ -1,6 +1,6 @@
 {
     "country_code": "at",
-    "name": "Austria - Chart of Accounts - Einheitskontenrahmen provided by fairkom.eu",
+    "name": "Austria - Chart of Accounts - Einheitskontenrahmen",
     "tree": {
         "Klasse 0 Aktiva: Anlageverm\u00f6gen": {
 				"0100 Konzessionen ": {"account_type": "Fixed Asset"},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
index 81c4fdf..5d194eb 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
@@ -1,6 +1,6 @@
 {
   "country_code": "gt",
-  "name": "Cuentas de Guatemala",
+  "name": "Guatemala - Cuentas",
   "tree": {
     "Activos": {
       "Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
index c300894..c7a8045 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json
@@ -1,6 +1,6 @@
 {
     "country_code": "in",
-    "name": "Chart of Accounts - India",
+    "name": "India - Chart of Accounts",
     "tree": {
 	    "Application of Funds (Assets)": {
 	        "Current Assets": {
@@ -37,18 +37,24 @@
 	            "Capital Equipments": {
 	                "account_type": "Fixed Asset"
 	            },
-	            "Computers": {
+	            "Electronic Equipments": {
 	                "account_type": "Fixed Asset"
 	            },
-	            "Furniture and Fixture": {
+	            "Furnitures and Fixtures": {
 	                "account_type": "Fixed Asset"
 	            },
 	            "Office Equipments": {
 	                "account_type": "Fixed Asset"
 	            },
-	            "Plant and Machinery": {
+	            "Plants and Machineries": {
 	                "account_type": "Fixed Asset"
-	            }
+	            },
+				"Buildings": {
+					"account_type": "Fixed Asset"
+				},
+				"Accumulated Depreciations": {
+					"account_type": "Accumulated Depreciation"
+				}
 	        },
 	        "Investments": {
 	        	"is_group": 1
@@ -71,67 +77,37 @@
 	                },
 	                "Stock Adjustment": {
 	                    "account_type": "Stock Adjustment"
-	                },
-	                "account_type": "Expense Account"
-	            },
-	            "account_type": "Expense Account"
+	                }
+	            }
 	        },
 	        "Indirect Expenses": {
-	            "Administrative Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Commission on Sales": {
-	                "account_type": "Expense Account"
-	            },
+	            "Administrative Expenses": {},
+	            "Commission on Sales": {},
 	            "Depreciation": {
-	                "account_type": "Expense Account"
+	                "account_type": "Depreciation"
 	            },
-	            "Entertainment Expenses": {
-	                "account_type": "Expense Account"
-	            },
+	            "Entertainment Expenses": {},
 	            "Freight and Forwarding Charges": {
 	                "account_type": "Chargeable"
 	            },
-	            "Legal Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Marketing Expenses": {
-	                "account_type": "Chargeable"
-	            },
-	            "Miscellaneous Expenses": {
-	                "account_type": "Chargeable"
-	            },
-	            "Office Maintenance Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Office Rent": {
-	                "account_type": "Expense Account"
-	            },
-	            "Postal Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Print and Stationary": {
-	                "account_type": "Expense Account"
-	            },
+	            "Legal Expenses": {},
+	            "Marketing Expenses": {},
+	            "Miscellaneous Expenses": {},
+	            "Office Maintenance Expenses": {},
+	            "Office Rent": {},
+	            "Postal Expenses": {},
+	            "Print and Stationary": {},
 	            "Rounded Off": {
-	                "account_type": "Expense Account"
+	                "account_type": "Round Off"
 	            },
-	            "Salary": {
-	                "account_type": "Expense Account"
-	            },
-	            "Sales Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Telephone Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Travel Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "Utility Expenses": {
-	                "account_type": "Expense Account"
-	            },
-	            "account_type": "Expense Account"
+	            "Salary": {},
+	            "Sales Expenses": {},
+	            "Telephone Expenses": {},
+	            "Travel Expenses": {},
+	            "Utility Expenses": {},
+				"Write Off": {},
+				"Exchange Gain/Loss": {},
+				"Gain/Loss on Asset Disposal": {}
 	        },
 			"root_type": "Expense"
 	    },
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
index d55b77e..9cd7e59 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
@@ -1,6 +1,6 @@
 {
 	"country_code": "ni",
-	"name": "Catalogo de Cuentas Nicaragua",
+	"name": "Nicaragua - Catalogo de Cuentas",
 	"tree": {
 		"Activo": {
 			"Activo Corriente": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
index a62be37..5f84394 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
@@ -1,6 +1,6 @@
 {
 	"country_code": "sg",
-	"name": "Singapore Default Chart of Accounts",
+	"name": "Singapore - Chart of Accounts",
 	"tree": {
 		"Assets": {
 			"Current assets": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
index fb84f20..20d3a80 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
@@ -1,6 +1,6 @@
 {
 	"country_code": "sg",
-	"name": "Singapore F&B Chart of Accounts",
+	"name": "Singapore - F&B Chart of Accounts",
 	"tree": {
 		"Assets": {
 			"Current assets": {
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
index 481ada8..5824704 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
@@ -41,17 +41,26 @@
 	            _("Capital Equipments"): {
 	                "account_type": "Fixed Asset"
 	            },
-	            _("Computers"): {
+	            _("Electronic Equipments"): {
 	                "account_type": "Fixed Asset"
 	            },
-	            _("Furniture and Fixture"): {
+	            _("Furnitures and Fixtures"): {
 	                "account_type": "Fixed Asset"
 	            },
 	            _("Office Equipments"): {
 	                "account_type": "Fixed Asset"
 	            },
-	            _("Plant and Machinery"): {
+	            _("Plants and Machineries"): {
 	                "account_type": "Fixed Asset"
+	            },
+				_("Buildings"): {
+					"account_type": "Fixed Asset"
+				},
+				_("Softwares"): {
+					"account_type": "Fixed Asset"
+				},
+	            _("Accumulated Depreciation"): {
+	            	"account_type": "Accumulated Depreciation"
 	            }
 	        },
 	        _("Investments"): {
@@ -68,92 +77,60 @@
 	        _("Direct Expenses"): {
 	            _("Stock Expenses"): {
 	                _("Cost of Goods Sold"): {
-	                    "account_type": "Expense Account"
+	                    "account_type": "Cost of Goods Sold"
 	                },
 	                _("Expenses Included In Valuation"): {
 	                    "account_type": "Expenses Included In Valuation"
 	                },
 	                _("Stock Adjustment"): {
 	                    "account_type": "Stock Adjustment"
-	                },
-	                "account_type": "Expense Account"
+	                }
 	            },
-	            "account_type": "Expense Account"
 	        },
 	        _("Indirect Expenses"): {
-	            _("Administrative Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Commission on Sales"): {
-	                "account_type": "Expense Account"
-	            },
+	            _("Administrative Expenses"): {},
+	            _("Commission on Sales"): {},
 	            _("Depreciation"): {
-	                "account_type": "Expense Account"
+	                "account_type": "Depreciation"
 	            },
-	            _("Entertainment Expenses"): {
-	                "account_type": "Expense Account"
-	            },
+	            _("Entertainment Expenses"): {},
 	            _("Freight and Forwarding Charges"): {
 	                "account_type": "Chargeable"
 	            },
-	            _("Legal Expenses"): {
-	                "account_type": "Expense Account"
-	            },
+	            _("Legal Expenses"): {},
 	            _("Marketing Expenses"): {
 	                "account_type": "Chargeable"
 	            },
 	            _("Miscellaneous Expenses"): {
 	                "account_type": "Chargeable"
 	            },
-	            _("Office Maintenance Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Office Rent"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Postal Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Print and Stationary"): {
-	                "account_type": "Expense Account"
-	            },
+	            _("Office Maintenance Expenses"): {},
+	            _("Office Rent"): {},
+	            _("Postal Expenses"): {},
+	            _("Print and Stationary"): {},
 	            _("Round Off"): {
 	                "account_type": "Round Off"
 	            },
-	            _("Salary"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Sales Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Telephone Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Travel Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            _("Utility Expenses"): {
-	                "account_type": "Expense Account"
-	            },
-	            "account_type": "Expense Account"
+	            _("Salary"): {},
+	            _("Sales Expenses"): {},
+	            _("Telephone Expenses"): {},
+	            _("Travel Expenses"): {},
+	            _("Utility Expenses"): {},
+				_("Write Off"): {},
+				_("Exchange Gain/Loss"): {},
+				_("Gain/Loss on Asset Disposal"): {}
 	        },
 			"root_type": "Expense"
 	    },
 	    _("Income"): {
 	        _("Direct Income"): {
-	            _("Sales"): {
-	                "account_type": "Income Account"
-	            },
-	            _("Service"): {
-	                "account_type": "Income Account"
-	            },
-	            "account_type": "Income Account"
+	            _("Sales"): {},
+	            _("Service"): {}
 	        },
 	        _("Indirect Income"): {
-	            "account_type": "Income Account",
 				"is_group": 1
 	        },
-			"root_type": "Income"
+	        "root_type": "Income"
 	    },
 	    _("Source of Funds (Liabilities)"): {
 	        _("Current Liabilities"): {
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index 83516da..5744721 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -12,6 +12,7 @@
 		["_Test Bank", "Bank Accounts", 0, "Bank", None],
 		["_Test Bank USD", "Bank Accounts", 0, "Bank", "USD"],
 		["_Test Bank EUR", "Bank Accounts", 0, "Bank", "EUR"],
+		["_Test Cash", "Cash In Hand", 0, "Cash", None],
 
 		["_Test Account Stock Expenses", "Direct Expenses", 1, None, None],
 		["_Test Account Shipping Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
@@ -32,10 +33,16 @@
 		["_Test Account CST", "Direct Expenses", 0, "Tax", None],
 		["_Test Account Discount", "Direct Expenses", 0, None, None],
 		["_Test Write Off", "Indirect Expenses", 0, None, None],
+		["_Test Exchange Gain/Loss", "Indirect Expenses", 0, None, None],
 
 		# related to Account Inventory Integration
 		["_Test Account Stock In Hand", "Current Assets", 0, None, None],
-		["_Test Account Fixed Assets", "Current Assets", 0, None, None],
+		
+		# fixed asset depreciation
+		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
+		["_Test Accumulated Depreciations", "Current Assets", 0, None, None],
+		["_Test Depreciations", "Expenses", 0, None, None],
+		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
 
 		# Receivable / Payable Account
 		["_Test Receivable", "Current Assets", 0, "Receivable", None],
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.js b/erpnext/accounts/doctype/accounts_settings/accounts_settings.js
new file mode 100644
index 0000000..0627675
--- /dev/null
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Accounts Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 1ba9221..a02e591 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -2,11 +2,14 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-24 15:49:57", 
  "custom": 0, 
  "description": "Settings for Accounts", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -18,6 +21,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Make Accounting Entry For Every Stock Movement", 
@@ -42,6 +46,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Accounts Frozen Upto", 
@@ -66,6 +71,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries", 
@@ -86,11 +92,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "description": "Role that is allowed to submit transactions that exceed credit limits set.", 
    "fieldname": "credit_controller", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Credit Controller", 
@@ -115,6 +146,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Check Supplier Invoice Number Uniqueness", 
@@ -136,13 +168,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-24 21:42:01.274459", 
+ "modified": "2016-07-14 14:32:06.056888", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Settings", 
@@ -169,6 +202,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/asset/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/asset/__init__.py
diff --git a/erpnext/accounts/doctype/asset/asset.js b/erpnext/accounts/doctype/asset/asset.js
new file mode 100644
index 0000000..38be263
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/asset.js
@@ -0,0 +1,273 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.asset");
+
+frappe.ui.form.on('Asset', {
+	onload: function(frm) {
+		frm.set_query("item_code", function() {
+			return {
+				"filters": {
+					"disabled": 0,
+					"is_fixed_asset": 1,
+					"is_stock_item": 0
+				}
+			};
+		});
+		
+		frm.set_query("warehouse", function() {
+			return {
+				"filters": {
+					"company": frm.doc.company
+				}
+			};
+		});
+	},
+	
+	refresh: function(frm) {
+		frappe.ui.form.trigger("Asset", "is_existing_asset");
+		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
+				
+		if (frm.doc.docstatus==1) {
+			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
+				frm.add_custom_button("Make Purchase Invoice", function() {
+					erpnext.asset.make_purchase_invoice(frm);
+				});
+			}
+			if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
+				frm.add_custom_button("Transfer Asset", function() {
+					erpnext.asset.transfer_asset(frm);
+				});
+				
+				frm.add_custom_button("Scrap Asset", function() {
+					erpnext.asset.scrap_asset(frm);
+				});
+				
+				frm.add_custom_button("Sale Asset", function() {
+					erpnext.asset.make_sales_invoice(frm);
+				});
+				
+			} else if (frm.doc.status=='Scrapped') {
+				frm.add_custom_button("Restore Asset", function() {
+					erpnext.asset.restore_asset(frm);
+				});
+			}
+			
+			frm.trigger("show_graph");
+		}
+	},
+	
+	show_graph: function(frm) {		
+		var x_intervals = ["x", frm.doc.purchase_date];
+		var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
+		var last_depreciation_date = frm.doc.purchase_date;
+		
+		if(frm.doc.opening_accumulated_depreciation) {
+			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date, 
+				-1*frm.doc.frequency_of_depreciation);
+			
+			x_intervals.push(last_depreciation_date);
+			asset_values.push(flt(frm.doc.gross_purchase_amount) - 
+				flt(frm.doc.opening_accumulated_depreciation));
+		}
+		
+		$.each(frm.doc.schedules || [], function(i, v) {
+			x_intervals.push(v.schedule_date);
+			asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
+			if(v.journal_entry) {				
+				last_depreciation_date = v.schedule_date;
+				asset_values.push(asset_value)
+			} else {
+				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
+	 				asset_values.push(null)
+				} else {
+					asset_values.push(asset_value)
+				}
+			}
+		})
+		
+		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
+			x_intervals.push(frm.doc.disposal_date);
+			asset_values.push(0);
+			last_depreciation_date = frm.doc.disposal_date;
+		}
+		
+		frm.dashboard.setup_chart({
+			data: {
+				x: 'x',
+				columns: [x_intervals, asset_values],
+				regions: {
+					'Asset Value': [{'start': last_depreciation_date, 'style':'dashed'}]
+				}
+			},
+			legend: {
+				show: false
+			},
+			axis: {
+				x: {
+					type: 'timeseries',
+					tick: {
+						format: "%d-%m-%Y"
+					}
+				},
+				y: {
+					min: 0,
+					padding: {bottom: 10}
+				}
+			}
+		});		
+	},
+	
+	item_code: function(frm) {
+		if(frm.doc.item_code) {
+			frappe.call({
+				method: "erpnext.accounts.doctype.asset.asset.get_item_details",
+				args: {
+					item_code: frm.doc.item_code
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						$.each(r.message, function(field, value) {
+							frm.set_value(field, value);
+						})
+					}
+				}
+			})
+		}
+	},
+	
+	is_existing_asset: function(frm) {
+		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
+		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
+	},
+});
+
+frappe.ui.form.on('Depreciation Schedule', {
+	make_depreciation_entry: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if (!row.journal_entry) {
+			frappe.call({
+				method: "erpnext.accounts.doctype.asset.depreciation.make_depreciation_entry",
+				args: {
+					"asset_name": frm.doc.name,
+					"date": row.schedule_date
+				},
+				callback: function(r) {
+					frappe.model.sync(r.message);
+					frm.refresh();
+				}
+			})
+		}
+	}
+})
+
+erpnext.asset.make_purchase_invoice = function(frm) {
+	frappe.call({
+		args: {
+			"asset": frm.doc.name,
+			"item_code": frm.doc.item_code,
+			"gross_purchase_amount": frm.doc.gross_purchase_amount,
+			"company": frm.doc.company,
+			"posting_date": frm.doc.purchase_date
+		},
+		method: "erpnext.accounts.doctype.asset.asset.make_purchase_invoice",
+		callback: function(r) {
+			var doclist = frappe.model.sync(r.message);
+			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+		}
+	})
+}
+
+erpnext.asset.make_sales_invoice = function(frm) {
+	frappe.call({
+		args: {
+			"asset": frm.doc.name,
+			"item_code": frm.doc.item_code,
+			"company": frm.doc.company
+		},
+		method: "erpnext.accounts.doctype.asset.asset.make_sales_invoice",
+		callback: function(r) {
+			var doclist = frappe.model.sync(r.message);
+			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+		}
+	})
+}
+
+erpnext.asset.scrap_asset = function(frm) {
+	frappe.confirm(__("Do you really want to scrap this asset?"), function () {
+		frappe.call({
+			args: {
+				"asset_name": frm.doc.name
+			},
+			method: "erpnext.accounts.doctype.asset.depreciation.scrap_asset",
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	})
+}
+
+erpnext.asset.restore_asset = function(frm) {
+	frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
+		frappe.call({
+			args: {
+				"asset_name": frm.doc.name
+			},
+			method: "erpnext.accounts.doctype.asset.depreciation.restore_asset",
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	})
+}
+
+erpnext.asset.transfer_asset = function(frm) {
+	var dialog = new frappe.ui.Dialog({
+		title: __("Transfer Asset"),
+		fields: [
+			{
+				"label": __("Target Warehouse"), 
+				"fieldname": "target_warehouse",
+				"fieldtype": "Link", 
+				"options": "Warehouse",
+				"get_query": function () {
+					return {
+						filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+					}
+				}, 
+				"reqd": 1 
+			},
+			{
+				"label": __("Date"), 
+				"fieldname": "transfer_date",
+				"fieldtype": "Datetime", 
+				"reqd": 1,
+				"default": frappe.datetime.now_datetime()
+			}
+		]
+	});
+
+	dialog.set_primary_action(__("Transfer"), function() {
+		args = dialog.get_values();
+		if(!args) return;
+		dialog.hide();
+		return frappe.call({
+			type: "GET",
+			method: "erpnext.accounts.doctype.asset.asset.transfer_asset",
+			args: {
+				args: {
+					"asset": frm.doc.name,
+					"transaction_date": args.transfer_date,
+					"source_warehouse": frm.doc.warehouse,
+					"target_warehouse": args.target_warehouse,
+					"company": frm.doc.company
+				}
+			},
+			freeze: true,
+			callback: function(r) {
+				cur_frm.reload_doc();
+			}
+		})
+	});
+	dialog.show();
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
new file mode 100644
index 0000000..612574d
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -0,0 +1,777 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:asset_name", 
+ "beta": 0, 
+ "creation": "2016-03-01 17:01:27.920130", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "asset_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "asset_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "is_existing_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Existing Asset", 
+   "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": "purchase_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purchase Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "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": "purchase_invoice", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purchase Invoice", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "disposal_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Disposal Date", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "journal_entry_for_scrap", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Journal Entry for Scrap", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "gross_purchase_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gross Purchase Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "description": "", 
+   "fieldname": "expected_value_after_useful_life", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Expected Value After Useful Life", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "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, 
+   "depends_on": "is_existing_asset", 
+   "fieldname": "opening_accumulated_depreciation", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Opening Accumulated Depreciation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "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": "value_after_depreciation", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Value After Depreciation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "depends_on": "", 
+   "fieldname": "depreciation_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStraight Line\nDouble Declining Balance", 
+   "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": "total_number_of_depreciations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Number of Depreciations", 
+   "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, 
+   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)", 
+   "fieldname": "number_of_depreciations_booked", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Number of Depreciations Booked", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "frequency_of_depreciation", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Frequency of Depreciation (Months)", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "next_depreciation_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Next Depreciation Date", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depreciation Schedule", 
+   "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": "schedules", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depreciation Schedules", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Depreciation Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 72, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-05 12:54:38.585259", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
new file mode 100644
index 0000000..b28aaa9
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -0,0 +1,241 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, add_months, cint, nowdate, getdate
+from frappe.model.document import Document
+from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
+from erpnext.accounts.doctype.asset.depreciation \
+	import get_disposal_account_and_cost_center, get_depreciation_accounts
+
+class Asset(Document):
+	def validate(self):
+		self.status = self.get_status()
+		self.validate_item()
+		self.set_missing_values()
+		self.validate_asset_values()
+		self.make_depreciation_schedule()
+		self.validate_expected_value_after_useful_life()
+		# Validate depreciation related accounts
+		get_depreciation_accounts(self)
+
+	def on_submit(self):
+		self.set_status()
+
+	def on_cancel(self):
+		self.validate_cancellation()
+		self.delete_depreciation_entries()
+		self.set_status()
+
+	def validate_item(self):
+		item = frappe.db.get_value("Item", self.item_code, 
+			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
+		if not item:
+			frappe.throw(_("Item {0} does not exist").format(self.item_code))
+		elif item.disabled:
+			frappe.throw(_("Item {0} has been disabled").format(self.item_code))
+		elif not item.is_fixed_asset:
+			frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
+		elif item.is_stock_item:
+			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
+			
+	def set_missing_values(self):
+		if self.item_code:
+			item_details = get_item_details(self.item_code)
+			for field, value in item_details.items():
+				if not self.get(field):
+					self.set(field, value)
+					
+		self.value_after_depreciation = (flt(self.gross_purchase_amount) - 
+			flt(self.opening_accumulated_depreciation))
+
+	def validate_asset_values(self):
+		if flt(self.expected_value_after_useful_life) >= flt(self.gross_purchase_amount):
+			frappe.throw(_("Expected Value After Useful Life must be less than Gross Purchase Amount"))
+
+		if not flt(self.gross_purchase_amount):
+			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
+		
+		if not self.is_existing_asset:
+			self.opening_accumulated_depreciation = 0
+			self.number_of_depreciations_booked = 0
+			if not self.next_depreciation_date:
+				frappe.throw(_("Next Depreciation Date is mandatory for new asset"))
+		else:
+			depreciable_amount = flt(self.gross_purchase_amount) - flt(self.expected_value_after_useful_life)
+			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
+					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
+						.format(depreciable_amount))
+						
+			if self.opening_accumulated_depreciation:
+				if not self.number_of_depreciations_booked:
+					frappe.throw(_("Please set Number of Depreciations Booked"))
+			else:
+				self.number_of_depreciations_booked = 0
+				
+			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
+				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
+						
+		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
+			frappe.throw(_("Next Depreciation Date must be on or after today"))
+			
+		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life) 
+			and not self.next_depreciation_date):
+				frappe.throw(_("Please set Next Depreciation Date"))
+
+	def make_depreciation_schedule(self):
+		self.schedules = []
+		if not self.get("schedules") and self.next_depreciation_date:
+			accumulated_depreciation = flt(self.opening_accumulated_depreciation)
+			value_after_depreciation = flt(self.value_after_depreciation)
+			
+			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
+				cint(self.number_of_depreciations_booked)
+			if number_of_pending_depreciations:
+				for n in xrange(number_of_pending_depreciations):
+					schedule_date = add_months(self.next_depreciation_date,
+						n * cint(self.frequency_of_depreciation))
+
+					depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
+				
+					accumulated_depreciation += flt(depreciation_amount)
+					value_after_depreciation -= flt(depreciation_amount)
+
+					self.append("schedules", {
+						"schedule_date": schedule_date,
+						"depreciation_amount": depreciation_amount,
+						"accumulated_depreciation_amount": accumulated_depreciation
+					})
+
+	def get_depreciation_amount(self, depreciable_value):
+		if self.depreciation_method == "Straight Line":
+			depreciation_amount = (flt(self.value_after_depreciation) -
+				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) - 
+				cint(self.number_of_depreciations_booked))
+		else:
+			factor = 200.0 /  self.total_number_of_depreciations
+			depreciation_amount = flt(depreciable_value * factor / 100, 0)
+
+			value_after_depreciation = flt(depreciable_value) - depreciation_amount
+			if value_after_depreciation < flt(self.expected_value_after_useful_life):
+				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
+
+		return depreciation_amount
+		
+	def validate_expected_value_after_useful_life(self):
+		if self.depreciation_method == "Double Declining Balance":
+			accumulated_depreciation_after_full_schedule = \
+				max([d.accumulated_depreciation_amount for d in self.get("schedules")])
+			
+			asset_value_after_full_schedule = (flt(self.gross_purchase_amount) - 
+				flt(accumulated_depreciation_after_full_schedule))
+			
+			if self.expected_value_after_useful_life < asset_value_after_full_schedule:
+				frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
+					.format(asset_value_after_full_schedule))
+
+	def validate_cancellation(self):
+		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
+			frappe.throw(_("Asset cannot be cancelled, as it is already {0}").format(self.status))
+
+		if self.purchase_invoice:
+			frappe.throw(_("Please cancel Purchase Invoice {0} first").format(self.purchase_invoice))
+
+	def delete_depreciation_entries(self):
+		for d in self.get("schedules"):
+			if d.journal_entry:
+				frappe.get_doc("Journal Entry", d.journal_entry).cancel()
+				d.db_set("journal_entry", None)
+		
+		self.db_set("value_after_depreciation", 
+			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
+
+	def set_status(self, status=None):
+		'''Get and update status'''
+		if not status:
+			status = self.get_status()
+		self.db_set("status", status)
+
+	def get_status(self):
+		'''Returns status based on whether it is draft, submitted, scrapped or depreciated'''
+		if self.docstatus == 0:
+			status = "Draft"
+		elif self.docstatus == 1:
+			status = "Submitted"
+			if self.journal_entry_for_scrap:
+				status = "Scrapped"
+			elif flt(self.value_after_depreciation) <= flt(self.expected_value_after_useful_life):
+				status = "Fully Depreciated"
+			elif flt(self.value_after_depreciation) < flt(self.gross_purchase_amount):
+				status = 'Partially Depreciated'
+		elif self.docstatus == 2:
+			status = "Cancelled"
+
+		return status
+
+@frappe.whitelist()
+def make_purchase_invoice(asset, item_code, gross_purchase_amount, company, posting_date):
+	pi = frappe.new_doc("Purchase Invoice")
+	pi.company = company
+	pi.currency = frappe.db.get_value("Company", company, "default_currency")
+	pi.posting_date = posting_date
+	pi.append("items", {
+		"item_code": item_code,
+		"is_fixed_asset": 1,
+		"asset": asset,
+		"expense_account": get_fixed_asset_account(asset),
+		"qty": 1,
+		"price_list_rate": gross_purchase_amount,
+		"rate": gross_purchase_amount
+	})
+	pi.set_missing_values()
+	return pi
+	
+@frappe.whitelist()
+def make_sales_invoice(asset, item_code, company):
+	si = frappe.new_doc("Sales Invoice")
+	si.company = company
+	si.currency = frappe.db.get_value("Company", company, "default_currency")
+	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(company)
+	si.append("items", {
+		"item_code": item_code,
+		"is_fixed_asset": 1,
+		"asset": asset,
+		"income_account": disposal_account,
+		"cost_center": depreciation_cost_center,
+		"qty": 1
+	})
+	si.set_missing_values()
+	return si
+	
+@frappe.whitelist()
+def transfer_asset(args):
+	import json
+	args = json.loads(args)
+	movement_entry = frappe.new_doc("Asset Movement")
+	movement_entry.update(args)
+	movement_entry.insert()
+	movement_entry.submit()
+	
+	frappe.db.commit()
+	
+	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
+	
+@frappe.whitelist()
+def get_item_details(item_code):
+	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
+	
+	if not asset_category:
+		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
+	
+	ret = frappe.db.get_value("Asset Category", asset_category, 
+		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
+		
+	ret.update({
+		"asset_category": asset_category
+	})
+		
+	return ret
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/depreciation.py b/erpnext/accounts/doctype/asset/depreciation.py
new file mode 100644
index 0000000..15c155c
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/depreciation.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, today, getdate
+
+def post_depreciation_entries(date=None):
+	if not date:
+		date = today()
+	for asset in get_depreciable_assets(date):
+		make_depreciation_entry(asset, date)
+		frappe.db.commit()
+
+def get_depreciable_assets(date):
+	return frappe.db.sql_list("""select a.name
+		from tabAsset a, `tabDepreciation Schedule` ds
+		where a.name = ds.parent and a.docstatus=1 and ds.schedule_date<=%s
+			and a.status in ('Submitted', 'Partially Depreciated')
+			and ifnull(ds.journal_entry, '')=''""", date)
+
+@frappe.whitelist()
+def make_depreciation_entry(asset_name, date=None):
+	frappe.has_permission('Journal Entry', throw=True)
+	
+	if not date:
+		date = today()
+
+	asset = frappe.get_doc("Asset", asset_name)
+	fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account = \
+		get_depreciation_accounts(asset)
+
+	depreciation_cost_center = frappe.db.get_value("Company", asset.company, "depreciation_cost_center")
+
+	for d in asset.get("schedules"):
+		if not d.journal_entry and getdate(d.schedule_date) <= getdate(date):
+			je = frappe.new_doc("Journal Entry")
+			je.voucher_type = "Depreciation Entry"
+			je.posting_date = d.schedule_date
+			je.company = asset.company
+			je.remark = "Depreciation Entry against {0} worth {1}".format(asset_name, d.depreciation_amount)
+
+			je.append("accounts", {
+				"account": accumulated_depreciation_account,
+				"credit_in_account_currency": d.depreciation_amount,
+				"reference_type": "Asset",
+				"reference_name": asset.name
+			})
+
+			je.append("accounts", {
+				"account": depreciation_expense_account,
+				"debit_in_account_currency": d.depreciation_amount,
+				"reference_type": "Asset",
+				"reference_name": asset.name,
+				"cost_center": depreciation_cost_center
+			})
+
+			je.flags.ignore_permissions = True
+			je.submit()
+
+			d.db_set("journal_entry", je.name)
+			asset.value_after_depreciation -= d.depreciation_amount
+
+	asset.db_set("value_after_depreciation", asset.value_after_depreciation)
+	asset.set_status()
+
+	return asset
+
+def get_depreciation_accounts(asset):
+	fixed_asset_account = accumulated_depreciation_account = depreciation_expense_account = None
+	
+	accounts = frappe.db.get_value("Asset Category Account",
+		filters={'parent': asset.asset_category, 'company_name': asset.company},
+		fieldname = ['fixed_asset_account', 'accumulated_depreciation_account',
+			'depreciation_expense_account'], as_dict=1)
+
+	if accounts:	
+		fixed_asset_account = accounts.fixed_asset_account
+		accumulated_depreciation_account = accounts.accumulated_depreciation_account
+		depreciation_expense_account = accounts.depreciation_expense_account
+		
+	if not accumulated_depreciation_account or not depreciation_expense_account:
+		accounts = frappe.db.get_value("Company", asset.company,
+			["accumulated_depreciation_account", "depreciation_expense_account"])
+		
+		if not accumulated_depreciation_account:
+			accumulated_depreciation_account = accounts[0]
+		if not depreciation_expense_account:
+			depreciation_expense_account = accounts[1]
+
+	if not fixed_asset_account or not accumulated_depreciation_account or not depreciation_expense_account:
+		frappe.throw(_("Please set Depreciation related Accounts in Asset Category {0} or Company {1}")
+			.format(asset.asset_category, asset.company))
+
+	return fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account
+
+@frappe.whitelist()
+def scrap_asset(asset_name):
+	asset = frappe.get_doc("Asset", asset_name)
+
+	if asset.docstatus != 1:
+		frappe.throw(_("Asset {0} must be submitted").format(asset.name))
+	elif asset.status in ("Cancelled", "Sold", "Scrapped"):
+		frappe.throw(_("Asset {0} cannot be scrapped, as it is already {1}").format(asset.name, asset.status))
+
+	je = frappe.new_doc("Journal Entry")
+	je.voucher_type = "Journal Entry"
+	je.posting_date = today()
+	je.company = asset.company
+	je.remark = "Scrap Entry for asset {0}".format(asset_name)
+
+	for entry in get_gl_entries_on_asset_disposal(asset):
+		entry.update({
+			"reference_type": "Asset",
+			"reference_name": asset_name
+		})
+		je.append("accounts", entry)
+
+	je.flags.ignore_permissions = True
+	je.submit()
+	
+	frappe.db.set_value("Asset", asset_name, "disposal_date", today())
+	frappe.db.set_value("Asset", asset_name, "journal_entry_for_scrap", je.name)
+	asset.set_status("Scrapped")
+	
+	frappe.msgprint(_("Asset scrapped via Journal Entry {0}").format(je.name))
+
+@frappe.whitelist()
+def restore_asset(asset_name):
+	asset = frappe.get_doc("Asset", asset_name)
+
+	je = asset.journal_entry_for_scrap
+	
+	asset.db_set("disposal_date", None)
+	asset.db_set("journal_entry_for_scrap", None)
+	
+	frappe.get_doc("Journal Entry", je).cancel()
+
+	asset.set_status()
+
+@frappe.whitelist()
+def get_gl_entries_on_asset_disposal(asset, selling_amount=0):
+	fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
+	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
+	accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(asset.value_after_depreciation)
+
+	gl_entries = [
+		{
+			"account": fixed_asset_account,
+			"credit_in_account_currency": asset.gross_purchase_amount,
+			"credit": asset.gross_purchase_amount
+		},
+		{
+			"account": accumulated_depr_account,
+			"debit_in_account_currency": accumulated_depr_amount,
+			"debit": accumulated_depr_amount
+		}
+	]
+
+	profit_amount = flt(selling_amount) - flt(asset.value_after_depreciation)
+	if flt(asset.value_after_depreciation) and profit_amount:
+		debit_or_credit = "debit" if profit_amount < 0 else "credit"
+		gl_entries.append({
+			"account": disposal_account,
+			"cost_center": depreciation_cost_center,
+			debit_or_credit: abs(profit_amount),
+			debit_or_credit + "_in_account_currency": abs(profit_amount)
+		})
+
+	return gl_entries
+
+@frappe.whitelist()
+def get_disposal_account_and_cost_center(company):
+	disposal_account, depreciation_cost_center = frappe.db.get_value("Company", company,
+		["disposal_account", "depreciation_cost_center"])
+
+	if not disposal_account:
+		frappe.throw(_("Please set 'Gain/Loss Account on Asset Disposal' in Company {0}").format(company))
+	if not depreciation_cost_center:
+		frappe.throw(_("Please set 'Asset Depreciation Cost Center' in Company {0}").format(company))
+
+	return disposal_account, depreciation_cost_center
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/test_asset.py b/erpnext/accounts/doctype/asset/test_asset.py
new file mode 100644
index 0000000..b409ec3
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/test_asset.py
@@ -0,0 +1,276 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import cstr, nowdate, getdate
+from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset, restore_asset
+from erpnext.accounts.doctype.asset.asset import make_sales_invoice, make_purchase_invoice
+
+class TestAsset(unittest.TestCase):
+	def setUp(self):
+		set_depreciation_settings_in_company()
+		create_asset()
+		
+	def test_purchase_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		
+		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
+			asset.company, asset.purchase_date)
+		pi.supplier = "_Test Supplier"
+		pi.insert()
+		pi.submit()
+		
+		asset.load_from_db()
+		self.assertEqual(asset.supplier, "_Test Supplier")
+		self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
+		self.assertEqual(asset.purchase_invoice, pi.name)
+		
+		expected_gle = (
+			("_Test Fixed Asset - _TC", 100000.0, 0.0),
+			("Creditors - _TC", 0.0, 100000.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Purchase Invoice' and voucher_no = %s
+			order by account""", pi.name)
+
+		self.assertEqual(gle, expected_gle)
+
+		pi.cancel()
+
+		asset.load_from_db()
+		self.assertEqual(asset.supplier, None)
+		self.assertEqual(asset.purchase_invoice, None)
+		
+		self.assertFalse(frappe.db.get_value("GL Entry", 
+			{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
+		
+
+	def test_schedule_for_straight_line_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 30000, 30000],
+			["2021-03-31", 30000, 60000],
+			["2021-06-30", 30000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_straight_line_method_for_existing_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.is_existing_asset = 1
+		asset.number_of_depreciations_booked = 1
+		asset.opening_accumulated_depreciation = 40000
+		asset.save()
+		
+		self.assertEqual(asset.status, "Draft")
+
+		expected_schedules = [
+			["2020-12-31", 25000, 65000],
+			["2021-03-31", 25000, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+
+
+	def test_schedule_for_double_declining_method(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Double Declining Balance"
+		asset.save()
+
+		expected_schedules = [
+			["2020-12-31", 66667, 66667],
+			["2021-03-31", 22222, 88889],
+			["2021-06-30", 1111, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+		
+	def test_schedule_for_double_declining_method_for_existing_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.depreciation_method = "Double Declining Balance"
+		asset.is_existing_asset = 1
+		asset.number_of_depreciations_booked = 1
+		asset.opening_accumulated_depreciation = 50000
+		asset.save()
+
+		expected_schedules = [
+			["2020-12-31", 33333, 83333],
+			["2021-03-31", 6667, 90000]
+		]
+
+		schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+			for d in asset.get("schedules")]
+
+		self.assertEqual(schedules, expected_schedules)
+
+	def test_depreciation(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		asset.load_from_db()
+		self.assertEqual(asset.status, "Submitted")
+
+		post_depreciation_entries(date="2021-01-01")
+		asset.load_from_db()
+
+		self.assertEqual(asset.status, "Partially Depreciated")
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 0.0, 30000.0),
+			("_Test Depreciations - _TC", 30000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where against_voucher_type='Asset' and against_voucher = %s
+			order by account""", asset.name)
+
+		self.assertEqual(gle, expected_gle)
+		self.assertEqual(asset.get("value_after_depreciation"), 70000)
+
+	def test_scrap_asset(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+		asset.submit()
+		post_depreciation_entries(date="2021-01-01")
+
+		scrap_asset("Macbook Pro 1")
+
+		asset.load_from_db()
+		self.assertEqual(asset.status, "Scrapped")
+		self.assertTrue(asset.journal_entry_for_scrap)
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 70000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Journal Entry' and voucher_no = %s
+			order by account""", asset.journal_entry_for_scrap)
+
+		self.assertEqual(gle, expected_gle)
+
+		restore_asset("Macbook Pro 1")
+
+		asset.load_from_db()
+		self.assertFalse(asset.journal_entry_for_scrap)
+		self.assertEqual(asset.status, "Partially Depreciated")
+
+	def test_asset_sale(self):
+		frappe.get_doc("Asset", "Macbook Pro 1").submit()
+		post_depreciation_entries(date="2021-01-01")
+
+		si = make_sales_invoice(asset="Macbook Pro 1", item_code="Macbook Pro", company="_Test Company")
+		si.customer = "_Test Customer"
+		si.due_date = nowdate()
+		si.get("items")[0].rate = 25000
+		si.insert()
+		si.submit()
+
+		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Sold")
+
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 30000.0, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 45000.0, 0.0),
+			("Debtors - _TC", 25000.0, 0.0)
+		)
+
+		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Sales Invoice' and voucher_no = %s
+			order by account""", si.name)
+
+		self.assertEqual(gle, expected_gle)
+
+		si.cancel()
+
+		self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Partially Depreciated")
+
+	def tearDown(self):
+		asset = frappe.get_doc("Asset", "Macbook Pro 1")
+
+		if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
+			asset.cancel()
+
+			self.assertEqual(frappe.db.get_value("Asset", "Macbook Pro 1", "status"), "Cancelled")
+
+		frappe.delete_doc("Asset", "Macbook Pro 1")
+
+def create_asset():
+	if not frappe.db.exists("Asset Category", "Computers"):
+		create_asset_category()
+
+	if not frappe.db.exists("Item", "Macbook Pro"):
+		create_fixed_asset_item()
+	
+	asset = frappe.get_doc({
+		"doctype": "Asset",
+		"asset_name": "Macbook Pro 1",
+		"asset_category": "Computers",
+		"item_code": "Macbook Pro",
+		"company": "_Test Company",
+		"purchase_date": "2015-01-01",
+		"next_depreciation_date": "2020-12-31",
+		"gross_purchase_amount": 100000,
+		"expected_value_after_useful_life": 10000,
+		"warehouse": "_Test Warehouse - _TC"
+	})
+	try:
+		asset.save()
+	except frappe.DuplicateEntryError:
+		pass
+
+	return asset
+
+def create_asset_category():
+	asset_category = frappe.new_doc("Asset Category")
+	asset_category.asset_category_name = "Computers"
+	asset_category.total_number_of_depreciations = 3
+	asset_category.frequency_of_depreciation = 3
+	asset_category.append("accounts", {
+		"company_name": "_Test Company",
+		"fixed_asset_account": "_Test Fixed Asset - _TC",
+		"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
+		"depreciation_expense_account": "_Test Depreciations - _TC"
+	})
+	asset_category.insert()
+
+def create_fixed_asset_item():
+	try:
+		frappe.get_doc({
+			"doctype": "Item",
+			"item_code": "Macbook Pro",
+			"item_name": "Macbook Pro",
+			"description": "Macbook Pro Retina Display",
+			"asset_category": "Computers",
+			"item_group": "All Item Groups",
+			"stock_uom": "Nos",
+			"is_stock_item": 0,
+			"is_fixed_asset": 1
+		}).insert()		
+	except frappe.DuplicateEntryError:
+		pass
+
+def set_depreciation_settings_in_company():
+	company = frappe.get_doc("Company", "_Test Company")
+	company.accumulated_depreciation_account = "_Test Accumulated Depreciations - _TC"
+	company.depreciation_expense_account = "_Test Depreciations - _TC"
+	company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
+	company.depreciation_cost_center = "_Test Cost Center - _TC"
+	company.save()
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/asset_category/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/asset_category/__init__.py
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.js b/erpnext/accounts/doctype/asset_category/asset_category.js
new file mode 100644
index 0000000..d5f4864
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category/asset_category.js
@@ -0,0 +1,53 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Category', {
+	setup: function(frm) {
+		frm.get_field('accounts').grid.editable_fields = [
+			{fieldname: 'company_name', columns: 3},
+			{fieldname: 'fixed_asset_account', columns: 3},
+			{fieldname: 'accumulated_depreciation_account', columns: 2},
+			{fieldname: 'depreciation_expense_account', columns: 2}
+		];
+	},
+
+	onload: function(frm) {
+		frm.add_fetch('company_name', 'accumulated_depreciation_account', 'accumulated_depreciation_account');
+		frm.add_fetch('company_name', 'depreciation_expense_account', 'accumulated_depreciation_account');
+
+		frm.set_query('fixed_asset_account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				"filters": {
+					"account_type": "Fixed Asset",
+					"root_type": "Asset",
+					"is_group": 0,
+					"company": d.company_name
+				}
+			};
+		});
+
+		frm.set_query('accumulated_depreciation_account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				"filters": {
+					"root_type": "Asset",
+					"is_group": 0,
+					"company": d.company_name
+				}
+			};
+		});
+
+		frm.set_query('depreciation_expense_account', 'accounts', function(doc, cdt, cdn) {
+			var d  = locals[cdt][cdn];
+			return {
+				"filters": {
+					"root_type": "Expense",
+					"is_group": 0,
+					"company": d.company_name
+				}
+			};
+		});
+
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
new file mode 100644
index 0000000..20dd247
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category/asset_category.json
@@ -0,0 +1,253 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:asset_category_name", 
+ "creation": "2016-03-01 17:41:39.778765", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "asset_category_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset Category Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "Straight Line", 
+   "fieldname": "depreciation_method", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depreciation Method", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStraight Line\nDouble Declining Balance", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_number_of_depreciations", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Number of Depreciations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "frequency_of_depreciation", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Frequency of Depreciation (Months)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accounts", 
+   "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": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-04-20 13:23:09.890324", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Category", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "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": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.py b/erpnext/accounts/doctype/asset_category/asset_category.py
new file mode 100644
index 0000000..5279c37
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category/asset_category.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import cint
+from frappe.model.document import Document
+
+class AssetCategory(Document):
+	def validate(self):
+		for field in ("total_number_of_depreciations", "frequency_of_depreciation"):
+			if cint(self.get(field))<1:
+				frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/test_asset_category.py b/erpnext/accounts/doctype/asset_category/test_asset_category.py
new file mode 100644
index 0000000..b32f9b5
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category/test_asset_category.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+class TestAssetCategory(unittest.TestCase):
+	def test_mandatory_fields(self):
+		asset_category = frappe.new_doc("Asset Category")
+		asset_category.asset_category_name = "Computers"
+		
+		self.assertRaises(frappe.MandatoryError, asset_category.insert)
+		
+		asset_category.total_number_of_depreciations = 3
+		asset_category.frequency_of_depreciation = 3
+		asset_category.append("accounts", {
+			"company_name": "_Test Company",
+			"fixed_asset_account": "_Test Fixed Asset - _TC",
+			"accumulated_depreciation_account": "_Test Accumulated Depreciations - _TC",
+			"depreciation_expense_account": "_Test Depreciations - _TC"
+		})
+		
+		try:
+			asset_category.insert()
+		except frappe.DuplicateEntryError:
+			pass
+			
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/asset_category_account/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/asset_category_account/__init__.py
diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.json b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
new file mode 100644
index 0000000..5158b99
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category_account/asset_category_account.json
@@ -0,0 +1,141 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-03-07 15:55:18.806409", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "fixed_asset_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Fixed Asset Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "accumulated_depreciation_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Accumulated Depreciation Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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": "depreciation_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Depreciation Expense Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:27:58.048060", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Category Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category_account/asset_category_account.py b/erpnext/accounts/doctype/asset_category_account/asset_category_account.py
new file mode 100644
index 0000000..67925f4
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_category_account/asset_category_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AssetCategoryAccount(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/asset_movement/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/asset_movement/__init__.py
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.js b/erpnext/accounts/doctype/asset_movement/asset_movement.js
new file mode 100644
index 0000000..680eedc
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Movement', {
+	onload: function(frm) {
+		frm.add_fetch("asset", "warehouse", "source_warehouse");
+		
+		frm.set_query("target_warehouse", function() {
+			return {
+				filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+			}
+		})
+
+	}
+});
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.json b/erpnext/accounts/doctype/asset_movement/asset_movement.json
new file mode 100644
index 0000000..59b8823
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.json
@@ -0,0 +1,274 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "AM-.#####", 
+ "creation": "2016-04-25 18:00:23.559973", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "transaction_date", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Transaction Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "source_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Source Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "target_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Target 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset Movement", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-04-25 19:14:08.853429", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Movement", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.py b/erpnext/accounts/doctype/asset_movement/asset_movement.py
new file mode 100644
index 0000000..574c499
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class AssetMovement(Document):
+	def validate(self):
+		self.validate_asset()
+		self.validate_warehouses()
+		
+	def validate_asset(self):
+		status, company = frappe.db.get_value("Asset", self.asset, ["status", "company"])
+		if status in ("Draft", "Scrapped", "Sold"):
+			frappe.throw(_("{0} asset cannot be transferred").format(status))
+			
+		if company != self.company:
+			frappe.throw(_("Asset {0} does not belong to company {1}").format(self.asset, self.company))
+			
+	def validate_warehouses(self):
+		if not self.source_warehouse:
+			self.source_warehouse = frappe.db.get_value("Asset", self.asset, "warehouse")
+		
+		if self.source_warehouse == self.target_warehouse:
+			frappe.throw(_("Source and Target Warehouse cannot be same"))
+
+	def on_submit(self):
+		self.set_latest_warehouse_in_asset()
+		
+	def on_cancel(self):
+		self.set_latest_warehouse_in_asset()
+		
+	def set_latest_warehouse_in_asset(self):
+		latest_movement_entry = frappe.db.sql("""select target_warehouse from `tabAsset Movement`
+			where asset=%s and docstatus=1 and company=%s
+			order by transaction_date desc limit 1""", (self.asset, self.company))
+		
+		if latest_movement_entry:
+			warehouse = latest_movement_entry[0][0]
+		else:
+			warehouse = frappe.db.sql("""select source_warehouse from `tabAsset Movement`
+				where asset=%s and docstatus=2 and company=%s
+				order by transaction_date asc limit 1""", (self.asset, self.company))[0][0]
+		
+		frappe.db.set_value("Asset", self.asset, "warehouse", warehouse)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/test_asset_movement.py b/erpnext/accounts/doctype/asset_movement/test_asset_movement.py
new file mode 100644
index 0000000..9880efc
--- /dev/null
+++ b/erpnext/accounts/doctype/asset_movement/test_asset_movement.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+from frappe.utils import now
+import unittest
+from erpnext.accounts.doctype.asset.test_asset import create_asset
+
+
+class TestAssetMovement(unittest.TestCase):
+	def test_movement(self):
+		asset = create_asset()
+		
+		if asset.docstatus == 0:
+			asset.submit()
+		
+		movement1 = create_asset_movement(asset, target_warehouse="_Test Warehouse 1 - _TC")
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 1 - _TC")
+		
+		movement2 = create_asset_movement(asset, target_warehouse="_Test Warehouse 2 - _TC")
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
+		
+		movement1.cancel()
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse 2 - _TC")
+		
+		movement2.cancel()
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "warehouse"), "_Test Warehouse - _TC")
+		
+		asset.load_from_db()
+		asset.cancel()
+		frappe.delete_doc("Asset", asset.name)
+		
+		
+def create_asset_movement(asset, target_warehouse, transaction_date=None):
+	if not transaction_date:
+		transaction_date = now()
+		
+	movement = frappe.new_doc("Asset Movement")
+	movement.update({
+		"asset": asset.name,
+		"transaction_date": transaction_date,
+		"target_warehouse": target_warehouse,
+		"company": asset.company
+	})
+	
+	movement.insert()
+	movement.submit()
+	
+	return movement
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index 3de8241..fcd280f 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -3,11 +3,22 @@
 
 frappe.ui.form.on("Bank Reconciliation", {
 	setup: function(frm) {
-		frm.get_docfield("journal_entries").allow_bulk_edit = 1;
+		frm.get_docfield("payment_entries").allow_bulk_edit = 1;
 		frm.add_fetch("bank_account", "account_currency", "account_currency");
+
+		frm.get_field('payment_entries').grid.editable_fields = [
+			{fieldname: 'against_account', columns: 3},
+			{fieldname: 'amount', columns: 2},
+			{fieldname: 'cheque_number', columns: 3},
+			{fieldname: 'clearance_date', columns: 2}
+		];
 	},
 
 	onload: function(frm) {
+		var default_bank_account =  locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"];
+
+		frm.set_value("bank_account", default_bank_account);
+
 		frm.set_query("bank_account", function() {
 			return {
 				"filters": {
@@ -27,16 +38,21 @@
 
 	update_clearance_date: function(frm) {
 		return frappe.call({
-			method: "update_details",
-			doc: frm.doc
-		});
-	},
-	get_relevant_entries: function(frm) {
-		return frappe.call({
-			method: "get_details",
+			method: "update_clearance_date",
 			doc: frm.doc,
 			callback: function(r, rt) {
-				frm.refresh()
+				frm.refresh_field("payment_entries");
+				frm.refresh_fields();
+			}
+		});
+	},
+	get_payment_entries: function(frm) {
+		return frappe.call({
+			method: "get_payment_entries",
+			doc: frm.doc,
+			callback: function(r, rt) {
+				frm.refresh_field("payment_entries");
+				frm.refresh_fields();
 			}
 		});
 	}
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index 59a3cfc..1a7b763 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -2,6 +2,7 @@
  "allow_copy": 1, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:05", 
  "custom": 0, 
  "docstatus": 0, 
@@ -16,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Bank Account", 
@@ -40,6 +42,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Currency", 
@@ -64,6 +67,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
@@ -87,6 +91,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Date", 
@@ -110,6 +115,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Include Reconciled Entries", 
@@ -129,13 +135,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "get_relevant_entries", 
+   "fieldname": "get_payment_entries", 
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Get Relevant Entries", 
+   "label": "Get Payment Entries", 
    "length": 0, 
    "no_copy": 0, 
    "options": "", 
@@ -153,13 +160,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "journal_entries", 
+   "fieldname": "payment_entries", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Journal Entries", 
+   "label": "Payment Entries", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Bank Reconciliation Detail", 
@@ -181,6 +189,7 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Clearance Date", 
@@ -205,6 +214,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount", 
@@ -226,6 +236,7 @@
  "hide_toolbar": 1, 
  "icon": "icon-check", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -233,7 +244,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-11-30 12:44:45.105451", 
+ "modified": "2016-06-28 13:11:09.396353", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 
@@ -260,7 +271,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 1, 
  "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 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 fb95731..a56170d 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -12,7 +12,7 @@
 }
 
 class BankReconciliation(Document):
-	def get_details(self):
+	def get_payment_entries(self):
 		if not (self.bank_account and self.from_date and self.to_date):
 			msgprint("Bank Account, From Date and To Date are Mandatory")
 			return
@@ -22,48 +22,68 @@
 			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_in_account_currency,
-				t2.credit_in_account_currency, t1.posting_date, t2.against_account, t1.clearance_date
+		journal_entries = frappe.db.sql("""
+			select 
+				"Journal Entry" as payment_document, t1.name as payment_entry, 
+				t1.cheque_no as cheque_number, t1.cheque_date, 
+				abs(t2.debit_in_account_currency - t2.credit_in_account_currency) as amount, 
+				t1.posting_date, t2.against_account, t1.clearance_date
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
-				t2.parent = t1.name and t2.account = %s
-				and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
-				and ifnull(t1.is_opening, 'No') = 'No' %s
-				order by t1.posting_date DESC, t1.name DESC""" %
-				('%s', '%s', '%s', condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
-
-		self.set('journal_entries', [])
+				t2.parent = t1.name and t2.account = %s and t1.docstatus=1
+				and t1.posting_date >= %s and t1.posting_date <= %s 
+				and ifnull(t1.is_opening, 'No') = 'No' {0}
+			order by t1.posting_date ASC, t1.name DESC
+		""".format(condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
+				
+		payment_entries = frappe.db.sql("""
+			select 
+				"Payment Entry" as payment_document, name as payment_entry, 
+				reference_no as cheque_number, reference_date as cheque_date, 
+				if(paid_from=%s, paid_amount, received_amount) as amount, 
+				posting_date, party as against_account, clearance_date
+			from `tabPayment Entry`
+			where
+				(paid_from=%s or paid_to=%s) and docstatus=1
+				and posting_date >= %s and posting_date <= %s {0}
+			order by 
+				posting_date ASC, name DESC
+		""".format(condition), 
+		(self.bank_account, self.bank_account, self.bank_account, self.from_date, self.to_date), as_dict=1)
+		
+		entries = sorted(list(payment_entries)+list(journal_entries), 
+			key=lambda k: k['posting_date'] or getdate(nowdate()))
+				
+		self.set('payment_entries', [])
 		self.total_amount = 0.0
 
-		for d in dl:
-			nl = self.append('journal_entries', {})
-			nl.posting_date = d.posting_date
-			nl.voucher_id = d.name
-			nl.cheque_number = d.cheque_no
-			nl.cheque_date = d.cheque_date
-			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_in_account_currency) - flt(d.credit_in_account_currency)
+		for d in entries:
+			row = self.append('payment_entries', {})
+			row.update(d)
+			self.total_amount += flt(d.amount)
 
-	def update_details(self):
-		vouchers = []
-		for d in self.get('journal_entries'):
+	def update_clearance_date(self):
+		clearance_date_updated = False
+		for d in self.get('payment_entries'):
 			if d.clearance_date:
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
-					frappe.throw(_("Clearance date cannot be before check date in row {0}").format(d.idx))
+					frappe.throw(_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}")
+						.format(d.idx, d.clearance_date, d.cheque_date))
 
 			if d.clearance_date or self.include_reconciled_entries:
 				if not d.clearance_date:
 					d.clearance_date = None
-				frappe.db.set_value("Journal Entry", d.voucher_id, "clearance_date", d.clearance_date)
-				frappe.db.sql("""update `tabJournal Entry` set clearance_date = %s, modified = %s
-					where name=%s""", (d.clearance_date, nowdate(), d.voucher_id))
-				vouchers.append(d.voucher_id)
 
-		if vouchers:
-			msgprint("Clearance Date updated in: {0}".format(", ".join(vouchers)))
+				frappe.db.set_value(d.payment_document, d.payment_entry, "clearance_date", d.clearance_date)
+				frappe.db.sql("""update `tab{0}` set clearance_date = %s, modified = %s 
+					where name=%s""".format(d.payment_document), 
+				(d.clearance_date, nowdate(), d.payment_entry))
+				
+				clearance_date_updated = True
+
+		if clearance_date_updated:
+			self.get_payment_entries()
+			msgprint(_("Clearance Date updated"))
 		else:
 			msgprint(_("Clearance Date not mentioned"))
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 fc3c3b6..7308fbc 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -2,27 +2,56 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:37", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "voucher_id", 
+   "fieldname": "payment_document", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Document", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "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": "payment_entry", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Voucher ID", 
+   "label": "Payment Entry", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_id", 
    "oldfieldtype": "Link", 
-   "options": "Journal Entry", 
+   "options": "payment_document", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -42,6 +71,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Against Account", 
@@ -64,13 +94,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "debit", 
+   "fieldname": "amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Debit", 
+   "in_list_view": 1, 
+   "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "debit", 
@@ -90,36 +121,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "credit", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Credit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "credit", 
-   "oldfieldtype": "Currency", 
-   "options": "account_currency", 
-   "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": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -144,8 +150,9 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -169,6 +176,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Cheque Number", 
@@ -194,6 +202,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cheque Date", 
@@ -219,6 +228,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Clearance Date", 
@@ -240,6 +250,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -247,12 +258,15 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-17 06:50:40.074578", 
+ "modified": "2016-07-11 03:27:58.139117", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/budget/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/budget/__init__.py
diff --git a/erpnext/accounts/doctype/budget/budget.js b/erpnext/accounts/doctype/budget/budget.js
new file mode 100644
index 0000000..f6a2c88
--- /dev/null
+++ b/erpnext/accounts/doctype/budget/budget.js
@@ -0,0 +1,32 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Budget', {
+	onload: function(frm) {
+		frm.set_query("cost_center", function() {
+			return {
+				filters: {
+					company: frm.doc.company
+				}
+			}
+		})
+		
+		frm.set_query("account", "accounts", function() {
+			return {
+				filters: {
+					company: frm.doc.company,
+					report_type: "Profit and Loss",
+					is_group: 0
+				}
+			}
+		})
+		
+		frm.set_query("monthly_distribution", function() {
+			return {
+				filters: {
+					fiscal_year: frm.doc.fiscal_year
+				}
+			}
+		})
+	}
+});
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
new file mode 100644
index 0000000..4946304
--- /dev/null
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -0,0 +1,314 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-16 11:42:29.632528", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "fiscal_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fiscal Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fiscal Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "monthly_distribution", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Monthly Distribution", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Monthly Distribution", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Stop", 
+   "fieldname": "action_if_annual_budget_exceeded", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Action if Annual Budget Exceeded", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "Warn", 
+   "description": "", 
+   "fieldname": "action_if_accumulated_monthly_budget_exceeded", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Action if Accumulated Monthly Budget Exceeded", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStop\nWarn\nIgnore", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Budget", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Budget Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Budget Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-05-16 15:00:40.233685", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Budget", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
new file mode 100644
index 0000000..819a635
--- /dev/null
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, getdate, add_months, get_last_day
+from frappe.model.naming import make_autoname
+from frappe.model.document import Document
+
+class BudgetError(frappe.ValidationError): pass
+class DuplicateBudgetError(frappe.ValidationError): pass
+
+class Budget(Document):
+	def autoname(self):
+		self.name = make_autoname(self.cost_center + "/" + self.fiscal_year + "/.###")
+
+	def validate(self):
+		self.validate_duplicate()
+		self.validate_accounts()
+
+	def validate_duplicate(self):
+		existing_budget = frappe.db.get_value("Budget", {"cost_center": self.cost_center,
+			"fiscal_year": self.fiscal_year, "company": self.company,
+			"name": ["!=", self.name], "docstatus": ["!=", 2]})
+		if existing_budget:
+			frappe.throw(_("Another Budget record {0} already exists against {1} for fiscal year {2}")
+				.format(existing_budget, self.cost_center, self.fiscal_year), DuplicateBudgetError)
+
+	def validate_accounts(self):
+		account_list = []
+		for d in self.get('accounts'):
+			if d.account:
+				account_details = frappe.db.get_value("Account", d.account,
+					["is_group", "company", "report_type"], as_dict=1)
+
+				if account_details.is_group:
+					frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
+				elif account_details.company != self.company:
+					frappe.throw(_("Account {0} does not belongs to company {1}")
+						.format(d.account, self.company))
+				elif account_details.report_type != "Profit and Loss":
+					frappe.throw(_("Budget cannot be assigned against {0}, as it's not an Income or Expense account")
+						.format(d.account))
+
+				if d.account in account_list:
+					frappe.throw(_("Account {0} has been entered multiple times").format(d.account))
+				else:
+					account_list.append(d.account)
+
+def validate_expense_against_budget(args):
+	args = frappe._dict(args)
+	if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
+		cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+
+		budget_records = frappe.db.sql("""
+			select ba.budget_amount, b.monthly_distribution, b.cost_center,
+				b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded
+			from `tabBudget` b, `tabBudget Account` ba
+			where
+				b.name=ba.parent and b.fiscal_year=%s and ba.account=%s and b.docstatus=1
+				and exists(select name from `tabCost Center` where lft<=%s and rgt>=%s and name=b.cost_center)
+		""", (args.fiscal_year, args.account, cc_lft, cc_rgt), as_dict=True)
+
+		for budget in budget_records:
+			if budget.budget_amount:
+				yearly_action = budget.action_if_annual_budget_exceeded
+				monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+
+				if monthly_action in ["Stop", "Warn"]:
+					budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
+						args.posting_date, args.fiscal_year, budget.budget_amount)
+
+					args["month_end_date"] = get_last_day(args.posting_date)
+
+					compare_expense_with_budget(args, budget.cost_center,
+						budget_amount, _("Accumulated Monthly"), monthly_action)
+
+				elif yearly_action in ["Stop", "Warn"]:
+					compare_expense_with_budget(args, budget.cost_center,
+						flt(budget.budget_amount), _("Annual"), yearly_action)
+
+def compare_expense_with_budget(args, cost_center, budget_amount, action_for, action):
+	actual_expense = get_actual_expense(args, cost_center)
+	if actual_expense > budget_amount:
+		diff = actual_expense - budget_amount
+
+		msg = _("{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4}").format(_(action_for), args.account, cost_center, budget_amount, diff)
+
+		if action=="Stop":
+			frappe.throw(msg, BudgetError)
+		else:
+			frappe.msgprint(msg)
+
+def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
+	distribution = {}
+	if monthly_distribution:
+		for d in frappe.db.sql("""select mdp.month, mdp.percentage_allocation
+			from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
+			where mdp.parent=md.name and md.fiscal_year=%s""", fiscal_year, as_dict=1):
+				distribution.setdefault(d.month, d.percentage_allocation)
+
+	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")
+	accumulated_percentage = 0.0
+
+	while(dt <= getdate(posting_date)):
+		if monthly_distribution:
+			accumulated_percentage += distribution.get(getdate(dt).strftime("%B"), 0)
+		else:
+			accumulated_percentage += 100.0/12
+
+		dt = add_months(dt, 1)
+
+	return annual_budget * accumulated_percentage / 100
+
+def get_actual_expense(args, cost_center):
+	lft_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"], as_dict=1)
+	args.update(lft_rgt)
+
+	condition = " and gle.posting_date <= %(month_end_date)s" if args.get("month_end_date") else ""
+
+	return flt(frappe.db.sql("""
+		select sum(gle.debit) - sum(gle.credit)
+		from `tabGL Entry` gle
+		where gle.account=%(account)s
+			and exists(select name from `tabCost Center`
+				where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)
+			and gle.fiscal_year=%(fiscal_year)s
+			and gle.company=%(company)s
+			and gle.docstatus=1
+			{condition}
+	""".format(condition=condition), (args))[0][0])
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/test_budget.py b/erpnext/accounts/doctype/budget/test_budget.py
new file mode 100644
index 0000000..78f5690
--- /dev/null
+++ b/erpnext/accounts/doctype/budget/test_budget.py
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.accounts.doctype.budget.budget import get_actual_expense, BudgetError
+from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+
+class TestBudget(unittest.TestCase):		
+	def test_monthly_budget_crossed_ignore(self):
+		set_total_expense_zero("2013-02-28")
+
+		budget = make_budget()
+		
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", submit=True)
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv.name}))
+			
+		budget.cancel()
+
+	def test_monthly_budget_crossed_stop(self):
+		set_total_expense_zero("2013-02-28")
+
+		budget = make_budget()
+		
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.load_from_db()
+		budget.cancel()
+
+	def test_yearly_budget_crossed_stop(self):
+		set_total_expense_zero("2013-02-28")
+
+		budget = make_budget()
+		
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.cancel()
+
+	def test_monthly_budget_on_cancellation(self):
+		set_total_expense_zero("2013-02-28")
+
+		budget = make_budget()
+				
+		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
+
+		jv2 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
+
+		self.assertTrue(frappe.db.get_value("GL Entry",
+			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
+
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+		
+		self.assertRaises(BudgetError, jv1.cancel)
+		
+		budget.load_from_db()
+		budget.cancel()
+		
+	def test_monthly_budget_against_group_cost_center(self):
+		set_total_expense_zero("2013-02-28")
+		set_total_expense_zero("2013-02-28", "_Test Cost Center 2 - _TC")
+		
+		budget = make_budget("_Test Company - _TC")
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+			"_Test Bank - _TC", 40000, "_Test Cost Center 2 - _TC")
+
+		self.assertRaises(BudgetError, jv.submit)
+		
+		budget.load_from_db()
+		budget.cancel()
+
+def set_total_expense_zero(posting_date, cost_center=None):
+	existing_expense = get_actual_expense({
+		"account": "_Test Account Cost for Goods Sold - _TC",
+		"cost_center": cost_center or "_Test Cost Center - _TC",
+		"monthly_end_date": posting_date,
+		"company": "_Test Company",
+		"fiscal_year": "_Test Fiscal Year 2013"
+	}, cost_center or "_Test Cost Center - _TC")
+	
+	make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+		"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+		
+def make_budget(cost_center=None):
+	budget = frappe.new_doc("Budget")
+	budget.cost_center = cost_center or "_Test Cost Center - _TC"
+	budget.fiscal_year = "_Test Fiscal Year 2013"
+	budget.monthly_distribution = "_Test Distribution"
+	budget.company = "_Test Company"
+	budget.action_if_annual_budget_exceeded = "Stop"
+	budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
+	
+	budget.append("accounts", {
+		"account": "_Test Account Cost for Goods Sold - _TC",
+		"budget_amount": 100000
+	})
+	
+	budget.insert()
+	budget.submit()
+
+	return budget
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/budget_account/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/budget_account/__init__.py
diff --git a/erpnext/accounts/doctype/budget_account/budget_account.json b/erpnext/accounts/doctype/budget_account/budget_account.json
new file mode 100644
index 0000000..58bb90e
--- /dev/null
+++ b/erpnext/accounts/doctype/budget_account/budget_account.json
@@ -0,0 +1,88 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-16 11:54:09.286135", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "budget_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Budget Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:27:58.705376", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Budget Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget_account/budget_account.py b/erpnext/accounts/doctype/budget_account/budget_account.py
new file mode 100644
index 0000000..81b2709
--- /dev/null
+++ b/erpnext/accounts/doctype/budget_account/budget_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class BudgetAccount(Document):
+	pass
diff --git a/erpnext/accounts/doctype/budget_detail/README.md b/erpnext/accounts/doctype/budget_detail/README.md
deleted file mode 100644
index 42c7621..0000000
--- a/erpnext/accounts/doctype/budget_detail/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Budget amounts for year and distribution for parent Cost Center.
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget_detail/__init__.py b/erpnext/accounts/doctype/budget_detail/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/accounts/doctype/budget_detail/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/accounts/doctype/budget_detail/budget_detail.json b/erpnext/accounts/doctype/budget_detail/budget_detail.json
deleted file mode 100644
index 99d3919..0000000
--- a/erpnext/accounts/doctype/budget_detail/budget_detail.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-03-07 11:55:04", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "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": "budget_allocated", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Budget Allocated", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "budget_allocated", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_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": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "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": 1, 
-   "search_index": 1, 
-   "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, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:43.050558", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Budget Detail", 
- "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/accounts/doctype/budget_detail/budget_detail.py b/erpnext/accounts/doctype/budget_detail/budget_detail.py
deleted file mode 100644
index f11ec9c..0000000
--- a/erpnext/accounts/doctype/budget_detail/budget_detail.py
+++ /dev/null
@@ -1,9 +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.model.document import Document
-
-class BudgetDetail(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/c_form/c_form.js b/erpnext/accounts/doctype/c_form/c_form.js
index eed81cb..92cdb63 100644
--- a/erpnext/accounts/doctype/c_form/c_form.js
+++ b/erpnext/accounts/doctype/c_form/c_form.js
@@ -3,12 +3,12 @@
 
 //c-form js file
 // -----------------------------
-frappe.require("assets/erpnext/js/utils.js");
+
 
 cur_frm.fields_dict.invoices.grid.get_field("invoice_no").get_query = function(doc) {
 	return {
 		filters: {
-			"docstatus": 1, 
+			"docstatus": 1,
 			"customer": doc.customer,
 			"company": doc.company,
 			"c_form_applicable": 'Yes',
diff --git a/erpnext/accounts/doctype/c_form/c_form.py b/erpnext/accounts/doctype/c_form/c_form.py
index c14990a..2dcf958 100644
--- a/erpnext/accounts/doctype/c_form/c_form.py
+++ b/erpnext/accounts/doctype/c_form/c_form.py
@@ -18,17 +18,17 @@
 					`tabSales Invoice` where name = %s and docstatus = 1""", d.invoice_no)
 
 				if inv and inv[0][0] != 'Yes':
-					frappe.throw("C-form is not applicable for Invoice: {0}".format(d.invoice_no))
+					frappe.throw(_("C-form is not applicable for Invoice: {0}".format(d.invoice_no)))
 
 				elif inv and inv[0][1] and inv[0][1] != self.name:
-					frappe.throw("""Invoice {0} is tagged in another C-form: {1}.
+					frappe.throw(_("""Invoice {0} is tagged in another C-form: {1}.
 						If you want to change C-form no for this invoice,
 						please remove invoice no from the previous c-form and then try again"""\
-						.format(d.invoice_no, inv[0][1]))
+						.format(d.invoice_no, inv[0][1])))
 
 				elif not inv:
-					frappe.throw("Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
-						Please enter a valid Invoice".format(d.idx, d.invoice_no))
+					frappe.throw(_("Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice".format(d.idx, d.invoice_no)))
 
 	def on_update(self):
 		"""	Update C-Form No on invoices"""
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 351ce99..e78620e 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:38", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice No", 
@@ -23,6 +26,7 @@
    "options": "Sales Invoice", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "160px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Date", 
@@ -47,6 +52,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
@@ -73,6 +80,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -90,6 +98,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Net Total", 
@@ -98,6 +107,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -115,6 +125,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
@@ -123,6 +134,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -136,18 +148,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:43.221484", 
+ "modified": "2016-07-11 03:27:58.768719", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form Invoice Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/cheque_print_template/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/cheque_print_template/__init__.py
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js
new file mode 100644
index 0000000..6a430eb
--- /dev/null
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js
@@ -0,0 +1,77 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.cheque_print");
+
+frappe.ui.form.on('Cheque Print Template', {
+	refresh: function(frm) {
+		if(!frm.doc.__islocal) {
+			frm.add_custom_button(frm.doc.has_print_format?__("Update Print Format"):__("Create Print Format"),
+				function() {
+					erpnext.cheque_print.view_cheque_print(frm);
+				}).addClass("btn-primary");
+				
+			$(frm.fields_dict.cheque_print_preview.wrapper).empty()
+				
+				
+			var template = '<div style="position: relative; overflow-x: scroll;">\
+				<div id="cheque_preview" style="width: {{ cheque_width }}cm; \
+					height: {{ cheque_height }}cm;\
+					background-repeat: no-repeat;\
+					background-size: cover;">\
+					<span style="top: {{ acc_pay_dist_from_top_edge }}cm;\
+						left: {{ acc_pay_dist_from_left_edge }}cm;\
+						border-bottom: solid 1px;border-top:solid 1px;\
+						position: absolute;"> {{ message_to_show || __("Account Pay Only") }} </span>\
+					<span style="top: {{ date_dist_from_top_edge }}cm;\
+						left: {{ date_dist_from_left_edge }}cm;\
+						position: absolute;"> {{ frappe.datetime.obj_to_user() }} </span>\
+					<span style="top: {{ acc_no_dist_from_top_edge }}cm;\
+						left: {{ acc_no_dist_from_left_edge }}cm;\
+						position: absolute;"> Acc. No. </span>\
+					<span style="top: {{ payer_name_from_top_edge }}cm;\
+						left: {{ payer_name_from_left_edge }}cm;\
+						position: absolute;"> Payer Name </span>\
+					<span style="top:{{ amt_in_words_from_top_edge }}cm;\
+						left: {{ amt_in_words_from_left_edge }}cm;\
+						position: absolute;\
+						display: block;\
+						width: {{ amt_in_word_width }}cm;\
+						line-height: {{ amt_in_words_line_spacing }}cm;\
+						word-wrap: break-word;"> Amount in Words </span>\
+					<span style="top: {{ amt_in_figures_from_top_edge }}cm;\
+						left: {{ amt_in_figures_from_left_edge }}cm;\
+						position: absolute;"> 1000 </span>\
+					<span style="top: {{ signatory_from_top_edge }}cm;\
+						left: {{ signatory_from_left_edge }}cm;\
+						position: absolute;"> Signatory Name </span>\
+				</div>\
+			</div>';
+			
+			$(frappe.render(template, frm.doc)).appendTo(frm.fields_dict.cheque_print_preview.wrapper)
+			
+			if (frm.doc.scanned_cheque) {
+				$(frm.fields_dict.cheque_print_preview.wrapper).find("#cheque_preview").css('background-image', 'url(' + frm.doc.scanned_cheque + ')');
+			}
+		}
+	}
+});
+
+
+erpnext.cheque_print.view_cheque_print = function(frm) {
+	frappe.call({
+		method: "erpnext.accounts.doctype.cheque_print_template.cheque_print_template.create_or_update_cheque_print_format",
+		args:{
+			"template_name": frm.doc.name
+		},
+		callback: function(r) {
+			if (!r.exe && !frm.doc.has_print_format) {
+				var doc = frappe.model.sync(r.message);
+				frappe.set_route("Form", r.message.doctype, r.message.name);
+			}
+			else {
+				frappe.msgprint(__("Print settings updated in respective print format"))
+			}
+		}
+	})
+}
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
new file mode 100644
index 0000000..51da9c0
--- /dev/null
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
@@ -0,0 +1,1102 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:bank_name", 
+ "beta": 0, 
+ "creation": "2016-05-04 14:35:00.402544", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "settings", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<div>\n<h3> All dimensions in centimeter only </h3>\n</div>", 
+   "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": "has_print_format", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Has Print Format", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "primary_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Primary 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "bank_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Bank Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "Regular", 
+   "fieldname": "cheque_size", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cheque Size", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nRegular\nA4", 
+   "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, 
+   "depends_on": "eval:doc.cheque_size==\"A4\"", 
+   "fieldname": "starting_position_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting position from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "20.00", 
+   "fieldname": "cheque_width", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cheque Width", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "9.00", 
+   "fieldname": "cheque_height", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cheque Height", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "", 
+   "fieldname": "scanned_cheque", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Scanned Cheque", 
+   "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": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "1", 
+   "fieldname": "is_account_payable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Account Payable", 
+   "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, 
+   "default": "1.00", 
+   "depends_on": "eval:doc.is_account_payable", 
+   "fieldname": "acc_pay_dist_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "9.00", 
+   "depends_on": "eval:doc.is_account_payable", 
+   "fieldname": "acc_pay_dist_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "Acc. Payee", 
+   "depends_on": "eval:doc.is_account_payable", 
+   "fieldname": "message_to_show", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Message to show", 
+   "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": "date_and_payer_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "date_settings", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Date Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Date Settings</label>", 
+   "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, 
+   "default": "1.00", 
+   "fieldname": "date_dist_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "15.00", 
+   "depends_on": "", 
+   "fieldname": "date_dist_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "payer_settings", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "2.00", 
+   "fieldname": "payer_name_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "3.00", 
+   "fieldname": "payer_name_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "amount_in_words_and_figure_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "html_19", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Amount In Words</label>", 
+   "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, 
+   "default": "3.00", 
+   "fieldname": "amt_in_words_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "4.00", 
+   "fieldname": "amt_in_words_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "15.00", 
+   "fieldname": "amt_in_word_width", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Width of amount in word", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "0.50", 
+   "fieldname": "amt_in_words_line_spacing", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Line spacing for amount in words", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "amount_in_figure", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount In Figure", 
+   "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, 
+   "default": "3.50", 
+   "fieldname": "amt_in_figures_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "16.00", 
+   "fieldname": "amt_in_figures_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "account_number_and_signatory_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "account_no_settings", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Account Number Settings</label>", 
+   "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, 
+   "default": "5.00", 
+   "fieldname": "acc_no_dist_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "4.00", 
+   "fieldname": "acc_no_dist_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "signatory_position", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Signatory Position", 
+   "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, 
+   "default": "6.00", 
+   "fieldname": "signatory_from_top_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Distance from top edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "15.00", 
+   "fieldname": "signatory_from_left_edge", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Starting location from left edge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "preview", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Preview", 
+   "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": "cheque_print_preview", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 1, 
+ "modified": "2016-06-23 20:19:11.694932", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cheque Print Template", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "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": 1, 
+   "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": 1, 
+   "email": 1, 
+   "export": 1, 
+   "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
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
new file mode 100644
index 0000000..a6cc8ba
--- /dev/null
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class ChequePrintTemplate(Document):
+	pass
+
+@frappe.whitelist()
+def create_or_update_cheque_print_format(template_name):
+	if not frappe.db.exists("Print Format", template_name):
+		cheque_print = frappe.new_doc("Print Format")
+		cheque_print.update({
+			"doc_type": "Payment Entry",
+			"standard": "No",
+			"custom_format": 1,
+			"print_format_type": "Server",
+			"name": template_name
+		})
+	else:
+		cheque_print = frappe.get_doc("Print Format", template_name)
+	
+	doc = frappe.get_doc("Cheque Print Template", template_name)
+	
+	cheque_print.html = """
+<div style="position: relative; top:%(starting_position_from_top_edge)scm">
+	<div style="width:%(cheque_width)scm;height:%(cheque_height)scm;">
+		<span style="top: {{ %(acc_pay_dist_from_top_edge)s }}cm; left: {{ %(acc_pay_dist_from_left_edge)s }}cm;
+			border-bottom: solid 1px;border-top:solid 1px; position: absolute;">
+				%(message_to_show)s
+		</span>
+		<span style="top:%(date_dist_from_top_edge)s cm; left:%(date_dist_from_left_edge)scm;
+			position: absolute;">
+			{{doc.reference_date or '' }}
+		</span>
+		<span style="top:%(acc_no_dist_from_top_edge)scm;left:%(acc_no_dist_from_left_edge)scm;
+			position: absolute;">
+			{{ doc.account_no or '' }}
+		</span>
+		<span style="top:%(payer_name_from_top_edge)scm;left: %(payer_name_from_left_edge)scm;
+			position: absolute;">
+			{{doc.party}}
+		</span>
+		<span style="top:%(amt_in_words_from_top_edge)scm; left:%(amt_in_words_from_left_edge)scm;
+			position: absolute; display: block; width: %(amt_in_word_width)scm;
+			line-height:%(amt_in_words_line_spacing)scm; word-wrap: break-word;">
+				{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}
+		</span>
+		<span style="top:%(amt_in_figures_from_top_edge)scm;left: %(amt_in_figures_from_left_edge)scm;
+			position: absolute;">
+			{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}
+		</span>
+		<span style="top:%(signatory_from_top_edge)scm;left: %(signatory_from_left_edge)scm;
+			position: absolute;">
+			{{doc.company}}
+		</span>
+	</div>
+</div>"""%{
+		"starting_position_from_top_edge": doc.starting_position_from_top_edge \
+			if doc.cheque_size == "A4" else 0.0,
+		"cheque_width": doc.cheque_width, "cheque_height": doc.cheque_height,
+		"acc_pay_dist_from_top_edge": doc.acc_pay_dist_from_top_edge,
+		"acc_pay_dist_from_left_edge": doc.acc_pay_dist_from_left_edge,
+		"message_to_show": doc.message_to_show if doc.message_to_show else _("Account Pay Only"),
+		"date_dist_from_top_edge": doc.date_dist_from_top_edge,
+		"date_dist_from_left_edge": doc.date_dist_from_left_edge,
+		"acc_no_dist_from_top_edge": doc.acc_no_dist_from_top_edge,
+		"acc_no_dist_from_left_edge": doc.acc_no_dist_from_left_edge,
+		"payer_name_from_top_edge": doc.payer_name_from_top_edge,
+		"payer_name_from_left_edge": doc.payer_name_from_left_edge,
+		"amt_in_words_from_top_edge": doc.amt_in_words_from_top_edge,
+		"amt_in_words_from_left_edge": doc.amt_in_words_from_left_edge,
+		"amt_in_word_width": doc.amt_in_word_width,
+		"amt_in_words_line_spacing": doc.amt_in_words_line_spacing,
+		"amt_in_figures_from_top_edge": doc.amt_in_figures_from_top_edge,
+		"amt_in_figures_from_left_edge": doc.amt_in_figures_from_left_edge,
+		"signatory_from_top_edge": doc.signatory_from_top_edge,
+		"signatory_from_left_edge": doc.signatory_from_left_edge
+	}
+		
+	cheque_print.save(ignore_permissions=True)
+	
+	frappe.db.set_value("Cheque Print Template", template_name, "has_print_format", 1)
+		
+	return cheque_print
diff --git a/erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py b/erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.py
new file mode 100644
index 0000000..fa9c5b5
--- /dev/null
+++ b/erpnext/accounts/doctype/cheque_print_template/test_cheque_print_template.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('Cheque Print Template')
+
+class TestChequePrintTemplate(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index f66459b..dea87f3 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -3,38 +3,20 @@
 
 frappe.provide("erpnext.accounts");
 
-cur_frm.list_route = "Accounts Browser/Cost Center";
 
-erpnext.accounts.CostCenterController = frappe.ui.form.Controller.extend({
-	onload: function() {
-		this.setup_queries();
-	},
 
-	setup_queries: function() {
-		var me = this;
-		if(this.frm.fields_dict["budgets"].grid.get_field("account")) {
-			this.frm.set_query("account", "budgets", function() {
-				return {
-					filters:[
-						['Account', 'company', '=', me.frm.doc.company],
-						['Account', 'is_group', '=', '0']
-					]
-				}
-			});
-		}
-
-		this.frm.set_query("parent_cost_center", function() {
+frappe.ui.form.on('Cost Center', {
+	onload: function(frm) {
+		frm.set_query("parent_cost_center", function() {
 			return {
-				filters:[
-					['Cost Center', 'is_group', '=', '1'],
-					['Cost Center', 'company', '=', me.frm.doc.company],
-				]
+				filters: {
+					company: frm.doc.company,
+					is_group: 1
+				}
 			}
-		});
+		})
 	}
-});
-
-$.extend(cur_frm.cscript, new erpnext.accounts.CostCenterController({frm: cur_frm}));
+})
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	var intro_txt = '';
@@ -51,7 +33,7 @@
 	cur_frm.set_intro(intro_txt);
 
 	cur_frm.add_custom_button(__('Chart of Cost Centers'),
-		function() { frappe.set_route("Accounts Browser", "Cost Center"); }, __("View"))
+		function() { frappe.set_route("Tree", "Cost Center"); }, __("View"))
 }
 
 cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 6efdf99..5f78a5b 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:cost_center_name", 
+ "beta": 0, 
  "creation": "2013-01-23 19:57:17", 
  "custom": 0, 
  "description": "Track separate Income and Expense for product verticals or divisions.", 
@@ -168,87 +169,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Define Budget for this Cost Center. To set budget action, see \"Company List\"", 
-   "fieldname": "sb1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Budget", 
-   "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, 
-   "description": "Select Monthly Distribution, if you want to track based on seasonality.", 
-   "fieldname": "distribution_id", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distribution Id", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "distribution_id", 
-   "oldfieldtype": "Link", 
-   "options": "Monthly Distribution", 
-   "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, 
-   "description": "Add rows to set annual budgets on Accounts.", 
-   "fieldname": "budgets", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Budgets", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "budget_details", 
-   "oldfieldtype": "Table", 
-   "options": "Budget Detail", 
-   "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": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
@@ -336,7 +256,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-14 15:59:51.508268", 
+ "modified": "2016-05-16 15:23:14.770933", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -443,8 +363,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_cost_center, is_group", 
+ "sort_order": "ASC", 
+ "track_seen": 0, 
  "version": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
index 072bf60..12d5e19 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -16,36 +16,12 @@
 
 	def validate(self):
 		self.validate_mandatory()
-		self.validate_accounts()
 
 	def validate_mandatory(self):
 		if self.cost_center_name != self.company and not self.parent_cost_center:
 			frappe.throw(_("Please enter parent cost center"))
 		elif self.cost_center_name == self.company and self.parent_cost_center:
 			frappe.throw(_("Root cannot have a parent cost center"))
-			
-	def validate_accounts(self):
-		if self.is_group==1 and self.get("budgets"):
-			frappe.throw(_("Budget cannot be set for Group Cost Center"))
-			
-		check_acc_list = []
-		for d in self.get('budgets'):
-			if d.account:
-				account_details = frappe.db.get_value("Account", d.account, 
-					["is_group", "company", "report_type"], as_dict=1)
-				if account_details.is_group:
-					frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
-				elif account_details.company != self.company:
-					frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company))
-				elif account_details.report_type != "Profit and Loss":
-					frappe.throw(_("Budget cannot be assigned against {0}, as it's not an Income or Expense account")
-						.format(d.account))
-
-				if [d.account, d.fiscal_year] in check_acc_list:
-					frappe.throw(_("Account {0} has been entered more than once for fiscal year {1}")
-						.format(d.account, d.fiscal_year))
-				else:
-					check_acc_list.append([d.account, d.fiscal_year])
 
 	def convert_group_to_ledger(self):
 		if self.check_if_child_exists():
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
new file mode 100644
index 0000000..d8d45c5
--- /dev/null
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -0,0 +1,26 @@
+frappe.treeview_settings["Cost Center"] = {
+	breadcrumbs: "Accounts",
+	get_tree_root: false,
+	filters: [{
+		fieldname: "company",
+		fieldtype:"Select",
+		options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
+		label: __("Company"),
+		default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+	}],
+	root_label: "Cost Centers",
+	get_tree_nodes: 'erpnext.accounts.utils.get_children',
+	add_tree_node: 'erpnext.accounts.utils.add_cc',
+	menu_items:[
+		{
+			label: __('New Company'),
+			action: function() { frappe.new_doc("Company", true) },
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+		}
+	],
+	fields:[
+		{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
+		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
+			description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/test_records.json b/erpnext/accounts/doctype/cost_center/test_records.json
index 129f0db..941a85b 100644
--- a/erpnext/accounts/doctype/cost_center/test_records.json
+++ b/erpnext/accounts/doctype/cost_center/test_records.json
@@ -1,17 +1,7 @@
 [
  {
-  "budgets": [
-   {
-    "account": "_Test Account Cost for Goods Sold - _TC",
-    "budget_allocated": 100000,
-    "doctype": "Budget Detail",
-    "fiscal_year": "_Test Fiscal Year 2013",
-    "parentfield": "budgets"
-   }
-  ],
   "company": "_Test Company",
   "cost_center_name": "_Test Cost Center",
-  "distribution_id": "_Test Distribution",
   "doctype": "Cost Center",
   "is_group": 0,
   "parent_cost_center": "_Test Company - _TC"
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/depreciation_schedule/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/depreciation_schedule/__init__.py
diff --git a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
new file mode 100644
index 0000000..57c14b7
--- /dev/null
+++ b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.json
@@ -0,0 +1,191 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2016-03-02 15:11:01.278862", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Schedule Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "depreciation_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Depreciation Amount", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "accumulated_depreciation_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Accumulated Depreciation Amount", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "journal_entry", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Journal Entry", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Journal Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:(!doc.journal_entry && doc.schedule_date <= get_today())", 
+   "fieldname": "make_depreciation_entry", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Depreciation Entry", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:27:59.603924", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Depreciation Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py
new file mode 100644
index 0000000..957d6d1
--- /dev/null
+++ b/erpnext/accounts/doctype/depreciation_schedule/depreciation_schedule.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class DepreciationSchedule(Document):
+	pass
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 8ff209a..2ff98da 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -12,7 +12,9 @@
 class FiscalYear(Document):
 	def set_as_default(self):
 		frappe.db.set_value("Global Defaults", None, "current_fiscal_year", self.name)
-		frappe.get_doc("Global Defaults").on_update()
+		global_defaults = frappe.get_doc("Global Defaults")
+		global_defaults.check_permission("write")
+		global_defaults.on_update()
 
 		# clear cache
 		frappe.clear_cache()
@@ -21,6 +23,7 @@
 
 	def validate(self):
 		self.validate_dates()
+		self.validate_overlap()
 
 		if not self.is_new():
 			year_start_end_dates = frappe.db.sql("""select year_start_date, year_end_date
@@ -46,6 +49,37 @@
 		if global_defaults.current_fiscal_year == self.name:
 			frappe.throw(_("You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings").format(self.name))
 
+	def validate_overlap(self):
+		existing_fiscal_years = frappe.db.sql("""select name from `tabFiscal Year`
+			where (
+				(%(year_start_date)s between year_start_date and year_end_date)
+				or (%(year_end_date)s between year_start_date and year_end_date)
+				or (year_start_date between %(year_start_date)s and %(year_end_date)s)
+				or (year_end_date between %(year_start_date)s and %(year_end_date)s)
+			) and name!=%(name)s""",
+			{
+				"year_start_date": self.year_start_date,
+				"year_end_date": self.year_end_date,
+				"name": self.name or "No Name"
+			}, as_dict=True)
+
+		if existing_fiscal_years:
+			for existing in existing_fiscal_years:
+				company_for_existing = frappe.db.sql_list("""select company from `tabFiscal Year Company`
+					where parent=%s""", existing.name)
+
+				overlap = False
+				if not self.get("companies") or not company_for_existing:
+					overlap = True
+
+				for d in self.get("companies"):
+					if d.company in company_for_existing:
+						overlap = True
+
+				if overlap:
+					frappe.throw(_("Year start date or end date is overlapping with {0}. To avoid please set company")
+						.format(existing.name), frappe.NameError)
+
 @frappe.whitelist()
 def check_duplicate_fiscal_year(doc):
 	year_start_end_dates = frappe.db.sql("""select name, year_start_date, year_end_date from `tabFiscal Year` where name!=%s""", (doc.name))
diff --git a/erpnext/accounts/doctype/fiscal_year/test_records.json b/erpnext/accounts/doctype/fiscal_year/test_records.json
index abaab97..d5723ca 100644
--- a/erpnext/accounts/doctype/fiscal_year/test_records.json
+++ b/erpnext/accounts/doctype/fiscal_year/test_records.json
@@ -34,5 +34,29 @@
   "year": "_Test Fiscal Year 2017",
   "year_end_date": "2017-12-31",
   "year_start_date": "2017-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2018",
+  "year_end_date": "2018-12-31",
+  "year_start_date": "2018-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2019",
+  "year_end_date": "2019-12-31",
+  "year_start_date": "2019-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2020",
+  "year_end_date": "2020-12-31",
+  "year_start_date": "2020-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2021",
+  "year_end_date": "2021-12-31",
+  "year_start_date": "2021-01-01"
  }
 ]
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 2957d0b..4e568f1 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-10-02 13:35:44.155278", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -35,21 +39,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.344839", 
+ "modified": "2016-07-11 03:28:00.505946", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year Company", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index b7b698c..71008a6 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -3,6 +3,7 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "GL.#######", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:06", 
  "custom": 0, 
  "docstatus": 0, 
@@ -16,6 +17,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Posting Date", 
@@ -25,6 +27,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +43,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Transaction Date", 
@@ -49,6 +53,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -64,6 +69,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account", 
@@ -74,6 +80,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -89,6 +96,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Type", 
@@ -97,6 +105,7 @@
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,6 +121,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party", 
@@ -120,6 +130,7 @@
    "options": "party_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,6 +146,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Cost Center", 
@@ -145,6 +157,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -160,6 +173,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit Amount", 
@@ -171,6 +185,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -186,6 +201,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Amount", 
@@ -197,6 +213,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,6 +229,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Currency", 
@@ -221,6 +239,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -236,6 +255,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit Amount in Account Currency", 
@@ -245,6 +265,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -260,6 +281,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Amount in Account Currency", 
@@ -269,6 +291,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -284,6 +307,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against", 
@@ -293,6 +317,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -308,6 +333,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Voucher Type", 
@@ -318,6 +344,7 @@
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -333,6 +360,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Voucher", 
@@ -343,6 +371,7 @@
    "options": "against_voucher_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -358,6 +387,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher Type", 
@@ -368,6 +398,7 @@
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -383,6 +414,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher No", 
@@ -393,6 +425,7 @@
    "options": "voucher_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -404,10 +437,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Remarks", 
@@ -417,6 +477,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -432,6 +493,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Is Opening", 
@@ -442,6 +504,7 @@
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -457,6 +520,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
@@ -467,6 +531,7 @@
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -482,6 +547,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
@@ -492,6 +558,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -507,6 +574,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -517,6 +585,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -535,7 +604,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.382225", 
+ "modified": "2016-05-26 16:22:03.094536", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 
@@ -602,9 +671,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "voucher_no,account,posting_date,against_voucher", 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index 906c131..9418372 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -38,10 +38,10 @@
 					self.against_voucher)
 
 	def check_mandatory(self):
-		mandatory = ['account','remarks','voucher_type','voucher_no','company']
+		mandatory = ['account','voucher_type','voucher_no','company']
 		for k in mandatory:
 			if not self.get(k):
-				frappe.throw(_("{0} is required").format(self.meta.get_label(k)))
+				frappe.throw(_("{0} is required").format(_(self.meta.get_label(k))))
 
 		account_type = frappe.db.get_value("Account", self.account, "account_type")
 		if account_type in ["Receivable", "Payable"] and not (self.party_type and self.party):
@@ -54,9 +54,13 @@
 	def pl_must_have_cost_center(self):
 		if frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss":
 			if not self.cost_center and self.voucher_type != 'Period Closing Voucher':
-				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}").format(self.account))
-		elif self.cost_center:
-			self.cost_center = None
+				frappe.throw(_("Cost Center is required for 'Profit and Loss' account {0}")
+					.format(self.account))
+		else:
+			if self.cost_center:
+				self.cost_center = None
+			if self.project:
+				self.project = None
 
 	def check_pl_account(self):
 		if self.is_opening=='Yes' and \
@@ -177,8 +181,8 @@
 
 	# Update outstanding amt on against voucher
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
-		frappe.db.sql("update `tab%s` set outstanding_amount=%s where name=%s" %
-			(against_voucher_type, '%s', '%s'),	(bal, against_voucher))
+		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
+		ref_doc.db_set('outstanding_amount', bal)
 
 def validate_frozen_account(account, adv_adj=None):
 	frozen_account = frappe.db.get_value("Account", account, "freeze_account")
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 0a831ca..2b06e60 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -3,9 +3,18 @@
 
 frappe.provide("erpnext.accounts");
 frappe.provide("erpnext.journal_entry");
-frappe.require("assets/erpnext/js/utils.js");
+
 
 frappe.ui.form.on("Journal Entry", {
+	setup: function(frm) {
+		frm.get_field('accounts').grid.editable_fields = [
+			{fieldname: 'account', columns: 3},
+			{fieldname: 'party', columns: 3},
+			{fieldname: 'debit_in_account_currency', columns: 2},
+			{fieldname: 'credit_in_account_currency', columns: 2}
+		];
+	},
+
 	refresh: function(frm) {
 		erpnext.toggle_naming_series();
 		frm.cscript.voucher_type(frm.doc);
@@ -50,6 +59,7 @@
 	},
 
 	load_defaults: function() {
+		//this.frm.show_print_first = true;
 		if(this.frm.doc.__islocal && this.frm.doc.company) {
 			frappe.model.set_default_values(this.frm.doc);
 			$.each(this.frm.doc.accounts || [], function(i, jvd) {
@@ -273,7 +283,8 @@
 				type: "GET",
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
 				args: {
-					"voucher_type": doc.voucher_type,
+					"account_type": (doc.voucher_type=="Bank Entry" ?
+						"Bank" : (doc.voucher_type=="Cash" ? "Cash" : null)),
 					"company": doc.company
 				},
 				callback: function(r) {
@@ -360,7 +371,7 @@
 	credit: function(frm, dt, dn) {
 		cur_frm.cscript.update_totals(frm.doc);
 	},
-	
+
 	exchange_rate: function(frm, cdt, cdn) {
 		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 		var row = locals[cdt][cdn];
@@ -368,7 +379,7 @@
 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
 			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
 		}
-		
+
 		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 	}
 })
@@ -463,6 +474,7 @@
 				},
 				{fieldtype: "Date", fieldname: "posting_date", label: __("Date"), reqd: 1,
 					default: frm.doc.posting_date},
+				{fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark"), reqd: 1},
 				{fieldtype: "Select", fieldname: "naming_series", label: __("Series"), reqd: 1,
 					options: naming_series_options, default: naming_series_default},
 			]
@@ -473,6 +485,7 @@
 			var values = dialog.get_values();
 
 			frm.set_value("posting_date", values.posting_date);
+			frm.set_value("user_remark", values.user_remark);
 			frm.set_value("naming_series", values.naming_series);
 
 			// clear table is used because there might've been an error while adding child
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 63ba380..9d4ad48 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -1,1207 +1,1209 @@
 {
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "creation": "2013-03-25 10:53:52",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "creation": "2013-03-25 10:53:52", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "entry_type_and_date",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "entry_type_and_date", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "Journal Entry",
-   "fieldname": "voucher_type",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Journal Entry", 
+   "fieldname": "voucher_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "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\nDepreciation Entry", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "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,
-   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "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, 
+   "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,
-   "ignore_xss_filter": 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,
-   "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, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "2_add_edit_gl_entries",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "2_add_edit_gl_entries", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "accounts",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "section_break99",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break99", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "cheque_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "cheque_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "cheque_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "cheque_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "user_remark",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "user_remark", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 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": "column_break99",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break99", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "total_debit",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_debit", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Total Debit", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "total_debit", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "total_credit",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_credit", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 1, 
+   "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,
-   "depends_on": "difference",
-   "fieldname": "difference",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "difference", 
+   "fieldname": "difference", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "difference",
-   "fieldname": "get_balance",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "difference", 
+   "fieldname": "get_balance", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "multi_currency",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "multi_currency", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "total_amount",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Total Amount",
-   "length": 0,
-   "no_copy": 1,
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Total Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "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,
-   "fieldname": "total_amount_in_words",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_amount_in_words", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "fieldname": "reference",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "clearance_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "remark",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "remark", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break98",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break98", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "bill_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "bill_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "bill_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "bill_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "due_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'",
-   "fieldname": "write_off",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
+   "fieldname": "write_off", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "Accounts Receivable",
-   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'",
-   "fieldname": "write_off_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Accounts Receivable", 
+   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
+   "fieldname": "write_off_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'",
-   "fieldname": "get_outstanding_invoices",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
+   "fieldname": "get_outstanding_invoices", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_30",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_30", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'",
-   "fieldname": "write_off_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.voucher_type == 'Write Off Entry'", 
+   "fieldname": "write_off_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "fieldname": "printing_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "printing_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "pay_to_recd_from",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "pay_to_recd_from", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_35",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_35", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "select_print_heading",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "select_print_heading", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "fieldname": "addtional_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
-   "print_hide_if_no_value": 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": "addtional_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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": "column_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 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,
-   "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, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "No",
-   "description": "",
-   "fieldname": "is_opening",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "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,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "No", 
+   "description": "", 
+   "fieldname": "is_opening", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "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, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "eval:inList([\"Credit Note\", \"Debit Note\"], doc.voucher_type)",
-   "fieldname": "stock_entry",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:inList([\"Credit Note\", \"Debit Note\"], doc.voucher_type)", 
+   "fieldname": "stock_entry", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "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,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-file-text",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2016-03-11 01:38:50.944475",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Journal Entry",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-file-text", 
+ "idx": 176, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-04-06 05:33:21.851581", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Journal Entry", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1,
-   "apply_user_permissions": 0,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "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": 1,
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "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": 1, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 1,
-   "apply_user_permissions": 0,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "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": 1,
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "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": 1, 
    "write": 1
-  },
+  }, 
   {
-   "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": "Auditor",
-   "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": "Auditor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "read_only": 0,
- "read_only_onload": 1,
- "search_fields": "voucher_type,posting_date, due_date, cheque_no",
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "title"
-}
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 1, 
+ "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_seen": 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 aaf3318..6f25220 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -404,7 +404,8 @@
 						"against_voucher_type": d.reference_type,
 						"against_voucher": d.reference_name,
 						"remarks": self.remark,
-						"cost_center": d.cost_center
+						"cost_center": d.cost_center,
+						"project": d.project
 					})
 				)
 
@@ -507,7 +508,7 @@
 
 	def validate_empty_accounts_table(self):
 		if not self.get('accounts'):
-			frappe.throw("Accounts table cannot be blank.")
+			frappe.throw(_("Accounts table cannot be blank."))
 
 	def set_account_and_party_balance(self):
 		account_balance = {}
@@ -518,28 +519,25 @@
 
 			if (d.party_type, d.party) not in party_balance:
 				party_balance[(d.party_type, d.party)] = get_balance_on(party_type=d.party_type,
-					party=d.party, date=self.posting_date)
+					party=d.party, date=self.posting_date, company=self.company)
 
 			d.account_balance = account_balance[d.account]
 			d.party_balance = party_balance[(d.party_type, d.party)]
 
 @frappe.whitelist()
-def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None, account=None):
+def get_default_bank_cash_account(company, account_type=None, mode_of_payment=None, account=None):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
 	if mode_of_payment:
-		account = get_bank_cash_account(mode_of_payment, company)
-		if account.get("account"):
-			account.update({"balance": get_balance_on(account.get("account"))})
-			return account
+		account = get_bank_cash_account(mode_of_payment, company).get("account")
 
 	if not account:
-		if voucher_type=="Bank Entry":
+		if account_type=="Bank":
 			account = frappe.db.get_value("Company", company, "default_bank_account")
 			if not account:
 				account = frappe.db.get_value("Account",
 					{"company": company, "account_type": "Bank", "is_group": 0})
 
-		elif voucher_type=="Cash Entry":
+		elif account_type=="Cash":
 			account = frappe.db.get_value("Company", company, "default_cash_account")
 			if not account:
 				account = frappe.db.get_value("Account",
@@ -548,12 +546,14 @@
 	if account:
 		account_details = frappe.db.get_value("Account", account,
 			["account_currency", "account_type"], as_dict=1)
-		return {
+			
+		return frappe._dict({
 			"account": account,
 			"balance": get_balance_on(account),
 			"account_currency": account_details.account_currency,
 			"account_type": account_details.account_type
-		}
+		})
+	else: return frappe._dict()
 
 @frappe.whitelist()
 def get_payment_entry_against_order(dt, dn, amount=None, debit_in_account_currency=None, journal_entry=False, bank_account=None):
@@ -661,7 +661,7 @@
 	bank_row = je.append("accounts")
 
 	#make it bank_details
-	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry", account=args.get("bank_account"))
+	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
 		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
@@ -727,8 +727,9 @@
 			amount_field: abs(against_jv_amount)
 		}
 	elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"):
+		party_type = "Customer" if args.get("doctype") == "Sales Invoice" else "Supplier"
 		invoice = frappe.db.get_value(args["doctype"], args["docname"],
-			["outstanding_amount", "conversion_rate"], as_dict=1)
+			["outstanding_amount", "conversion_rate", scrub(party_type)], as_dict=1)
 
 		exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
 
@@ -741,7 +742,9 @@
 
 		return {
 			amount_field: abs(flt(invoice.outstanding_amount)),
-			"exchange_rate": exchange_rate
+			"exchange_rate": exchange_rate,
+			"party_type": party_type,
+			"party": invoice.get(scrub(party_type))
 		}
 
 @frappe.whitelist()
@@ -752,7 +755,7 @@
 	account = get_party_account(party_type, party, company)
 
 	account_balance = get_balance_on(account=account)
-	party_balance = get_balance_on(party_type=party_type, party=party)
+	party_balance = get_balance_on(party_type=party_type, party=party, company=company)
 
 	return {
 		"account": account,
@@ -810,7 +813,7 @@
 	company_currency = get_company_currency(company)
 
 	if account_currency != company_currency:
-		if reference_type and reference_name and frappe.get_meta(reference_type).get_field("conversion_rate"):
+		if reference_type in ("Sales Invoice", "Purchase Invoice") and reference_name:
 			exchange_rate = frappe.db.get_value(reference_type, reference_name, "conversion_rate")
 
 		elif account_details and account_details.account_type == "Bank" and \
@@ -827,6 +830,7 @@
 	# don't return None or 0 as it is multipled with a value and that value could be lost
 	return exchange_rate or 1
 
+@frappe.whitelist()
 def get_average_exchange_rate(account):
 	exchange_rate = 0
 	bank_balance_in_account_currency = get_balance_on(account)
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index bad7f98..3e609ce 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -4,7 +4,6 @@
 from __future__ import unicode_literals
 import unittest, frappe
 from frappe.utils import flt
-from erpnext.accounts.utils import get_actual_expense, BudgetError, get_fiscal_year
 from erpnext.exceptions import InvalidAccountCurrency
 
 
@@ -96,78 +95,6 @@
 
 		set_perpetual_inventory(0)
 
-	def test_monthly_budget_crossed_ignore(self):
-		frappe.db.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore")
-
-		self.set_total_expense_zero("2013-02-28")
-
-		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", submit=True)
-
-		self.assertTrue(frappe.db.get_value("GL Entry",
-			{"voucher_type": "Journal Entry", "voucher_no": jv.name}))
-
-	def test_monthly_budget_crossed_stop(self):
-		frappe.db.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop")
-
-		self.set_total_expense_zero("2013-02-28")
-
-		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC")
-
-		self.assertRaises(BudgetError, jv.submit)
-
-		frappe.db.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore")
-
-	def test_yearly_budget_crossed_stop(self):
-		self.test_monthly_budget_crossed_ignore()
-
-		frappe.db.set_value("Company", "_Test Company", "yearly_bgt_flag", "Stop")
-
-		self.set_total_expense_zero("2013-02-28")
-
-		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC")
-
-		self.assertRaises(BudgetError, jv.submit)
-
-		frappe.db.set_value("Company", "_Test Company", "yearly_bgt_flag", "Ignore")
-
-	def test_monthly_budget_on_cancellation(self):
-		self.set_total_expense_zero("2013-02-28")
-
-		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
-
-		self.assertTrue(frappe.db.get_value("GL Entry",
-			{"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
-
-		jv2 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
-
-		self.assertTrue(frappe.db.get_value("GL Entry",
-			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
-
-		frappe.db.set_value("Company", "_Test Company", "monthly_bgt_flag", "Stop")
-
-		self.assertRaises(BudgetError, jv1.cancel)
-
-		frappe.db.set_value("Company", "_Test Company", "monthly_bgt_flag", "Ignore")
-
-	def get_actual_expense(self, monthly_end_date):
-		return get_actual_expense({
-			"account": "_Test Account Cost for Goods Sold - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-			"monthly_end_date": monthly_end_date,
-			"company": "_Test Company",
-			"fiscal_year": get_fiscal_year(monthly_end_date)[0]
-		})
-
-	def set_total_expense_zero(self, posting_date):
-		existing_expense = self.get_actual_expense(posting_date)
-		make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
-
 	def test_multi_currency(self):
 		jv = make_journal_entry("_Test Bank USD - _TC",
 			"_Test Bank - _TC", 100, exchange_rate=50, save=False)
@@ -245,9 +172,9 @@
 
 		jv.submit()
 
-def make_journal_entry(account1, account2, amount, cost_center=None, exchange_rate=1, save=True, submit=False):
+def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False):
 	jv = frappe.new_doc("Journal Entry")
-	jv.posting_date = "2013-02-14"
+	jv.posting_date = posting_date or "2013-02-14"
 	jv.company = "_Test Company"
 	jv.user_remark = "test"
 	jv.multi_currency = 1
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 9277da5..e71b53c 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:39", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account", 
@@ -44,6 +47,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Type", 
@@ -68,6 +72,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Balance", 
@@ -96,6 +101,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Cost Center", 
@@ -124,6 +130,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -146,6 +153,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Type", 
@@ -170,6 +178,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Party", 
@@ -194,6 +203,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Balance", 
@@ -221,6 +231,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
@@ -245,6 +256,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Currency", 
@@ -270,6 +282,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -293,6 +306,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
@@ -317,6 +331,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
@@ -340,6 +355,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Debit", 
@@ -365,6 +381,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit in Company Currency", 
@@ -392,6 +409,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -414,6 +432,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Credit", 
@@ -439,6 +458,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit in Company Currency", 
@@ -466,6 +486,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
@@ -489,12 +510,13 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "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", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -514,6 +536,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
@@ -535,10 +558,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -561,6 +611,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
@@ -587,6 +638,7 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Account", 
@@ -608,18 +660,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-12-02 04:14:37.571883", 
+ "modified": "2016-07-11 03:28:01.575159", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
index 10807ff..9115c20 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
@@ -2,11 +2,12 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.set_query("default_account", "accounts", function(doc, cdt, cdn) {
+	var d = locals[cdt][cdn];
 	return{
 		filters: [
 			['Account', 'account_type', 'in', 'Bank, Cash'],
 			['Account', 'is_group', '=', 0],
-			['Account', 'company', '=', doc.company]
+			['Account', 'company', '=', d.company]
 		]
 	}
 });
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 6befedc..26519ac 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -17,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mode of Payment", 
@@ -26,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -37,10 +39,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cash\nBank\nGeneral", 
+   "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": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
@@ -50,6 +79,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -68,7 +98,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.335559", 
+ "modified": "2016-04-26 11:48:17.411796", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -115,6 +145,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 9cd1e7c..0395b38 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
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-01-05 14:17:53.101432", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,6 +45,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Account", 
@@ -50,6 +55,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -60,21 +66,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.367895", 
+ "modified": "2016-07-11 03:28:02.649800", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment Account", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 096e12b..377a95c 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -1,156 +1,159 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:distribution_id",
- "creation": "2013-01-10 16:34:05",
- "custom": 0,
- "description": "**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:distribution_id", 
+ "beta": 0, 
+ "creation": "2013-01-10 16:34:05", 
+ "custom": 0, 
+ "description": "**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "Name of the Monthly Distribution",
-   "fieldname": "distribution_id",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Distribution Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "distribution_id",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 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": "Name of the Monthly Distribution", 
+   "fieldname": "distribution_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Distribution Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "distribution_id", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "fiscal_year",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "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": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "fiscal_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "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": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "percentages",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Monthly Distribution Percentages",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "budget_distribution_details",
-   "oldfieldtype": "Table",
-   "options": "Monthly Distribution Percentage",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "percentages", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Monthly Distribution Percentages", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "budget_distribution_details", 
+   "oldfieldtype": "Table", 
+   "options": "Monthly Distribution Percentage", 
+   "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
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-bar-chart",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-03-03 02:46:44.493857",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Monthly Distribution",
- "name_case": "Title Case",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-bar-chart", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-05-16 16:35:20.349194", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Monthly Distribution", 
+ "name_case": "Title Case", 
+ "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": "Accounts 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": "Accounts 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": 2,
-   "print": 0,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts 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": 2, 
+   "print": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
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 11f7eb8..373d090 100644
--- a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
+++ b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:38", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Month", 
@@ -25,6 +28,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Percentage Allocation", 
@@ -49,6 +54,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -60,18 +66,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.468982", 
+ "modified": "2016-07-11 03:28:02.714462", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution Percentage", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
index 4527531..a83bb26 100644
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-08-29 16:02:39.740505", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -24,6 +27,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -35,33 +39,11 @@
    "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, 
-   "label": "", 
-   "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, 
    "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Account", 
@@ -70,6 +52,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -80,21 +63,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.450360", 
+ "modified": "2016-07-11 03:28:03.348246", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Party Account", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/payment_entry/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/payment_tool/__init__.py
rename to erpnext/accounts/doctype/payment_entry/__init__.py
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
new file mode 100644
index 0000000..a5fbfba
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -0,0 +1,762 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Payment Entry', {
+	onload: function(frm) {
+		if(frm.doc.__islocal) {
+			if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null);
+			if (!frm.doc.paid_to) frm.set_value("paid_to_account_currency", null);
+		}
+	},
+
+	setup: function(frm) {
+		frm.get_field('references').grid.editable_fields = [
+			{fieldname: 'reference_doctype', columns: 2},
+			{fieldname: 'reference_name', columns: 2},
+			{fieldname: 'outstanding_amount', columns: 3},
+			{fieldname: 'allocated_amount', columns: 3}
+		];
+
+		var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
+
+		frm.set_query("paid_from", function() {
+			var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
+				["Bank", "Cash"] : party_account_type;
+
+			return {
+				filters: {
+					"account_type": ["in", account_types],
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			}
+		});
+
+		frm.set_query("paid_to", function() {
+			var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
+	 			["Bank", "Cash"] : party_account_type;
+
+			return {
+				filters: {
+					"account_type": ["in", account_types],
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			}
+		});
+
+		frm.set_query("account", "deductions", function() {
+			return {
+				filters: {
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			}
+		});
+
+		frm.set_query("cost_center", "deductions", function() {
+			return {
+				filters: {
+					"is_group": 0,
+					"company": frm.doc.company
+				}
+			}
+		});
+
+		frm.set_query("reference_doctype", "references", function() {
+			if (frm.doc.party_type=="Customer") {
+				var doctypes = ["Sales Order", "Sales Invoice", "Journal Entry"];
+			} else if (frm.doc.party_type=="Supplier") {
+				var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"];
+			} else {
+				var doctypes = ["Journal Entry"];
+			}
+
+			return {
+				filters: { "name": ["in", doctypes] }
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		erpnext.hide_company();
+		frm.events.hide_unhide_fields(frm);
+		frm.events.set_dynamic_labels(frm);
+		frm.events.show_general_ledger(frm);
+	},
+
+	hide_unhide_fields: function(frm) {
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		frm.toggle_display("source_exchange_rate",
+			(frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency));
+
+		frm.toggle_display("target_exchange_rate", (frm.doc.received_amount &&
+			frm.doc.paid_to_account_currency != company_currency &&
+			frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency));
+
+			frm.toggle_display("base_paid_amount", frm.doc.paid_from_account_currency != company_currency);
+
+		frm.toggle_display("base_received_amount", (frm.doc.paid_to_account_currency != company_currency &&
+			frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency));
+
+		frm.toggle_display("received_amount",
+			frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency)
+
+		frm.toggle_display(["base_total_allocated_amount"],
+			(frm.doc.paid_amount && frm.doc.received_amount && frm.doc.base_total_allocated_amount &&
+			((frm.doc.payment_type=="Receive" && frm.doc.paid_from_account_currency != company_currency) ||
+			(frm.doc.payment_type=="Pay" && frm.doc.paid_to_account_currency != company_currency))));
+
+		var party_amount = frm.doc.payment_type=="Receive" ?
+			frm.doc.paid_amount : frm.doc.received_amount;
+
+		frm.toggle_display("write_off_difference_amount", (frm.doc.difference_amount && frm.doc.party &&
+			(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) &&
+			(frm.doc.total_allocated_amount > party_amount)));
+
+		frm.toggle_display("set_exchange_gain_loss",
+			(frm.doc.paid_amount && frm.doc.received_amount && frm.doc.difference_amount &&
+				(frm.doc.paid_from_account_currency != company_currency ||
+					frm.doc.paid_to_account_currency != company_currency)));
+
+		frm.refresh_fields();
+	},
+
+	set_dynamic_labels: function(frm) {
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		var field_label_map = {};
+		var grid_field_label_map = {};
+
+		var setup_field_label_map = function(fields_list, currency, parentfield) {
+			var doctype = parentfield ? frm.fields_dict[parentfield].grid.doctype : frm.doc.doctype;
+			$.each(fields_list, function(i, fname) {
+				var docfield = frappe.meta.docfield_map[doctype][fname];
+				if(docfield) {
+					var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
+					if(parentfield) {
+						grid_field_label_map[doctype + "-" + fname] =
+							label.trim() + " (" + __(currency) + ")";
+					} else {
+						field_label_map[fname] = label.trim() + " (" + currency + ")";
+					}
+				}
+			});
+		}
+
+		setup_field_label_map(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
+			"difference_amount"], company_currency);
+
+		setup_field_label_map(["paid_amount"], frm.doc.paid_from_account_currency);
+		setup_field_label_map(["received_amount"], frm.doc.paid_to_account_currency);
+
+		var party_account_currency = frm.doc.payment_type=="Receive" ?
+			frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
+
+		setup_field_label_map(["total_allocated_amount", "unallocated_amount"], party_account_currency);
+
+		$.each(field_label_map, function(fname, label) {
+			me.frm.fields_dict[fname].set_label(label);
+		});
+
+		setup_field_label_map(["total_amount", "outstanding_amount", "allocated_amount"],
+			party_account_currency, "references");
+
+		setup_field_label_map(["amount"], company_currency, "deductions");
+
+		$.each(grid_field_label_map, function(fname, label) {
+			fname = fname.split("-");
+			var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
+			if(df) df.label = label;
+		});
+
+		cur_frm.set_df_property("source_exchange_rate", "description",
+			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
+
+		cur_frm.set_df_property("target_exchange_rate", "description",
+			("1 " + frm.doc.paid_to_account_currency + " = [?] " + company_currency));
+
+		frm.refresh_fields();
+	},
+
+	show_general_ledger: function(frm) {
+		if(frm.doc.docstatus==1) {
+			frm.add_custom_button(__('Ledger'), function() {
+				frappe.route_options = {
+					"voucher_no": frm.doc.name,
+					"from_date": frm.doc.posting_date,
+					"to_date": frm.doc.posting_date,
+					"company": frm.doc.company,
+					group_by_voucher: 0
+				};
+				frappe.set_route("query-report", "General Ledger");
+			}, "icon-table");
+		}
+	},
+
+	payment_type: function(frm) {
+		if(frm.doc.payment_type == "Internal Transfer") {
+			$.each(["party", "party_balance", "paid_from", "paid_to",
+				"references", "total_allocated_amount"], function(i, field) {
+					frm.set_value(field, null);
+			})
+		} else {
+			if(!frm.doc.party)
+				frm.set_value("party_type", frm.doc.payment_type=="Receive" ? "Customer" : "Supplier");
+			else
+				frm.events.party(frm);
+
+			if(frm.doc.mode_of_payment)
+				frm.events.mode_of_payment(frm);
+		}
+	},
+
+	party_type: function(frm) {
+		if(frm.doc.party) {
+			$.each(["party", "party_balance", "paid_from", "paid_to",
+				"paid_from_account_currency", "paid_from_account_balance",
+				"paid_to_account_currency", "paid_to_account_balance",
+				"references", "total_allocated_amount"], function(i, field) {
+					frm.set_value(field, null);
+			})
+		}
+	},
+
+	party: function(frm) {
+		if(frm.doc.payment_type && frm.doc.party_type && frm.doc.party) {
+			frm.set_party_account_based_on_party = true;
+
+			return frappe.call({
+				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_details",
+				args: {
+					company: frm.doc.company,
+					party_type: frm.doc.party_type,
+					party: frm.doc.party,
+					date: frm.doc.posting_date
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						if(frm.doc.payment_type == "Receive") {
+							frm.set_value("paid_from", r.message.party_account);
+							frm.set_value("paid_from_account_currency", r.message.party_account_currency);
+							frm.set_value("paid_from_account_balance", r.message.account_balance);
+						} else if (frm.doc.payment_type == "Pay"){
+							frm.set_value("paid_to", r.message.party_account);
+							frm.set_value("paid_to_account_currency", r.message.party_account_currency);
+							frm.set_value("paid_to_account_balance", r.message.account_balance);
+						}
+						frm.set_value("party_balance", r.message.party_balance);
+						frm.events.get_outstanding_documents(frm);
+						frm.events.hide_unhide_fields(frm);
+						frm.events.set_dynamic_labels(frm);
+						frm.set_party_account_based_on_party = false;
+					}
+				}
+			});
+		}
+	},
+
+	mode_of_payment: function(frm) {
+		return  frappe.call({
+			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
+			args: {
+				"mode_of_payment": frm.doc.mode_of_payment,
+				"company": frm.doc.company
+			},
+			callback: function(r, rt) {
+				if(r.message) {
+					var payment_account_field = frm.doc.payment_type == "Receive" ? "paid_to" : "paid_from";
+					frm.set_value(payment_account_field, r.message['account']);
+				}
+			}
+		});
+	},
+
+	paid_from: function(frm) {
+		if(frm.set_party_account_based_on_party) return;
+
+		frm.events.set_account_currency_and_balance(frm, frm.doc.paid_from,
+			"paid_from_account_currency", "paid_from_account_balance", function(frm) {
+				if (frm.doc.payment_type == "Receive") {
+					frm.events.get_outstanding_documents(frm);
+				} else if (frm.doc.payment_type == "Pay") {
+					frm.events.paid_amount(frm);
+				}
+			}
+		);
+	},
+
+	paid_to: function(frm) {
+		if(frm.set_party_account_based_on_party) return;
+
+		frm.events.set_account_currency_and_balance(frm, frm.doc.paid_to,
+			"paid_to_account_currency", "paid_to_account_balance", function(frm) {
+				if(frm.doc.payment_type == "Pay") {
+					frm.events.get_outstanding_documents(frm);
+				} else if (frm.doc.payment_type == "Receive") {
+					frm.events.received_amount(frm);
+				}
+			}
+		);
+	},
+
+	set_account_currency_and_balance: function(frm, account, currency_field,
+			balance_field, callback_function) {
+		frappe.call({
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
+			args: {
+				"account": account,
+				"date": frm.doc.posting_date
+			},
+			callback: function(r, rt) {
+				if(r.message) {
+					frm.set_value(currency_field, r.message['account_currency']);
+					frm.set_value(balance_field, r.message['account_balance']);
+
+					if(frm.doc.payment_type=="Receive" && currency_field=="paid_to_account_currency") {
+						frm.toggle_reqd(["reference_no", "reference_date"],
+							(r.message['account_type'] == "Bank" ? 1 : 0));
+						if(!frm.doc.received_amount && frm.doc.paid_amount)
+							frm.events.paid_amount(frm);
+					} else if(frm.doc.payment_type=="Pay" && currency_field=="paid_from_account_currency") {
+						frm.toggle_reqd(["reference_no", "reference_date"],
+							(r.message['account_type'] == "Bank" ? 1 : 0));
+
+						if(!frm.doc.paid_amount && frm.doc.received_amount)
+							frm.events.received_amount(frm);
+					}
+
+					if(callback_function) callback_function(frm);
+
+					frm.events.hide_unhide_fields(frm);
+					frm.events.set_dynamic_labels(frm);
+				}
+			}
+		});
+	},
+
+	paid_from_account_currency: function(frm) {
+		if(!frm.doc.paid_from_account_currency) return;
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		if (frm.doc.paid_from_account_currency == company_currency) {
+			frm.set_value("source_exchange_rate", 1);
+		} else if (frm.doc.paid_from){
+			if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) {
+				frappe.call({
+					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate",
+					args: {
+						account: frm.doc.paid_from
+					},
+					callback: function(r, rt) {
+						frm.set_value("source_exchange_rate", r.message);
+					}
+				})
+			} else {
+				frm.events.set_current_exchange_rate(frm, "source_exchange_rate",
+					frm.doc.paid_from_account_currency, company_currency);
+			}
+		}
+	},
+
+	paid_to_account_currency: function(frm) {
+		if(!frm.doc.paid_to_account_currency) return;
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		frm.events.set_current_exchange_rate(frm, "target_exchange_rate",
+			frm.doc.paid_to_account_currency, company_currency);
+	},
+
+	set_current_exchange_rate: function(frm, exchange_rate_field, from_currency, to_currency) {
+		frappe.call({
+			method: "erpnext.setup.utils.get_exchange_rate",
+			args: {
+				from_currency: from_currency,
+				to_currency: to_currency
+			},
+			callback: function(r, rt) {
+				frm.set_value(exchange_rate_field, r.message);
+			}
+		})
+	},
+
+	source_exchange_rate: function(frm) {
+		if (frm.doc.paid_amount) {
+			frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
+			if(!frm.set_paid_amount_based_on_received_amount &&
+					(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
+				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+				frm.set_value("base_received_amount", frm.doc.base_paid_amount);
+			}
+			
+			frm.events.set_difference_amount(frm);
+		}
+	},
+
+	target_exchange_rate: function(frm) {
+		frm.set_paid_amount_based_on_received_amount = true;
+		
+		if (frm.doc.received_amount) {
+			frm.set_value("base_received_amount",
+				flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate));
+				
+			if(!frm.doc.source_exchange_rate && 
+					(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
+				frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+				frm.set_value("base_paid_amount", frm.doc.base_received_amount);
+			}
+			
+			frm.events.set_difference_amount(frm);
+		}
+		frm.set_paid_amount_based_on_received_amount = false;
+	},
+
+	paid_amount: function(frm) {
+		frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
+
+		frm.trigger("reset_received_amount");
+
+		frm.set_paid_amount_based_on_received_amount = false;
+	},
+
+	received_amount: function(frm) {
+		frm.set_paid_amount_based_on_received_amount = true;
+
+		if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
+			frm.set_value("paid_amount", frm.doc.received_amount);
+			frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
+			frm.set_value("base_paid_amount", frm.doc.base_received_amount);
+		}
+
+		frm.set_value("base_received_amount",
+			flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate));
+
+		if(frm.doc.payment_type == "Pay")
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
+		else
+			frm.events.set_difference_amount(frm);
+	},
+	
+	reset_received_amount: function(frm) {
+		if(!frm.set_paid_amount_based_on_received_amount &&
+				(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
+			
+			// var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
+			// 	function(d) { return d.amount}));
+			//
+			// var received_amount = frm.doc.paid_amount +
+			// 	flt(total_deductions) / flt(frm.doc.source_exchange_rate);
+			//
+			frm.set_value("received_amount", frm.doc.paid_amount);
+			frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
+			frm.set_value("base_received_amount", frm.doc.base_paid_amount);
+		}
+		if(frm.doc.payment_type == "Receive")
+			frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount);
+		else
+			frm.events.set_difference_amount(frm);
+	},
+
+	get_outstanding_documents: function(frm) {
+		frm.clear_table("references");
+
+		if(!frm.doc.party) return;
+
+		frm.events.check_mandatory_to_fetch(frm);
+		var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+
+		return  frappe.call({
+			method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
+			args: {
+				args: {
+					"company": frm.doc.company,
+					"party_type": frm.doc.party_type,
+					"payment_type": frm.doc.payment_type,
+					"party": frm.doc.party,
+					"party_account": frm.doc.payment_type=="Receive" ? frm.doc.paid_from : frm.doc.paid_to
+				}
+			},
+			callback: function(r, rt) {
+				if(r.message) {
+					var total_positive_outstanding = 0;
+					var total_negative_outstanding = 0;
+
+					$.each(r.message, function(i, d) {
+						var c = frm.add_child("references");
+						c.reference_doctype = d.voucher_type;
+						c.reference_name = d.voucher_no;
+						c.total_amount = d.invoice_amount;
+						c.outstanding_amount = d.outstanding_amount;
+						if(!in_list(["Sales Order", "Purchase Order"], d.voucher_type)) {
+							if(flt(d.outstanding_amount) > 0)
+								total_positive_outstanding += flt(d.outstanding_amount);
+							else
+								total_negative_outstanding += Math.abs(flt(d.outstanding_amount));
+						}
+
+						var party_account_currency = frm.doc.payment_type=="Receive" ?
+							frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
+
+						if(party_account_currency != company_currency) {
+							c.exchange_rate = d.exchange_rate;
+						} else {
+							c.exchange_rate = 1;
+						}
+						if (in_list(['Sales Invoice', 'Purchase Invoice'], d.reference_doctype)){
+							c.due_date = d.due_date;
+						}
+					});
+
+					if((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")) {
+							if(total_positive_outstanding > total_negative_outstanding)
+								frm.set_value("paid_amount",
+									total_positive_outstanding - total_negative_outstanding);
+					} else if (total_negative_outstanding &&
+							(total_positive_outstanding < total_negative_outstanding)) {
+						frm.set_value("received_amount",
+							total_negative_outstanding - total_positive_outstanding);
+					}
+				}
+
+				frm.events.allocate_party_amount_against_ref_docs(frm,
+					(frm.doc.payment_type=="Receive" ? frm.doc.paid_amount : frm.doc.received_amount));
+			}
+		});
+	},
+
+	allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
+		var total_positive_outstanding_including_order = 0;
+		var total_negative_outstanding = 0;
+
+		$.each(frm.doc.references || [], function(i, row) {
+			if(flt(row.outstanding_amount) > 0)
+				total_positive_outstanding_including_order += flt(row.outstanding_amount);
+			else
+				total_negative_outstanding += Math.abs(flt(row.outstanding_amount));
+		})
+
+		var allocated_negative_outstanding = 0;
+		if((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+				(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")) {
+			if(total_positive_outstanding_including_order > paid_amount) {
+				var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
+				allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
+					total_negative_outstanding : remaining_outstanding;
+			}
+
+			var allocated_positive_outstanding =  paid_amount + allocated_negative_outstanding;
+		} else {
+			if(paid_amount > total_negative_outstanding) {
+				if(total_negative_outstanding == 0) {
+					frappe.msgprint(__("Cannot {0} {1} {2} without any negative outstanding invoice",
+						[frm.doc.payment_type,
+							(frm.doc.party_type=="Customer" ? "to" : "from"), frm.doc.party_type]));
+					return false
+				} else {
+					frappe.msgprint(__("Paid Amount cannot be greater than total negative outstanding amount {0}", [total_negative_outstanding]));
+					return false;
+				}
+			} else {
+				allocated_positive_outstanding = total_negative_outstanding - paid_amount;
+				allocated_negative_outstanding = paid_amount +
+					(total_positive_outstanding_including_order < allocated_positive_outstanding ?
+						total_positive_outstanding_including_order : allocated_positive_outstanding)
+			}
+		}
+
+		$.each(frm.doc.references || [], function(i, row) {
+			row.allocated_amount = 0
+
+			if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
+				if(row.outstanding_amount >= allocated_positive_outstanding)
+						row.allocated_amount = allocated_positive_outstanding;
+				else row.allocated_amount = row.outstanding_amount;
+
+				allocated_positive_outstanding -= flt(row.allocated_amount);
+			} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
+				if(Math.abs(row.outstanding_amount) >= allocated_negative_outstanding)
+					row.allocated_amount = -1*allocated_negative_outstanding;
+				else row.allocated_amount = row.outstanding_amount;
+
+				allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
+			}
+		})
+		frm.refresh_fields()
+		frm.events.set_total_allocated_amount(frm);
+	},
+
+	set_total_allocated_amount: function(frm) {
+		var total_allocated_amount = base_total_allocated_amount = 0.0;
+		$.each(frm.doc.references || [], function(i, row) {
+			if (row.allocated_amount) {
+				total_allocated_amount += flt(row.allocated_amount);
+				base_total_allocated_amount += flt(flt(row.allocated_amount)*flt(row.exchange_rate),
+					precision("base_paid_amount"));
+			}
+		});
+		frm.set_value("total_allocated_amount", Math.abs(total_allocated_amount));
+		frm.set_value("base_total_allocated_amount", Math.abs(base_total_allocated_amount));
+
+		frm.events.set_difference_amount(frm);
+	},
+
+	set_difference_amount: function(frm) {
+		var unallocated_amount = 0;
+		if(frm.doc.party) {
+			var party_amount = frm.doc.payment_type=="Receive" ?
+				frm.doc.paid_amount : frm.doc.received_amount;
+
+			if(frm.doc.total_allocated_amount < party_amount)
+				unallocated_amount = party_amount - frm.doc.total_allocated_amount;
+		}
+
+		frm.set_value("unallocated_amount", unallocated_amount);
+
+		var difference_amount = 0;
+		var base_unallocated_amount = flt(frm.doc.unallocated_amount) *
+			(frm.doc.payment_type=="Receive" ? frm.doc.source_exchange_rate : frm.doc.target_exchange_rate);
+
+		var base_party_amount = flt(frm.doc.base_total_allocated_amount) + base_unallocated_amount;
+
+		if(frm.doc.payment_type == "Receive") {
+			difference_amount = base_party_amount - flt(frm.doc.base_received_amount);
+		} else if (frm.doc.payment_type == "Pay") {
+			difference_amount = flt(frm.doc.base_paid_amount) - base_party_amount;
+		} else {
+			difference_amount = flt(frm.doc.base_paid_amount) - flt(frm.doc.base_received_amount);
+		}
+
+		$.each(frm.doc.deductions || [], function(i, d) {
+			if(d.amount) difference_amount -= flt(d.amount);
+		})
+
+		frm.set_value("difference_amount", difference_amount);
+
+		frm.events.hide_unhide_fields(frm);
+	},
+
+	check_mandatory_to_fetch: function(frm) {
+		$.each(["Company", "Party Type", "Party", "payment_type"], function(i, field) {
+			if(!frm.doc[frappe.model.scrub(field)]) {
+				frappe.msgprint(__("Please select {0} first", [field]));
+				return false;
+			}
+
+		});
+	},
+
+	validate_reference_document: function(frm, row) {
+		var _validate = function(i, row) {
+			if (!row.reference_doctype) {
+				return;
+			}
+
+			if(frm.doc.party_type=="Customer"
+				&& !in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.reference_doctype)) {
+					frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
+					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry", [row.idx]));
+					return false;
+				}
+
+			if(frm.doc.party_type=="Supplier" && !in_list(["Purchase Order",
+				"Purchase Invoice", "Journal Entry"], row.reference_doctype)) {
+					frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
+					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
+					return false;
+				}
+		}
+
+		if (row) {
+			_validate(0, row);
+		} else {
+			$.each(frm.doc.vouchers || [], _validate);
+		}
+	},
+
+	write_off_difference_amount: function(frm) {
+		frm.events.set_deductions_entry(frm, "write_off_account");
+	},
+
+	set_exchange_gain_loss: function(frm) {
+		frm.events.set_deductions_entry(frm, "exchange_gain_loss_account");
+	},
+
+	set_deductions_entry: function(frm, account) {
+		if(frm.doc.difference_amount) {
+			frappe.call({
+				method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_company_defaults",
+				args: {
+					company: frm.doc.company
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						var write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
+							return t.account==r.message[account] ? t : null; });
+
+						if (!write_off_row.length) {
+							var row = frm.add_child("deductions");
+							row.account = r.message[account];
+							row.cost_center = r.message["cost_center"];
+						} else {
+							var row = write_off_row[0];
+						}
+
+						row.amount = flt(row.amount) + flt(frm.doc.difference_amount);
+						refresh_field("deductions");
+
+						frm.events.set_difference_amount(frm);
+					}
+				}
+			})
+		}
+	}
+});
+
+
+frappe.ui.form.on('Payment Entry Reference', {
+	reference_doctype: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		frm.events.validate_reference_document(frm, row);
+	},
+
+	reference_name: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		return frappe.call({
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_reference_details",
+			args: {
+				reference_doctype: row.reference_doctype,
+				reference_name: row.reference_name,
+				party_account_currency: frm.doc.payment_type=="Receive" ?
+					frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
+			},
+			callback: function(r, rt) {
+				if(r.message) {
+					$.each(r.message, function(field, value) {
+						frappe.model.set_value(cdt, cdn, field, value);
+					})
+					frm.refresh_fields();
+				}
+			}
+		})
+	},
+
+	allocated_amount: function(frm) {
+		frm.events.set_total_allocated_amount(frm);
+	},
+
+	references_remove: function(frm) {
+		frm.events.set_total_allocated_amount(frm);
+	}
+})
+
+frappe.ui.form.on('Payment Entry Deduction', {
+	amount: function(frm) {
+		frm.events.set_difference_amount(frm);
+	},
+
+	deductions_remove: function(frm) {
+		frm.events.set_difference_amount(frm);
+	}
+})
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
new file mode 100644
index 0000000..4e99293
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -0,0 +1,1407 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2016-06-01 14:38:51.012597", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "type_of_payment", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Type of Payment", 
+   "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": 1, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "PE-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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": "payment_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Receive\nPay\nInternal Transfer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type)", 
+   "fieldname": "party_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer\nSupplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.party_type", 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Party", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "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": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Posting Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Mode of Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "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": 1, 
+   "fieldname": "payment_accounts_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accounts", 
+   "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, 
+   "depends_on": "party", 
+   "fieldname": "party_balance", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Party Balance", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(in_list([\"Internal Transfer\", \"Pay\"], doc.payment_type) || doc.party)", 
+   "fieldname": "paid_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Paid From", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "paid_from", 
+   "fieldname": "paid_from_account_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Currency", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "paid_from", 
+   "fieldname": "paid_from_account_balance", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Balance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "paid_from_account_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:(in_list([\"Internal Transfer\", \"Receive\"], doc.payment_type) || doc.party)", 
+   "fieldname": "paid_to", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Paid To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "paid_to", 
+   "fieldname": "paid_to_account_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Currency", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "paid_to", 
+   "fieldname": "paid_to_account_balance", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account Balance", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "paid_to_account_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "collapsible_depends_on": "", 
+   "depends_on": "eval:(doc.paid_to && doc.paid_from)", 
+   "fieldname": "payment_amounts_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "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": 1, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "paid_from_account_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "", 
+   "fieldname": "source_exchange_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exchange Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "", 
+   "fieldname": "base_paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid 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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "received_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Received Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "paid_to_account_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "", 
+   "fieldname": "target_exchange_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exchange Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "", 
+   "fieldname": "base_received_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Received 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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "references", 
+   "depends_on": "eval:(doc.party && doc.paid_from && doc.paid_to && doc.paid_amount && doc.received_amount)", 
+   "fieldname": "section_break_14", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "references", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment References", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Entry Reference", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "section_break_34", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Writeoff", 
+   "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": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.paid_amount && doc.received_amount && doc.references)", 
+   "fieldname": "total_allocated_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Allocated Amount", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "base_total_allocated_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Allocated 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "set_exchange_gain_loss", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Set Exchange Gain / Loss", 
+   "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": "column_break_36", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.paid_amount && doc.received_amount && doc.references)", 
+   "fieldname": "unallocated_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Unallocated Amount", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.paid_amount && doc.received_amount)", 
+   "fieldname": "difference_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Difference 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "difference_amount", 
+   "fieldname": "write_off_difference_amount", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Write Off Difference Amount", 
+   "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": 1, 
+   "collapsible_depends_on": "deductions", 
+   "depends_on": "eval:(doc.paid_amount && doc.received_amount)", 
+   "fieldname": "deductions_or_loss_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Deductions or Loss", 
+   "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": "deductions", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payment Deductions or Loss", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Entry Deduction", 
+   "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": "transaction_references", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Transaction 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.paid_from && doc.paid_to)", 
+   "fieldname": "reference_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cheque/Reference No", 
+   "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": "column_break_23", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.paid_from && doc.paid_to)", 
+   "fieldname": "reference_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cheque/Reference Date", 
+   "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, 
+   "depends_on": "eval:doc.docstatus==1", 
+   "fieldname": "clearance_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Clearance Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": 1, 
+   "collapsible_depends_on": "", 
+   "depends_on": "eval:(doc.paid_from && doc.paid_to && doc.paid_amount && doc.received_amount)", 
+   "fieldname": "section_break_12", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "More Information", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "remarks", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Remarks", 
+   "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": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "print_heading", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Heading", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Print Heading", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Payment Entry", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Title", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 08:06:33.121527", 
+ "modified_by": "NuranVerkleij@example.com", 
+ "module": "Accounts", 
+ "name": "Payment Entry", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
new file mode 100644
index 0000000..28978cd
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -0,0 +1,678 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe import _, scrub, ValidationError
+from frappe.utils import flt, comma_or, nowdate
+from erpnext.accounts.utils import get_outstanding_invoices, get_account_currency, get_balance_on
+from erpnext.accounts.party import get_party_account
+from erpnext.accounts.doctype.journal_entry.journal_entry \
+	import get_average_exchange_rate, get_default_bank_cash_account
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.accounts.general_ledger import make_gl_entries
+
+from erpnext.controllers.accounts_controller import AccountsController
+
+class InvalidPaymentEntry(ValidationError): pass
+
+class PaymentEntry(AccountsController):
+	def setup_party_account_field(self):		
+		self.party_account_field = None
+		self.party_account = None
+		self.party_account_currency = None
+		
+		if self.payment_type == "Receive":
+			self.party_account_field = "paid_from"
+			self.party_account = self.paid_from
+			self.party_account_currency = self.paid_from_account_currency
+			
+		elif self.payment_type == "Pay":
+			self.party_account_field = "paid_to"
+			self.party_account = self.paid_to
+			self.party_account_currency = self.paid_to_account_currency
+							
+	def validate(self):
+		self.setup_party_account_field()
+		self.set_missing_values()
+		self.validate_payment_type()
+		self.validate_party_details()
+		self.validate_bank_accounts()
+		self.set_exchange_rate()
+		self.validate_mandatory()
+		self.validate_reference_documents()
+		self.set_amounts()
+		self.clear_unallocated_reference_document_rows()
+		self.validate_payment_against_negative_invoice()
+		self.validate_transaction_reference()
+		self.set_title()
+		self.set_remarks()
+		
+	def on_submit(self):
+		self.setup_party_account_field()
+		if self.difference_amount:
+			frappe.throw(_("Difference Amount must be zero"))
+		self.make_gl_entries()
+		self.update_advance_paid()
+		
+	def on_cancel(self):
+		self.setup_party_account_field()
+		self.make_gl_entries(cancel=1)
+		self.update_advance_paid()
+							
+	def set_missing_values(self):
+		if self.payment_type == "Internal Transfer":
+			for field in ("party", "party_balance", "total_allocated_amount", 
+				"base_total_allocated_amount", "unallocated_amount"):
+					self.set(field, None)
+			self.references = []
+		else:
+			if not self.party_type:
+				frappe.throw(_("Party Type is mandatory"))
+				
+			if not self.party:
+				frappe.throw(_("Party is mandatory"))
+		
+		if self.party:
+			if not self.party_balance:
+				self.party_balance = get_balance_on(party_type=self.party_type,
+					party=self.party, date=self.posting_date, company=self.company)
+			
+			if not self.party_account:
+				party_account = get_party_account(self.party_type, self.party, self.company)
+				self.set(self.party_account_field, party_account)
+				self.party_account = party_account
+				
+		if self.paid_from and not (self.paid_from_account_currency or self.paid_from_account_balance):
+			acc = get_account_details(self.paid_from, self.posting_date)
+			self.paid_from_account_currency = acc.account_currency
+			self.paid_from_account_balance = acc.account_balance
+				
+		if self.paid_to and not (self.paid_to_account_currency or self.paid_to_account_balance):
+			acc = get_account_details(self.paid_to, self.posting_date)
+			self.paid_to_account_currency = acc.account_currency
+			self.paid_to_account_balance = acc.account_balance
+			
+		self.party_account_currency = self.paid_from_account_currency \
+			if self.payment_type=="Receive" else self.paid_to_account_currency
+			
+		self.set_missing_ref_details()
+			
+	
+	def set_missing_ref_details(self):
+		for d in self.get("references"):
+			if d.allocated_amount:
+				ref_details = get_reference_details(d.reference_doctype, 
+					d.reference_name, self.party_account_currency)
+					
+				for field, value in ref_details.items():
+					if not d.get(field):
+						d.set(field, value)
+						
+	def validate_payment_type(self):
+		if self.payment_type not in ("Receive", "Pay", "Internal Transfer"):
+			frappe.throw(_("Payment Type must be one of Receive, Pay and Internal Transfer"))
+	
+	def validate_party_details(self):
+		if self.party:
+			if not frappe.db.exists(self.party_type, self.party):
+				frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
+			
+			if self.party_account:
+				party_account_type = "Receivable" if self.party_type=="Customer" else "Payable"
+				self.validate_account_type(self.party_account, [party_account_type])
+					
+	def validate_bank_accounts(self):
+		if self.payment_type in ("Pay", "Internal Transfer"):
+			self.validate_account_type(self.paid_from, ["Bank", "Cash"])
+			
+		if self.payment_type in ("Receive", "Internal Transfer"):
+			self.validate_account_type(self.paid_to, ["Bank", "Cash"])
+			
+	def validate_account_type(self, account, account_types):
+		account_type = frappe.db.get_value("Account", account, "account_type")
+		if account_type not in account_types:
+			frappe.throw(_("Account Type for {0} must be {1}").format(account, comma_or(account_types)))
+				
+	def set_exchange_rate(self):
+		if self.paid_from and not self.source_exchange_rate:
+			if self.paid_from_account_currency == self.company_currency:
+				self.source_exchange_rate = 1
+			elif self.payment_type in ("Pay", "Internal Transfer"):
+				self.source_exchange_rate = get_average_exchange_rate(self.paid_from)
+			else:
+				self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency, 
+					self.company_currency)
+		
+		if self.paid_to and not self.target_exchange_rate:
+			self.target_exchange_rate = get_exchange_rate(self.paid_to_account_currency, 
+				self.company_currency)
+				
+	def validate_mandatory(self):
+		for field in ("paid_amount", "received_amount", "source_exchange_rate", "target_exchange_rate"):
+			if not self.get(field):
+				frappe.throw(_("{0} is mandatory").format(self.meta.get_label(field)))
+				
+	def validate_reference_documents(self):
+		if self.party_type == "Customer":
+			valid_reference_doctypes = ("Sales Order", "Sales Invoice", "Journal Entry")
+		else:
+			valid_reference_doctypes = ("Purchase Order", "Purchase Invoice", "Journal Entry")
+			
+		for d in self.get("references"):
+			if not d.allocated_amount:
+				continue
+			if d.reference_doctype not in valid_reference_doctypes:
+				frappe.throw(_("Reference Doctype must be one of {0}")
+					.format(comma_or(valid_reference_doctypes)))
+				
+			elif d.reference_name:
+				if not frappe.db.exists(d.reference_doctype, d.reference_name):
+					frappe.throw(_("{0} {1} does not exist").format(d.reference_doctype, d.reference_name))
+				else:
+					ref_doc = frappe.get_doc(d.reference_doctype, d.reference_name)
+
+					if d.reference_doctype != "Journal Entry":
+						if self.party != ref_doc.get(scrub(self.party_type)):
+							frappe.throw(_("{0} {1} does not associated with {2} {3}")
+								.format(d.reference_doctype, d.reference_name, self.party_type, self.party))
+					else:
+						self.validate_journal_entry()
+								
+					if d.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
+						ref_party_account = ref_doc.debit_to \
+							if self.party_type=="Customer" else ref_doc.credit_to
+						if ref_party_account != self.party_account:
+							frappe.throw(_("{0} {1} does not associated with Party Account {2}")
+								.format(d.reference_doctype, d.reference_name, self.party_account))
+						
+					if ref_doc.docstatus != 1:
+						frappe.throw(_("{0} {1} must be submitted")
+							.format(d.reference_doctype, d.reference_name))
+							
+	def validate_journal_entry(self):
+		for d in self.get("references"):
+			if d.allocated_amount and d.reference_doctype == "Journal Entry":				
+				je_accounts = frappe.db.sql("""select debit, credit from `tabJournal Entry Account`
+					where account = %s and party=%s and docstatus = 1 and parent = %s
+					and (reference_type is null or reference_type in ("", "Sales Order", "Purchase Order"))
+					""", (self.party_account, self.party, d.reference_name), as_dict=True)
+
+				if not je_accounts:
+					frappe.throw(_("Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher")
+						.format(d.idx, d.reference_name, self.party_account))
+				else:
+					dr_or_cr = "debit" if self.payment_type == "Receive" else "credit"
+					valid = False
+					for jvd in je_accounts:
+						if flt(jvd[dr_or_cr]) > 0:
+							valid = True
+					if not valid:
+						frappe.throw(_("Against Journal Entry {0} does not have any unmatched {1} entry")
+							.format(d.reference_name, dr_or_cr))
+							
+	def set_amounts(self):
+		self.set_amounts_in_company_currency()
+		self.set_total_allocated_amount()
+		self.set_unallocated_amount()
+		self.set_difference_amount()
+
+	def set_amounts_in_company_currency(self):
+		self.base_paid_amount, self.base_received_amount, self.difference_amount = 0, 0, 0
+		if self.paid_amount:
+			self.base_paid_amount = flt(flt(self.paid_amount) * flt(self.source_exchange_rate), 
+				self.precision("base_paid_amount"))
+				
+		if self.received_amount:
+			self.base_received_amount = flt(flt(self.received_amount) * flt(self.target_exchange_rate), 
+				self.precision("base_received_amount"))
+				
+	def set_total_allocated_amount(self):
+		if self.payment_type == "Internal Transfer":
+			return
+			
+		total_allocated_amount, base_total_allocated_amount = 0, 0
+		for d in self.get("references"):
+			if d.allocated_amount:				
+				total_allocated_amount += flt(d.allocated_amount)
+				base_total_allocated_amount += flt(flt(d.allocated_amount) * flt(d.exchange_rate), 
+					self.precision("base_paid_amount"))
+					
+		self.total_allocated_amount = abs(total_allocated_amount)
+		self.base_total_allocated_amount = abs(base_total_allocated_amount)
+	
+	def set_unallocated_amount(self):
+		self.unallocated_amount = 0;
+		if self.party:
+			party_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
+			
+			if self.total_allocated_amount < party_amount:
+				self.unallocated_amount = party_amount - self.total_allocated_amount
+				
+	def set_difference_amount(self):
+		base_unallocated_amount = flt(self.unallocated_amount) * \
+			(self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate)
+			
+		base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
+		
+		if self.payment_type == "Receive":
+			self.difference_amount = base_party_amount - self.base_received_amount
+		elif self.payment_type == "Pay":
+			self.difference_amount = self.base_paid_amount - base_party_amount
+		else:
+			self.difference_amount = self.base_paid_amount - flt(self.base_received_amount)
+			
+		for d in self.get("deductions"):
+			if d.amount:
+				self.difference_amount -= flt(d.amount)
+				
+	def clear_unallocated_reference_document_rows(self):
+		self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]}))
+
+		frappe.db.sql("""delete from `tabPayment Entry Reference` 
+			where parent = %s and allocated_amount = 0""", self.name)
+			
+	def validate_payment_against_negative_invoice(self):
+		if ((self.payment_type=="Pay" and self.party_type=="Customer") 
+				or (self.payment_type=="Receive" and self.party_type=="Supplier")):
+				
+			total_negative_outstanding = sum([abs(flt(d.outstanding_amount)) 
+				for d in self.get("references") if flt(d.outstanding_amount) < 0])
+			
+			party_amount = self.paid_amount if self.payment_type=="Receive" else self.received_amount
+
+			if not total_negative_outstanding:
+				frappe.throw(_("Cannot {0} {1} {2} without any negative outstanding invoice")
+					.format(self.payment_type, ("to" if self.party_type=="Customer" else "from"), 
+						self.party_type), InvalidPaymentEntry)
+					
+			elif party_amount > total_negative_outstanding:
+				frappe.throw(_("Paid Amount cannot be greater than total negative outstanding amount {0}")
+					.format(total_negative_outstanding), InvalidPaymentEntry)
+			
+	def set_title(self):
+		if self.payment_type in ("Receive", "Pay"):
+			self.title = self.party
+		else:
+			self.title = self.paid_from + " - " + self.paid_to
+			
+	def validate_transaction_reference(self):
+		bank_account = self.paid_to if self.payment_type == "Receive" else self.paid_from
+		bank_account_type = frappe.db.get_value("Account", bank_account, "account_type")
+		
+		if bank_account_type == "Bank":
+			if not self.reference_no or not self.reference_date:
+				frappe.throw(_("Reference No and Reference Date is mandatory for Bank transaction"))
+				
+	def set_remarks(self):
+		if self.remarks: return
+		
+		if self.payment_type=="Internal Transfer":
+			remarks = [_("Amount {0} {1} transferred from {2} to {3}")
+				.format(self.paid_from_account_currency, self.paid_amount, self.paid_from, self.paid_to)]
+		else:
+			
+			remarks = [_("Amount {0} {1} {2} {3}").format(
+				self.party_account_currency,
+				self.paid_amount if self.payment_type=="Receive" else self.received_amount,
+				_("received from") if self.payment_type=="Receive" else _("to"), self.party
+			)]
+			
+		if self.reference_no:
+			remarks.append(_("Transaction reference no {0} dated {1}")
+				.format(self.reference_no, self.reference_date))
+
+		if self.payment_type in ["Receive", "Pay"]:
+			for d in self.get("references"):
+				if d.allocated_amount:
+					remarks.append(_("Amount {0} {1} against {2} {3}").format(self.party_account_currency, 
+						d.allocated_amount, d.reference_doctype, d.reference_name))
+		
+		for d in self.get("deductions"):
+			if d.amount:
+				remarks.append(_("Amount {0} {1} deducted against {2}")
+					.format(self.company_currency, d.amount, d.account))
+
+		self.set("remarks", "\n".join(remarks))
+			
+	def make_gl_entries(self, cancel=0, adv_adj=0):
+		if self.payment_type in ("Receive", "Pay") and not self.get("party_account_field"):
+			self.setup_party_account_field()
+			
+		gl_entries = []
+		self.add_party_gl_entries(gl_entries)
+		self.add_bank_gl_entries(gl_entries)
+		self.add_deductions_gl_entries(gl_entries)
+
+		make_gl_entries(gl_entries, cancel=cancel, adv_adj=adv_adj)
+		
+	def add_party_gl_entries(self, gl_entries):
+		if self.party_account:
+			if self.payment_type=="Receive":
+				against_account = self.paid_to
+			else:
+				 against_account = self.paid_from
+			
+				
+			party_gl_dict = self.get_gl_dict({
+				"account": self.party_account,
+				"party_type": self.party_type,
+				"party": self.party,
+				"against": against_account,
+				"account_currency": self.party_account_currency
+			})
+			
+			dr_or_cr = "credit" if self.party_type == "Customer" else "debit"
+			
+			for d in self.get("references"):
+				gle = party_gl_dict.copy()
+				gle.update({
+					"against_voucher_type": d.reference_doctype,
+					"against_voucher": d.reference_name
+				})
+				
+				allocated_amount_in_company_currency = flt(flt(d.allocated_amount) * flt(d.exchange_rate), 
+					self.precision("paid_amount"))	
+				
+				gle.update({
+					dr_or_cr + "_in_account_currency": d.allocated_amount,
+					dr_or_cr: allocated_amount_in_company_currency
+				})
+				
+				gl_entries.append(gle)
+				
+			if self.unallocated_amount:
+				base_unallocated_amount = base_unallocated_amount = self.unallocated_amount * \
+					(self.source_exchange_rate if self.payment_type=="Receive" else self.target_exchange_rate)
+					
+				gle = party_gl_dict.copy()
+				
+				gle.update({
+					dr_or_cr + "_in_account_currency": self.unallocated_amount,
+					dr_or_cr: base_unallocated_amount
+				})
+
+				gl_entries.append(gle)
+				
+	def add_bank_gl_entries(self, gl_entries):
+		if self.payment_type in ("Pay", "Internal Transfer"):
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": self.paid_from,
+					"account_currency": self.paid_from_account_currency,
+					"against": self.party if self.payment_type=="Pay" else self.paid_to,
+					"credit_in_account_currency": self.paid_amount,
+					"credit": self.base_paid_amount
+				})
+			)
+		if self.payment_type in ("Receive", "Internal Transfer"):
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": self.paid_to,
+					"account_currency": self.paid_to_account_currency,
+					"against": self.party if self.payment_type=="Receive" else self.paid_from,
+					"debit_in_account_currency": self.received_amount,
+					"debit": self.base_received_amount
+				})
+			)
+			
+	def add_deductions_gl_entries(self, gl_entries):
+		for d in self.get("deductions"):
+			if d.amount:
+				account_currency = get_account_currency(d.account)
+				if account_currency != self.company_currency:
+					frappe.throw(_("Currency for {0} must be {1}").format(d.account, self.company_currency))
+					
+				gl_entries.append(
+					self.get_gl_dict({
+						"account": d.account,
+						"account_currency": account_currency,
+						"against": self.party or self.paid_from,
+						"debit_in_account_currency": d.amount,
+						"debit": d.amount,
+						"cost_center": d.cost_center
+					})
+				)
+				
+	def update_advance_paid(self):
+		if self.payment_type in ("Receive", "Pay") and self.party:
+			for d in self.get("references"):
+				if d.allocated_amount and d.reference_doctype in ("Sales Order", "Purchase Order"):
+					frappe.get_doc(d.reference_doctype, d.reference_name).set_total_advance_paid()
+
+@frappe.whitelist()
+def get_outstanding_reference_documents(args):
+	args = json.loads(args)
+
+	party_account_currency = get_account_currency(args.get("party_account"))
+	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")
+	
+	# Get negative outstanding sales /purchase invoices
+	total_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
+		
+	negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"), 
+		args.get("party"), args.get("party_account"), total_field)
+
+	# Get positive outstanding sales /purchase invoices
+	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"), 
+		args.get("party_account"))
+	
+	for d in outstanding_invoices:
+		d["exchange_rate"] = 1
+		if party_account_currency != company_currency \
+			and d.voucher_type in ("Sales Invoice", "Purchase Invoice"):
+				d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
+
+	# 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 negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
+	
+def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
+	voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
+
+	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
+
+	orders = frappe.db.sql("""
+		select
+			name as voucher_no,
+			{ref_field} as invoice_amount,
+			({ref_field} - advance_paid) as outstanding_amount,
+			transaction_date as posting_date
+		from
+			`tab{voucher_type}`
+		where
+			{party_type} = %s
+			and docstatus = 1
+			and ifnull(status, "") != "Closed"
+			and {ref_field} > advance_paid
+			and abs(100 - per_billed) > 0.01
+		order by
+			transaction_date, name
+		""".format(**{
+			"ref_field": ref_field,
+			"voucher_type": voucher_type,
+			"party_type": scrub(party_type)
+		}), party, as_dict = True)
+
+	order_list = []
+	for d in orders:
+		d["voucher_type"] = voucher_type
+		d["exchange_rate"] = get_exchange_rate(party_account_currency, company_currency)
+		order_list.append(d)
+
+	return order_list
+	
+def get_negative_outstanding_invoices(party_type, party, party_account, total_field):
+	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
+	return frappe.db.sql("""
+		select
+			"{voucher_type}" as voucher_type, name as voucher_no, 
+			{total_field} as invoice_amount, outstanding_amount, posting_date, 
+			due_date, conversion_rate as exchange_rate
+		from
+			`tab{voucher_type}`
+		where
+			{party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
+		order by
+			posting_date, name
+		""".format(**{
+			"total_field": total_field,
+			"voucher_type": voucher_type,
+			"party_type": scrub(party_type),
+			"party_account": "debit_to" if party_type=="Customer" else "credit_to"
+		}), (party, party_account), as_dict = True)
+	
+@frappe.whitelist()
+def get_party_details(company, party_type, party, date):
+	if not frappe.db.exists(party_type, party):
+		frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
+		
+	party_account = get_party_account(party_type, party, company)
+	
+	account_currency = get_account_currency(party_account)
+	account_balance = get_balance_on(party_account, date)
+	party_balance = get_balance_on(party_type=party_type, party=party)
+	
+	return {
+		"party_account": party_account,
+		"party_account_currency": account_currency,
+		"party_balance": party_balance,
+		"account_balance": account_balance
+	}
+
+@frappe.whitelist()	
+def get_account_details(account, date):
+	frappe.has_permission('Payment Entry', throw=True)
+	return frappe._dict({
+		"account_currency": get_account_currency(account),
+		"account_balance": get_balance_on(account, date),
+		"account_type": frappe.db.get_value("Account", account, "account_type")
+	})
+	
+@frappe.whitelist()
+def get_company_defaults(company):
+	fields = ["write_off_account", "exchange_gain_loss_account", "cost_center"]
+	ret = frappe.db.get_value("Company", company, fields, as_dict=1)
+	
+	for fieldname in fields:
+		if not ret[fieldname]:
+			frappe.throw(_("Please set default {0} in Company {1}")
+				.format(frappe.get_meta("Company").get_label(fieldname), company))
+	
+	return ret
+
+@frappe.whitelist()
+def get_reference_details(reference_doctype, reference_name, party_account_currency):
+	total_amount = outstanding_amount = exchange_rate = None
+	
+	if reference_doctype != "Journal Entry":
+		ref_doc = frappe.get_doc(reference_doctype, reference_name)
+
+		if party_account_currency == ref_doc.company_currency:
+			total_amount = ref_doc.base_grand_total
+			exchange_rate = 1
+		else:
+			total_amount = ref_doc.grand_total
+			exchange_rate = ref_doc.get("conversion_rate") or \
+				get_exchange_rate(party_account_currency, ref_doc.company_currency)
+		
+		outstanding_amount = ref_doc.get("outstanding_amount") \
+			if reference_doctype in ("Sales Invoice", "Purchase Invoice") \
+			else flt(total_amount) - flt(ref_doc.advance_paid)			
+	else:
+		exchange_rate = get_exchange_rate(party_account_currency, ref_doc.company_currency)
+		
+	return frappe._dict({
+		"due_date": ref_doc.get("due_date"),
+		"total_amount": total_amount,
+		"outstanding_amount": outstanding_amount,
+		"exchange_rate": exchange_rate
+	})
+	
+@frappe.whitelist()
+def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=None):
+	doc = frappe.get_doc(dt, dn)
+	
+	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) > 0:
+		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
+	
+	party_type = "Customer" if dt in ("Sales Invoice", "Sales Order") else "Supplier"
+
+	# party account
+	if dt == "Sales Invoice":
+		party_account = doc.debit_to
+	elif dt == "Purchase Invoice":
+		party_account = doc.credit_to
+	else:
+		party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company)
+		
+	party_account_currency = doc.get("party_account_currency") or get_account_currency(party_account)
+	
+	# payment type
+	if (dt == "Sales Order" or (dt=="Sales Invoice" and doc.outstanding_amount > 0)) \
+		or (dt=="Purchase Invoice" and doc.outstanding_amount < 0):
+			payment_type = "Receive"
+	else:
+		payment_type = "Pay"
+	
+	# amounts
+	grand_total = outstanding_amount = 0
+	if party_amount:
+		grand_total = outstanding_amount = party_amount
+	elif dt in ("Sales Invoice", "Purchase Invoice"):
+		grand_total = doc.grand_total
+		outstanding_amount = doc.outstanding_amount
+	else:
+		total_field = "base_grand_total" if party_account_currency == doc.company_currency else "grand_total"
+		grand_total = flt(doc.get(total_field))
+		outstanding_amount = grand_total - flt(doc.advance_paid)
+
+	# bank or cash
+	bank = get_default_bank_cash_account(doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"), 
+		account=bank_account)
+	
+	paid_amount = received_amount = 0
+	if party_account_currency == bank.account_currency:
+		paid_amount = received_amount = abs(outstanding_amount)
+	elif payment_type == "Receive":
+		paid_amount = abs(outstanding_amount)
+		if bank_amount:
+			received_amount = bank_amount
+	else:
+		received_amount = abs(outstanding_amount)
+		if bank_amount:
+			paid_amount = bank_amount
+	
+	pe = frappe.new_doc("Payment Entry")
+	pe.payment_type = payment_type
+	pe.company = doc.company
+	pe.posting_date = nowdate()
+	pe.mode_of_payment = doc.get("mode_of_payment")
+	pe.party_type = party_type
+	pe.party = doc.get(scrub(party_type))
+	pe.paid_from = party_account if payment_type=="Receive" else bank.account
+	pe.paid_to = party_account if payment_type=="Pay" else bank.account
+	pe.paid_from_account_currency = party_account_currency \
+		if payment_type=="Receive" else bank.account_currency
+	pe.paid_to_account_currency = party_account_currency if payment_type=="Pay" else bank.account_currency
+	pe.paid_amount = paid_amount
+	pe.received_amount = received_amount
+	
+	pe.append("references", {
+		"reference_doctype": dt,
+		"reference_name": dn,
+		"due_date": doc.get("due_date"),
+		"total_amount": grand_total,
+		"outstanding_amount": outstanding_amount,
+		"allocated_amount": outstanding_amount
+	})
+
+	pe.setup_party_account_field()
+	pe.set_missing_values()
+	if bank:
+		pe.set_exchange_rate()
+		pe.set_amounts()
+	return pe
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
new file mode 100644
index 0000000..81230d0
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
@@ -0,0 +1,6 @@
+frappe.listview_settings['Payment Entry'] = {
+	add_fields: ["payment_type"],
+	get_indicator: function(doc) {
+		return [__(doc.payment_type), (doc.docstatus==0 ? 'red' : 'blue'), 'status=' + doc.payment_type]
+	}
+}
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
new file mode 100644
index 0000000..8be5f6d
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -0,0 +1,218 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import flt, nowdate
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, InvalidPaymentEntry
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
+
+test_dependencies = ["Item"]
+
+class TestPaymentEntry(unittest.TestCase):
+	def test_payment_entry_against_order(self):
+		so = make_sales_order()
+		pe = get_payment_entry("Sales Order", so.name, bank_account="_Test Cash - _TC")
+		pe.paid_from = "Debtors - _TC"
+		pe.insert()
+		pe.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["Debtors - _TC", 0, 1000, so.name],
+			["_Test Cash - _TC", 1000.0, 0, None]
+		])
+		
+		self.validate_gl_entries(pe.name, expected_gle)
+		
+		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
+		self.assertEqual(so_advance_paid, 1000)
+		
+		pe.cancel()
+		
+		self.assertFalse(self.get_gle(pe.name))
+		
+		so_advance_paid = frappe.db.get_value("Sales Order", so.name, "advance_paid")
+		self.assertEqual(so_advance_paid, 0)
+		
+	def test_payment_entry_against_si_usd_to_usd(self):
+		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+			currency="USD", conversion_rate=50)
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank USD - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.target_exchange_rate = 50		
+		pe.insert()
+		pe.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Receivable USD - _TC", 0, 5000, si.name],
+			["_Test Bank USD - _TC", 5000.0, 0, None]
+		])
+		
+		self.validate_gl_entries(pe.name, expected_gle)
+		
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 0)
+		
+		pe.cancel()
+		self.assertFalse(self.get_gle(pe.name))
+		
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 100)
+		
+	def test_payment_entry_against_pi(self):
+		pi =  make_purchase_invoice(supplier="_Test Supplier USD", debit_to="_Test Payable USD - _TC",
+			currency="USD", conversion_rate=50)
+		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank USD - _TC")
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		pe.source_exchange_rate = 50		
+		pe.insert()
+		pe.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Payable USD - _TC", 12500, 0, pi.name],
+			["_Test Bank USD - _TC", 0, 12500, None]
+		])
+		
+		self.validate_gl_entries(pe.name, expected_gle)
+		
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", pi.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 0)
+		
+	def test_payment_entry_against_si_usd_to_inr(self):
+		si =  create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
+			currency="USD", conversion_rate=50)
+		pe = get_payment_entry("Sales Invoice", si.name, party_amount=20, 
+			bank_account="_Test Bank - _TC", bank_amount=900)
+		pe.reference_no = "1"
+		pe.reference_date = "2016-01-01"
+		
+		self.assertEqual(pe.difference_amount, 100)
+		
+		pe.append("deductions", {
+			"account": "_Test Exchange Gain/Loss - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"amount": 100
+		})
+		pe.insert()
+		pe.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Receivable USD - _TC", 0, 1000, si.name],
+			["_Test Bank - _TC", 900, 0, None],
+			["_Test Exchange Gain/Loss - _TC", 100.0, 0, None],
+		])
+		
+		self.validate_gl_entries(pe.name, expected_gle)
+		
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 80)
+		
+	def test_internal_transfer_usd_to_inr(self):
+		pe = frappe.new_doc("Payment Entry")
+		pe.payment_type = "Internal Transfer"
+		pe.company = "_Test Company"
+		pe.paid_from = "_Test Bank USD - _TC"
+		pe.paid_to = "_Test Bank - _TC"
+		pe.paid_amount = 100
+		pe.source_exchange_rate = 50
+		pe.received_amount = 4500
+		pe.reference_no = "2"
+		pe.reference_date = nowdate()
+		
+		pe.setup_party_account_field()
+		pe.set_missing_values()
+		pe.set_exchange_rate()
+		pe.set_amounts()
+				
+		self.assertEquals(pe.difference_amount, 500)
+		
+		pe.append("deductions", {
+			"account": "_Test Exchange Gain/Loss - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"amount": 500
+		})
+		
+		pe.insert()
+		pe.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Bank USD - _TC", 0, 5000, None],
+			["_Test Bank - _TC", 4500, 0, None],
+			["_Test Exchange Gain/Loss - _TC", 500.0, 0, None],
+		])
+		
+		self.validate_gl_entries(pe.name, expected_gle)
+		
+	def test_payment_against_negative_sales_invoice(self):
+		pe1 = frappe.new_doc("Payment Entry")
+		pe1.payment_type = "Pay"
+		pe1.company = "_Test Company"
+		pe1.party_type = "Customer"
+		pe1.party = "_Test Customer"
+		pe1.paid_from = "_Test Cash - _TC"
+		pe1.paid_amount = 100
+		pe1.received_amount = 100
+		
+		self.assertRaises(InvalidPaymentEntry, pe1.validate)
+		
+		si1 =  create_sales_invoice()
+		
+		# create full payment entry against si1
+		pe2 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")
+		pe2.insert()
+		pe2.submit()
+		
+		# create return entry against si1
+		create_sales_invoice(is_return=1, return_against=si1.name, qty=-1)
+		si1_outstanding = frappe.db.get_value("Sales Invoice", si1.name, "outstanding_amount")
+		self.assertEqual(si1_outstanding, -100)
+		
+		# pay more than outstanding against si1
+		pe3 = get_payment_entry("Sales Invoice", si1.name, bank_account="_Test Cash - _TC")
+		pe3.paid_amount = pe3.received_amount = 300
+		self.assertRaises(InvalidPaymentEntry, pe3.validate)
+		
+		# pay negative outstanding against si1
+		pe3.paid_to = "Debtors - _TC"
+		pe3.paid_amount = pe3.received_amount = 100
+		
+		pe3.insert()
+		pe3.submit()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["Debtors - _TC", 100, 0, si1.name],
+			["_Test Cash - _TC", 0, 100, None]
+		])
+
+		self.validate_gl_entries(pe3.name, expected_gle)
+
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si1.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, 0)
+
+		pe3.cancel()
+		self.assertFalse(self.get_gle(pe3.name))
+
+		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si1.name, "outstanding_amount"))
+		self.assertEqual(outstanding_amount, -100)
+		
+	def validate_gl_entries(self, voucher_no, expected_gle):
+		gl_entries = self.get_gle(voucher_no)
+			
+		self.assertTrue(gl_entries)
+
+		for i, gle in enumerate(gl_entries):
+			self.assertEquals(expected_gle[gle.account][0], gle.account)
+			self.assertEquals(expected_gle[gle.account][1], gle.debit)
+			self.assertEquals(expected_gle[gle.account][2], gle.credit)
+			self.assertEquals(expected_gle[gle.account][3], gle.against_voucher)
+		
+	def get_gle(self, voucher_no):
+		return frappe.db.sql("""select account, debit, credit, against_voucher
+			from `tabGL Entry` where voucher_type='Payment Entry' and voucher_no=%s
+			order by account asc""", voucher_no, as_dict=1)
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/payment_entry_deduction/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/payment_entry_deduction/__init__.py
diff --git a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
new file mode 100644
index 0000000..b4d63f8
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
@@ -0,0 +1,114 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-15 15:56:30.815503", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:03.420683", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Entry Deduction", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.py b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.py
new file mode 100644
index 0000000..d6686bb
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PaymentEntryDeduction(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/payment_entry_reference/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/payment_entry_reference/__init__.py
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
new file mode 100644
index 0000000..6441748
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -0,0 +1,238 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-01 16:55:32.196722", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "reference_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "reference_name", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "reference_doctype", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Due Date", 
+   "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, 
+   "search_index": 0, 
+   "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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Total Amount", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "outstanding_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Outstanding", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "allocated_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Allocated", 
+   "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": "exchange_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exchange Rate", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-14 14:48:13.356944", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Payment Entry Reference", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py
new file mode 100644
index 0000000..51f8c06
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PaymentEntryReference(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
index df8eaeb..91089af 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -16,6 +16,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payment Gateway", 
@@ -41,6 +42,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Default", 
@@ -65,6 +67,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -88,6 +91,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payment Account", 
@@ -113,6 +117,7 @@
    "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
@@ -138,6 +143,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -160,9 +166,10 @@
    "collapsible": 0, 
    "default": "Please click on the link below to make your payment", 
    "fieldname": "message", 
-   "fieldtype": "Text Editor", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Payment Request Message", 
@@ -183,16 +190,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "Click here to make a payment", 
-   "fieldname": "payment_url_message", 
-   "fieldtype": "Data", 
+   "fieldname": "message_examples", 
+   "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Payment URL Message", 
+   "label": "Message Examples", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt; Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.&lt;/p&gt;\n\n&lt;p&gt; Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;p&gt; We don't want you to be spending time running around in order to pay for your Bill.<br>After all, life is beautiful and the time you have in hand should be spent to enjoy it!<br>So here are our little ways to help you get more time for life! &lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -214,7 +222,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-01-21 11:32:10.311015", 
+ "modified": "2016-04-27 17:47:53.979690", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Gateway Account", 
@@ -262,8 +270,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 5075f15..027fa63 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -4,6 +4,14 @@
 frappe.provide("erpnext.accounts");
 
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
+	setup: function() {
+		this.frm.get_field('payments').grid.editable_fields = [
+			{fieldname: 'reference_name', columns: 3},
+			{fieldname: 'invoice_number', columns: 3},
+			{fieldname: 'amount', columns: 2},
+			{fieldname: 'allocated_amount', columns: 2}
+		];
+	},
 
 	onload: function() {
 		var me = this
@@ -106,12 +114,14 @@
 				invoices.push(row.invoice_type + " | " + row.invoice_number);
 		});
 
-		frappe.meta.get_docfield("Payment Reconciliation Payment", "invoice_number",
-			me.frm.doc.name).options = invoices.join("\n");
+		if (invoices) {
+			frappe.meta.get_docfield("Payment Reconciliation Payment", "invoice_number",
+				me.frm.doc.name).options = "\n" + invoices.join("\n");
 
-		$.each(me.frm.doc.payments || [], function(i, p) {
-			if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
-		});
+			$.each(me.frm.doc.payments || [], function(i, p) {
+				if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
+			});
+		}
 
 		refresh_field("payments");
 	},
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 832a346..5910a24 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -7,31 +7,49 @@
 from frappe import msgprint, _
 from frappe.model.document import Document
 from erpnext.accounts.utils import get_outstanding_invoices
+from erpnext.controllers.accounts_controller import get_advance_payment_entries
 
 class PaymentReconciliation(Document):
 	def get_unreconciled_entries(self):
-		self.get_jv_entries()
+		self.get_nonreconciled_payment_entries()
 		self.get_invoice_entries()
+		
+	def get_nonreconciled_payment_entries(self):
+		self.check_mandatory_to_fetch()
+		
+		payment_entries = self.get_payment_entries()
+		journal_entries = self.get_jv_entries()
+				
+		self.add_payment_entries(payment_entries + journal_entries)
+		
+	def get_payment_entries(self):
+		order_doctype = "Sales Order" if self.party_type=="Customer" else "Purchase Order"
+		payment_entries = get_advance_payment_entries(self.party_type, self.party, 
+			self.receivable_payable_account, order_doctype, against_all_orders=True)
+			
+		return payment_entries
 
 	def get_jv_entries(self):
-		self.check_mandatory_to_fetch()
 		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
 			else "debit_in_account_currency"
 
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
 
-		jv_entries = frappe.db.sql("""
+		journal_entries = frappe.db.sql("""
 			select
-				t1.name as voucher_no, t1.posting_date, t1.remark,
-				t2.name as voucher_detail_no, {dr_or_cr} as payment_amount, t2.is_advance
+				"Journal Entry" as reference_type, t1.name as reference_name, 
+				t1.posting_date, t1.remark as remarks, t2.name as reference_row, 
+				{dr_or_cr} as amount, t2.is_advance
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
 				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 (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
+				and (t2.reference_type is null or t2.reference_type = '' or 
+					(t2.reference_type in ('Sales Order', 'Purchase Order') 
+						and t2.reference_name is not null and t2.reference_name != ''))
 				and (CASE
 					WHEN t1.voucher_type in ('Debit Note', 'Credit Note')
 					THEN 1=1
@@ -47,18 +65,13 @@
 				"bank_cash_account": "%%%s%%" % self.bank_cash_account
 			}, as_dict=1)
 
-		self.add_payment_entries(jv_entries)
+		return list(journal_entries)
 
-	def add_payment_entries(self, jv_entries):
+	def add_payment_entries(self, entries):
 		self.set('payments', [])
-		for e in jv_entries:
-			ent = self.append('payments', {})
-			ent.journal_entry = e.get('voucher_no')
-			ent.posting_date = e.get('posting_date')
-			ent.amount = flt(e.get('payment_amount'))
-			ent.remark = e.get('remark')
-			ent.voucher_detail_number = e.get('voucher_detail_no')
-			ent.is_advance = e.get('is_advance')
+		for e in entries:
+			row = self.append('payments', {})
+			row.update(e)
 
 	def get_invoice_entries(self):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
@@ -90,14 +103,16 @@
 
 		self.get_invoice_entries()
 		self.validate_invoice()
-		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
-			else "debit_in_account_currency"
+		dr_or_cr = "credit_in_account_currency" \
+			if self.party_type == "Customer" else "debit_in_account_currency"
+			
 		lst = []
 		for e in self.get('payments'):
 			if e.invoice_number and e.allocated_amount:
-				lst.append({
-					'voucher_no' : e.journal_entry,
-					'voucher_detail_no' : e.voucher_detail_number,
+				lst.append(frappe._dict({
+					'voucher_type': e.reference_type,
+					'voucher_no' : e.reference_name,
+					'voucher_detail_no' : e.reference_row,
 					'against_voucher_type' : e.invoice_type,
 					'against_voucher'  : e.invoice_number,
 					'account' : self.receivable_payable_account,
@@ -105,13 +120,14 @@
 					'party': self.party,
 					'is_advance' : e.is_advance,
 					'dr_or_cr' : dr_or_cr,
-					'unadjusted_amt' : flt(e.amount),
-					'allocated_amt' : flt(e.allocated_amount)
-				})
-
+					'unadjusted_amount' : flt(e.amount),
+					'allocated_amount' : flt(e.allocated_amount)
+				}))
+				
 		if lst:
 			from erpnext.accounts.utils import reconcile_against_document
 			reconcile_against_document(lst)
+			
 			msgprint(_("Successfully Reconciled"))
 			self.get_unreconciled_entries()
 
@@ -142,7 +158,7 @@
 						.format(p.invoice_type, p.invoice_number))
 
 				if flt(p.allocated_amount) > flt(p.amount):
-					frappe.throw(_("Row {0}: Allocated amount {1} must be less than or equals to JV amount {2}")
+					frappe.throw(_("Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2}")
 						.format(p.idx, p.allocated_amount, p.amount))
 
 				invoice_outstanding = unreconciled_invoices.get(p.invoice_type, {}).get(p.invoice_number)
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 5659f1f..ab8761a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -2,20 +2,23 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-07-09 16:14:23.672922", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "invoice_type", 
-   "fieldtype": "Data", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Type", 
@@ -24,6 +27,7 @@
    "options": "Sales Invoice\nPurchase Invoice\nJournal Entry", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -36,17 +40,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "invoice_number", 
-   "fieldtype": "Data", 
+   "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Number", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "", 
+   "options": "invoice_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,6 +68,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Date", 
@@ -69,6 +76,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -84,6 +92,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -91,6 +100,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -106,6 +116,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -113,6 +124,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -128,6 +140,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Outstanding Amount", 
@@ -135,6 +148,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -145,21 +159,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.516537", 
+ "modified": "2016-07-11 03:28:03.588476", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Invoice", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 f9b6039..681cd53 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -2,28 +2,58 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-07-09 16:13:35.452759", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "journal_entry", 
+   "fieldname": "reference_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Journal Entry", 
+   "in_list_view": 0, 
+   "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Journal Entry", 
+   "options": "DocType", 
    "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": "reference_name", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +69,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Posting Date", 
@@ -46,6 +77,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -61,6 +93,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -68,6 +101,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -83,6 +117,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
@@ -90,6 +125,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -101,17 +137,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "voucher_detail_number", 
+   "fieldname": "reference_row", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Voucher Detail Number", 
+   "label": "Reference Row", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -127,6 +165,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -134,6 +173,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -149,6 +189,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Number", 
@@ -157,6 +198,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -172,6 +214,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated amount", 
@@ -180,6 +223,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -195,6 +239,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -202,6 +247,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -217,6 +263,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remark", 
@@ -224,6 +271,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -234,21 +282,26 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.563989", 
+ "menu_index": 0, 
+ "modified": "2016-07-11 03:28:03.672936", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Payment", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index 1f0e9bc..e73da4c 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -16,7 +16,7 @@
 })
 
 frappe.ui.form.on("Payment Request", "refresh", function(frm) {
-	if(!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal){
+	if(!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal && frm.doc.docstatus==1){
 		frm.add_custom_button(__('Resend Payment Email'), function(){
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 74a18fc..eca0ad0 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -13,14 +13,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "payment_details", 
+   "fieldname": "recipient_and_message", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Payment Details", 
+   "label": "Recipient Message And Payment Details", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -38,100 +38,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Transaction Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "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, 
-   "description": "Amount in customer's currency", 
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "2", 
-   "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": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
+   "default": "", 
+   "fieldname": "print_format", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status", 
+   "label": "Print Format", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nDraft\nInitiated\nPaid\nFailed\nCancelled", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -142,15 +65,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", 
-   "fieldname": "make_sales_invoice", 
-   "fieldtype": "Check", 
+   "fieldname": "email_to", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Make Sales Invoice", 
+   "label": "To", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -168,8 +90,33 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Subject", 
+   "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": "column_break_9", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -209,6 +156,32 @@
    "print_hide_if_no_value": 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": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Transaction Currency", 
+   "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, 
    "search_index": 0, 
    "set_only_once": 0, 
@@ -218,7 +191,237 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_9", 
+   "description": "Amount in customer's currency", 
+   "fieldname": "grand_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nDraft\nInitiated\nPaid\nFailed\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "depends_on": "eval:doc.reference_doctype==\"Sales Order\"", 
+   "fieldname": "make_sales_invoice", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Make Sales Invoice", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "message", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Message", 
+   "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": "message_examples", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Message Examples", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt; Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.&lt;/p&gt;\n\n&lt;p&gt; Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;p&gt; We don't want you to be spending time running around in order to pay for your Bill.<br>After all, life is beautiful and the time you have in hand should be spent to enjoy it!<br>So here are our little ways to help you get more time for life! &lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n", 
+   "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": "mute_email", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mute Email", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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, 
+   "fieldname": "payment_url", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "payment_url", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "doc.payment_gateway_account", 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_16", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -294,208 +497,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "recipient_and_message", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recipient and Message", 
-   "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, 
-   "default": "", 
-   "fieldname": "print_format", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Print Format", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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": "mute_email", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Mute Email", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "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, 
-   "fieldname": "email_to", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Email To", 
-   "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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "subject", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Subject", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "message", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Message", 
-   "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": "payment_url_message", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Payment URL Message", 
-   "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": "payment_url", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "payment_url", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "reference_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -604,7 +605,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-04-12 15:26:22.756129", 
+ "modified": "2016-05-03 10:31:45.692016", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
@@ -672,6 +673,7 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index f2679ba..0c8df02 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -6,137 +6,148 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import flt, nowdate, get_url, cstr
+from frappe.utils import flt, get_url, nowdate
 from erpnext.accounts.party import get_party_account
 from erpnext.accounts.utils import get_account_currency
-from erpnext.accounts.doctype.journal_entry.journal_entry import (get_payment_entry_against_invoice, 
-get_payment_entry_against_order)
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, get_company_defaults
 
-class PaymentRequest(Document):		
+class PaymentRequest(Document):
 	def validate(self):
 		self.validate_payment_gateway_account()
 		self.validate_payment_request()
 		self.validate_currency()
 
 	def validate_payment_request(self):
-		if frappe.db.get_value("Payment Request", {"reference_name": self.reference_name, 
+		if frappe.db.get_value("Payment Request", {"reference_name": self.reference_name,
 			"name": ("!=", self.name), "status": ("not in", ["Initiated", "Paid"]), "docstatus": 1}, "name"):
 			frappe.throw(_("Payment Request already exists {0}".format(self.reference_name)))
-	
+
 	def validate_currency(self):
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 		if ref_doc.currency != frappe.db.get_value("Account", self.payment_account, "account_currency"):
 			frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
-			
+
 	def validate_payment_gateway_account(self):
 		if not self.payment_gateway:
 			frappe.throw(_("Payment Gateway Account is not configured"))
-			
+
 	def validate_payment_gateway(self):
 		if self.payment_gateway == "PayPal":
 			if not frappe.db.get_value("PayPal Settings", None, "api_username"):
 				if not frappe.conf.paypal_username:
 					frappe.throw(_("PayPal Settings missing"))
-			
+
 	def on_submit(self):
-		if not self.mute_email:
+		send_mail = True
+		self.make_communication_entry()
+		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
+
+		if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
+			send_mail = False
+
+		if send_mail:
 			self.send_payment_request()
 			self.send_email()
 
-		self.make_communication_entry()
-	
 	def on_cancel(self):
 		self.set_as_cancelled()
-	
+
 	def get_payment_url(self):
 		""" This is blanck method to trigger hooks call from individual payment gateway app
-		  which will return respective payment gateway"""
+		which will return respective payment gateway"""
 		pass
-	
+
 	def make_invoice(self):
-		if self.make_sales_invoice:
+		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
+		if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
 			from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
 			si = make_sales_invoice(self.reference_name, ignore_permissions=True)
 			si = si.insert(ignore_permissions=True)
 			si.submit()
-	
+
 	def send_payment_request(self):
 		self.payment_url = get_url("/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request?name={0}".format(self.name))
 		if self.payment_url:
-			frappe.db.set_value(self.doctype, self.name, "payment_url", self.payment_url)
-			frappe.db.set_value(self.doctype, self.name, "status", "Initiated")
-			
+			self.db_set('payment_url', self.payment_url)
+			self.db_set('status', 'Initiated')
+
 	def set_as_paid(self):
 		if frappe.session.user == "Guest":
 			frappe.set_user("Administrator")
-			
-		jv = self.create_journal_entry()
+
+		payment_entry = self.create_payment_entry()
 		self.make_invoice()
-		
-		return jv
-		
-	def create_journal_entry(self):
+
+		return payment_entry
+
+	def create_payment_entry(self):
 		"""create entry"""
 		frappe.flags.ignore_account_permission = True
-		
+
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		
-		party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company)
-		party_account_currency = get_account_currency(party_account)
-				
-		debit_in_account_currency = 0.0
-				
-		if party_account_currency == ref_doc.company_currency:
-			amount = flt(flt(self.grand_total) * \
-				flt(ref_doc.conversion_rate, ref_doc.precision("conversion_rate")), \
-				ref_doc.precision("base_grand_total"))
-			
-			if self.currency != ref_doc.company_currency:
-				debit_in_account_currency = self.grand_total
-			
+
+		if self.reference_doctype == "Sales Invoice":
+			party_account = ref_doc.debit_to
+		elif self.reference_doctype == "Purchase Invoice":
+			party_account = ref_doc.credit_to
 		else:
-			amount = debit_in_account_currency = self.grand_total
-				
-		if self.reference_doctype == "Sales Order":
-			jv = get_payment_entry_against_order(self.reference_doctype, self.reference_name,
-			 amount=amount, debit_in_account_currency=debit_in_account_currency , journal_entry=True, 
-			 bank_account=self.payment_account)
-			
-		if self.reference_doctype == "Sales Invoice":			
-			jv = get_payment_entry_against_invoice(self.reference_doctype, self.reference_name,
-			 amount=amount, debit_in_account_currency=debit_in_account_currency, journal_entry=True,
-			 bank_account=self.payment_account)
-			
-		jv.update({
-			"voucher_type": "Journal Entry",
-			"posting_date": nowdate()
+			party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company)
+
+		party_account_currency = ref_doc.get("party_account_currency") or get_account_currency(party_account)
+
+		bank_amount = self.grand_total
+		if party_account_currency == ref_doc.company_currency and party_account_currency != self.currency:
+			party_amount = ref_doc.base_grand_total
+		else:
+			party_amount = self.grand_total
+
+		payment_entry = get_payment_entry(self.reference_doctype, self.reference_name,
+			party_amount=party_amount, bank_account=self.payment_account, bank_amount=bank_amount)
+
+		payment_entry.update({
+			"reference_no": self.name,
+			"reference_date": nowdate(),
+			"remarks": "Payment Entry against {0} {1} via Payment Request {2}".format(self.reference_doctype,
+				self.reference_name, self.name)
 		})
-		
-		jv.insert(ignore_permissions=True)
-		jv.submit()
+
+		company_details = get_company_defaults(ref_doc.company)
+		if payment_entry.difference_amount:
+			payment_entry.append("deductions", {
+				"account": company_details.exchange_gain_loss_account,
+				"cost_center": company_details.cost_center,
+				"amount": payment_entry.difference_amount
+			})
+		payment_entry.insert(ignore_permissions=True)
+		payment_entry.submit()
 
 		#set status as paid for Payment Request
-		frappe.db.set_value(self.doctype, self.name, "status", "Paid")
-		
-		return jv
-		
+		self.db_set('status', 'Paid')
+
+		return payment_entry
+
 	def send_email(self):
 		"""send email with payment link"""
 		frappe.sendmail(recipients=self.email_to, sender=None, subject=self.subject,
-			message=self.get_message(), attachments=[frappe.attach_print(self.reference_doctype, 
+			message=self.get_message(), attachments=[frappe.attach_print(self.reference_doctype,
 			self.reference_name, file_name=self.reference_name, print_format=self.print_format)])
-						
+
 	def get_message(self):
 		"""return message with payment gateway link"""
-		return  cstr(self.message) + " <a href='{0}'>{1}</a>".format(self.payment_url, \
-			self.payment_url_message or _(" Click here to pay"))
-		
+
+		context = {
+			"doc": frappe.get_doc(self.reference_doctype, self.reference_name),
+			"payment_url": self.payment_url
+		}
+
+		return frappe.render_template(self.message, context)
+
 	def set_failed(self):
 		pass
-	
+
 	def set_as_cancelled(self):
-		frappe.db.set_value(self.doctype, self.name, "status", "Cancelled")
-	
+		self.db_set("status", "Cancelled")
+
 	def make_communication_entry(self):
 		"""Make communication entry"""
 		comm = frappe.get_doc({
@@ -148,108 +159,103 @@
 			"reference_name": self.reference_name
 		})
 		comm.insert(ignore_permissions=True)
-	
+
 	def get_payment_success_url(self):
 		return self.payment_success_url
 
 @frappe.whitelist(allow_guest=True)
 def make_payment_request(**args):
 	"""Make payment request"""
-	
+
 	args = frappe._dict(args)
+
 	ref_doc = frappe.get_doc(args.dt, args.dn)
-	
+
 	gateway_account = get_gateway_details(args)
-	
+
 	grand_total = get_amount(ref_doc, args.dt)
-	
-	existing_payment_request = frappe.db.get_value("Payment Request", 
-		{"reference_doctype": args.dt, "reference_name": args.dn})
-	
+
+	existing_payment_request = frappe.db.get_value("Payment Request",
+		{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": ["!=", 2]})
+
 	if existing_payment_request:
 		pr = frappe.get_doc("Payment Request", existing_payment_request)
-		
-	else:	
+
+	else:
 		pr = frappe.new_doc("Payment Request")
 		pr.update({
 			"payment_gateway_account": gateway_account.name,
 			"payment_gateway": gateway_account.payment_gateway,
 			"payment_account": gateway_account.payment_account,
 			"currency": ref_doc.currency,
-			"make_sales_invoice": args.cart or 0,
 			"grand_total": grand_total,
-			"mute_email": args.mute_email or 0,
 			"email_to": args.recipient_id or "",
 			"subject": "Payment Request for %s"%args.dn,
 			"message": gateway_account.message,
-			"payment_url_message": gateway_account.payment_url_message,
-			"payment_success_url": gateway_account.payment_success_url,
 			"reference_doctype": args.dt,
 			"reference_name": args.dn
 		})
-	
+
 		if args.return_doc:
 			return pr
-		
 		if args.submit_doc:
 			pr.insert(ignore_permissions=True)
 			pr.submit()
 
-		
-	if args.cart:
+	if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
 		generate_payment_request(pr.name)
 		frappe.db.commit()
-		
-	if not args.cart:	
+
+	if not args.cart:
 		return pr
-			
+
 	return pr.as_dict()
 
 def get_amount(ref_doc, dt):
 	"""get amount based on doctype"""
 	if dt == "Sales Order":
 		grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
-		
+
 	if dt == "Sales Invoice":
 		if ref_doc.party_account_currency == ref_doc.currency:
 			grand_total = flt(ref_doc.outstanding_amount)
 		else:
 			grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
-		
+
 	if grand_total > 0 :
 		return grand_total
-		
+
 	else:
 		frappe.throw(_("Payment Entry is already created"))
-		
+
 def get_gateway_details(args):
 	"""return gateway and payment account of default payment gateway"""
 	if args.get("payment_gateway"):
 		return get_payment_gateway_account(args.get("payment_gateway"))
-		
+
 	if args.cart:
 		payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account
 		return get_payment_gateway_account(payment_gateway_account)
-	
+
 	gateway_account = get_payment_gateway_account({"is_default": 1})
-	
+
 	if not gateway_account:
 		frappe.throw(_("Payment Gateway Account is not configured"))
-	
+
 	return gateway_account
-	
+
 def get_payment_gateway_account(args):
-	return frappe.db.get_value("Payment Gateway Account", args, 
-		["name", "payment_gateway", "payment_account", "message", "payment_url_message"], 
+	return frappe.db.get_value("Payment Gateway Account", args,
+		["name", "payment_gateway", "payment_account", "message"],
 			as_dict=1)
 
 @frappe.whitelist()
 def get_print_format_list(ref_doctype):
 	print_format_list = ["Standard"]
-	
-	print_format_list.extend([p.name for p in frappe.get_all("Print Format", 
+
+	print_format_list.extend([p.name for p in frappe.get_all("Print Format",
 		filters={"doc_type": ref_doctype})])
-	
+
 	return {
 		"print_format": print_format_list
 	}
@@ -257,8 +263,7 @@
 @frappe.whitelist(allow_guest=True)
 def generate_payment_request(name):
 	frappe.get_doc("Payment Request", name).run_method("get_payment_url")
-	
+
 @frappe.whitelist(allow_guest=True)
 def resend_payment_email(docname):
 	return frappe.get_doc("Payment Request", docname).send_email()
-		
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py
index eb8e558..73c412f 100644
--- a/erpnext/accounts/doctype/payment_request/test_payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request, get_gateway_details
+from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.setup.utils import get_exchange_rate
 # test_records = frappe.get_test_records('Payment Request')
@@ -62,27 +62,44 @@
 		self.assertEquals(pr.currency, "USD")
 
 	def test_payment_entry(self):
+		frappe.db.set_value("Company", "_Test Company", 
+			"exchange_gain_loss_account", "_Test Exchange Gain/Loss - _TC")
+		frappe.db.set_value("Company", "_Test Company", 
+			"write_off_account", "_Test Write Off - _TC")
+		frappe.db.set_value("Company", "_Test Company", 
+			"cost_center", "_Test Cost Center - _TC")
+		
 		so_inr = make_sales_order(currency="INR")
 		pr = make_payment_request(dt="Sales Order", dn=so_inr.name, recipient_id="saurabh@erpnext.com",
 			mute_email=1, submit_doc=1)
-		jv = pr.set_as_paid()
+		pe = pr.set_as_paid()
 
 		so_inr = frappe.get_doc("Sales Order", so_inr.name)
 
-		self.assertEquals(so_inr.advance_paid, jv.total_debit)
-
-		conversion_rate = get_exchange_rate("USD", "INR")
+		self.assertEquals(so_inr.advance_paid, 1000)
 
 		si_usd = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
-			currency="USD", conversion_rate=conversion_rate)
+			currency="USD", conversion_rate=50)
 
 		pr = make_payment_request(dt="Sales Invoice", dn=si_usd.name, recipient_id="saurabh@erpnext.com",
-			mute_email=1, return_doc=1, payment_gateway="_Test Gateway - USD")
+			mute_email=1, payment_gateway="_Test Gateway - USD", submit_doc=1)
+		
+		pe = pr.set_as_paid()
+		
+		expected_gle = dict((d[0], d) for d in [
+			["_Test Receivable USD - _TC", 0, 5000, si_usd.name],
+			[pr.payment_account, 6000.0, 0, None],
+			["_Test Exchange Gain/Loss - _TC", 0, 1000, None]
+		])
+		
+		gl_entries = frappe.db.sql("""select account, debit, credit, against_voucher
+			from `tabGL Entry` where voucher_type='Payment Entry' and voucher_no=%s
+			order by account asc""", pe.name, as_dict=1)
 
-		jv = pr.set_as_paid()
+		self.assertTrue(gl_entries)
 
-		payment_gateway_details = get_gateway_details({"payment_gateway": "_Test Gateway - USD"})
-				
-		self.assertEquals(jv.accounts[0].account, "_Test Receivable USD - _TC")
-		self.assertEquals(jv.accounts[1].account, payment_gateway_details.payment_account)
-		
\ No newline at end of file
+		for i, gle in enumerate(gl_entries):
+			self.assertEquals(expected_gle[gle.account][0], gle.account)
+			self.assertEquals(expected_gle[gle.account][1], gle.debit)
+			self.assertEquals(expected_gle[gle.account][2], gle.credit)
+			self.assertEquals(expected_gle[gle.account][3], gle.against_voucher)
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.js b/erpnext/accounts/doctype/payment_tool/payment_tool.js
deleted file mode 100644
index 8d8e0ce..0000000
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.js
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// For license information, please see license.txt
-
-frappe.provide("erpnext.payment_tool");
-
-// Help content
-frappe.ui.form.on("Payment Tool", "onload", function(frm) {
-	frm.set_value("make_jv_help",
-		+ __("Note: If payment is not made against any reference, make Journal Entry manually."));
-
-	frm.set_query("party_type", function() {
-		return {
-			filters: {"name": ["in", ["Customer", "Supplier"]]}
-		};
-	});
-
-	frm.set_query("payment_account", function() {
-		return {
-			filters: {
-				"account_type": ["in", ["Bank", "Cash"]],
-				"is_group": 0,
-				"company": frm.doc.company
-			}
-		}
-	});
-
-	frm.set_query("against_voucher_type", "vouchers", function() {
-		if (frm.doc.party_type=="Customer") {
-			var doctypes = ["Sales Order", "Sales Invoice", "Journal Entry"];
-		} else {
-			var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"];
-		}
-
-		return {
-			filters: { "name": ["in", doctypes] }
-		};
-	});
-});
-
-frappe.ui.form.on("Payment Tool", "refresh", function(frm) {
-	frm.disable_save();
-	frappe.ui.form.trigger("Payment Tool", "party_type");
-});
-
-frappe.ui.form.on("Payment Tool", "party_type", function(frm) {
-	frm.set_value("received_or_paid", frm.doc.party_type=="Customer" ? "Received" : "Paid");
-});
-
-frappe.ui.form.on("Payment Tool", "party", function(frm) {
-	if(frm.doc.party_type && frm.doc.party) {
-		return frappe.call({
-			method: "erpnext.accounts.party.get_party_account",
-			args: {
-				company: frm.doc.company,
-				party_type: frm.doc.party_type,
-				party: frm.doc.party
-			},
-			callback: function(r) {
-				if(!r.exc && r.message) {
-					frm.set_value("party_account", r.message);
-					erpnext.payment_tool.check_mandatory_to_set_button(frm);
-				}
-			}
-		});
-	}
-})
-
-frappe.ui.form.on("Payment Tool", "party_account", function(frm) {
-	if(frm.doc.party_account) {
-		frm.call({
-			method: "frappe.client.get_value",
-			args: {
-				doctype: "Account",
-				fieldname: "account_currency",
-				filters: { name: frm.doc.party_account },
-			},
-			callback: function(r, rt) {
-				if(r.message) {
-					frm.set_value("party_account_currency", r.message.account_currency);
-					erpnext.payment_tool.check_mandatory_to_set_button(frm);
-				}
-			}
-		});
-	}
-})
-
-frappe.ui.form.on("Payment Tool", "company", function(frm) {
-	erpnext.payment_tool.check_mandatory_to_set_button(frm);
-});
-
-frappe.ui.form.on("Payment Tool", "received_or_paid", function(frm) {
-	erpnext.payment_tool.check_mandatory_to_set_button(frm);
-});
-
-// Fetch bank/cash account based on payment mode
-frappe.ui.form.on("Payment Tool", "payment_mode", function(frm) {
-	return  frappe.call({
-		method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
-		args: {
-				"mode_of_payment": frm.doc.payment_mode,
-				"company": frm.doc.company
-		},
-		callback: function(r, rt) {
-			if(r.message) {
-				cur_frm.set_value("payment_account", r.message['account']);
-			}
-		}
-	});
-});
-
-
-erpnext.payment_tool.check_mandatory_to_set_button = function(frm) {
-	if (frm.doc.company && frm.doc.party_type && frm.doc.party && frm.doc.received_or_paid && frm.doc.party_account) {
-		frm.fields_dict.get_outstanding_vouchers.$input.addClass("btn-primary");
-	}
-}
-
-// Get outstanding vouchers
-frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) {
-	erpnext.payment_tool.check_mandatory_to_fetch(frm.doc);
-
-	frm.set_value("vouchers", []);
-
-	return  frappe.call({
-		method: 'erpnext.accounts.doctype.payment_tool.payment_tool.get_outstanding_vouchers',
-		args: {
-			args: {
-				"company": frm.doc.company,
-				"party_type": frm.doc.party_type,
-				"received_or_paid": frm.doc.received_or_paid,
-				"party": frm.doc.party,
-				"party_account": frm.doc.party_account
-			}
-		},
-		callback: function(r, rt) {
-			if(r.message) {
-				frm.fields_dict.get_outstanding_vouchers.$input.removeClass("btn-primary");
-				frm.fields_dict.make_journal_entry.$input.addClass("btn-primary");
-
-				frm.clear_table("vouchers");
-
-				$.each(r.message, function(i, d) {
-					var c = frm.add_child("vouchers");
-					c.against_voucher_type = d.voucher_type;
-					c.against_voucher_no = d.voucher_no;
-					c.total_amount = d.invoice_amount;
-					c.outstanding_amount = d.outstanding_amount;
-
-					if (in_list(['Sales Invoice', 'Purchase Invoice'], d.voucher_type)){
-						c.due_date = d.due_date
-					}
-
-					if (frm.doc.set_payment_amount) {
-						c.payment_amount = d.outstanding_amount;
-					}
-				});
-			}
-			refresh_field("vouchers");
-			frm.layout.refresh_sections();
-			erpnext.payment_tool.set_total_payment_amount(frm);
-		}
-	});
-});
-
-// validate against_voucher_type
-frappe.ui.form.on("Payment Tool Detail", "against_voucher_type", function(frm, cdt, cdn) {
-	var row = frappe.model.get_doc(cdt, cdn);
-	erpnext.payment_tool.validate_against_voucher(frm, row);
-});
-
-erpnext.payment_tool.validate_against_voucher = function(frm, row) {
-	var _validate = function(i, row) {
-		if (!row.against_voucher_type) {
-			return;
-		}
-
-		if(frm.doc.party_type=="Customer"
-			&& !in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.against_voucher_type)) {
-				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", "");
-				frappe.msgprint(__("Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry"));
-				return false;
-			}
-
-		if(frm.doc.party_type=="Supplier"
-			&& !in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.against_voucher_type)) {
-				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", "");
-				frappe.msgprint(__("Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry"));
-				return false;
-			}
-
-	}
-
-	if (row) {
-		_validate(0, row);
-	} else {
-		$.each(frm.doc.vouchers || [], _validate);
-	}
-
-}
-
-// validate against_voucher_type
-frappe.ui.form.on("Payment Tool Detail", "against_voucher_no", function(frm, cdt, cdn) {
-	var row = locals[cdt][cdn];
-	if (!row.against_voucher_no) {
-		return;
-	}
-
-	frappe.call({
-		method: 'erpnext.accounts.doctype.payment_tool.payment_tool.get_against_voucher_details',
-		args: {
-			"against_voucher_type": row.against_voucher_type,
-			"against_voucher_no": row.against_voucher_no,
-			"party_account": frm.doc.party_account,
-			"company": frm.doc.company
-		},
-		callback: function(r) {
-			if(!r.exc) {
-				$.each(r.message, function(k, v) {
-					frappe.model.set_value(cdt, cdn, k, v);
-				});
-
-				frappe.model.set_value(cdt, cdn, "payment_amount", r.message.outstanding_amount);
-			}
-		}
-	});
-});
-
-// Set total payment amount
-frappe.ui.form.on("Payment Tool Detail", "payment_amount", function(frm) {
-	erpnext.payment_tool.set_total_payment_amount(frm);
-});
-
-frappe.ui.form.on("Payment Tool Detail", "vouchers_remove", function(frm) {
-	erpnext.payment_tool.set_total_payment_amount(frm);
-});
-
-erpnext.payment_tool.set_total_payment_amount = function(frm) {
-	var total_amount = 0.00;
-	$.each(frm.doc.vouchers || [], function(i, row) {
-		if (row.payment_amount && (row.payment_amount <= row.outstanding_amount)) {
-			total_amount = total_amount + row.payment_amount;
-		} else {
-			if(row.payment_amount < 0)
-				msgprint(__("Row {0}: Payment amount can not be negative", [row.idx]));
-			else if(row.payment_amount > row.outstanding_amount)
-				msgprint(__("Row {0}: Payment Amount cannot be greater than Outstanding Amount", [__(row.idx)]));
-
-			frappe.model.set_value(row.doctype, row.name, "payment_amount", 0.0);
-		}
-	});
-	frm.set_value("total_payment_amount", total_amount);
-}
-
-
-// Make Journal Entry
-frappe.ui.form.on("Payment Tool", "make_journal_entry", function(frm) {
-	erpnext.payment_tool.check_mandatory_to_fetch(frm.doc);
-
-	return  frappe.call({
-		method: 'make_journal_entry',
-		doc: frm.doc,
-		callback: function(r) {
-			frm.fields_dict.make_journal_entry.$input.addClass("btn-primary");
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	});
-});
-
-erpnext.payment_tool.check_mandatory_to_fetch = function(doc) {
-	$.each(["Company", "Party Type", "Party", "Received or Paid"], function(i, field) {
-		if(!doc[frappe.model.scrub(field)]) frappe.throw(__("Please select {0} first", [field]));
-	});
-}
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.json b/erpnext/accounts/doctype/payment_tool/payment_tool.json
deleted file mode 100644
index a99054f..0000000
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.json
+++ /dev/null
@@ -1,551 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2014-07-23 15:12:27.746665", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "fields": [
-  {
-   "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, 
-   "label": "Find Invoices to Match", 
-   "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": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Company", 
-   "no_copy": 0, 
-   "options": "Company", 
-   "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, 
-   "default": "Customer", 
-   "fieldname": "party_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Party Type", 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "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": "received_or_paid", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Received Or Paid", 
-   "no_copy": 0, 
-   "options": "Received\nPaid", 
-   "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": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "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": "", 
-   "fieldname": "party", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Party", 
-   "no_copy": 0, 
-   "options": "party_type", 
-   "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": "party_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Party Account", 
-   "no_copy": 1, 
-   "options": "Account", 
-   "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": "party_account_currency", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Party Account Currency", 
-   "no_copy": 1, 
-   "options": "Currency", 
-   "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": "set_payment_amount", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Set Payment Amount = Outstanding Amount", 
-   "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": "get_outstanding_vouchers", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Get Outstanding Vouchers", 
-   "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.company && doc.party_type && doc.received_or_paid && doc.party_account)", 
-   "fieldname": "sec_break3", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Set Matching Amounts", 
-   "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": "vouchers", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Against Vouchers", 
-   "no_copy": 0, 
-   "options": "Payment Tool 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, 
-   "depends_on": "eval:(doc.company && doc.party_type && doc.received_or_paid && doc.party_account)", 
-   "fieldname": "section_break_19", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Make Payment Entry", 
-   "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": "payment_mode", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Payment Mode", 
-   "no_copy": 0, 
-   "options": "Mode of Payment", 
-   "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": "payment_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Payment Account", 
-   "no_copy": 0, 
-   "options": "Account", 
-   "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": "total_payment_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Total Payment Amount", 
-   "no_copy": 0, 
-   "options": "party_account_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": "data_22", 
-   "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": "reference_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reference Date", 
-   "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": "reference_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reference No", 
-   "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": "make_journal_entry", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Make Journal Entry", 
-   "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.company && doc.party_type && doc.received_or_paid && doc.party_account)", 
-   "fieldname": "section_break_21", 
-   "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, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "make_jv_help", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 1, 
- "icon": "icon-magic", 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "modified": "2015-10-01 09:43:24.199025", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Tool", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "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": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC"
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.py b/erpnext/accounts/doctype/payment_tool/payment_tool.py
deleted file mode 100644
index 5c5b393..0000000
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _, scrub
-from frappe.utils import flt
-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):
-		from erpnext.accounts.utils import get_balance_on
-		total_payment_amount = 0.00
-
-		jv = frappe.new_doc('Journal Entry')
-		jv.voucher_type = 'Journal Entry'
-		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"))
-
-		for v in self.get("vouchers"):
-			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.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")
-		if 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, bank_account_currency, self.company,
-				debit=(abs(total_payment_amount) if total_payment_amount < 0 else 0),
-				credit=(total_payment_amount if total_payment_amount > 0 else 0))
-			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()
-
-@frappe.whitelist()
-def get_outstanding_vouchers(args):
-	from erpnext.accounts.utils import get_outstanding_invoices
-
-	if not frappe.has_permission("Payment Tool"):
-		frappe.throw(_("No permission to use Payment Tool"), frappe.PermissionError)
-
-	args = json.loads(args)
-
-	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") == "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(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):
-	voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
-
-	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
-
-	orders = frappe.db.sql("""
-		select
-			name as voucher_no,
-			{ref_field} as invoice_amount,
-			({ref_field} - advance_paid) as outstanding_amount,
-			transaction_date as posting_date
-		from
-			`tab{voucher_type}`
-		where
-			{party_type} = %s
-			and docstatus = 1
-			and ifnull(status, "") != "Closed"
-			and {ref_field} > advance_paid
-			and abs(100 - per_billed) > 0.01
-		""".format(**{
-			"ref_field": ref_field,
-			"voucher_type": voucher_type,
-			"party_type": scrub(party_type)
-		}), party, as_dict = True)
-
-	order_list = []
-	for d in orders:
-		d["voucher_type"] = voucher_type
-		order_list.append(d)
-
-	return order_list
-
-@frappe.whitelist()
-def get_against_voucher_details(against_voucher_type, against_voucher_no, party_account, company):
-	party_account_currency = get_account_currency(party_account)
-	company_currency = frappe.db.get_value("Company", company, "default_currency")
-	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, {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)
-	elif against_voucher_type == "Journal Entry":
-		ref_field = "total_debit" if party_account_currency == company_currency else "total_debit/exchange_rate"
-		select_cond = "{0} as total_amount".format(ref_field)
-
-	details = frappe.db.sql("""select {0} from `tab{1}` where name = %s"""
-		.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/test_payment_tool.py b/erpnext/accounts/doctype/payment_tool/test_payment_tool.py
deleted file mode 100644
index 4f1c9e9..0000000
--- a/erpnext/accounts/doctype/payment_tool/test_payment_tool.py
+++ /dev/null
@@ -1,175 +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 unittest, frappe, json
-from frappe.utils import flt
-from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import test_records as si_test_records
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import test_records as pi_test_records
-from erpnext.accounts.doctype.journal_entry.test_journal_entry import test_records as jv_test_records
-
-test_dependencies = ["Item"]
-
-class TestPaymentTool(unittest.TestCase):
-	def test_make_journal_entry(self):
-		self.clear_table_entries()
-		frappe.db.set_default("currency", "INR")
-
-		base_customer_jv = self.create_against_jv(jv_test_records[2], { "party": "_Test Customer 3"})
-		base_supplier_jv = self.create_against_jv(jv_test_records[1], { "party": "_Test Supplier 1"})
-
-
-		# Create SO with partial outstanding
-		so1 = make_sales_order(customer="_Test Customer 3", qty=10, rate=100)
-
-		self.create_against_jv(jv_test_records[0], {
-			"party": "_Test Customer 3",
-			"reference_type": "Sales Order",
-			"reference_name": so1.name,
-			"is_advance": "Yes"
-		})
-
-
-		#Create SO with no outstanding
-		so2 = make_sales_order(customer="_Test Customer 3")
-
-		self.create_against_jv(jv_test_records[0], {
-			"party": "_Test Customer 3",
-			"reference_type": "Sales Order",
-			"reference_name": so2.name,
-			"credit_in_account_currency": 1000,
-			"is_advance": "Yes"
-		})
-
-		# Purchase order
-		po = create_purchase_order(supplier="_Test Supplier 1")
-
-		#Create SI with partial outstanding
-		si1 = self.create_voucher(si_test_records[0], {
-			"customer": "_Test Customer 3",
-			"debit_to": "_Test Receivable - _TC"
-		})
-
-		self.create_against_jv(jv_test_records[0], {
-			"party": "_Test Customer 3",
-			"reference_type": si1.doctype,
-			"reference_name": si1.name
-		})
-		#Create SI with no outstanding
-		si2 = self.create_voucher(si_test_records[0], {
-			"customer": "_Test Customer 3",
-			"debit_to": "_Test Receivable - _TC"
-		})
-
-		self.create_against_jv(jv_test_records[0], {
-			"party": "_Test Customer 3",
-			"reference_type": si2.doctype,
-			"reference_name": si2.name,
-			"credit_in_account_currency": 561.80
-		})
-
-		pi = self.create_voucher(pi_test_records[0], {
-			"supplier": "_Test Supplier 1",
-			"credit_to": "_Test Payable - _TC"
-		})
-
-		#Create a dict containing properties and expected values
-		expected_outstanding = {
-			"Journal Entry"	: [base_customer_jv.name, 400.00],
-			"Sales Invoice"		: [si1.name, 161.80],
-			"Purchase Invoice"	: [pi.name, 1512.30],
-			"Sales Order"		: [so1.name, 600.00],
-			"Purchase Order"	: [po.name, 5000.00]
-		}
-
-		args = {
-			"company": "_Test Company",
-			"party_type": "Customer",
-			"received_or_paid": "Received",
-			"party": "_Test Customer 3",
-			"party_account": "_Test Receivable - _TC",
-			"payment_mode": "Cheque",
-			"payment_account": "_Test Bank - _TC",
-			"reference_no": "123456",
-			"reference_date": "2013-02-14"
-		}
-
-		self.make_voucher_for_party(args, expected_outstanding)
-
-		args.update({
-			"party_type": "Supplier",
-			"received_or_paid": "Paid",
-			"party": "_Test Supplier 1",
-			"party_account": "_Test Payable - _TC"
-		})
-		expected_outstanding["Journal Entry"] = [base_supplier_jv.name, 400.00]
-		self.make_voucher_for_party(args, expected_outstanding)
-
-	def create_voucher(self, test_record, args):
-		doc = frappe.copy_doc(test_record)
-		doc.update(args)
-		doc.insert()
-		doc.submit()
-		return doc
-
-	def create_against_jv(self, test_record, args):
-		jv = frappe.copy_doc(test_record)
-		jv.get("accounts")[0].update(args)
-		if args.get("debit_in_account_currency"):
-			jv.get("accounts")[1].credit_in_account_currency = args["debit_in_account_currency"]
-		elif args.get("credit_in_account_currency"):
-			jv.get("accounts")[1].debit_in_account_currency = args["credit_in_account_currency"]
-
-		jv.insert()
-		jv.submit()
-		return jv
-
-	def make_voucher_for_party(self, args, expected_outstanding):
-		#Make Journal Entry for Party
-		payment_tool_doc = frappe.new_doc("Payment Tool")
-
-		for k, v in args.items():
-			payment_tool_doc.set(k, v)
-
-		self.check_outstanding_vouchers(payment_tool_doc, args, expected_outstanding)
-
-
-	def check_outstanding_vouchers(self, doc, args, expected_outstanding):
-		from erpnext.accounts.doctype.payment_tool.payment_tool import get_outstanding_vouchers
-		outstanding_entries = get_outstanding_vouchers(json.dumps(args))
-
-		for d in outstanding_entries:
-			self.assertEquals(flt(d.get("outstanding_amount"), 2), 
-				expected_outstanding.get(d.get("voucher_type"))[1])
-
-		self.check_jv_entries(doc, outstanding_entries, expected_outstanding)
-
-	def check_jv_entries(self, paytool, outstanding_entries, expected_outstanding):
-		for e in outstanding_entries:
-			d1 = paytool.append("vouchers")
-			d1.against_voucher_type = e.get("voucher_type")
-			d1.against_voucher_no = e.get("voucher_no")
-			d1.total_amount = e.get("invoice_amount")
-			d1.outstanding_amount = e.get("outstanding_amount")
-			d1.payment_amount = 100.00
-		paytool.total_payment_amount = 300
-
-		new_jv = paytool.make_journal_entry()
-		for jv_entry in new_jv.get("accounts"):
-			if paytool.party_account == jv_entry.get("account") and paytool.party == jv_entry.get("party"):
-				self.assertEquals(100.00, jv_entry.get("debit_in_account_currency" 
-					if paytool.party_type=="Supplier" else "credit_in_account_currency"))
-				self.assertEquals(jv_entry.reference_name,
-					expected_outstanding[jv_entry.reference_type][0])
-
-		self.assertEquals(new_jv.get("cheque_no"), paytool.reference_no)
-		self.assertEquals(new_jv.get("cheque_date"), paytool.reference_date)
-
-	def clear_table_entries(self):
-		frappe.db.sql("""delete from `tabGL Entry` where party in ("_Test Customer 3", "_Test Supplier 1")""")
-		frappe.db.sql("""delete from `tabSales Order` where customer = "_Test Customer 3" """)
-		frappe.db.sql("""delete from `tabSales Invoice` where customer = "_Test Customer 3" """)
-		frappe.db.sql("""delete from `tabPurchase Order` where supplier = "_Test Supplier 1" """)
-		frappe.db.sql("""delete from `tabPurchase Invoice` where supplier = "_Test Supplier 1" """)
diff --git a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json b/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
deleted file mode 100644
index 66447b0..0000000
--- a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2014-08-11 14:27:54.463897", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "against_voucher_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Against Voucher Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": ""
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "against_voucher_no", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Against Voucher No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "against_voucher_type", 
-   "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": "due_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Due Date", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "total_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Total Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_account_currency", 
-   "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": "outstanding_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Outstanding Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_account_currency", 
-   "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": "payment_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Payment Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_account_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-05-05 06:22:24.736160", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Tool Detail", 
- "name_case": "", 
- "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/accounts/doctype/payment_tool_detail/payment_tool_detail.py b/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.py
deleted file mode 100644
index 21fd1c6..0000000
--- a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class PaymentToolDetail(Document):
-	pass
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 d22f4d3..04d4ed7 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -55,6 +55,7 @@
 			if flt(acc.balance_in_company_currency):
 				gl_entries.append(self.get_gl_dict({
 					"account": acc.account,
+					"cost_center": acc.cost_center,
 					"account_currency": acc.account_currency,
 					"debit_in_account_currency": abs(flt(acc.balance_in_account_currency)) \
 						if flt(acc.balance_in_account_currency) < 0 else 0,
@@ -84,12 +85,12 @@
 		"""Get balance for pl accounts"""
 		return frappe.db.sql("""
 			select
-				t1.account, t2.account_currency,
+				t1.account, t1.cost_center, 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 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
+			group by t1.account, t1.cost_center
 		""", (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 1fdf002..6f5a663 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
@@ -6,7 +6,7 @@
 import unittest
 import frappe
 from frappe.utils import flt, today
-from erpnext.accounts.utils import get_fiscal_year
+from erpnext.accounts.utils import get_fiscal_year, now
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
 class TestPeriodClosingVoucher(unittest.TestCase):
@@ -14,10 +14,10 @@
 		year_start_date = get_fiscal_year(today())[1]
 
 		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400,
-			"_Test Cost Center - _TC", submit=True)
+			"_Test Cost Center - _TC", posting_date=now(), submit=True)
 
 		make_journal_entry("_Test Account Cost for Goods Sold - _TC",
-			"_Test Bank - _TC", 600, "_Test Cost Center - _TC", submit=True)
+			"_Test Bank - _TC", 600, "_Test Cost Center - _TC", posting_date=now(), submit=True)
 
 		random_expense_account = frappe.db.sql("""
 			select t1.account,
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index da49036..99438a6 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -3,11 +3,11 @@
 
 frappe.ui.form.on("POS Profile", "onload", function(frm) {
 	frm.set_query("selling_price_list", function() {
-		return { filter: { selling: 1 } };
+		return { filters: { selling: 1 } };
 	});
 
 	frm.set_query("print_format", function() {
-		return { filter: { doc_type: "Sales Invoice" } };
+		return { filters: { doc_type: "Sales Invoice", print_format_type: "Js"} };
 	});
 
 	erpnext.queries.setup_queries(frm, "Warehouse", function() {
@@ -24,18 +24,6 @@
 	});
 });
 
-//cash bank account
-//------------------------------------
-cur_frm.fields_dict['cash_bank_account'].get_query = function(doc,cdt,cdn) {
-	return{
-		filters:{
-			'report_type': "Balance Sheet",
-			'is_group': 0,
-			'company': doc.company
-		}
-	}
-}
-
 // Income Account
 // --------------------------------
 cur_frm.fields_dict['income_account'].get_query = function(doc,cdt,cdn) {
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 6d395af..a7e49dd 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -3,6 +3,7 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-24 12:15:51", 
  "custom": 0, 
  "docstatus": 0, 
@@ -16,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Applicable for User", 
@@ -26,6 +28,7 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,6 +44,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Series", 
@@ -51,6 +55,7 @@
    "options": "[Select]", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -62,37 +67,13 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "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": "1", 
    "description": "", 
    "fieldname": "update_stock", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Stock", 
@@ -100,6 +81,60 @@
    "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, 
+   "depends_on": "update_stock", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "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": "ignore_pricing_rule", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Ignore Pricing Rule", 
+   "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, 
@@ -115,6 +150,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -122,6 +158,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +174,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
@@ -147,6 +185,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -162,6 +201,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -172,6 +212,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -187,6 +228,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
@@ -197,6 +239,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -208,19 +251,70 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
+   "fieldname": "allow_partial_payment", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Mode of Payment", 
+   "label": "Allow Partial Payment", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Mode of Payment", 
    "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": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "payments", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Invoice Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -236,6 +330,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -243,6 +338,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -254,10 +350,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "Point of Sale", 
    "fieldname": "print_format", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Format", 
@@ -267,6 +365,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -282,6 +381,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
@@ -292,6 +392,7 @@
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -307,6 +408,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
@@ -317,6 +419,7 @@
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -332,6 +435,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
@@ -342,6 +446,7 @@
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -357,6 +462,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -364,6 +470,33 @@
    "oldfieldtype": "Column Break", 
    "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": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -380,6 +513,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
@@ -390,6 +524,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -405,6 +540,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
@@ -415,6 +551,60 @@
    "options": "Price List", 
    "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": "apply_discount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Apply 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Grand Total", 
+   "depends_on": "apply_discount", 
+   "fieldname": "apply_discount_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Apply Discount On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grand Total\nNet Total", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -430,6 +620,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -437,6 +628,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -448,10 +640,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "write_off_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Account", 
@@ -461,6 +655,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -476,6 +671,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Cost Center", 
@@ -485,6 +681,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -500,6 +697,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
@@ -510,6 +708,7 @@
    "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, 
@@ -525,6 +724,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -532,31 +732,7 @@
    "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": "cash_bank_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Cash/Bank Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cash_bank_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -572,6 +748,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Income Account", 
@@ -582,6 +759,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -598,6 +776,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Account", 
@@ -606,6 +785,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -621,6 +801,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
@@ -631,6 +812,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -643,13 +825,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.741253", 
+ "modified": "2016-06-13 21:20:13.805101", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 
@@ -696,9 +879,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "user"
+ "title_field": "user", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index 98a8509..5f4d5bc 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import msgprint, _
 from frappe.utils import cint
+from erpnext.accounts.doctype.sales_invoice.sales_invoice import set_account_for_mode_of_payment
 
 from frappe.model.document import Document
 
@@ -26,7 +27,7 @@
 					self.company), raise_exception=1)
 
 	def validate_all_link_fields(self):
-		accounts = {"Account": [self.cash_bank_account, self.income_account,
+		accounts = {"Account": [self.income_account,
 			self.expense_account], "Cost Center": [self.cost_center],
 			"Warehouse": [self.warehouse]}
 
@@ -36,6 +37,9 @@
 						"company": self.company, "name": link_dn}):
 					frappe.throw(_("{0} does not belong to Company {1}").format(link_dn, self.company))
 
+	def before_save(self):
+		set_account_for_mode_of_payment(self)
+
 	def on_update(self):
 		self.set_defaults()
 
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 854f5b3..4c22b0d 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -89,3 +89,27 @@
 cur_frm.cscript.buying = function() {
 	cur_frm.cscript.set_options_for_applicable_for();
 }
+
+//Dynamically change the description based on type of margin
+cur_frm.cscript.type = function(doc){
+	cur_frm.set_df_property('rate', 'description', doc.type=='Percentage'?'In Percentage %':'In Amount')
+}
+
+frappe.ui.form.on('Pricing Rule', 'price_or_discount', function(frm){
+	if(frm.doc.price_or_discount == 'Price') {
+		frm.set_value('for_price_list', "")
+	}
+})
+
+frappe.ui.form.on('Pricing Rule', {
+	setup: function(frm) {
+		frm.fields_dict["for_price_list"].get_query = function(doc){
+			return {
+				filters: {
+					'selling': doc.selling,
+					'buying': doc.buying
+				}
+			}
+		}
+	}
+})
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index eb77ae2..23fc76d 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -17,6 +17,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -40,6 +41,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
@@ -65,6 +67,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Apply On", 
@@ -90,6 +93,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -115,6 +119,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Brand", 
@@ -140,6 +145,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group", 
@@ -164,6 +170,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -188,6 +195,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Priority", 
@@ -212,6 +220,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disable", 
@@ -235,6 +244,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -258,6 +268,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Selling", 
@@ -281,6 +292,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Buying", 
@@ -304,6 +316,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -328,6 +341,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Applicable For", 
@@ -353,6 +367,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
@@ -378,6 +393,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
@@ -403,6 +419,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Territory", 
@@ -428,6 +445,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
@@ -453,6 +471,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
@@ -478,6 +497,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
@@ -503,6 +523,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Type", 
@@ -527,6 +548,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -550,6 +572,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Min Qty", 
@@ -573,6 +596,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -596,6 +620,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Max Qty", 
@@ -619,6 +644,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -643,6 +669,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid From", 
@@ -666,6 +693,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid Upto", 
@@ -689,6 +717,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -711,6 +740,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -731,10 +761,115 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval: doc.selling == 1", 
+   "fieldname": "margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin", 
+   "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, 
+   "default": "Percentage", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "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_33", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.margin_type", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "price_discount_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -759,6 +894,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price or Discount", 
@@ -783,6 +919,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -806,6 +943,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price", 
@@ -830,6 +968,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Discount on Price List Rate (%)", 
@@ -854,6 +993,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "For Price List", 
@@ -878,6 +1018,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -902,6 +1043,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule Help", 
@@ -928,7 +1070,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-01-15 04:05:11.633824", 
+ "modified": "2016-03-16 17:35:25.935271", 
  "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 736d03c..b4fe148 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -124,7 +124,7 @@
 		"name": args.name,
 		"pricing_rule": None
 	})
-
+	
 	if args.ignore_pricing_rule or not args.item_code:
 		return item_details
 
@@ -155,6 +155,8 @@
 	if pricing_rule:
 		item_details.pricing_rule = pricing_rule.name
 		item_details.pricing_rule_for = pricing_rule.price_or_discount
+		item_details.margin_type = pricing_rule.margin_type
+		item_details.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
 		if pricing_rule.price_or_discount == "Price":
 			item_details.update({
 				"price_list_rate": pricing_rule.price/flt(args.conversion_rate) \
@@ -163,7 +165,6 @@
 			})
 		else:
 			item_details.discount_percentage = pricing_rule.discount_percentage
-
 	return item_details
 
 def get_pricing_rules(args):
diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
index d8d74bc..814c5c0 100644
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -86,6 +86,54 @@
 
 		frappe.db.sql("delete from `tabPricing Rule`")
 
+	def test_pricing_rule_for_margin(self):
+		from erpnext.stock.get_item_details import get_item_details
+		from frappe import MandatoryError
+
+		frappe.db.sql("delete from `tabPricing Rule`")
+
+		test_record = {
+			"doctype": "Pricing Rule",
+			"title": "_Test Pricing Rule",
+			"apply_on": "Item Code",
+			"item_code": "_Test FG Item 2",
+			"selling": 1,
+			"price_or_discount": "Discount Percentage",
+			"price": 0,
+			"margin_type": "Percentage",
+			"margin_rate_or_amount": 10,
+			"company": "_Test Company"
+		}
+		frappe.get_doc(test_record.copy()).insert()
+		
+		item_price = frappe.get_doc({
+			"doctype": "Item Price",
+			"price_list": "_Test Price List 2",
+			"item_code": "_Test FG Item 2",
+			"price_list_rate": 100
+		})
+		
+		item_price.insert(ignore_permissions=True)
+
+		args = frappe._dict({
+			"item_code": "_Test FG Item 2",
+			"company": "_Test Company",
+			"price_list": "_Test Price List",
+			"currency": "_Test Currency",
+			"doctype": "Sales Order",
+			"conversion_rate": 1,
+			"price_list_currency": "_Test Currency",
+			"plc_conversion_rate": 1,
+			"order_type": "Sales",
+			"customer": "_Test Customer",
+			"name": None
+		})
+		details = get_item_details(args)
+		self.assertEquals(details.get("margin_type"), "Percentage")
+		self.assertEquals(details.get("margin_rate_or_amount"), 10)
+
+		frappe.db.sql("delete from `tabPricing Rule`")
+
 	def test_pricing_rule_for_variants(self):
 		from erpnext.stock.get_item_details import get_item_details
 		from frappe import MandatoryError
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 4d865b8..c655626 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -2,7 +2,8 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext.accounts");
-{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+
 
 erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 	onload: function() {
@@ -14,54 +15,66 @@
 				this.frm.set_df_property("credit_to", "print_hide", 0);
 			}
 		}
+
+		// formatter for material request item
+		this.frm.set_indicator_formatter('item_code',
+			function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
+
 	},
 
 	refresh: function(doc) {
 		this._super();
 
+		hide_fields(this.frm.doc);
 		// Show / Hide button
 		this.show_general_ledger();
 
-		if(!doc.is_return) {
-			if(doc.docstatus==1) {
-				if(doc.outstanding_amount > 0) {
-					this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
-					cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
-				}
-				if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
-					cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
-				}
+		if(doc.update_stock==1 && doc.docstatus==1) {
+			this.show_stock_ledger();
+		}
+
+		if(!doc.is_return && doc.docstatus==1) {
+			if(doc.outstanding_amount != 0) {
+				this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
+				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 
-			if(doc.docstatus===0) {
-				cur_frm.add_custom_button(__('Purchase Order'), function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
-						source_doctype: "Purchase Order",
-						get_query_filters: {
-							supplier: cur_frm.doc.supplier || undefined,
-							docstatus: 1,
-							status: ["!=", "Closed"],
-							per_billed: ["<", 99.99],
-							company: cur_frm.doc.company
-						}
-					})
-				}, __("Get items from"));
-
-				cur_frm.add_custom_button(__('Purchase Receipt'), function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
-						source_doctype: "Purchase Receipt",
-						get_query_filters: {
-							supplier: cur_frm.doc.supplier || undefined,
-							docstatus: 1,
-							status: ["!=", "Closed"],
-							company: cur_frm.doc.company
-						}
-					})
-				}, __("Get items from"));
+			if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+				cur_frm.add_custom_button(doc.update_stock ? __('Purchase Return') : __('Debit Note'),
+					this.make_debit_note, __("Make"));
 			}
 		}
+
+		if(doc.docstatus===0) {
+			cur_frm.add_custom_button(__('Purchase Order'), function() {
+				erpnext.utils.map_current_doc({
+					method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
+					source_doctype: "Purchase Order",
+					get_query_filters: {
+						supplier: cur_frm.doc.supplier || undefined,
+						docstatus: 1,
+						status: ["!=", "Closed"],
+						per_billed: ["<", 99.99],
+						company: cur_frm.doc.company
+					}
+				})
+			}, __("Get items from"));
+
+			cur_frm.add_custom_button(__('Purchase Receipt'), function() {
+				erpnext.utils.map_current_doc({
+					method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
+					source_doctype: "Purchase Receipt",
+					get_query_filters: {
+						supplier: cur_frm.doc.supplier || undefined,
+						docstatus: 1,
+						status: ["!=", "Closed"],
+						company: cur_frm.doc.company
+					}
+				})
+			}, __("Get items from"));
+		}
+
+		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
 	},
 
 	supplier: function() {
@@ -100,19 +113,33 @@
 		}
 	},
 
+	is_paid: function() {
+		hide_fields(this.frm.doc);
+		if(cint(this.frm.doc.is_paid)) {
+			if(!this.frm.doc.company) {
+				cur_frm.set_value("is_paid", 0)
+				msgprint(__("Please specify Company to proceed"));
+			}
+		}
+		this.calculate_outstanding_amount();
+		this.frm.refresh_fields();
+	},
+
 	write_off_amount: function() {
 		this.set_in_company_currency(this.frm.doc, ["write_off_amount"]);
 		this.calculate_outstanding_amount();
 		this.frm.refresh_fields();
 	},
 
-	allocated_amount: function() {
-		this.calculate_total_advance();
+	paid_amount: function() {
+		this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
+		this.write_off_amount();
 		this.frm.refresh_fields();
 	},
 
-	tc_name: function() {
-		this.get_terms();
+	allocated_amount: function() {
+		this.calculate_total_advance();
+		this.frm.refresh_fields();
 	},
 
 	items_add: function(doc, cdt, cdn) {
@@ -133,24 +160,63 @@
 			frm: cur_frm
 		})
 	},
+
+	asset: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.asset) {
+			frappe.call({
+				method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_fixed_asset_account",
+				args: {
+					"asset": row.asset,
+					"account": row.expense_account
+				},
+				callback: function(r, rt) {
+					frappe.model.set_value(cdt, cdn, "expense_account", r.message);
+				}
+			})
+		}
+	}
 });
 
 cur_frm.script_manager.make(erpnext.accounts.PurchaseInvoice);
 
-cur_frm.cscript.make_bank_entry = function() {
-	return frappe.call({
-		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice",
-		args: {
-			"dt": "Purchase Invoice",
-			"dn": cur_frm.doc.name
-		},
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+// Hide Fields
+// ------------
+function hide_fields(doc) {
+	parent_fields = ['due_date', 'is_opening', 'advances_section', 'from_date', 'to_date'];
+
+	if(cint(doc.is_paid) == 1) {
+		hide_field(parent_fields);
+	} else {
+		for (i in parent_fields) {
+			var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
+			if(!docfield.hidden) unhide_field(parent_fields[i]);
 		}
-	});
+
+	}
+
+	item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
+
+	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
+		(cint(doc.update_stock)==1 ? true : false));
+
+	cur_frm.refresh_fields();
 }
 
+cur_frm.cscript.update_stock = function(doc, dt, dn) {
+	hide_fields(doc, dt, dn);
+}
+
+cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {
+	return {
+		filters: [
+			["Account", "account_type", "in", ["Cash", "Bank"]],
+			["Account", "root_type", "=", "Asset"],
+			["Account", "is_group", "=",0],
+			["Account", "company", "=", doc.company]
+		]
+	}
+}
 
 cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
 	return{
@@ -166,10 +232,7 @@
 
 cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
 	return {
-		query: "erpnext.controllers.queries.item_query",
-		filters:{
-			'is_purchase_item': 1
-		}
+		query: "erpnext.controllers.queries.item_query"
 	}
 }
 
@@ -196,7 +259,7 @@
 
 // Get Print Heading
 cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) {
-return{
+	return {
 		filters:[
 			['Print Heading', 'docstatus', '!=', 2]
 		]
@@ -204,12 +267,24 @@
 }
 
 cur_frm.set_query("expense_account", "items", function(doc) {
-	return{
-		query: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account",
+	return {
+		query: "erpnext.controllers.queries.get_expense_account",
 		filters: {'company': doc.company}
 	}
 });
 
+cur_frm.set_query("asset", "items", function(doc, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	return {
+		filters: {
+			'item_code': d.item_code,
+			'docstatus': 1,
+			'company': doc.company,
+			'status': 'Submitted'
+		}
+	}
+});
+
 cur_frm.cscript.expense_account = function(doc, cdt, cdn){
 	var d = locals[cdt][cdn];
 	if(d.idx == 1 && d.expense_account){
@@ -258,3 +333,28 @@
 	else
 		cur_frm.pformat.print_heading = __("Purchase Invoice");
 }
+
+frappe.ui.form.on("Purchase Invoice", {
+	onload: function(frm) {
+		$.each(["warehouse", "rejected_warehouse"], function(i, field) {
+			frm.set_query(field, "items", function() {
+				return {
+					filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+				}
+			})
+		})
+
+		frm.set_query("supplier_warehouse", function() {
+			return {
+				filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+			}
+		})
+	},
+
+	is_subcontracted: function(frm) {
+		if (frm.doc.is_subcontracted === "Yes") {
+			erpnext.buying.get_default_bom(frm);
+		}
+		frm.toggle_reqd("supplier_warehouse", frm.doc.is_subcontracted==="Yes");
+	}
+})
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index a67f109..b247e3e 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-21 16:16:39", 
  "custom": 0, 
  "docstatus": 0, 
@@ -26,7 +27,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -91,7 +92,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "supplier", 
    "fieldname": "supplier_name", 
@@ -120,6 +121,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "is_paid", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Paid", 
+   "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, 
+   "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, 
@@ -262,8 +288,6 @@
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -279,6 +303,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "0", 
    "fieldname": "is_return", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -807,6 +832,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "0", 
+   "fieldname": "update_stock", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Update Stock", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -825,7 +876,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -1600,7 +1651,7 @@
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1667,6 +1718,162 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "collapsible_depends_on": "paid_amount", 
+   "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)", 
+   "fieldname": "payments_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Payments", 
+   "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": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mode of Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "cash_bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Cash/Bank Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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": "col_br_payments", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_paid", 
+   "fieldname": "paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "base_paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "collapsible_depends_on": "write_off_amount", 
    "depends_on": "grand_total", 
    "fieldname": "write_off", 
@@ -1848,7 +2055,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "get_advances_paid", 
+   "fieldname": "get_advances", 
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1859,7 +2066,7 @@
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
-   "options": "get_advances", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1975,15 +2182,15 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "printing_settings", 
+   "collapsible": 0, 
+   "fieldname": "raw_materials_supplied", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Printing Settings", 
+   "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2001,21 +2208,102 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "language", 
-   "fieldtype": "Data", 
+   "default": "No", 
+   "fieldname": "is_subcontracted", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Print Language", 
+   "label": "Raw Materials Supplied", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "No\nYes", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 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": "supplier_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Warehouse", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "50px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "supplied_items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplied Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Purchase Receipt Item Supplied", 
+   "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": 1, 
+   "fieldname": "printing_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
    "search_index": 0, 
@@ -2078,6 +2366,31 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
@@ -2263,28 +2576,28 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Mode of Payment", 
+   "label": "Posting Time", 
    "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "mode_of_payment", 
-   "oldfieldtype": "Select", 
-   "options": "Mode of Payment", 
+   "no_copy": 1, 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
+   "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "100px"
   }, 
   {
    "allow_on_submit": 0, 
@@ -2315,6 +2628,33 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "description": "Warehouse where you are maintaining stock of rejected items", 
+   "fieldname": "rejected_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rejected Warehouse", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": 1, 
    "collapsible_depends_on": "is_recurring", 
    "depends_on": "eval:doc.docstatus<2", 
@@ -2369,35 +2709,8 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_recurring", 
-   "description": "", 
-   "fieldname": "recurring_id", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reference Document", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Purchase Invoice", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
-   "description": "", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "Select the period when the invoice will be generated automatically", 
    "fieldname": "recurring_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -2405,7 +2718,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Frequency", 
+   "label": "Recurring Type", 
    "length": 0, 
    "no_copy": 1, 
    "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
@@ -2423,16 +2736,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
-   "description": "", 
-   "fieldname": "repeat_on_day_of_month", 
-   "fieldtype": "Int", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "Start date of current invoice's period", 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Repeat on Day of Month", 
+   "label": "From Date", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
@@ -2449,16 +2762,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring && doc.recurring_id === doc.name", 
-   "description": "", 
-   "fieldname": "end_date", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "End date of current invoice's period", 
+   "fieldname": "to_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Recurring Ends On", 
+   "label": "To Date", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
@@ -2528,19 +2841,18 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
-   "description": "", 
-   "fieldname": "notification_email_address", 
-   "fieldtype": "Code", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc", 
+   "fieldname": "repeat_on_day_of_month", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Notification Email Address", 
+   "label": "Repeat on Day of Month", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Email", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -2552,24 +2864,23 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_recurring && doc.notify_by_email && doc.recurring_id === doc.name", 
-   "fieldname": "recurring_print_format", 
-   "fieldtype": "Link", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "The date on which recurring invoice will be stop", 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Recurring Print Format", 
+   "label": "End Date", 
    "length": 0, 
-   "no_copy": 0, 
-   "options": "Print Format", 
+   "no_copy": 1, 
    "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2603,25 +2914,51 @@
    "width": "50%"
   }, 
   {
-   "allow_on_submit": 1, 
+   "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_recurring", 
-   "description": "", 
-   "fieldname": "from_date", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "The date on which next invoice will be generated. It is generated on submit.", 
+   "fieldname": "next_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "From Date", 
+   "label": "Next Date", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 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:doc.is_recurring==1", 
+   "description": "The unique id for tracking all recurring invoices. It is generated on submit.", 
+   "fieldname": "recurring_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
    "search_index": 0, 
@@ -2632,16 +2969,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_recurring", 
-   "description": "", 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
+   "fieldname": "notification_email_address", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "To Date", 
+   "label": "Notification Email Address", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
@@ -2658,20 +2995,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_recurring", 
-   "description": "", 
-   "fieldname": "next_date", 
-   "fieldtype": "Date", 
+   "depends_on": "eval:doc.is_recurring==1", 
+   "fieldname": "recurring_print_format", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Next Date", 
+   "label": "Recurring Print Format", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
+   "options": "Print Format", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2684,7 +3022,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
- "idx": 1, 
+ "idx": 204, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -2692,7 +3031,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-21 13:13:43.694604", 
+ "modified": "2016-06-30 13:40:39.440648", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
@@ -2739,26 +3078,6 @@
    "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": "Supplier", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
-  {
    "amend": 1, 
    "apply_user_permissions": 0, 
    "cancel": 1, 
@@ -2819,11 +3138,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 180831e..5be0b69 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import cint, formatdate, flt, getdate
-from frappe import msgprint, _, throw
+from frappe import _, throw
 from erpnext.setup.utils import get_company_currency
 import frappe.defaults
 
@@ -12,6 +12,9 @@
 from erpnext.accounts.party import get_party_account, get_due_date
 from erpnext.accounts.utils import get_account_currency, get_fiscal_year
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_billed_amount_based_on_po
+from erpnext.controllers.stock_controller import get_warehouse_account
+from erpnext.accounts.general_ledger import make_gl_entries, merge_similar_entries, delete_gl_entries
+from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -43,26 +46,39 @@
 			self.po_required()
 			self.pr_required()
 			self.validate_supplier_invoice()
-			self.validate_advance_jv("Purchase Order")
 
-		self.check_active_purchase_items()
+
+		# validate cash purchase
+		if (self.is_paid == 1):
+			self.validate_cash()
+
 		self.check_conversion_rate()
 		self.validate_credit_to_acc()
 		self.clear_unallocated_advances("Purchase Invoice Advance", "advances")
 		self.check_for_closed_status()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("uom", "qty")
+		self.set_expense_account()
 		self.set_against_expense_account()
 		self.validate_write_off_account()
-		self.update_valuation_rate("items")
-		self.validate_multiple_billing("Purchase Receipt", "pr_detail", "amount",
-			"items")
+		self.validate_multiple_billing("Purchase Receipt", "pr_detail", "amount", "items")
+		self.validate_fixed_asset()
+		self.validate_fixed_asset_account()
 		self.create_remarks()
 
+	def validate_cash(self):
+		if not self.cash_bank_account and flt(self.paid_amount):
+			frappe.throw(_("Cash or Bank Account is mandatory for making payment entry"))
+
+		if flt(self.paid_amount) + flt(self.write_off_amount) \
+				- flt(self.base_grand_total) > 1/(10**(self.precision("base_grand_total") + 1)):
+			frappe.throw(_("""Paid amount + Write Off Amount can not be greater than Grand Total"""))
+
 	def create_remarks(self):
 		if not self.remarks:
 			if self.bill_no and self.bill_date:
-				self.remarks = _("Against Supplier Invoice {0} dated {1}").format(self.bill_no, formatdate(self.bill_date))
+				self.remarks = _("Against Supplier Invoice {0} dated {1}").format(self.bill_no,
+					formatdate(self.bill_date))
 			else:
 				self.remarks = _("No Remarks")
 
@@ -74,17 +90,6 @@
 
 		super(PurchaseInvoice, self).set_missing_values(for_validate)
 
-	def get_advances(self):
-		if not self.is_return:
-			super(PurchaseInvoice, self).get_advances(self.credit_to, "Supplier", self.supplier,
-				"Purchase Invoice Advance", "advances", "debit_in_account_currency", "purchase_order")
-
-	def check_active_purchase_items(self):
-		for d in self.get('items'):
-			if d.item_code:		# extra condn coz item_code is not mandatory in PV
-				if frappe.db.get_value("Item", d.item_code, "is_purchase_item") != 1:
-					msgprint(_("Item {0} is not Purchase Item").format(d.item_code), raise_exception=True)
-
 	def check_conversion_rate(self):
 		default_currency = get_company_currency(self.company)
 		if not default_currency:
@@ -142,50 +147,54 @@
 				["Purchase Receipt", "purchase_receipt", "pr_detail"]
 			])
 
-	def set_against_expense_account(self):
+	def set_expense_account(self):
 		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()
 
-		against_accounts = []
-		stock_items = self.get_stock_items()
+		if self.update_stock:
+			warehouse_account = get_warehouse_account()
+
 		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
+			# expense account is always "Stock Received But Not Billed" for a stock item
+			# except epening entry, drop-ship entry and fixed asset items
 
 			if auto_accounting_for_stock and item.item_code in stock_items \
-				and self.is_opening == 'No' and (not item.po_detail or
+				and self.is_opening == 'No' and not item.is_fixed_asset \
+				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
-
-				if stock_not_billed_account not in against_accounts:
-					against_accounts.append(stock_not_billed_account)
+				if self.update_stock:
+					item.expense_account = warehouse_account[item.warehouse]["name"]
+				else:
+					item.expense_account = stock_not_billed_account
 
 			elif not item.expense_account:
 				throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
 
-			elif item.expense_account not in against_accounts:
-				# if no auto_accounting_for_stock or not a stock item
+	def set_against_expense_account(self):
+		against_accounts = []
+		for item in self.get("items"):
+			if item.expense_account not in against_accounts:
 				against_accounts.append(item.expense_account)
 
 		self.against_expense_account = ",".join(against_accounts)
 
 	def po_required(self):
 		if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes':
-			 for d in self.get('items'):
-				 if not d.purchase_order:
-					 throw(_("Purchse Order number required for Item {0}").format(d.item_code))
+			for d in self.get('items'):
+				if not d.purchase_order:
+					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 and d.item_code in stock_items:
-					 throw(_("Purchase Receipt number required for Item {0}").format(d.item_code))
+			for d in self.get('items'):
+				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):
 		if self.write_off_amount and not self.write_off_account:
@@ -202,68 +211,131 @@
 				if not submitted:
 					frappe.throw(_("Purchase Receipt {0} is not submitted").format(d.purchase_receipt))
 
+	def update_status_updater_args(self):
+		if cint(self.update_stock):
+			self.status_updater.extend([{
+				'source_dt': 'Purchase Invoice Item',
+				'target_dt': 'Purchase Order Item',
+				'join_field': 'po_detail',
+				'target_field': 'received_qty',
+				'target_parent_dt': 'Purchase Order',
+				'target_parent_field': 'per_received',
+				'target_ref_field': 'qty',
+				'source_field': 'qty',
+				'percent_join_field':'purchase_order',
+				# 'percent_join_field': 'prevdoc_docname',
+				'overflow_type': 'receipt',
+				'extra_cond': """ and exists(select name from `tabPurchase Invoice`
+					where name=`tabPurchase Invoice Item`.parent and update_stock = 1)"""
+			},
+			{
+				'source_dt': 'Purchase Invoice Item',
+				'target_dt': 'Purchase Order Item',
+				'join_field': 'po_detail',
+				'target_field': 'returned_qty',
+				'target_parent_dt': 'Purchase Order',
+				# 'target_parent_field': 'per_received',
+				# 'target_ref_field': 'qty',
+				'source_field': '-1 * qty',
+				# 'percent_join_field': 'prevdoc_docname',
+				# 'overflow_type': 'receipt',
+				'extra_cond': """ and exists (select name from `tabPurchase Invoice`
+					where name=`tabPurchase Invoice Item`.parent and update_stock=1 and is_return=1)"""
+			}
+		])
 
-	def update_against_document_in_jv(self):
-		"""
-			Links invoice and advance voucher:
-				1. cancel advance voucher
-				2. split into multiple rows if partially adjusted, assign against voucher
-				3. submit advance voucher
-		"""
-
-		lst = []
-		for d in self.get('advances'):
-			if flt(d.allocated_amount) > 0:
-				args = {
-					'voucher_no' : d.journal_entry,
-					'voucher_detail_no' : d.jv_detail_no,
-					'against_voucher_type' : 'Purchase Invoice',
-					'against_voucher'  : self.name,
-					'account' : self.credit_to,
-					'party_type': 'Supplier',
-					'party': self.supplier,
-					'is_advance' : 'Yes',
-					'dr_or_cr' : 'debit_in_account_currency',
-					'unadjusted_amt' : flt(d.advance_amount),
-					'allocated_amt' : flt(d.allocated_amount)
-				}
-				lst.append(args)
-
-		if lst:
-			from erpnext.accounts.utils import reconcile_against_document
-			reconcile_against_document(lst)
+	def validate_purchase_receipt_if_update_stock(self):
+		if self.update_stock:
+			for item in self.get("items"):
+				if item.purchase_receipt:
+					frappe.throw(_("Stock cannot be updated against Purchase Receipt {0}")
+						.format(item.purchase_receipt))
 
 	def on_submit(self):
 		self.check_prev_docstatus()
+		self.update_status_updater_args()
 
 		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
 			self.company, self.base_grand_total)
 
-		# this sequence because outstanding may get -negative
-		self.make_gl_entries()
 		if not self.is_return:
 			self.update_against_document_in_jv()
 			self.update_prevdoc_status()
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
 			self.update_billing_status_in_pr()
 
-		self.update_project()
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating ordered qty in bin depends upon updated ordered qty in PO
+		if self.update_stock == 1:
+			self.update_stock_ledger()
+			from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
+			update_serial_nos_after_submit(self, "items")
 
-	def make_gl_entries(self):
-		auto_accounting_for_stock = \
+		# this sequence because outstanding may get -negative
+		self.make_gl_entries()
+
+		self.update_project()
+		self.update_fixed_asset()
+
+	def update_fixed_asset(self):
+		for d in self.get("items"):
+			if d.is_fixed_asset:
+				asset = frappe.get_doc("Asset", d.asset)
+				if self.docstatus==1:
+					asset.purchase_invoice = self.name
+					asset.purchase_date = self.posting_date
+					asset.supplier = self.supplier
+				else:
+					asset.purchase_invoice = None
+					asset.supplier = None
+
+				asset.flags.ignore_validate_update_after_submit = True
+				asset.save()
+
+	def make_gl_entries(self, repost_future_gle=False):
+		self.auto_accounting_for_stock = \
 			cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
 
-		stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
-		expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
-
+		self.stock_received_but_not_billed = self.get_company_default("stock_received_but_not_billed")
+		self.expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
+		self.negative_expense_to_be_booked = 0.0
 		gl_entries = []
 
-		# parent's gl entry
+
+		self.make_supplier_gl_entry(gl_entries)
+		self.make_item_gl_entries(gl_entries)
+		self.make_tax_gl_entries(gl_entries)
+
+		gl_entries = merge_similar_entries(gl_entries)
+
+		self.make_payment_gl_entries(gl_entries)
+
+		self.make_write_off_gl_entry(gl_entries)
+
+		if gl_entries:
+			update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"
+
+			make_gl_entries(gl_entries,  cancel=(self.docstatus == 2),
+				update_outstanding=update_outstanding, merge_entries=False)
+
+			if update_outstanding == "No":
+				update_outstanding_amt(self.credit_to, "Supplier", self.supplier,
+					self.doctype, self.return_against if cint(self.is_return) else self.name)
+
+			if repost_future_gle and cint(self.update_stock) and self.auto_accounting_for_stock:
+				from erpnext.controllers.stock_controller import update_gl_entries_after
+				items, warehouses = self.get_items_and_warehouses()
+				update_gl_entries_after(self.posting_date, self.posting_time, warehouses, items)
+
+		elif self.docstatus == 2 and cint(self.update_stock) and self.auto_accounting_for_stock:
+			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
+
+
+	def make_supplier_gl_entry(self, gl_entries):
 		if self.grand_total:
 			# Didnot use base_grand_total to book rounding loss gle
 			grand_total_in_company_currency = flt(self.grand_total * self.conversion_rate,
 				self.precision("grand_total"))
-
 			gl_entries.append(
 				self.get_gl_dict({
 					"account": self.credit_to,
@@ -278,6 +350,91 @@
 				}, self.party_account_currency)
 			)
 
+	def make_item_gl_entries(self, gl_entries):
+		# item gl entries
+		stock_items = self.get_stock_items()
+		expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
+		warehouse_account = get_warehouse_account()
+
+		for item in self.get("items"):
+			if flt(item.base_net_amount):
+				account_currency = get_account_currency(item.expense_account)
+
+				if self.update_stock and self.auto_accounting_for_stock:
+					val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9
+
+					# warehouse account
+					warehouse_debit_amount = flt(flt(item.valuation_rate, val_rate_db_precision)
+						* flt(item.qty)	* flt(item.conversion_factor), item.precision("base_net_amount"))
+
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": item.expense_account,
+							"against": self.supplier,
+							"debit": warehouse_debit_amount,
+							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+							"cost_center": item.cost_center,
+							"project": item.project
+						}, account_currency)
+					)
+
+					# Amount added through landed-cost-voucher
+					if flt(item.landed_cost_voucher_amount):
+						gl_entries.append(self.get_gl_dict({
+							"account": expenses_included_in_valuation,
+							"against": item.expense_account,
+							"cost_center": item.cost_center,
+							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+							"credit": flt(item.landed_cost_voucher_amount),
+							"project": item.project
+						}))
+
+					# sub-contracting warehouse
+					if flt(item.rm_supp_cost):
+						supplier_warehouse_account = warehouse_account[self.supplier_warehouse]["name"]
+						gl_entries.append(self.get_gl_dict({
+							"account": supplier_warehouse_account,
+							"against": item.expense_account,
+							"cost_center": item.cost_center,
+							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+							"credit": flt(item.rm_supp_cost)
+						}, warehouse_account[self.supplier_warehouse]["account_currency"]))
+				else:
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": item.expense_account,
+							"against": self.supplier,
+							"debit": flt(item.base_net_amount, item.precision("base_net_amount")),
+							"debit_in_account_currency": (flt(item.base_net_amount,
+								item.precision("base_net_amount")) if account_currency==self.company_currency
+								else flt(item.net_amount, item.precision("net_amount"))),
+							"cost_center": item.cost_center,
+							"project": item.project
+						}, account_currency)
+					)
+
+			if self.auto_accounting_for_stock and self.is_opening == "No" and \
+				item.item_code in stock_items and item.item_tax_amount:
+					# Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt
+					if item.purchase_receipt:
+						negative_expense_booked_in_pr = frappe.db.sql("""select name from `tabGL Entry`
+							where voucher_type='Purchase Receipt' and voucher_no=%s and account=%s""",
+							(item.purchase_receipt, self.expenses_included_in_valuation))
+
+						if not negative_expense_booked_in_pr:
+							gl_entries.append(
+								self.get_gl_dict({
+									"account": self.stock_received_but_not_billed,
+									"against": self.supplier,
+									"debit": flt(item.item_tax_amount, item.precision("item_tax_amount")),
+									"remarks": self.remarks or "Accounting Entry for Stock"
+								})
+							)
+
+							self.negative_expense_to_be_booked += flt(item.item_tax_amount, \
+								item.precision("item_tax_amount"))
+
+	def make_tax_gl_entries(self, gl_entries):
 		# tax table gl entries
 		valuation_tax = {}
 		for tax in self.get("taxes"):
@@ -297,69 +454,31 @@
 						"cost_center": tax.cost_center
 					}, account_currency)
 				)
-
 			# accumulate valuation tax
 			if self.is_opening == "No" and tax.category in ("Valuation", "Valuation and Total") and flt(tax.base_tax_amount_after_discount_amount):
-				if auto_accounting_for_stock and not tax.cost_center:
+				if self.auto_accounting_for_stock and not tax.cost_center:
 					frappe.throw(_("Cost Center is required in row {0} in Taxes table for type {1}").format(tax.idx, _(tax.category)))
 				valuation_tax.setdefault(tax.cost_center, 0)
 				valuation_tax[tax.cost_center] += \
 					(tax.add_deduct_tax == "Add" and 1 or -1) * flt(tax.base_tax_amount_after_discount_amount)
 
-		# item gl entries
-		negative_expense_to_be_booked = 0.0
-		stock_items = self.get_stock_items()
-		for item in self.get("items"):
-			if flt(item.base_net_amount):
-				account_currency = get_account_currency(item.expense_account)
-				gl_entries.append(
-					self.get_gl_dict({
-						"account": item.expense_account,
-						"against": self.supplier,
-						"debit": item.base_net_amount,
-						"debit_in_account_currency": item.base_net_amount \
-							if account_currency==self.company_currency else item.net_amount,
-						"cost_center": item.cost_center
-					}, account_currency)
-				)
-
-			if auto_accounting_for_stock and self.is_opening == "No" and \
-				item.item_code in stock_items and item.item_tax_amount:
-					# Post reverse entry for Stock-Received-But-Not-Billed if it is booked in Purchase Receipt
-					if item.purchase_receipt:
-						negative_expense_booked_in_pr = frappe.db.sql("""select name from `tabGL Entry`
-							where voucher_type='Purchase Receipt' and voucher_no=%s and account=%s""",
-							(item.purchase_receipt, expenses_included_in_valuation))
-
-						if not negative_expense_booked_in_pr:
-							gl_entries.append(
-								self.get_gl_dict({
-									"account": stock_received_but_not_billed,
-									"against": self.supplier,
-									"debit": flt(item.item_tax_amount, self.precision("item_tax_amount", item)),
-									"remarks": self.remarks or "Accounting Entry for Stock"
-								})
-							)
-
-							negative_expense_to_be_booked += flt(item.item_tax_amount, self.precision("item_tax_amount", item))
-
-		if self.is_opening == "No" and negative_expense_to_be_booked and valuation_tax:
+		if self.is_opening == "No" and self.negative_expense_to_be_booked and valuation_tax:
 			# credit valuation tax amount in "Expenses Included In Valuation"
 			# this will balance out valuation amount included in cost of goods sold
 
 			total_valuation_amount = sum(valuation_tax.values())
-			amount_including_divisional_loss = negative_expense_to_be_booked
+			amount_including_divisional_loss = self.negative_expense_to_be_booked
 			i = 1
 			for cost_center, amount in valuation_tax.items():
 				if i == len(valuation_tax):
 					applicable_amount = amount_including_divisional_loss
 				else:
-					applicable_amount = negative_expense_to_be_booked * (amount / total_valuation_amount)
+					applicable_amount = self.negative_expense_to_be_booked * (amount / total_valuation_amount)
 					amount_including_divisional_loss -= applicable_amount
 
 				gl_entries.append(
 					self.get_gl_dict({
-						"account": expenses_included_in_valuation,
+						"account": self.expenses_included_in_valuation,
 						"cost_center": cost_center,
 						"against": self.supplier,
 						"credit": applicable_amount,
@@ -369,6 +488,36 @@
 
 				i += 1
 
+	def make_payment_gl_entries(self, gl_entries):
+		# Make Cash GL Entries
+		if cint(self.is_paid) and self.cash_bank_account and self.paid_amount:
+			bank_account_currency = get_account_currency(self.cash_bank_account)
+			# CASH, make payment entries
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": self.credit_to,
+					"party_type": "Supplier",
+					"party": self.supplier,
+					"against": self.cash_bank_account,
+					"debit": self.base_paid_amount,
+					"debit_in_account_currency": self.base_paid_amount \
+						if self.party_account_currency==self.company_currency else self.paid_amount,
+					"against_voucher": self.return_against if cint(self.is_return) else self.name,
+					"against_voucher_type": self.doctype,
+				}, self.party_account_currency)
+			)
+
+			gl_entries.append(
+				self.get_gl_dict({
+					"account": self.cash_bank_account,
+					"against": self.supplier,
+					"credit": self.base_paid_amount,
+					"credit_in_account_currency": self.base_paid_amount \
+						if bank_account_currency==self.company_currency else self.paid_amount
+				}, bank_account_currency)
+			)
+
+	def make_write_off_gl_entry(self, gl_entries):
 		# writeoff account includes petty difference in the invoice amount
 		# and the amount that is paid
 		if self.write_off_account and flt(self.write_off_amount):
@@ -398,13 +547,11 @@
 				})
 			)
 
-		if gl_entries:
-			from erpnext.accounts.general_ledger import make_gl_entries
-			make_gl_entries(gl_entries, cancel=(self.docstatus == 2))
-
 	def on_cancel(self):
 		self.check_for_closed_status()
 
+		self.update_status_updater_args()
+
 		if not self.is_return:
 			from erpnext.accounts.utils import remove_against_link_from_jv
 			remove_against_link_from_jv(self.doctype, self.name)
@@ -413,8 +560,14 @@
 			self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
 			self.update_billing_status_in_pr()
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating ordered qty in bin depends upon updated ordered qty in PO
+		if self.update_stock == 1:
+			self.update_stock_ledger()
+
 		self.make_gl_entries_on_cancel()
 		self.update_project()
+		self.update_fixed_asset()
 
 	def update_project(self):
 		project_list = []
@@ -429,7 +582,7 @@
 	def validate_supplier_invoice(self):
 		if self.bill_date:
 			if getdate(self.bill_date) > getdate(self.posting_date):
-				frappe.throw("Supplier Invoice Date cannot be greater than Posting Date")
+				frappe.throw(_("Supplier Invoice Date cannot be greater than Posting Date"))
 
 		if self.bill_no:
 			if cint(frappe.db.get_single_value("Accounts Settings", "check_supplier_invoice_uniqueness")):
@@ -449,7 +602,7 @@
 
 				if pi:
 					pi = pi[0][0]
-					frappe.throw("Supplier Invoice No exists in Purchase Invoice {0}".format(pi))
+					frappe.throw(_("Supplier Invoice No exists in Purchase Invoice {0}".format(pi)))
 
 	def update_billing_status_in_pr(self, update_modified=True):
 		updated_pr = []
@@ -466,27 +619,31 @@
 		for pr in set(updated_pr):
 			frappe.get_doc("Purchase Receipt", pr).update_billing_percentage(update_modified=update_modified)
 
+	def validate_fixed_asset_account(self):
+		for d in self.get('items'):
+			if d.is_fixed_asset:
+				account_type = frappe.db.get_value("Account", d.expense_account, "account_type")
+				if account_type != 'Fixed Asset':
+					frappe.throw(_("Row {0}# Account must be of type 'Fixed Asset'").format(d.idx))
+
 	def on_recurring(self, reference_doc):
 		self.due_date = None
 
 @frappe.whitelist()
-def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
-	from erpnext.controllers.queries import get_match_cond
-
-	# expense account can be any Debit account,
-	# but can also be a Liability account with account_type='Expense Account' in special circumstances.
-	# Hence the first condition is an "OR"
-	return frappe.db.sql("""select tabAccount.name from `tabAccount`
-			where (tabAccount.report_type = "Profit and Loss"
-					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} 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):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
 	return make_return_doc("Purchase Invoice", source_name, target_doc)
+
+@frappe.whitelist()
+def get_fixed_asset_account(asset, account=None):
+	if account:
+		if frappe.db.get_value("Account", account, "account_type") != "Fixed Asset":
+			account=None
+
+	if not account:
+		asset_category, company = frappe.db.get_value("Asset", asset, ["asset_category", "company"])
+
+		account = frappe.db.get_value("Asset Category Account",
+			filters={"parent": asset_category, "company_name": company}, fieldname="fixed_asset_account")
+
+	return account
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
new file mode 100644
index 0000000..9b950db
--- /dev/null
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py
@@ -0,0 +1,31 @@
+from frappe import _
+
+data = {
+	'fieldname': 'purchase_invoice',
+	'non_standard_fieldnames': {
+		'Delivery Note': 'against_sales_invoice',
+		'Journal Entry': 'reference_name',
+		'Payment Entry': 'reference_name',
+		'Payment Request': 'reference_name',
+		'Landed Cost Voucher': 'receipt_document',
+		'Purchase Invoice': 'return_against'
+	},
+	'internal_links': {
+		'Purchase Order': ['items', 'sales_order'],
+		'Purchase Receipt': ['items', 'delivery_note'],
+	},
+	'transactions': [
+		{
+			'label': _('Payment'),
+			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Purchase Order', 'Purchase Receipt', 'Asset', 'Landed Cost Voucher']
+		},
+		{
+			'label': _('Returns'),
+			'items': ['Purchase Invoice']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index b0ac627..4ea18ac 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -6,11 +6,12 @@
 import unittest
 import frappe
 import frappe.model
-from frappe.utils import cint
+from frappe.utils import cint, flt, today
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
 	test_records as pr_test_records
 from erpnext.exceptions import InvalidCurrency
+from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
 
 test_dependencies = ["Item", "Cost Center"]
 test_ignore = ["Serial No"]
@@ -49,9 +50,9 @@
 		pi = frappe.copy_doc(test_records[1])
 		pi.insert()
 		pi.submit()
-		
+
 		self.check_gle_for_pi(pi.name)
-		
+
 		set_perpetual_inventory(0)
 
 	def test_gl_entries_with_auto_accounting_for_stock_against_pr(self):
@@ -119,20 +120,20 @@
 		set_perpetual_inventory(0)
 
 	def test_purchase_invoice_calculation(self):
-		wrapper = frappe.copy_doc(test_records[0])
-		wrapper.insert()
-		wrapper.load_from_db()
+		pi = frappe.copy_doc(test_records[0])
+		pi.insert()
+		pi.load_from_db()
 
 		expected_values = [
 			["_Test Item Home Desktop 100", 90, 59],
 			["_Test Item Home Desktop 200", 135, 177]
 		]
-		for i, item in enumerate(wrapper.get("items")):
+		for i, item in enumerate(pi.get("items")):
 			self.assertEqual(item.item_code, expected_values[i][0])
 			self.assertEqual(item.item_tax_amount, expected_values[i][1])
 			self.assertEqual(item.valuation_rate, expected_values[i][2])
 
-		self.assertEqual(wrapper.base_net_total, 1250)
+		self.assertEqual(pi.base_net_total, 1250)
 
 		# tax amounts
 		expected_values = [
@@ -146,7 +147,7 @@
 			["_Test Account Discount - _TC", 168.03, 1512.30],
 		]
 
-		for i, tax in enumerate(wrapper.get("taxes")):
+		for i, tax in enumerate(pi.get("taxes")):
 			self.assertEqual(tax.account_head, expected_values[i][0])
 			self.assertEqual(tax.tax_amount, expected_values[i][1])
 			self.assertEqual(tax.total, expected_values[i][2])
@@ -195,8 +196,9 @@
 
 		pi = frappe.copy_doc(test_records[0])
 		pi.append("advances", {
-			"journal_entry": jv.name,
-			"jv_detail_no": jv.get("accounts")[0].name,
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
 			"advance_amount": 400,
 			"allocated_amount": 300,
 			"remarks": jv.remark
@@ -315,30 +317,137 @@
 
 		self.assertFalse(gle)
 
+	def test_purchase_invoice_update_stock_gl_entry_with_perpetual_inventory(self):
+		set_perpetual_inventory()
+
+		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
+			posting_time=frappe.utils.nowtime())
+
+		gl_entries = frappe.db.sql("""select account, account_currency, debit, credit,
+			debit_in_account_currency, credit_in_account_currency
+			from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
+			order by account asc""", pi.name, as_dict=1)
+
+		self.assertTrue(gl_entries)
+
+		expected_gl_entries = dict((d[0], d) for d in [
+			[pi.credit_to, 0.0, 250.0],
+			[pi.items[0].warehouse, 250.0, 0.0]
+		])
+
+		for i, gle in enumerate(gl_entries):
+			self.assertEquals(expected_gl_entries[gle.account][0], gle.account)
+			self.assertEquals(expected_gl_entries[gle.account][1], gle.debit)
+			self.assertEquals(expected_gl_entries[gle.account][2], gle.credit)
+
+	def test_purchase_invoice_for_is_paid_and_update_stock_gl_entry_with_perpetual_inventory(self):
+		set_perpetual_inventory()
+		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
+			posting_time=frappe.utils.nowtime(), cash_bank_account="Cash - _TC", is_paid=1)
+
+		gl_entries = frappe.db.sql("""select account, account_currency, sum(debit) as debit,
+				sum(credit) as credit, debit_in_account_currency, credit_in_account_currency
+			from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
+			group by account, voucher_no order by account asc;""", pi.name, as_dict=1)
+
+		self.assertTrue(gl_entries)
+
+		expected_gl_entries = dict((d[0], d) for d in [
+			[pi.credit_to, 250.0, 250.0],
+			[pi.items[0].warehouse, 250.0, 0.0],
+			["Cash - _TC", 0.0, 250.0]
+		])
+
+		for i, gle in enumerate(gl_entries):
+			self.assertEquals(expected_gl_entries[gle.account][0], gle.account)
+			self.assertEquals(expected_gl_entries[gle.account][1], gle.debit)
+			self.assertEquals(expected_gl_entries[gle.account][2], gle.credit)
+
+	def test_update_stock_and_purchase_return(self):
+		actual_qty_0 = get_qty_after_transaction()
+
+		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
+			posting_time=frappe.utils.nowtime())
+
+		actual_qty_1 = get_qty_after_transaction()
+		self.assertEquals(actual_qty_0 + 5, actual_qty_1)
+
+		# return entry
+		pi1 = make_purchase_invoice(is_return=1, return_against=pi.name, qty=-2, rate=50, update_stock=1)
+
+		actual_qty_2 = get_qty_after_transaction()
+		self.assertEquals(actual_qty_1 - 2, actual_qty_2)
+
+		pi1.cancel()
+		self.assertEquals(actual_qty_1, get_qty_after_transaction())
+
+		pi.reload()
+		pi.cancel()
+		self.assertEquals(actual_qty_0, get_qty_after_transaction())
+
+	def test_subcontracting_via_purchase_invoice(self):
+		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+		make_stock_entry(item_code="_Test Item", target="_Test Warehouse 1 - _TC", qty=100, basic_rate=100)
+		make_stock_entry(item_code="_Test Item Home Desktop 100", target="_Test Warehouse 1 - _TC",
+			qty=100, basic_rate=100)
+
+		pi = make_purchase_invoice(item_code="_Test FG Item", qty=10, rate=500,
+			update_stock=1, is_subcontracted="Yes")
+
+		self.assertEquals(len(pi.get("supplied_items")), 2)
+
+		rm_supp_cost = sum([d.amount for d in pi.get("supplied_items")])
+		self.assertEquals(pi.get("items")[0].rm_supp_cost, flt(rm_supp_cost, 2))
+
+	def test_rejected_serial_no(self):
+		pi = make_purchase_invoice(item_code="_Test Serialized Item With Series", received_qty=2, qty=1,
+			rejected_qty=1, rate=500, update_stock=1,
+			rejected_warehouse = "_Test Rejected Warehouse - _TC")
+
+		self.assertEquals(frappe.db.get_value("Serial No", pi.get("items")[0].serial_no, "warehouse"),
+			pi.get("items")[0].warehouse)
+
+		self.assertEquals(frappe.db.get_value("Serial No", pi.get("items")[0].rejected_serial_no,
+			"warehouse"), pi.get("items")[0].rejected_warehouse)
+
 def make_purchase_invoice(**args):
 	pi = frappe.new_doc("Purchase Invoice")
 	args = frappe._dict(args)
-	if args.posting_date:
-		pi.posting_date = args.posting_date
+	pi.posting_date = args.posting_date or today()
 	if args.posting_time:
 		pi.posting_time = args.posting_time
+	if args.update_stock:
+		pi.update_stock = 1
+	if args.is_paid:
+		pi.is_paid = 1
+
+	if args.cash_bank_account:
+		pi.cash_bank_account=args.cash_bank_account
+
 	pi.company = args.company or "_Test Company"
 	pi.supplier = args.supplier or "_Test Supplier"
 	pi.currency = args.currency or "INR"
 	pi.conversion_rate = args.conversion_rate or 1
 	pi.is_return = args.is_return
 	pi.return_against = args.return_against
+	pi.is_subcontracted = args.is_subcontracted or "No"
+	pi.supplier_warehouse = "_Test Warehouse 1 - _TC"
 
 	pi.append("items", {
 		"item_code": args.item or args.item_code or "_Test Item",
 		"warehouse": args.warehouse or "_Test Warehouse - _TC",
 		"qty": args.qty or 5,
+		"received_qty": args.received_qty or 0,
+		"rejected_qty": args.rejected_qty or 0,
 		"rate": args.rate or 50,
 		"conversion_factor": 1.0,
 		"serial_no": args.serial_no,
 		"stock_uom": "_Test UOM",
 		"cost_center": "_Test Cost Center - _TC",
-		"project": args.project
+		"project": args.project,
+		"rejected_warehouse": args.rejected_warehouse or "",
+		"rejected_serial_no": args.rejected_serial_no or ""
 	})
 	if not args.do_not_save:
 		pi.insert()
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_records.json b/erpnext/accounts/doctype/purchase_invoice/test_records.json
index 4218828..7feca23 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_records.json
+++ b/erpnext/accounts/doctype/purchase_invoice/test_records.json
@@ -22,7 +22,8 @@
     "parentfield": "items",
     "qty": 10,
     "rate": 50,
-    "uom": "_Test UOM"
+    "uom": "_Test UOM",
+	"warehouse": "_Test Warehouse - _TC"
    },
    {
     "amount": 750,
@@ -37,7 +38,8 @@
     "parentfield": "items",
     "qty": 5,
     "rate": 150,
-    "uom": "_Test UOM"
+    "uom": "_Test UOM",
+	"warehouse": "_Test Warehouse - _TC"
    }
   ],
   "grand_total": 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 34156f5..d73fa99 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -2,29 +2,34 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-03-08 15:36:46", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "journal_entry", 
+   "fieldname": "reference_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Journal Entry", 
+   "in_list_view": 0, 
+   "label": "Reference Type", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "journal_voucher", 
    "oldfieldtype": "Link", 
-   "options": "Journal Entry", 
+   "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -38,36 +43,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "jv_detail_no", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
+   "fieldname": "reference_name", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Journal Entry Detail No", 
+   "in_list_view": 1, 
+   "label": "Reference Name", 
    "length": 0, 
    "no_copy": 1, 
-   "oldfieldname": "jv_detail_no", 
-   "oldfieldtype": "Date", 
+   "options": "reference_type", 
    "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "80px", 
+   "precision": "", 
+   "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, 
-   "width": "80px"
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "remarks", 
-   "fieldtype": "Small Text", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remarks", 
@@ -77,6 +83,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -90,16 +97,46 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "reference_row", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Row", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "jv_detail_no", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "80px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "80px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "col_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -115,6 +152,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Advance Amount", 
@@ -125,6 +163,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -142,6 +181,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated Amount", 
@@ -152,6 +192,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -165,18 +206,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:53.288895", 
+ "menu_index": 0, 
+ "modified": "2016-07-18 05:13:42.137419", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Advance", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 ae44c1a..c822b93 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-22 12:43:10", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -215,6 +217,31 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "received_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Received Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": 1, 
    "collapsible": 0, 
    "fieldname": "qty", 
@@ -243,6 +270,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "rejected_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rejected Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -767,6 +819,185 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "warehouse_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse", 
+   "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, 
+   "default": "", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accepted 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "rejected_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rejected 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Batch No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Batch", 
+   "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": "col_br_wh", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Serial No", 
+   "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": "rejected_serial_no", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rejected Serial No", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "accounting", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -869,6 +1100,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "default": ":Company", 
+   "depends_on": "eval:!doc.is_fixed_asset", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1057,6 +1289,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "bom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "BOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM", 
+   "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": "col_break6", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1080,6 +1338,58 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Fixed Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "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": "po_detail", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1180,7 +1490,7 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "valuation_rate", 
@@ -1228,25 +1538,53 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "landed_cost_voucher_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Landed Cost Voucher Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:05:27.752823", 
+ "modified": "2016-07-11 03:28:04.932212", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 67982da..83762e1 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
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-21 16:16:04", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -562,18 +564,21 @@
  "hide_heading": 1, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-22 09:33:46.131818", 
+ "modified": "2016-07-11 03:28:06.117769", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
index 56a2955..433cda7 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
@@ -3,7 +3,7 @@
 
 cur_frm.cscript.tax_table = "Purchase Taxes and Charges";
 
-{% include "public/js/controllers/accounts.js" %}
+{% include "erpnext/public/js/controllers/accounts.js" %}
 
 frappe.ui.form.on("Purchase Taxes and Charges", "add_deduct_tax", function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 18faae7..605bf09 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -2,55 +2,225 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
+from frappe import _
+from frappe.utils import nowdate
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.stock.get_item_details import get_pos_profile
+from erpnext.accounts.party import get_party_account_currency
+from erpnext.controllers.accounts_controller import get_taxes_and_charges
 
 @frappe.whitelist()
-def get_items(price_list, sales_or_purchase, item=None):
-	condition = ""
-	order_by = ""
-	args = {"price_list": price_list}
+def get_pos_data():
+	doc = frappe.new_doc('Sales Invoice')
+	doc.update_stock = 1;
+	doc.is_pos = 1;
+	pos_profile = get_pos_profile(doc.company) or {}
 
-	if sales_or_purchase == "Sales":
-		condition = "i.is_sales_item=1"
+	if pos_profile.get('name'):
+		pos_profile = frappe.get_doc('POS Profile', pos_profile.get('name'))
 	else:
-		condition = "i.is_purchase_item=1"
+		frappe.msgprint('<a href="#Form/POS Profile/New POS Profile">'
+			+ _("Welcome to POS: Create your POS Profile") + '</a>');
 
-	if item:
-		# search serial no
-		item_code = frappe.db.sql("""select name as serial_no, item_code
-			from `tabSerial No` where name=%s""", (item), as_dict=1)
-		if item_code:
-			item_code[0]["name"] = item_code[0]["item_code"]
-			return item_code
+	update_pos_profile_data(doc, pos_profile)
+	update_multi_mode_option(doc, pos_profile)
+	default_print_format = pos_profile.get('print_format') or "Point of Sale"
+	print_template = frappe.db.get_value('Print Format', default_print_format, 'html')
 
-		# search barcode
-		item_code = frappe.db.sql("""select name, item_code from `tabItem`
-			where barcode=%s""",
-			(item), as_dict=1)
-		if item_code:
-			item_code[0]["barcode"] = item
-			return item_code
+	return {
+		'doc': doc,
+		'default_customer': pos_profile.get('customer'),
+		'items': get_items(doc, pos_profile),
+		'customers': get_customers(pos_profile, doc),
+		'pricing_rules': get_pricing_rules(doc),
+		'print_template': print_template,
+		'write_off_account': pos_profile.get('write_off_account'),
+		'meta': {
+			'invoice': frappe.get_meta('Sales Invoice'),
+			'items': frappe.get_meta('Sales Invoice Item'),
+			'taxes': frappe.get_meta('Sales Taxes and Charges')
+		}
+	}
 
-		condition += " and ((CONCAT(i.name, i.item_name) like %(name)s) or (i.variant_of like %(name)s) or (i.item_group like %(name)s))"
-		order_by = """if(locate(%(_name)s, i.name), locate(%(_name)s, i.name), 99999),
-			if(locate(%(_name)s, i.item_name), locate(%(_name)s, i.item_name), 99999),
-			if(locate(%(_name)s, i.variant_of), locate(%(_name)s, i.variant_of), 99999),
-			if(locate(%(_name)s, i.item_group), locate(%(_name)s, i.item_group), 99999),"""
-		args["name"] = "%%%s%%" % frappe.db.escape(item)
-		args["_name"] = item.replace("%", "")
+def update_pos_profile_data(doc, pos_profile):
+	company_data = frappe.db.get_value('Company', doc.company, '*', as_dict=1)
 
-	# locate function is used to sort by closest match from the beginning of the value
-	return frappe.db.sql("""select i.name, i.item_name, i.image,
-		item_det.price_list_rate, item_det.currency
-		from `tabItem` i LEFT JOIN
-			(select item_code, price_list_rate, currency from
-				`tabItem Price`	where price_list=%(price_list)s) item_det
-		ON
-			(item_det.item_code=i.name or item_det.item_code=i.variant_of)
-		where
-			i.has_variants = 0 and
-			{condition}
-		order by
-			{order_by}
-			i.name
-		limit 24""".format(condition=condition, order_by=order_by), args, as_dict=1)
+	doc.taxes_and_charges = pos_profile.get('taxes_and_charges')
+	if doc.taxes_and_charges:
+		update_tax_table(doc)
+
+	doc.currency = pos_profile.get('currency') or company_data.default_currency
+	doc.conversion_rate = 1.0
+	if doc.currency != company_data.default_currency:
+		doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency)
+	doc.selling_price_list = pos_profile.get('selling_price_list') or frappe.db.get_value('Selling Settings', None, 'selling_price_list')
+	doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
+	doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
+	doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
+	doc.apply_discount_on = pos_profile.get('apply_discount_on') or ''
+	doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
+	doc.territory = pos_profile.get('territory') or get_root('Territory')
+
+def get_root(table):
+	root = frappe.db.sql(""" select name from `tab%(table)s` having
+		min(lft)"""%{'table': table}, as_dict=1)
+
+	return root[0].name
+
+def update_multi_mode_option(doc, pos_profile):
+	from frappe.model import default_fields
+
+	if not pos_profile or not pos_profile.get('payments'):
+		for payment in get_mode_of_payment(doc):
+			payments = doc.append('payments', {})
+			payments.mode_of_payment = payment.parent
+			payments.account = payment.default_account
+			payments.type = payment.type
+
+		return
+
+	for payment_mode in pos_profile.payments:
+		payment_mode = payment_mode.as_dict()
+
+		for fieldname in default_fields:
+			if fieldname in payment_mode:
+				del payment_mode[fieldname]
+
+		doc.append('payments', payment_mode)
+
+def get_mode_of_payment(doc):
+	return frappe.db.sql(""" select mpa.default_account, mpa.parent, mp.type as type from `tabMode of Payment Account` mpa,
+		 `tabMode of Payment` mp where mpa.parent = mp.name and company = %(company)s""", {'company': doc.company}, as_dict=1)
+
+def update_tax_table(doc):
+	taxes = get_taxes_and_charges('Sales Taxes and Charges Template', doc.taxes_and_charges)
+	for tax in taxes:
+		doc.append('taxes', tax)
+
+def get_items(doc, pos_profile):
+	item_list = []
+	for item in frappe.get_all("Item", fields=["*"], filters={'disabled': 0, 'has_variants': 0}):
+		item_doc = frappe.get_doc('Item', item.name)
+		if item_doc.taxes:
+			item.taxes = json.dumps(dict(([d.tax_type, d.tax_rate] for d in
+						item_doc.get("taxes"))))
+
+		item.price_list_rate = frappe.db.get_value('Item Price', {'item_code': item.name,
+									'price_list': doc.selling_price_list}, 'price_list_rate') or 0
+		item.default_warehouse = pos_profile.get('warehouse') or item.default_warehouse or None
+		item.expense_account = pos_profile.get('expense_account') or item.expense_account
+		item.income_account = pos_profile.get('income_account') or item_doc.income_account
+		item.cost_center = pos_profile.get('cost_center') or item_doc.selling_cost_center
+		item.actual_qty = frappe.db.get_value('Bin', {'item_code': item.name,
+								'warehouse': item.default_warehouse}, 'actual_qty') or 0
+		item.serial_nos = get_serial_nos(item, pos_profile)
+		item.batch_nos = frappe.db.sql_list("""select name from `tabBatch` where expiry_date > curdate()
+			and item = %(item_code)s""", {'item_code': item.item_code})
+
+		item_list.append(item)
+
+	return item_list
+
+def get_serial_nos(item, pos_profile):
+	cond = "1=1"
+	if pos_profile.get('update_stock') and pos_profile.get('warehouse'):
+		cond = "warehouse = '{0}'".format(pos_profile.get('warehouse'))
+
+	serial_nos = frappe.db.sql("""select name, warehouse from `tabSerial No` where {0}
+				and item_code = %(item_code)s""".format(cond), {'item_code': item.item_code}, as_dict=1)
+
+	serial_no_list = {}
+	for serial_no in serial_nos:
+		serial_no_list[serial_no.name] = serial_no.warehouse
+
+	return serial_no_list
+
+def get_customers(pos_profile, doc):
+	filters = {'disabled': 0}
+	customer_list = []
+	customers = frappe.get_all("Customer", fields=["*"], filters = filters)
+
+	for customer in customers:
+		customer_currency = get_party_account_currency('Customer', customer.name, doc.company) or doc.currency
+		if customer_currency == doc.currency:
+			customer_list.append(customer)
+	return customer_list
+
+def get_pricing_rules(doc):
+	pricing_rules = ""
+	if doc.ignore_pricing_rule == 0:
+		pricing_rules = frappe.db.sql(""" Select * from `tabPricing Rule` where docstatus < 2 and disable = 0
+						and selling = 1 and ifnull(company, '') in (%(company)s, '') and
+						ifnull(for_price_list, '') in (%(price_list)s, '')  and %(date)s between
+						ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31') order by priority desc, name desc""",
+						{'company': doc.company, 'price_list': doc.selling_price_list, 'date': nowdate()}, as_dict=1)
+	return pricing_rules
+
+@frappe.whitelist()
+def make_invoice(doc_list):
+	if isinstance(doc_list, basestring):
+		doc_list = json.loads(doc_list)
+
+	name_list = []
+
+	for docs in doc_list:
+		for name, doc in docs.items():
+			if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
+				validate_customer(doc)
+				validate_item(doc)
+				si_doc = frappe.new_doc('Sales Invoice')
+				si_doc.offline_pos_name = name
+				si_doc.update(doc)
+				submit_invoice(si_doc, name)
+				name_list.append(name)
+
+	return name_list
+
+def validate_customer(doc):
+	if not frappe.db.exists('Customer', doc.get('customer')):
+		customer_doc = frappe.new_doc('Customer')
+		customer_doc.customer_name = doc.get('customer')
+		customer_doc.customer_type = 'Company'
+		customer_doc.customer_group = doc.get('customer_group')
+		customer_doc.territory = doc.get('territory')
+		customer_doc.save(ignore_permissions = True)
+		frappe.db.commit()
+		doc['customer'] = customer_doc.name
+
+	return doc
+
+def validate_item(doc):
+	for item in doc.get('items'):
+		if not frappe.db.exists('Item', item.get('item_code')):
+			item_doc = frappe.new_doc('Item')
+			item_doc.name = item.get('item_code')
+			item_doc.item_code = item.get('item_code')
+			item_doc.item_name = item.get('item_name')
+			item_doc.description = item.get('description')
+			item_doc.default_warehouse = item.get('warehouse')
+			item_doc.stock_uom = item.get('stock_uom')
+			item_doc.item_group = item.get('item_group')
+			item_doc.save(ignore_permissions=True)
+			frappe.db.commit()
+
+def submit_invoice(si_doc, name):
+	try:
+		si_doc.insert()
+		si_doc.submit()
+	except Exception, e:
+		if frappe.message_log: frappe.message_log.pop()
+		frappe.db.rollback()
+		save_invoice(e, si_doc, name)
+
+def save_invoice(e, si_doc, name):
+		si_doc.docstatus = 0
+		si_doc.name = ''
+		si_doc.save(ignore_permissions=True)
+		make_scheduler_log(e, si_doc.name)
+
+def make_scheduler_log(e, sales_invoice):
+	scheduler_log = frappe.new_doc('Scheduler Log')
+	scheduler_log.error = e
+	scheduler_log.sales_invoice = sales_invoice
+	scheduler_log.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 89af721..b73673f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -4,7 +4,7 @@
 // print heading
 cur_frm.pformat.print_heading = 'Invoice';
 
-{% include 'selling/sales_common.js' %};
+{% include 'erpnext/selling/sales_common.js' %};
 
 frappe.provide("erpnext.accounts");
 erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({
@@ -17,17 +17,6 @@
 			this.frm.set_df_property("debit_to", "print_hide", 0);
 		}
 
-		// toggle to pos view if is_pos is 1 in user_defaults
-		if ((is_null(this.frm.doc.is_pos) && cint(frappe.defaults.get_user_default("is_pos"))===1) || this.frm.doc.is_pos) {
-			if(this.frm.doc.__islocal && !this.frm.doc.amended_from && !this.frm.doc.customer) {
-				this.frm.set_value("is_pos", 1);
-				this.is_pos(function() {
-					if (cint(frappe.defaults.get_user_defaults("fs_pos_view"))===1)
-						erpnext.pos.toggle(me.frm, true);
-				});
-			}
-		}
-
 		erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(me.frm.doc);
 		});
@@ -35,14 +24,11 @@
 
 	refresh: function(doc, dt, dn) {
 		this._super();
-
 		if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
 			// hide new msgbox
 			cur_frm.msgbox.hide();
 		}
 
-		cur_frm.dashboard.reset();
-
 		this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
 
 		this.show_general_ledger();
@@ -62,7 +48,7 @@
 					this.make_sales_return, __("Make"));
 				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
-			
+
 			if(cint(doc.update_stock)!=1) {
 				// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
 				var from_delivery_note = false;
@@ -72,16 +58,20 @@
 					});
 
 				if(!from_delivery_note && !is_delivered_by_supplier) {
-					cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'], 
+					cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'],
 						__("Make"));
 				}
 			}
 
+			if(doc.outstanding_amount!=0 && !cint(doc.is_return)) {
+				cur_frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
+			}
+
 			if(doc.outstanding_amount>0 && !cint(doc.is_return)) {
 				cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make"));
-				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
 			}
 
+
 		}
 
 		// Show buttons only when pos view is active
@@ -111,7 +101,7 @@
 	sales_order_btn: function() {
 		this.$sales_order_btn = cur_frm.add_custom_button(__('Sales Order'),
 			function() {
-				frappe.model.map_current_doc({
+				erpnext.utils.map_current_doc({
 					method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
 					source_doctype: "Sales Order",
 					get_query_filters: {
@@ -128,7 +118,7 @@
 	delivery_note_btn: function() {
 		this.$delivery_note_btn = cur_frm.add_custom_button(__('Delivery Note'),
 			function() {
-				frappe.model.map_current_doc({
+				erpnext.utils.map_current_doc({
 					method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
 					source_doctype: "Delivery Note",
 					get_query: function() {
@@ -149,39 +139,6 @@
 		this.get_terms();
 	},
 
-	is_pos: function(doc, dt, dn, callback_fn) {
-		cur_frm.cscript.hide_fields(this.frm.doc);
-		if(cur_frm.doc.__missing_values_set) return;
-		if(cint(this.frm.doc.is_pos)) {
-			if(!this.frm.doc.company) {
-				this.frm.set_value("is_pos", 0);
-				msgprint(__("Please specify Company to proceed"));
-			} else {
-				var me = this;
-				return this.frm.call({
-					doc: me.frm.doc,
-					method: "set_missing_values",
-					callback: function(r) {
-						if(!r.exc) {
-							if(r.message && r.message.print_format) {
-								cur_frm.pos_print_format = r.message.print_format;
-							}
-							cur_frm.doc.__missing_values_set = true;
-							me.frm.script_manager.trigger("update_stock");
-							frappe.model.set_default_values(me.frm.doc);
-							me.set_dynamic_labels();
-							me.calculate_taxes_and_totals();
-							if(callback_fn) callback_fn();
-							frappe.after_ajax(function() {
-								cur_frm.doc.__missing_values_set = false;
-							})
-						}
-					}
-				});
-			}
-		}
-	},
-
 	customer: function() {
 		var me = this;
 		if(this.frm.updating_party_details) return;
@@ -245,11 +202,6 @@
 		this.write_off_outstanding_amount_automatically();
 	},
 
-	paid_amount: function() {
-		this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
-		this.write_off_outstanding_amount_automatically();
-	},
-
 	items_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
 		this.frm.script_manager.copy_from_first_row("items", row, ["income_account", "cost_center"]);
@@ -269,6 +221,52 @@
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return",
 			frm: cur_frm
 		})
+	},
+
+	asset: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if(row.asset) {
+			frappe.call({
+				method: erpnext.accounts.doctype.asset.depreciation.get_disposal_account_and_cost_center,
+				args: {
+					"company": frm.doc.company
+				},
+				callback: function(r, rt) {
+					frappe.model.set_value(cdt, cdn, "income_account", r.message[0]);
+					frappe.model.set_value(cdt, cdn, "cost_center", r.message[1]);
+				}
+			})
+		}
+	},
+
+	is_pos: function(frm){
+		if(this.frm.doc.is_pos) {
+			if(!this.frm.doc.company) {
+				this.frm.set_value("is_pos", 0);
+				msgprint(__("Please specify Company to proceed"));
+			} else {
+				var me = this;
+				return this.frm.call({
+					doc: me.frm.doc,
+					method: "set_missing_values",
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message && r.message.print_format) {
+								frm.pos_print_format = r.message.print_format;
+							}
+							me.frm.script_manager.trigger("update_stock");
+							frappe.model.set_default_values(me.frm.doc);
+							me.set_dynamic_labels();
+							me.calculate_taxes_and_totals();
+						}
+					}
+				});
+			}
+		}
+	},
+
+	amount: function(){
+		this.write_off_outstanding_amount_automatically()
 	}
 });
 
@@ -278,20 +276,20 @@
 // Hide Fields
 // ------------
 cur_frm.cscript.hide_fields = function(doc) {
-	par_flds = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances_received',
+	parent_fields = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances',
 		'advances', 'sales_partner', 'commission_rate', 'total_commission', 'advances', 'from_date', 'to_date'];
 
 	if(cint(doc.is_pos) == 1) {
-		hide_field(par_flds);
+		hide_field(parent_fields);
 	} else {
-		for (i in par_flds) {
-			var docfield = frappe.meta.docfield_map[doc.doctype][par_flds[i]];
-			if(!docfield.hidden) unhide_field(par_flds[i]);
+		for (i in parent_fields) {
+			var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
+			if(!docfield.hidden) unhide_field(parent_fields[i]);
 		}
 	}
 
-	item_flds_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
-	cur_frm.fields_dict['items'].grid.set_column_disp(item_flds_stock,
+	item_fields_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
+	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
 		(cint(doc.update_stock)==1 ? true : false));
 
 	// India related fields
@@ -303,25 +301,6 @@
 	cur_frm.refresh_fields();
 }
 
-
-cur_frm.cscript.mode_of_payment = function(doc) {
-	if(doc.is_pos) {
-		return cur_frm.call({
-			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
-			args: {
-				"mode_of_payment": doc.mode_of_payment,
-				"company": doc.company
-			 },
-			 callback: function(r, rt) {
-				if(r.message) {
-					cur_frm.set_value("cash_bank_account", r.message["account"]);
-				}
-
-			 }
-		});
-	 }
-}
-
 cur_frm.cscript.update_stock = function(doc, dt, dn) {
 	cur_frm.cscript.hide_fields(doc, dt, dn);
 }
@@ -333,20 +312,6 @@
 	})
 }
 
-cur_frm.cscript.make_bank_entry = function() {
-	return frappe.call({
-		method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice",
-		args: {
-			"dt": "Sales Invoice",
-			"dn": cur_frm.doc.name
-		},
-		callback: function(r) {
-			var doclist = frappe.model.sync(r.message);
-			frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-		}
-	});
-}
-
 cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {
 	return {
 		filters: [
@@ -442,7 +407,7 @@
 	if(cur_frm.doc.is_pos) {
 		cur_frm.msgbox = frappe.msgprint(format('<a class="btn btn-primary" \
 			onclick="cur_frm.print_preview.printit(true)" style="margin-right: 5px;">{0}</a>\
-			<a class="btn btn-default" href="javascript:new_doc(cur_frm.doctype);">{1}</a>', [
+			<a class="btn btn-default" href="javascript:frappe.new_doc(cur_frm.doctype);">{1}</a>', [
 			__('Print'), __('New')
 		]));
 
@@ -471,3 +436,41 @@
 		}
 	}
 });
+
+cur_frm.set_query("asset", "items", function(doc, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	return {
+		filters: [
+			["Asset", "item_code", "=", d.item_code],
+			["Asset", "docstatus", "=", 1],
+			["Asset", "status", "in", ["Submitted", "Partially Depreciated", "Fully Depreciated"]],
+			["Asset", "company", "=", doc.company]
+		]
+	}
+});
+
+frappe.ui.form.on('Sales Invoice', {
+	setup: function(frm){
+		frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(doc, cdt, cdn){
+			return {
+				filters: [
+					["Timesheet", "status", "in", ["Submitted", "Payslip"]]
+				]
+			}
+		}
+	},
+})
+
+frappe.ui.form.on('Sales Invoice Timesheet', {
+	time_sheet: function(frm){
+		frm.call({
+			method: "calculate_billing_amount_from_timesheet",
+			doc: frm.doc,
+			callback: function(r, rt) {
+				refresh_field('total_billing_amount')
+			}
+		})
+	}
+})
+
+cur_frm.add_fetch("time_sheet", "total_billing_amount", "billing_amount");
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 20b8d1b..af5790f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-24 19:29:05", 
  "custom": 0, 
  "default_print_format": "Standard", 
@@ -52,7 +53,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -117,7 +118,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "customer", 
    "fieldname": "customer_name", 
@@ -146,103 +147,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "is_pos", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -295,6 +199,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "offline_pos_name", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Offline POS Name", 
+   "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, 
+   "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, 
@@ -479,10 +408,207 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "depends_on": "", 
+   "fieldname": "address_and_contact", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address and Contact", 
+   "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": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "fieldname": "shipping_address_name", 
    "fieldtype": "Link", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
@@ -508,7 +634,7 @@
    "collapsible": 0, 
    "fieldname": "shipping_address", 
    "fieldtype": "Small Text", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
@@ -530,7 +656,60 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 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": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "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": 1, 
+   "depends_on": "customer", 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -889,6 +1068,85 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.total_billing_amount > 0", 
+   "depends_on": "", 
+   "fieldname": "time_sheet_list", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Time Sheet List", 
+   "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": "timesheets", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Time Sheets", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice Timesheet", 
+   "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, 
+   "default": "0", 
+   "fieldname": "total_billing_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Billing Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "section_break_30", 
    "fieldtype": "Section Break", 
@@ -989,6 +1247,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "net_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Total", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "total", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1015,31 +1298,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "net_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Net Total", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "taxes_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1625,7 +1883,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
@@ -1667,7 +1925,7 @@
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1761,7 +2019,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "get_advances_received", 
+   "fieldname": "get_advances", 
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1772,7 +2030,7 @@
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
-   "options": "get_advances", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1813,8 +2071,8 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "paid_amount", 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)", 
    "fieldname": "payments_section", 
    "fieldtype": "Section Break", 
@@ -1844,7 +2102,7 @@
    "depends_on": "is_pos", 
    "fieldname": "cash_bank_account", 
    "fieldtype": "Link", 
-   "hidden": 0, 
+   "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
@@ -1869,9 +2127,34 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_pos", 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
+   "fieldname": "payments", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Invoice Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "section_break_84", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1880,6 +2163,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -1887,35 +2171,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "is_pos", 
-   "fieldname": "paid_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Paid Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "paid_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
    "unique": 0
   }, 
   {
@@ -1947,6 +2202,110 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_change_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Base Change 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_86", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "is_pos", 
+   "fieldname": "paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "paid_amount", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "change_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Change Amount", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "write_off_amount", 
    "depends_on": "grand_total", 
@@ -2338,7 +2697,7 @@
    "bold": 0, 
    "collapsible": 1, 
    "depends_on": "customer", 
-   "fieldname": "contact_section", 
+   "fieldname": "more_information", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -2348,7 +2707,7 @@
    "label": "More Information", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "icon-bullhorn", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -2390,58 +2749,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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, 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 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": "col_break23", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2466,56 +2773,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "depends_on": "eval:doc.source == 'Campaign'", 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
@@ -3410,7 +3667,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
- "idx": 1, 
+ "idx": 181, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -3418,7 +3676,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-21 13:12:12.430038", 
+ "modified": "2016-07-07 13:40:27.977803", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -3470,26 +3728,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Customer", 
-   "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, 
@@ -3525,11 +3763,13 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index a1144f2..1df86aa 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -9,10 +9,13 @@
 from erpnext.accounts.party import get_party_account, get_due_date
 from erpnext.controllers.stock_controller import update_gl_entries_after
 from frappe.model.mapper import get_mapped_doc
+from erpnext.accounts.doctype.sales_invoice.pos import update_multi_mode_option
 
 from erpnext.controllers.selling_controller import SellingController
 from erpnext.accounts.utils import get_account_currency
 from erpnext.stock.doctype.delivery_note.delivery_note import update_billed_amount_based_on_so
+from erpnext.accounts.doctype.asset.depreciation \
+	import get_disposal_account_and_cost_center, get_gl_entries_on_asset_disposal
 
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
@@ -55,14 +58,14 @@
 		self.validate_uom_is_integer("stock_uom", "qty")
 		self.check_close_sales_order("sales_order")
 		self.validate_debit_to_acc()
-		self.validate_fixed_asset_account()
 		self.clear_unallocated_advances("Sales Invoice Advance", "advances")
-		self.validate_advance_jv("Sales Order")
 		self.add_remarks()
 		self.validate_write_off_account()
+		self.validate_fixed_asset()
+		self.set_income_account_for_fixed_assets()
 
-		if cint(self.is_pos):
-			self.validate_pos()
+		# if cint(self.is_pos):
+			# self.validate_pos()
 
 		if cint(self.update_stock):
 			self.validate_dropship_item()
@@ -76,18 +79,27 @@
 
 		self.set_against_income_account()
 		self.validate_c_form()
-		self.validate_time_logs_are_submitted()
+		self.validate_time_sheets_are_submitted()
 		self.validate_multiple_billing("Delivery Note", "dn_detail", "amount", "items")
 		self.update_packing_list()
+		self.calculate_billing_amount_from_timesheet()
+
+	def before_save(self):
+		set_account_for_mode_of_payment(self)
+
+	def update_change_amount(self):
+		self.base_paid_amount = 0.0
+		if self.paid_amount:
+			self.base_paid_amount = flt(self.paid_amount * self.conversion_rate, self.precision("base_paid_amount"))
+			self.change_amount = self.base_change_amount = 0.0
+			if self.paid_amount > self.grand_total:
+				self.change_amount = flt(self.paid_amount - self.grand_total, self.precision("change_amount"))
+				self.base_change_amount = flt(self.change_amount * self.conversion_rate, self.precision("base_change_amount"))
 
 	def on_submit(self):
-		if cint(self.update_stock) == 1:
-			self.update_stock_ledger()
-		else:
-			# Check for Approving Authority
-			if not self.recurring_id:
-				frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
-				 	self.company, self.base_grand_total, self)
+		if not self.recurring_id:
+			frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
+			 	self.company, self.base_grand_total, self)
 
 		self.check_prev_docstatus()
 
@@ -99,6 +111,11 @@
 		self.update_prevdoc_status()
 		self.update_billing_status_in_dn()
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating reserved qty in bin depends upon updated delivered qty in SO
+		if self.update_stock == 1:
+			self.update_stock_ledger()
+
 		# this sequence because outstanding may get -ve
 		self.make_gl_entries()
 
@@ -109,16 +126,12 @@
 		if not cint(self.is_pos) == 1 and not self.is_return:
 			self.update_against_document_in_jv()
 
-		self.update_time_log_batch(self.name)
-
+		self.update_time_sheet(self.name)
 
 	def before_cancel(self):
-		self.update_time_log_batch(None)
+		self.update_time_sheet(None)
 
 	def on_cancel(self):
-		if cint(self.update_stock) == 1:
-			self.update_stock_ledger()
-
 		self.check_close_sales_order("sales_order")
 
 		from erpnext.accounts.utils import remove_against_link_from_jv
@@ -137,6 +150,11 @@
 
 		self.validate_c_form_on_cancel()
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating reserved qty in bin depends upon updated delivered qty in SO
+		if self.update_stock == 1:
+			self.update_stock_ledger()
+
 		self.make_gl_entries_on_cancel()
 
 	def update_status_updater_args(self):
@@ -199,20 +217,21 @@
 		if pos:
 			return {"print_format": pos.get("print_format") }
 
-	def update_time_log_batch(self, sales_invoice):
-		for d in self.get("items"):
-			if d.time_log_batch:
-				tlb = frappe.get_doc("Time Log Batch", d.time_log_batch)
-				tlb.sales_invoice = sales_invoice
-				tlb.flags.ignore_validate_update_after_submit = True
-				tlb.save()
+	def update_time_sheet(self, sales_invoice):
+		for d in self.timesheets:
+			if d.time_sheet:
+				timesheet = frappe.get_doc("Timesheet", d.time_sheet)
+				timesheet.sales_invoice = sales_invoice
+				timesheet.flags.ignore_validate_update_after_submit = True
+				timesheet.set_status()
+				timesheet.save()
 
-	def validate_time_logs_are_submitted(self):
-		for d in self.get("items"):
-			if d.time_log_batch:
-				docstatus = frappe.db.get_value("Time Log Batch", d.time_log_batch, "docstatus")
-				if docstatus!=1:
-					frappe.throw(_("Time Log Batch {0} must be 'Submitted'").format(d.time_log_batch))
+	def validate_time_sheets_are_submitted(self):
+		for data in self.timesheets:
+			if data.time_sheet:
+				status = frappe.db.get_value("Timesheet", data.time_sheet, "status")
+				if status not in ['Submitted', 'Payslip']:
+					frappe.throw(_("Timesheet {0} is already completed or cancelled").format(data.time_sheet))
 
 	def set_pos_fields(self, for_validate=False):
 		"""Set retail related fields from POS Profiles"""
@@ -254,46 +273,15 @@
 			if self.taxes_and_charges and not len(self.get("taxes")):
 				self.set_taxes()
 
-		return pos
+			if not self.get('payments'):
+				pos_profile = frappe.get_doc('POS Profile', pos.name)
+				update_multi_mode_option(self, pos_profile)
 
-	def get_advances(self):
-		if not self.is_return:
-			super(SalesInvoice, self).get_advances(self.debit_to, "Customer", self.customer,
-				"Sales Invoice Advance", "advances", "credit_in_account_currency", "sales_order")
+		return pos
 
 	def get_company_abbr(self):
 		return frappe.db.sql("select abbr from tabCompany where name=%s", self.company)[0][0]
 
-	def update_against_document_in_jv(self):
-		"""
-			Links invoice and advance voucher:
-				1. cancel advance voucher
-				2. split into multiple rows if partially adjusted, assign against voucher
-				3. submit advance voucher
-		"""
-
-		lst = []
-		for d in self.get('advances'):
-			if flt(d.allocated_amount) > 0:
-				args = {
-					'voucher_no' : d.journal_entry,
-					'voucher_detail_no' : d.jv_detail_no,
-					'against_voucher_type' : 'Sales Invoice',
-					'against_voucher'  : self.name,
-					'account' : self.debit_to,
-					'party_type': 'Customer',
-					'party': self.customer,
-					'is_advance' : 'Yes',
-					'dr_or_cr' : 'credit_in_account_currency',
-					'unadjusted_amt' : flt(d.advance_amount),
-					'allocated_amt' : flt(d.allocated_amount)
-				}
-				lst.append(args)
-
-		if lst:
-			from erpnext.accounts.utils import reconcile_against_document
-			reconcile_against_document(lst)
-
 	def validate_debit_to_acc(self):
 		account = frappe.db.get_value("Account", self.debit_to,
 			["account_type", "report_type", "account_currency"], as_dict=True)
@@ -309,14 +297,6 @@
 
 		self.party_account_currency = account.account_currency
 
-	def validate_fixed_asset_account(self):
-		"""Validate Fixed Asset and whether Income Account Entered Exists"""
-		for d in self.get('items'):
-			is_asset_item = frappe.db.get_value("Item", d.item_code, "is_asset_item")
-			account_type = frappe.db.get_value("Account", d.income_account, "account_type")
-			if is_asset_item == 1 and account_type != 'Fixed Asset':
-				msgprint(_("Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item").format(d.income_account, d.item_code), raise_exception=True)
-
 	def validate_with_previous_doc(self):
 		super(SalesInvoice, self).validate_with_previous_doc({
 			"Sales Order": {
@@ -440,6 +420,13 @@
 		else:
 			self.set('packed_items', [])
 
+	def calculate_billing_amount_from_timesheet(self):
+		total_billing_amount = 0.0
+		for data in self.timesheets:
+			if data.billing_amount:
+				total_billing_amount += data.billing_amount
+
+		self.total_billing_amount = total_billing_amount
 
 	def get_warehouse(self):
 		user_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
@@ -457,21 +444,16 @@
 
 		return warehouse
 
-	def on_update(self):
-		if cint(self.is_pos) == 1:
-			if flt(self.paid_amount) == 0:
-				if self.cash_bank_account:
-					frappe.db.set(self, 'paid_amount',
-						flt(flt(self.grand_total) - flt(self.write_off_amount), self.precision("paid_amount")))
-				else:
-					# show message that the amount is not paid
-					frappe.db.set(self,'paid_amount',0)
-					frappe.msgprint(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
-		else:
-			frappe.db.set(self,'paid_amount',0)
+	def set_income_account_for_fixed_assets(self):
+		disposal_account = depreciation_cost_center = None
+		for d in self.get("items"):
+			if d.is_fixed_asset:
+				if not disposal_account:
+					disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(self.company)
 
-		frappe.db.set(self, 'base_paid_amount',
-			flt(self.paid_amount*self.conversion_rate, self.precision("base_paid_amount")))
+				d.income_account = disposal_account
+				if not d.cost_center:
+					d.cost_center = depreciation_cost_center
 
 	def check_prev_docstatus(self):
 		for d in self.get('items'):
@@ -566,17 +548,28 @@
 		# income account gl entries
 		for item in self.get("items"):
 			if flt(item.base_net_amount):
-				account_currency = get_account_currency(item.income_account)
-				gl_entries.append(
-					self.get_gl_dict({
-						"account": item.income_account,
-						"against": self.customer,
-						"credit": item.base_net_amount,
-						"credit_in_account_currency": item.base_net_amount \
-							if account_currency==self.company_currency else item.net_amount,
-						"cost_center": item.cost_center
-					}, account_currency)
-				)
+				if item.is_fixed_asset:
+					asset = frappe.get_doc("Asset", item.asset)
+
+					fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset, item.base_net_amount)
+					for gle in fixed_asset_gl_entries:
+						gle["against"] = self.customer
+						gl_entries.append(self.get_gl_dict(gle))
+
+					asset.db_set("disposal_date", self.posting_date)
+					asset.set_status("Sold" if self.docstatus==1 else None)
+				else:
+					account_currency = get_account_currency(item.income_account)
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": item.income_account,
+							"against": self.customer,
+							"credit": item.base_net_amount,
+							"credit_in_account_currency": item.base_net_amount \
+								if account_currency==self.company_currency else item.net_amount,
+							"cost_center": item.cost_center
+						}, account_currency)
+					)
 
 		# expense account gl entries
 		if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) \
@@ -584,8 +577,7 @@
 			gl_entries += super(SalesInvoice, self).get_gl_entries()
 
 	def make_pos_gl_entries(self, gl_entries):
-		if cint(self.is_pos) and self.cash_bank_account and self.paid_amount:
-			bank_account_currency = get_account_currency(self.cash_bank_account)
+		if cint(self.is_pos) and self.paid_amount:
 			# POS, make payment entries
 			gl_entries.append(
 				self.get_gl_dict({
@@ -593,27 +585,49 @@
 					"party_type": "Customer",
 					"party": self.customer,
 					"against": self.cash_bank_account,
-					"credit": self.base_paid_amount,
-					"credit_in_account_currency": self.base_paid_amount \
-						if self.party_account_currency==self.company_currency else self.paid_amount,
+					"credit": flt(self.base_paid_amount - self.base_change_amount),
+					"credit_in_account_currency": flt(self.base_paid_amount - self.base_change_amount) \
+						if self.party_account_currency==self.company_currency else flt(self.paid_amount - self.change_amount),
 					"against_voucher": self.return_against if cint(self.is_return) else self.name,
 					"against_voucher_type": self.doctype,
 				}, self.party_account_currency)
 			)
-			gl_entries.append(
-				self.get_gl_dict({
-					"account": self.cash_bank_account,
-					"against": self.customer,
-					"debit": self.base_paid_amount,
-					"debit_in_account_currency": self.base_paid_amount \
-						if bank_account_currency==self.company_currency else self.paid_amount
-				}, bank_account_currency)
-			)
+
+			cash_account = ''
+			for payment_mode in self.payments:
+				if payment_mode.type == 'Cash':
+					cash_account = payment_mode.account
+
+				if payment_mode.base_amount > 0:
+					payment_mode_account_currency = get_account_currency(payment_mode.account)
+					gl_entries.append(
+						self.get_gl_dict({
+							"account": payment_mode.account,
+							"against": self.customer,
+							"debit": payment_mode.base_amount,
+							"debit_in_account_currency": payment_mode.base_amount \
+								if payment_mode_account_currency==self.company_currency else payment_mode.amount
+						}, payment_mode_account_currency)
+					)
+
+			if self.change_amount:
+				cash_account = cash_account or self.payments[0].account
+				cash_account_currency = get_account_currency(cash_account)
+				gl_entries.append(
+					self.get_gl_dict({
+						"account": cash_account,
+						"against": self.customer,
+						"credit": self.base_change_amount,
+						"credit_in_account_currency": self.base_change_amount \
+							if payment_mode_account_currency==self.company_currency else self.change_amount
+					}, payment_mode_account_currency)
+				)
 
 	def make_write_off_gl_entry(self, gl_entries):
 		# write off entries, applicable if only pos
 		if self.write_off_account and self.write_off_amount:
 			write_off_account_currency = get_account_currency(self.write_off_account)
+			default_cost_center = frappe.db.get_value('Company', self.company, 'cost_center')
 
 			gl_entries.append(
 				self.get_gl_dict({
@@ -635,7 +649,7 @@
 					"debit": self.base_write_off_amount,
 					"debit_in_account_currency": self.base_write_off_amount \
 						if write_off_account_currency==self.company_currency else self.write_off_amount,
-					"cost_center": self.write_off_cost_center
+					"cost_center": self.write_off_cost_center or default_cost_center
 				}, write_off_account_currency)
 			)
 
@@ -663,7 +677,12 @@
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
-	list_context["title"] = _("My Invoices")
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Invoices'),
+	})
 	return list_context
 
 @frappe.whitelist()
@@ -671,7 +690,8 @@
 	account = frappe.db.get_value("Mode of Payment Account",
 		{"parent": mode_of_payment, "company": company}, "default_account")
 	if not account:
-		frappe.msgprint(_("Please set default Cash or Bank account in Mode of Payment {0}").format(mode_of_payment))
+		frappe.throw(_("Please set default Cash or Bank account in Mode of Payment {0}")
+			.format(mode_of_payment))
 	return {
 		"account": account
 	}
@@ -729,3 +749,8 @@
 def make_sales_return(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
 	return make_return_doc("Sales Invoice", source_name, target_doc)
+
+def set_account_for_mode_of_payment(self):
+	for data in self.payments:
+		if not data.account:
+			data.account = get_bank_cash_account(data.mode_of_payment, self.company).get("account")
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
new file mode 100644
index 0000000..f494303
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -0,0 +1,30 @@
+from frappe import _
+
+data = {
+	'fieldname': 'sales_invoice',
+	'non_standard_fieldnames': {
+		'Delivery Note': 'against_sales_invoice',
+		'Journal Entry': 'reference_name',
+		'Payment Entry': 'reference_name',
+		'Payment Request': 'reference_name',
+		'Sales Invoice': 'return_against'
+	},
+	'internal_links': {
+		'Sales Order': ['items', 'sales_order'],
+		'Delivery Note': ['items', 'delivery_note'],
+	},
+	'transactions': [
+		{
+			'label': _('Payment'),
+			'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Timesheet', 'Delivery Note', 'Sales Order']
+		},
+		{
+			'label': _('Returns'),
+			'items': ['Sales Invoice']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index fc8ca63..e7eee5f 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -441,17 +441,45 @@
 		self.make_pos_profile()
 
 		self._insert_purchase_receipt()
-
 		pos = copy.deepcopy(test_records[1])
 		pos["is_pos"] = 1
 		pos["update_stock"] = 1
-		pos["cash_bank_account"] = "_Test Bank - _TC"
-		pos["paid_amount"] = 600.0
+		pos["payments"] = [{'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 300},
+							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 300}]
 
 		si = frappe.copy_doc(pos)
 		si.insert()
 		si.submit()
 
+		self.assertEquals(si.paid_amount, 600.0)
+
+		self.pos_gl_entry(si, pos, 300)
+
+	def test_make_pos_invoice(self):
+		from erpnext.accounts.doctype.sales_invoice.pos import make_invoice
+
+		set_perpetual_inventory()
+
+		self.make_pos_profile()
+		self._insert_purchase_receipt()
+
+		pos = copy.deepcopy(test_records[1])
+		pos["is_pos"] = 1
+		pos["update_stock"] = 1
+		pos["payments"] = [{'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 300},
+							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 330}]
+
+		invoice_data = [{'09052016142': pos}]
+		si = make_invoice(invoice_data)
+		self.assertEquals(si[0], '09052016142')
+
+		sales_invoice = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': '09052016142', 'docstatus': 1})
+		si = frappe.get_doc('Sales Invoice', sales_invoice[0].name)
+		self.assertEquals(si.grand_total, 630.0)
+
+		self.pos_gl_entry(si, pos, 330)
+
+	def pos_gl_entry(self, si, pos, cash_amount):
 		# check stock ledger entries
 		sle = frappe.db.sql("""select * from `tabStock Ledger Entry`
 			where voucher_type = 'Sales Invoice' and voucher_no = %s""",
@@ -475,8 +503,9 @@
 			[pos["taxes"][1]["account_head"], 0.0, 50.0],
 			[stock_in_hand, 0.0, abs(sle.stock_value_difference)],
 			[pos["items"][0]["expense_account"], abs(sle.stock_value_difference), 0.0],
-			[si.debit_to, 0.0, 600.0],
-			["_Test Bank - _TC", 600.0, 0.0]
+			[si.debit_to, 0.0, si.paid_amount],
+			["_Test Bank - _TC", 300.0, 0.0],
+			["Cash - _TC", cash_amount, 0.0]
 		])
 
 		for i, gle in enumerate(sorted(gl_entries, key=lambda gle: gle.account)):
@@ -496,7 +525,6 @@
 
 	def make_pos_profile(self):
 		pos_profile = frappe.get_doc({
-			"cash_bank_account": "_Test Bank - _TC",
 			"company": "_Test Company",
 			"cost_center": "_Test Cost Center - _TC",
 			"currency": "INR",
@@ -648,8 +676,9 @@
 		si = frappe.copy_doc(test_records[0])
 		si.append("advances", {
 			"doctype": "Sales Invoice Advance",
-			"journal_entry": jv.name,
-			"jv_detail_no": jv.get("accounts")[0].name,
+			"reference_type": "Journal Entry",
+			"reference_name": jv.name,
+			"reference_row": jv.get("accounts")[0].name,
 			"advance_amount": 400,
 			"allocated_amount": 300,
 			"remarks": jv.remark
@@ -910,11 +939,57 @@
 
 		self.assertRaises(InvalidAccountCurrency, si5.submit)
 
+	def test_create_so_with_margin(self):
+		si = create_sales_invoice(item_code="_Test Item", qty=1, do_not_submit=True)
+		price_list_rate = si.items[0].price_list_rate
+		si.items[0].margin_type = 'Percentage'
+		si.items[0].margin_rate_or_amount = 25
+		si.insert()
+
+		self.assertNotEquals(si.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
+		si.items[0].margin_rate_or_amount = 25
+		si.submit()
+
+		self.assertNotEquals(si.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
+
+	def test_party_status(self):
+		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+		from frappe.utils import random_string
+
+		customer_name = 'test customer for status'
+
+		if frappe.db.exists('Customer', customer_name):
+			customer = frappe.get_doc('Customer', customer_name)
+			customer.db_set('status', 'Active')
+		else:
+			customer = frappe.get_doc({
+				'doctype': 'Customer',
+				'customer_name': customer_name,
+				'customer_group': 'Commercial',
+				'customer_type': 'Individual',
+				'territory': 'Rest of the World'
+			}).insert()
+
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
+
+		invoice = create_sales_invoice(customer="test customer for status",
+			debit_to="_Test Receivable - _TC",
+			currency="USD", conversion_rate=50)
+
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
+
+		pe = get_payment_entry(invoice.doctype, invoice.name)
+		pe.reference_no = random_string(10)
+		pe.reference_date = invoice.posting_date
+		pe.insert()
+		pe.submit()
+
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
+
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
 	args = frappe._dict(args)
-	if args.posting_date:
-		si.posting_date = args.posting_date or nowdate()
+	si.posting_date = args.posting_date or nowdate()
 
 	si.company = args.company or "_Test Company"
 	si.customer = args.customer or "_Test Customer"
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 b1fae8e..069ac3a 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -2,29 +2,34 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:41", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "journal_entry", 
+   "fieldname": "reference_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Journal Entry", 
+   "in_list_view": 0, 
+   "label": "Reference Type", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "journal_voucher", 
    "oldfieldtype": "Link", 
-   "options": "Journal Entry", 
+   "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "250px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -38,10 +43,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "remarks", 
-   "fieldtype": "Small Text", 
+   "fieldname": "reference_name", 
+   "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Reference Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "reference_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "remarks", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remarks", 
@@ -51,6 +83,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -64,19 +97,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "jv_detail_no", 
+   "fieldname": "reference_row", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Journal Entry Detail No", 
+   "label": "Reference Row", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "jv_detail_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -94,12 +129,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -115,6 +152,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Advance amount", 
@@ -125,6 +163,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -142,6 +181,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated amount", 
@@ -152,6 +192,7 @@
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -165,18 +206,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:56.263776", 
+ "menu_index": 0, 
+ "modified": "2016-07-18 05:13:21.819598", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Advance", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 79f5f55..a408643 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-06-04 11:02:19", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
@@ -40,6 +43,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item", 
@@ -66,6 +70,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -88,6 +93,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -113,6 +119,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Item Code", 
@@ -136,6 +143,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Edit Description", 
@@ -160,6 +168,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -187,6 +196,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -210,6 +220,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -235,6 +246,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -259,6 +271,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -282,6 +295,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
@@ -307,6 +321,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
@@ -329,36 +344,11 @@
    "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_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": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -381,6 +371,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
@@ -405,6 +396,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
@@ -426,11 +418,167 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "discount_and_margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Discount and Margin", 
+   "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, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_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": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "total_margin", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "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": "section_break1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -453,6 +601,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
@@ -479,6 +628,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -505,6 +655,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -527,6 +678,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
@@ -553,6 +705,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
@@ -579,6 +732,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
@@ -603,6 +757,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -626,6 +781,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
@@ -651,6 +807,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
@@ -676,6 +833,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -699,6 +857,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
@@ -724,6 +883,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
@@ -750,6 +910,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Drop Ship", 
@@ -774,6 +935,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivered By Supplier", 
@@ -798,6 +960,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting Details", 
@@ -821,6 +984,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Income Account", 
@@ -849,6 +1013,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Expense Account", 
@@ -874,6 +1039,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -897,6 +1063,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Cost Center", 
@@ -926,6 +1093,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Details", 
@@ -949,6 +1117,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
@@ -975,6 +1144,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Warehouse (Optional)", 
@@ -1000,6 +1170,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
@@ -1025,6 +1196,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
@@ -1050,6 +1222,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
@@ -1076,6 +1249,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Brand Name", 
@@ -1101,6 +1275,7 @@
    "fieldtype": "Small Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
@@ -1126,6 +1301,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1148,6 +1324,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Batch Qty at Warehouse", 
@@ -1174,6 +1351,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Qty at Warehouse", 
@@ -1199,6 +1377,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "References", 
@@ -1219,34 +1398,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "time_log_batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Time Log Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Time Log Batch", 
-   "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": "sales_order", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Order", 
@@ -1273,6 +1429,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Order Item", 
@@ -1298,6 +1455,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1321,6 +1479,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Note", 
@@ -1347,6 +1506,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Note Item", 
@@ -1372,6 +1532,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivered Qty", 
@@ -1393,10 +1554,62 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Fixed Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "asset", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Asset", 
+   "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": "section_break_54", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1420,6 +1633,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
@@ -1439,20 +1653,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-01 11:16:58.288462", 
+ "modified": "2016-07-11 03:28:07.483665", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/sales_invoice_payment/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/sales_invoice_payment/__init__.py
diff --git a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
new file mode 100644
index 0000000..13d7f15
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
@@ -0,0 +1,193 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-08 23:49:38.842621", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Mode of Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "0.0", 
+   "depends_on": "eval:parent.doctype == 'Sales Invoice'", 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "type", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "mode_of_payment.type", 
+   "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": "base_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Base 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:07.779228", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Sales Invoice Payment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.py b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.py
new file mode 100644
index 0000000..cc0b7a6
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SalesInvoicePayment(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/doctype/sales_invoice_timesheet/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/doctype/sales_invoice_timesheet/__init__.py
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
new file mode 100644
index 0000000..8ab95f4
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -0,0 +1,88 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-14 19:21:34.321662", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "time_sheet", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Time Sheet", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Timesheet", 
+   "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": "billing_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Billing Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:07.876168", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Sales Invoice Timesheet", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.py b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.py
new file mode 100644
index 0000000..afc05ab
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SalesInvoiceTimesheet(Document):
+	pass
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 c3017eb..3c1a8fe 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
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "INVTD.######", 
+ "beta": 0, 
  "creation": "2013-04-24 11:39:32", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -508,18 +510,22 @@
  "hide_heading": 1, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-22 09:35:25.423372", 
+ "modified": "2016-07-11 03:28:08.283145", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
index 8828e0c..97a6fdd 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
@@ -3,5 +3,5 @@
 
 cur_frm.cscript.tax_table = "Sales Taxes and Charges";
 
-{% include "public/js/controllers/accounts.js" %}
+{% include "erpnext/public/js/controllers/accounts.js" %}
 
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 351cd56..28964bb 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
@@ -12,8 +12,9 @@
 		valdiate_taxes_and_charges_template(self)
 
 def valdiate_taxes_and_charges_template(doc):
-	if not doc.is_default and not frappe.get_all(doc.doctype, filters={"is_default": 1}):
-		doc.is_default = 1
+	# default should not be disabled
+	# if not doc.is_default and not frappe.get_all(doc.doctype, filters={"is_default": 1}):
+	# 	doc.is_default = 1
 
 	if doc.is_default == 1:
 		frappe.db.sql("""update `tab{0}` set is_default = 0
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 f653b10..a6df2ac 100644
--- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-25 11:54:50", 
  "custom": 0, 
  "description": "A condition for a Shipping Rule", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Value", 
@@ -23,6 +26,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -38,6 +42,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Value", 
@@ -45,6 +50,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -60,6 +66,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Shipping Amount", 
@@ -68,6 +75,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -79,18 +87,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.700694", 
+ "modified": "2016-07-11 03:28:08.503506", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule Condition", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 3d0c36c..fe28fcb 100644
--- a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
+++ b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-09-17 06:43:22.767534", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -35,21 +39,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.731755", 
+ "modified": "2016-07-11 03:28:08.567594", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule Country", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index 38e6805..26e379b 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "TR.####", 
+ "beta": 0, 
  "creation": "2015-08-07 02:33:52.670866", 
  "custom": 0, 
  "docstatus": 0, 
@@ -18,6 +19,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Tax Type", 
@@ -27,6 +29,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -42,6 +45,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Use for Shopping Cart", 
@@ -50,6 +54,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,6 +70,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -72,6 +78,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,6 +95,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Tax Template", 
@@ -97,6 +105,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -113,6 +122,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Tax Template", 
@@ -122,6 +132,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +148,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Filters", 
@@ -145,6 +157,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -161,6 +174,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
@@ -170,6 +184,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -186,6 +201,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
@@ -195,6 +211,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,6 +227,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing City", 
@@ -218,6 +236,32 @@
    "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": "billing_county", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billing County", 
+   "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, 
@@ -233,6 +277,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing State", 
@@ -241,6 +286,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -256,6 +302,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Country", 
@@ -265,6 +312,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -280,6 +328,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -287,6 +336,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,6 +353,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
@@ -312,6 +363,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -328,6 +380,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Type", 
@@ -337,6 +390,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -352,6 +406,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping City", 
@@ -360,6 +415,32 @@
    "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": "shipping_county", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Shipping County", 
+   "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, 
@@ -375,6 +456,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping State", 
@@ -383,6 +465,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -398,6 +481,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Country", 
@@ -407,6 +491,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -422,6 +507,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Validity", 
@@ -430,6 +516,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -445,6 +532,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
@@ -453,6 +541,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -468,6 +557,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -475,6 +565,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -490,6 +581,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
@@ -498,6 +590,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -513,6 +606,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -520,6 +614,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -536,6 +631,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Priority", 
@@ -544,6 +640,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -559,6 +656,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -566,6 +664,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -581,6 +680,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -590,6 +690,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -600,13 +701,14 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.201327", 
+ "modified": "2016-05-30 15:53:16.630072", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -634,8 +736,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index be6f4a4..7ec833e 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -49,9 +49,11 @@
 			"supplier":			self.supplier,
 			"supplier_type":	self.supplier_type,
 			"billing_city":		self.billing_city,
+			"billing_county":	self.billing_county,
 			"billing_state": 	self.billing_state,
 			"billing_country":	self.billing_country,
 			"shipping_city":	self.shipping_city,
+			"shipping_county":	self.shipping_county,
 			"shipping_state":	self.shipping_state,
 			"shipping_country":	self.shipping_country,
 			"company":			self.company
@@ -101,16 +103,18 @@
 		billing_filters=	{party_type: party, "is_primary_address": 1}
 		shipping_filters=	{party_type:party, "is_shipping_address": 1}
 
-	billing_address=	frappe.get_all("Address", fields=["city", "state", "country"], filters= billing_filters)
-	shipping_address=	frappe.get_all("Address", fields=["city", "state", "country"], filters= shipping_filters)
+	billing_address=	frappe.get_all("Address", fields=["city", "county", "state", "country"], filters= billing_filters)
+	shipping_address=	frappe.get_all("Address", fields=["city", "county", "state", "country"], filters= shipping_filters)
 
 	if billing_address:
 		out["billing_city"]= billing_address[0].city
+		out["billing_county"]= billing_address[0].county
 		out["billing_state"]= billing_address[0].state
 		out["billing_country"]= billing_address[0].country
 
 	if shipping_address:
 		out["shipping_city"]= shipping_address[0].city
+		out["shipping_county"]= shipping_address[0].county
 		out["shipping_state"]= shipping_address[0].state
 		out["shipping_country"]= shipping_address[0].country
 
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 2063edf..4af197e 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -6,7 +6,7 @@
 from frappe.utils import flt, cstr, cint
 from frappe import _
 from frappe.model.meta import get_field_precision
-from erpnext.accounts.utils import validate_expense_against_budget
+from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
 
 
 class StockAccountInvalidTransaction(frappe.ValidationError): pass
@@ -25,7 +25,6 @@
 def process_gl_map(gl_map, merge_entries=True):
 	if merge_entries:
 		gl_map = merge_similar_entries(gl_map)
-
 	for entry in gl_map:
 		# toggle debit, credit if negative entry
 		if flt(entry.debit) < 0:
@@ -75,7 +74,8 @@
 			and cstr(e.get('party'))==cstr(gle.get('party')) \
 			and cstr(e.get('against_voucher'))==cstr(gle.get('against_voucher')) \
 			and cstr(e.get('against_voucher_type')) == cstr(gle.get('against_voucher_type')) \
-			and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')):
+			and cstr(e.get('cost_center')) == cstr(gle.get('cost_center')) \
+			and cstr(e.get('project')) == cstr(gle.get('project')):
 				return e
 
 def save_entries(gl_map, adv_adj, update_outstanding):
@@ -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 (warehouse != '' and warehouse is not null)""")]
+				where account_type = 'Stock' and (warehouse != '' and warehouse is not null) and is_group=0""")]
 
 			for entry in gl_map:
 				if entry.account in aii_accounts:
@@ -160,7 +160,6 @@
 
 	gl_map.append(round_off_gle)
 
-
 def delete_gl_entries(gl_entries=None, voucher_type=None, voucher_no=None,
 		adv_adj=False, update_outstanding="Yes"):
 
@@ -168,8 +167,12 @@
 		check_freezing_date, update_outstanding_amt, validate_frozen_account
 
 	if not gl_entries:
-		gl_entries = frappe.db.sql("""select * from `tabGL Entry`
+		gl_entries = frappe.db.sql("""
+			select account, posting_date, party_type, party, cost_center, fiscal_year,
+			voucher_type, voucher_no, against_voucher_type, against_voucher, cost_center
+			from `tabGL Entry`
 			where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True)
+
 	if gl_entries:
 		check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
 
@@ -180,7 +183,7 @@
 		validate_frozen_account(entry["account"], adv_adj)
 		validate_balance_type(entry["account"], adv_adj)
 		validate_expense_against_budget(entry)
-
+		
 		if entry.get("against_voucher") and update_outstanding == 'Yes':
 			update_outstanding_amt(entry["account"], entry.get("party_type"), entry.get("party"), entry.get("against_voucher_type"),
 				entry.get("against_voucher"), on_cancel=True)
diff --git a/erpnext/accounts/page/accounts_browser/README.md b/erpnext/accounts/page/accounts_browser/README.md
deleted file mode 100644
index b879561..0000000
--- a/erpnext/accounts/page/accounts_browser/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tree view browser for Chart of Accounts and Chart of Cost Centers
\ No newline at end of file
diff --git a/erpnext/accounts/page/accounts_browser/__init__.py b/erpnext/accounts/page/accounts_browser/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/accounts/page/accounts_browser/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
deleted file mode 100644
index 7e64ea3..0000000
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-// tree of chart of accounts / cost centers
-// multiple companies
-// add node
-// edit node
-// see ledger
-
-frappe.pages["Accounts Browser"].on_page_load  = function(wrapper){
-	frappe.ui.make_app_page({
-		parent: wrapper,
-		single_column: true
-	})
-
-	frappe.breadcrumbs.add("Accounts");
-
-	var main = wrapper.page.main,
-		chart_area = $("<div>")
-			.css({"margin-bottom": "15px", "min-height": "200px"})
-			.appendTo(main),
-		help_area = $('<hr><div style="padding: 0px 15px;">'+
-		'<h4>'+__('Quick Help')+'</h4>'+
-		'<ol>'+
-			'<li>'+__('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'</li>'+
-			'<li>'+
-			      __('Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.')+
-		    '</li>'+
-			'<li>'+__('Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'</li>'+
-			'<li>'+
-			     '<b>'+__('To create a Bank Account')+'</b>: '+
-			      __('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"')+
-			'</li>'+
-			'<li>'+
-			      '<b>'+__('To create a Tax Account') +'</b>: '+
-			      __('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.')+
-			'</li>'+
-		'</ol>'+
-		'<p>'+__('Please setup your chart of accounts before you start Accounting Entries')+'</p></div>').appendTo(main);
-
-	if (frappe.boot.user.can_create.indexOf("Company") !== -1) {
-		wrapper.page.add_menu_item(__('New Company'), function() { newdoc('Company'); }, true);
-	}
-
-	wrapper.page.add_menu_item(__('Refresh'), function() {
-			wrapper.$company_select.change();
-		});
-
-	wrapper.page.set_primary_action(__('New'), function() {
-		erpnext.account_chart && erpnext.account_chart.make_new();
-	}, "octicon octicon-plus");
-
-	var company_list = $.map(locals[':Company'], function(c) { return c.name; }).sort();
-
-	// company-select
-	wrapper.$company_select = wrapper.page.add_select("Company", company_list)
-		.change(function() {
-			var ctype = frappe.get_route()[1] || 'Account';
-			erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
-				chart_area.get(0), wrapper.page);
-		})
-
-	wrapper.$company_select.change();
-}
-
-frappe.pages["Accounts Browser"].on_page_show = function(wrapper){
-	// set route
-	var ctype = frappe.get_route()[1] || 'Account';
-
-	if(frappe.route_options) {
-		if(frappe.route_options.company) {
-			wrapper.$company_select.val(frappe.route_options.company).change();
-		}
-		frappe.route_options = null;
-	} else if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
-		wrapper.$company_select.change();
-	}
-
-}
-
-erpnext.AccountsChart = Class.extend({
-	init: function(ctype, company, wrapper, page) {
-		$(wrapper).empty();
-		var me = this;
-		me.ctype = ctype;
-		me.can_create = frappe.model.can_create(this.ctype);
-		me.can_delete = frappe.model.can_delete(this.ctype);
-		me.can_write = frappe.model.can_write(this.ctype);
-		me.page = page;
-		me.set_title();
-
-		// __("Accounts"), __("Cost Centers")
-
-		me.company = company;
-		this.tree = new frappe.ui.Tree({
-			parent: $(wrapper),
-			label: ctype==="Account" ? "Accounts" : "Cost Centers",
-			args: {ctype: ctype, comp: company},
-			method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_children',
-			click: function(link) {
-				// bold
-				$('.bold').removeClass('bold'); // deselect
-				$(link).parent().find('.balance-area:first').addClass('bold'); // select
-
-			},
-			toolbar: [
-				{ toggle_btn: true },
-				{
-					label: __("Open"),
-					condition: function(node) { return !node.root },
-					click: function(node, btn) {
-						 frappe.set_route("Form", me.ctype, node.label);
-					}
-				},
-				{
-					condition: function(node) { return node.expandable; },
-					label: __("Add Child"),
-					click: function() {
-						me.make_new()
-					},
-					btnClass: "hidden-xs"
-				},
-				{
-					condition: function(node) {
-						return !node.root && me.ctype === 'Account'
-							&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1
-					},
-					label: __("View Ledger"),
-					click: function(node, btn) {
-						frappe.route_options = {
-							"account": node.label,
-							"from_date": sys_defaults.year_start_date,
-							"to_date": sys_defaults.year_end_date,
-							"company": me.company
-						};
-						frappe.set_route("query-report", "General Ledger");
-					},
-					btnClass: "hidden-xs"
-				},
-				{
-					condition: function(node) { return !node.root && me.can_write },
-					label: __("Rename"),
-					click: function(node) {
-						frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
-							node.reload_parent();
-						});
-					},
-					btnClass: "hidden-xs"
-				},
-				{
-					condition: function(node) { return !node.root && me.can_delete },
-					label: __("Delete"),
-					click: function(node) {
-						frappe.model.delete_doc(me.ctype, node.label, function() {
-							node.parent.remove();
-						});
-					},
-					btnClass: "hidden-xs"
-				}
-			],
-			onrender: function(node) {
-				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">'
-						+ (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);
-				}
-			}
-		});
-	},
-	set_title: function(val) {
-		var chart_str = this.ctype=="Account" ? __("Chart of Accounts") : __("Chart of Cost Centers");
-		if(val) {
-			this.page.set_title(chart_str + " - " + cstr(val));
-		} else {
-			this.page.set_title(chart_str);
-		}
-	},
-
-	make_new: function() {
-		if(this.ctype=='Account') {
-			this.new_account();
-		} else {
-			this.new_cost_center();
-		}
-	},
-
-	new_account: function() {
-		var me = this;
-
-		var node = me.tree.get_selected_node();
-
-		if(!(node && node.expandable)) {
-			frappe.msgprint(__("Select a group node first."));
-			return;
-		}
-
-		// the dialog
-		var d = new frappe.ui.Dialog({
-			title:__('New Account'),
-			fields: [
-				{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
-					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.") },
-				{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')},
-				{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"},
-				{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
-					description: __("Optional. Sets company's default currency, if not specified.")}
-			]
-		})
-
-		var fd = d.fields_dict;
-
-		// account type if ledger
-		$(fd.is_group.input).change(function() {
-			if($(this).prop("checked")) {
-				$(fd.account_type.wrapper).toggle(false);
-				$(fd.tax_rate.wrapper).toggle(false);
-				$(fd.warehouse.wrapper).toggle(false);
-			} else {
-				$(fd.account_type.wrapper).toggle(true);
-				fd.account_type.$input.trigger("change");
-			}
-		});
-
-		// tax rate if tax
-		$(fd.account_type.input).change(function() {
-			$(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() {
-			var btn = this;
-			var v = d.get_values();
-			if(!v) return;
-
-			if(v.account_type==="Warehouse" && !v.warehouse) {
-				msgprint(__("Warehouse is required"));
-				return;
-			}
-
-			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,
-				method: 'erpnext.accounts.utils.add_ac',
-				callback: function(r) {
-					d.hide();
-					if(node.expanded) {
-						node.toggle_node();
-					}
-					node.load();
-				}
-			});
-		});
-
-		// show
-		d.on_page_show = function() {
-			$(fd.is_group.input).change();
-			$(fd.account_type.input).change();
-		}
-
-		$(fd.is_group.input).prop("checked", false).change();
-		d.show();
-	},
-
-	new_cost_center: function(){
-		var me = this;
-		// the dialog
-		var d = new frappe.ui.Dialog({
-			title:__('New Cost Center'),
-			fields: [
-				{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
-				{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
-					description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')},
-				{fieldtype:'Button', fieldname:'create_new', label:__('Create New') }
-			]
-		});
-
-		// create
-		$(d.fields_dict.create_new.input).click(function() {
-			var v = d.get_values();
-			if(!v) return;
-
-			var node = me.tree.get_selected_node();
-
-			v.parent_cost_center = node.label;
-			v.company = me.company;
-
-			return frappe.call({
-				args: v,
-				method: 'erpnext.accounts.utils.add_cc',
-				callback: function(r) {
-					d.hide();
-					if(node.expanded) {
-						node.toggle_node();
-					}
-					node.load();
-				}
-			});
-		});
-		d.show();
-	}
-});
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.json b/erpnext/accounts/page/accounts_browser/accounts_browser.json
deleted file mode 100644
index 7fb1815..0000000
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "creation": "2012-06-14 15:07:28.000000", 
- "docstatus": 0, 
- "doctype": "Page", 
- "icon": "icon-sitemap", 
- "idx": 1, 
- "modified": "2013-07-11 14:39:42.000000", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Accounts Browser", 
- "owner": "Administrator", 
- "page_name": "Accounts Browser", 
- "roles": [
-  {
-   "role": "Accounts User"
-  }, 
-  {
-   "role": "Accounts Manager"
-  }
- ], 
- "standard": "Yes"
-}
\ No newline at end of file
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py
deleted file mode 100644
index d96b213..0000000
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.py
+++ /dev/null
@@ -1,57 +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
-import frappe.defaults
-from frappe.utils import flt
-from erpnext.accounts.utils import get_balance_on
-from erpnext.accounts.report.financial_statements import sort_root_accounts
-
-@frappe.whitelist()
-def get_companies():
-	"""get a list of companies based on permission"""
-	return [d.name for d in frappe.get_list("Company", fields=["name"],
-		order_by="name")]
-
-@frappe.whitelist()
-def get_children():
-	args = frappe.local.form_dict
-	ctype, company = args['ctype'], args['comp']
-	fieldname = frappe.db.escape(ctype.lower().replace(' ','_'))
-	doctype = frappe.db.escape(ctype)
-
-	# root
-	if args['parent'] in ("Accounts", "Cost Centers"):
-		fields = ", root_type, report_type, account_currency" if ctype=="Account" else ""
-		acc = frappe.db.sql(""" select
-			name as value, is_group as expandable {fields}
-			from `tab{doctype}`
-			where ifnull(`parent_{fieldname}`,'') = ''
-			and `company` = %s	and docstatus<2
-			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
-				company, as_dict=1)
-
-		if args["parent"]=="Accounts":
-			sort_root_accounts(acc)
-	else:
-		# other
-		fields = ", account_currency" if ctype=="Account" else ""
-		acc = frappe.db.sql("""select
-			name as value, is_group as expandable, parent_{fieldname} as parent {fields}
-	 		from `tab{doctype}`
-			where ifnull(`parent_{fieldname}`,'') = %s
-			and docstatus<2
-			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
-				args['parent'], as_dict=1)
-
-	if ctype == 'Account':
-		company_currency = frappe.db.get_value("Company", company, "default_currency")
-		for each in acc:
-			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/page/financial_analytics/README.md b/erpnext/accounts/page/financial_analytics/README.md
deleted file mode 100644
index ccb56bb..0000000
--- a/erpnext/accounts/page/financial_analytics/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Trends (multi-year) for account balances including.
\ No newline at end of file
diff --git a/erpnext/accounts/page/financial_analytics/__init__.py b/erpnext/accounts/page/financial_analytics/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/accounts/page/financial_analytics/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js
deleted file mode 100644
index ef373aa..0000000
--- a/erpnext/accounts/page/financial_analytics/financial_analytics.js
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.pages['financial-analytics'].on_page_load = function(wrapper) {
-	frappe.ui.make_app_page({
-		parent: wrapper,
-		title: __('Financial Analytics'),
-		single_column: true
-	});
-	erpnext.financial_analytics = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics');
-	frappe.breadcrumbs.add("Accounts");
-
-};
-
-frappe.require("assets/erpnext/js/account_tree_grid.js");
-
-erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
-	filters: [
-		{
-			fieldtype:"Select", label: __("PL or BS"), fieldname: "pl_or_bs",
-			options:[{"label": __("Profit and Loss"), "value": "Profit and Loss"},
-				{"label": __("Balance Sheet"), "value": "Balance Sheet"}],
-			filter: function(val, item, opts, me) {
-				if(item._show) return true;
-
-				// pl or bs
-				var out = (val=='Balance Sheet') ?
-					item.report_type=='Balance Sheet' : item.report_type=='Profit and Loss';
-				if(!out) return false;
-
-				return me.apply_zero_filter(val, item, opts, me);
-			}
-		},
-		{
-			fieldtype:"Select", label: __("Company"), fieldname: "company",
-			link:"Company", default_value: __("Select Company..."),
-			filter: function(val, item, opts) {
-				return item.company == val || val == opts.default_value || item._show;
-			}
-		},
-		{fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year", fieldname: "fiscal_year",
-			default_value: __("Select Fiscal Year...")},
-		{fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
-		{fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
-		{fieldtype:"Select", label: __("Range"), fieldname: "range",
-			options:[{label: __("Daily"), value: "Daily"}, {label: __("Weekly"), value: "Weekly"},
-				{label: __("Monthly"), value: "Monthly"}, {label: __("Quarterly"), value: "Quarterly"},
-		{label: __("Yearly"), value: "Yearly"}]}
-	],
-	setup_columns: function() {
-		var std_columns = [
-			{id: "_check", name: __("Plot"), field: "_check", width: 30,
-				formatter: this.check_formatter},
-			{id: "name", name: __("Account"), field: "name", width: 300,
-				formatter: this.tree_formatter},
-			{id: "opening_dr", name: __("Opening (Dr)"), field: "opening_dr",
-				hidden: true, formatter: this.currency_formatter, balance_type: "Dr"},
-			{id: "opening_cr", name: __("Opening (Cr)"), field: "opening_cr",
-				hidden: true, formatter: this.currency_formatter, balance_type: "Cr"},
-		];
-
-		this.make_date_range_columns(true);
-		this.columns = std_columns.concat(this.columns);
-	},
-	make_date_range_columns: function() {
-		this.columns = [];
-
-		var me = this;
-		var range = this.filter_inputs.range.val();
-		this.from_date = dateutil.user_to_str(this.filter_inputs.from_date.val());
-		this.to_date = dateutil.user_to_str(this.filter_inputs.to_date.val());
-		var date_diff = dateutil.get_diff(this.to_date, this.from_date);
-
-		me.column_map = {};
-		me.last_date = null;
-
-		var add_column = function(date, balance_type) {
-			me.columns.push({
-				id: date + "_" + balance_type.toLowerCase(),
-				name: dateutil.str_to_user(date),
-				field: date + "_" + balance_type.toLowerCase(),
-				date: date,
-				balance_type: balance_type,
-				formatter: me.currency_formatter,
-				width: 110
-			});
-		}
-
-		var build_columns = function(condition) {
-			// add column for each date range
-			for(var i=0; i <= date_diff; i++) {
-				var date = dateutil.add_days(me.from_date, i);
-				if(!condition) condition = function() { return true; }
-
-				if(condition(date)) {
-					$.each(["Dr", "Cr"], function(i, v) {
-						add_column(date, v)
-					});
-				}
-				me.last_date = date;
-
-				if(me.columns.length) {
-					me.column_map[date] = me.columns[me.columns.length-1];
-				}
-			}
-		}
-
-		// make columns for all date ranges
-		if(range=='Daily') {
-			build_columns();
-		} else if(range=='Weekly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return !(dateutil.get_diff(date, me.from_date) % 7)
-			});
-		} else if(range=='Monthly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return dateutil.str_to_obj(me.last_date).getMonth() != dateutil.str_to_obj(date).getMonth()
-			});
-		} else if(range=='Quarterly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return dateutil.str_to_obj(date).getDate()==1 && in_list([0,3,6,9], dateutil.str_to_obj(date).getMonth())
-			});
-		} else if(range=='Yearly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return $.map(frappe.report_dump.data['Fiscal Year'], function(v) {
-						return date==v.year_start_date ? true : null;
-					}).length;
-			});
-
-		}
-
-		// set label as last date of period
-		$.each(this.columns, function(i, col) {
-			col.name = me.columns[i+2]
-				? dateutil.str_to_user(dateutil.add_days(me.columns[i+2].date, -1)) + " (" + me.columns[i].balance_type + ")"
-				: dateutil.str_to_user(me.to_date) + " (" + me.columns[i].balance_type + ")";
-		});
-	},
-	setup_filters: function() {
-		var me = this;
-		this._super();
-		this.trigger_refresh_on_change(["pl_or_bs"]);
-
-		this.filter_inputs.pl_or_bs
-			.add_options($.map(frappe.report_dump.data["Cost Center"], function(v) {return v.name;}));
-
-		this.setup_plot_check();
-	},
-	init_filter_values: function() {
-		this._super();
-		this.filter_inputs.range.val('Monthly');
-	},
-	prepare_balances: function() {
-		var me = this;
-		// setup cost center map
-		if(!this.cost_center_by_name) {
-			this.cost_center_by_name = this.make_name_map(frappe.report_dump.data["Cost Center"]);
-		}
-
-		var cost_center = inList(["Balance Sheet", "Profit and Loss"], this.pl_or_bs)
-			? null : this.cost_center_by_name[this.pl_or_bs];
-
-		$.each(frappe.report_dump.data['GL Entry'], function(i, gl) {
-			var filter_by_cost_center = (function() {
-				if(cost_center) {
-					if(gl.cost_center) {
-						var gl_cost_center = me.cost_center_by_name[gl.cost_center];
-						return gl_cost_center.lft >= cost_center.lft && gl_cost_center.rgt <= cost_center.rgt;
-					} else {
-						return false;
-					}
-				} else {
-					return true;
-				}
-			})();
-
-			if(filter_by_cost_center) {
-				var posting_date = dateutil.str_to_obj(gl.posting_date);
-				var account = me.item_by_name[gl.account];
-				var col = me.column_map[gl.posting_date];
-				if(col) {
-					if(gl.voucher_type=='Period Closing Voucher') {
-						// period closing voucher not to be added
-						// to profit and loss accounts (else will become zero!!)
-						if(account.report_type=='Balance Sheet')
-							me.add_balance(col.date, account, gl);
-					} else {
-						me.add_balance(col.date, account, gl);
-					}
-
-				} else if(account.report_type=='Balance Sheet'
-					&& (posting_date < dateutil.str_to_obj(me.from_date))) {
-						me.add_balance('opening', account, gl);
-				}
-			}
-		});
-
-		// make balances as cumulative
-		if(me.pl_or_bs=='Balance Sheet') {
-			$.each(me.data, function(i, ac) {
-				if((ac.rgt - ac.lft)==1 && ac.report_type=='Balance Sheet') {
-					var opening = flt(ac["opening_dr"]) - flt(ac["opening_cr"]);
-					//if(opening) throw opening;
-					$.each(me.columns, function(i, col) {
-						if(col.formatter==me.currency_formatter) {
-							if(col.balance_type=="Dr" && !in_list(["opening_dr", "opening_cr"], col.field)) {
-								opening = opening + flt(ac[col.date + "_dr"]) -
-									flt(ac[col.date + "_cr"]);
-								me.set_debit_or_credit(ac, col.date, opening);
-							}
-						}
-					});
-				}
-			})
-		}
-		this.update_groups();
-		this.accounts_initialized = true;
-
-		if(!me.is_default("company")) {
-			// show Net Profit / Loss
-			var net_profit = {
-				company: me.company,
-				id: "Net Profit / Loss",
-				name: "Net Profit / Loss",
-				indent: 0,
-				opening: 0,
-				checked: false,
-				report_type: me.pl_or_bs=="Balance Sheet"? "Balance Sheet" : "Profit and Loss",
-			};
-			me.item_by_name[net_profit.name] = net_profit;
-
-			$.each(me.columns, function(i, col) {
-				if(col.formatter==me.currency_formatter) {
-					if(!net_profit[col.id]) net_profit[col.id] = 0;
-				}
-			});
-
-			$.each(me.data, function(i, ac) {
-				if(!ac.parent_account && me.apply_filter(ac, "company") &&
-						ac.report_type==net_profit.report_type) {
-					$.each(me.columns, function(i, col) {
-						if(col.formatter==me.currency_formatter && col.balance_type=="Dr") {
-							var bal = net_profit[col.date+"_dr"] -
-								net_profit[col.date+"_cr"] +
-								ac[col.date+"_dr"] - ac[col.date+"_cr"];
-							me.set_debit_or_credit(net_profit, col.date, bal);
-						}
-					});
-				}
-			});
-			this.data.push(net_profit);
-		}
-	},
-	add_balance: function(field, account, gl) {
-		var bal = flt(account[field+"_dr"]) - flt(account[field+"_cr"]) +
-			flt(gl.debit) - flt(gl.credit);
-		this.set_debit_or_credit(account, field, bal);
-	},
-	update_groups: function() {
-		// update groups
-		var me= this;
-		$.each(this.data, function(i, account) {
-			// update groups
-			if((account.is_group == 0) || (account.rgt - account.lft == 1)) {
-				var parent = me.parent_map[account.name];
-				while(parent) {
-					var parent_account = me.item_by_name[parent];
-					$.each(me.columns, function(c, col) {
-						if (col.formatter == me.currency_formatter && col.balance_type=="Dr") {
-							var bal = flt(parent_account[col.date+"_dr"]) -
-								flt(parent_account[col.date+"_cr"]) +
-								flt(account[col.date+"_dr"]) -
-								flt(account[col.date+"_cr"]);
-							me.set_debit_or_credit(parent_account, col.date, bal);
-						}
-					});
-					parent = me.parent_map[parent];
-				}
-			}
-		});
-	},
-	init_account: function(d) {
-		// set 0 values for all columns
-		this.reset_item_values(d);
-
-		// check for default graphs
-		if(!this.accounts_initialized && !d.parent_account) {
-			d.checked = true;
-		}
-
-	},
-	get_plot_data: function() {
-		var data = [];
-		var me = this;
-		var pl_or_bs = this.pl_or_bs;
-		$.each(this.data, function(i, account) {
-
-			var show = pl_or_bs == "Balance Sheet" ?
-				account.report_type=="Balance Sheet" : account.report_type=="Profit and Loss";
-			if (show && account.checked && me.apply_filter(account, "company")) {
-				data.push({
-					label: account.name,
-					data: $.map(me.columns, function(col, idx) {
-						if(col.formatter==me.currency_formatter && !col.hidden &&
-							col.balance_type=="Dr") {
-								var bal = account[col.date+"_dr"]||account[col.date+"_cr"];
-								if (pl_or_bs != "Balance Sheet") {
-									return [[dateutil.str_to_obj(col.date).getTime(), bal],
-										[dateutil.str_to_obj(col.date).getTime(), bal]];
-								} else {
-									return [[dateutil.str_to_obj(col.date).getTime(), bal]];
-								}
-						}
-					}),
-					points: {show: true},
-					lines: {show: true, fill: true},
-				});
-
-				if(pl_or_bs == "Balance Sheet") {
-					// prepend opening for balance sheet accounts
-					data[data.length-1].data = [[dateutil.str_to_obj(me.from_date).getTime(),
-						account.opening]].concat(data[data.length-1].data);
-				}
-			}
-		});
-		return data;
-	}
-})
diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.json b/erpnext/accounts/page/financial_analytics/financial_analytics.json
deleted file mode 100644
index f551d82..0000000
--- a/erpnext/accounts/page/financial_analytics/financial_analytics.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "creation": "2013-01-27 16:30:52.000000", 
- "docstatus": 0, 
- "doctype": "Page", 
- "icon": "icon-bar-chart", 
- "idx": 1, 
- "modified": "2013-07-11 14:42:16.000000", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "financial-analytics", 
- "owner": "Administrator", 
- "page_name": "financial-analytics", 
- "roles": [
-  {
-   "role": "Analytics"
-  }, 
-  {
-   "role": "Accounts Manager"
-  }
- ], 
- "standard": "Yes", 
- "title": "Financial Analytics"
-}
\ No newline at end of file
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index df7757b..cb57ff4 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1,46 +1,1037 @@
+frappe.provide("erpnext.pos");
+{% include "erpnext/public/js/controllers/taxes_and_totals.js" %}
+
 frappe.pages['pos'].on_page_load = function(wrapper) {
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
-		title: __('Start Point-of-Sale (POS)'),
+		title: __('Point of Sale'),
 		single_column: true
 	});
 
-	page.main.html(frappe.render_template("pos_page", {}));
-
-	var pos_type = frappe.ui.form.make_control({
-		parent: page.main.find(".select-type"),
-		df: {
-			fieldtype: "Select",
-			options: [
-				{label: __("Billing (Sales Invoice)"), value:"Sales Invoice"},
-				{value:"Sales Order"},
-				{value:"Delivery Note"},
-				{value:"Quotation"},
-				{value:"Purchase Order"},
-				{value:"Purchase Receipt"},
-				{value:"Purchase Invoice"},
-			],
-			fieldname: "pos_type"
-		},
-		only_input: true
-	});
-
-	pos_type.refresh();
-
-	pos_type.set_input("Sales Invoice");
-
-	page.main.find(".btn-primary").on("click", function() {
-		erpnext.open_as_pos = true;
-		new_doc(pos_type.get_value());
-	});
-
-	$.ajax({
-		url: "/api/resource/POS Profile",
-		success: function(data) {
-			if(!data.data.length) {
-				page.main.find(".pos-setting-message").removeClass('hide');
-			}
-		}
-	})
-
+	wrapper.pos = new erpnext.pos.PointOfSale(wrapper)
 }
+
+frappe.pages['pos'].refresh = function(wrapper) {
+	window.onbeforeunload = function () {
+		return wrapper.pos.beforeunload()
+	}
+	wrapper.pos.on_refresh_page()
+}
+
+
+erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
+	init: function(wrapper){
+		this.load = true;
+		this.page = wrapper.page;
+		this.wrapper = $(wrapper).find('.page-content');
+		this.set_indicator();
+		this.onload();
+		this.make_menu_list();
+		this.set_interval_for_si_sync();
+		this.si_docs = this.get_doc_from_localstorage();
+	},
+
+	on_refresh_page: function() {
+		var me = this;
+		if(this.load){
+			this.load = false;
+		}else if(this.connection_status){
+			this.onload();
+		}else{
+			this.create_new();
+		}
+	},
+
+	beforeunload: function(e){
+		if(this.connection_status == false && frappe.get_route()[0] == "pos"){
+			e = e || window.event;
+
+			// For IE and Firefox prior to version 4
+			if (e) {
+			    e.returnValue = __("You are in offline mode. You will not be able to reload until you have network.");
+				return
+			}
+
+			// For Safari
+			return __("You are in offline mode. You will not be able to reload until you have network.");
+		}
+	},
+
+	check_internet_connection: function(){
+		var me = this;
+		//Check Internet connection after every 30 seconds
+		setInterval(function(){
+			me.set_indicator();
+		}, 5000)
+	},
+
+	set_indicator: function(){
+		var me = this;
+		// navigator.onLine
+		this.connection_status = false;
+		this.page.set_indicator("Offline", "grey")
+		frappe.call({
+			method:"frappe.handler.ping",
+			callback: function(r){
+				if(r.message){
+					me.connection_status = true;
+					me.page.set_indicator("Online", "green")
+				}
+			}
+		})
+	},
+
+	onload: function(){
+		var me = this;
+		this.get_data_from_server(function(){
+			me.create_new();
+		});
+
+		this.check_internet_connection();
+	},
+
+	make_menu_list: function(){
+		var me = this;
+
+		this.page.add_menu_item(__("New Sales Invoice"), function() {
+			me.save_previous_entry();
+			me.create_new();
+		})
+
+		this.page.add_menu_item(__("View Offline Records"), function(){
+			me.show_unsync_invoice_list();
+		});
+
+		this.page.add_menu_item(__("Sync Master Data"), function(){
+			me.get_data_from_server(function(){
+				me.load_data(false);
+				me.make_customer();
+				me.make_item_list();
+				me.set_missing_values();
+			})
+		});
+
+		this.page.add_menu_item(__("POS Profile"), function() {
+			frappe.set_route('List', 'POS Profile');
+		});
+	},
+
+	show_unsync_invoice_list: function(){
+		var me = this;
+		this.si_docs = this.get_doc_from_localstorage();
+
+		this.list_dialog = new frappe.ui.Dialog({
+			title: 'Invoice List'
+		});
+
+		this.list_dialog.show();
+		this.list_body = this.list_dialog.body;
+		if(this.si_docs.length > 0){
+			$(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
+					<div class="col-xs-2">Sr</div>\
+					<div class="col-xs-4">Customer</div>\
+					<div class="col-xs-2 text-left">Status</div>\
+					<div class="col-xs-4 text-right">Grand Total</div>\
+			</div>')
+
+			$.each(this.si_docs, function(index, data){
+				for(key in data) {
+					$(frappe.render_template("pos_invoice_list", {
+						sr: index + 1,
+						name: key,
+						customer: data[key].customer,
+						grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
+						data: me.get_doctype_status(data[key])
+					})).appendTo($(me.list_body));
+				}
+			})
+
+			$(this.list_body).find('.list-row').click(function() {
+				me.name = $(this).attr('invoice-name')
+				doc_data = me.get_invoice_doc(me.si_docs)
+				if(doc_data){
+					me.frm.doc = doc_data[0][me.name];
+					me.set_missing_values();
+					me.refresh(false);
+					me.disable_input_field();
+					me.list_dialog.hide();
+				}
+			})
+		}else{
+			$(this.list_body).append(repl('<div class="media-heading">%(message)s</div>', {'message': __("All records are synced.")}))
+		}
+	},
+
+	get_doctype_status: function(doc){
+		if(doc.outstanding_amount == 0){
+			return {status: "Paid", indicator: "green"}
+		}else if(doc.docstatus == 0){
+			return {status: "Draft", indicator: "red"}
+		}else if(doc.paid_amount >= 0){
+			return {status: "Unpaid", indicator: "orange"}
+		}
+	},
+
+	set_missing_values: function(){
+		var me = this;
+		doc = JSON.parse(localStorage.getItem('doc'))
+		if(this.frm.doc.payments.length == 0){
+			this.frm.doc.payments = doc.payments;
+		}
+
+		if(this.frm.doc.customer){
+			this.party_field.$input.val(this.frm.doc.customer);
+		}
+	},
+
+	get_invoice_doc: function(si_docs){
+		var me = this;
+		this.si_docs = this.get_doc_from_localstorage();
+
+		return $.grep(this.si_docs, function(data){
+			for(key in data){
+				return key == me.name
+			}
+		})
+	},
+
+	get_data_from_server: function(callback){
+		var me = this;
+		frappe.call({
+			method: "erpnext.accounts.doctype.sales_invoice.pos.get_pos_data",
+			freeze: true,
+			freeze_message: __("Master data syncing, it might take some time"),
+			callback: function(r){
+				window.items = r.message.items;
+				window.customers = r.message.customers;
+				window.pricing_rules = r.message.pricing_rules;
+				window.meta = r.message.meta;
+				window.print_template = r.message.print_template;
+				me.default_customer = r.message.default_customer || null;
+				me.write_off_account = r.message.write_off_account;
+				localStorage.setItem('doc', JSON.stringify(r.message.doc));
+				if(callback){
+					callback();
+				}
+			}
+		})
+	},
+
+	save_previous_entry : function(){
+		if(this.frm.doc.items.length > 0){
+			this.create_invoice()
+		}
+	},
+
+	create_new: function(){
+		var me = this;
+		this.frm = {}
+		this.name = '';
+		this.load_data(true);
+		this.setup();
+	},
+
+	load_data: function(load_doc){
+		this.items = window.items;
+		this.customers = window.customers;
+		this.pricing_rules = window.pricing_rules;
+
+		if(load_doc) {
+			this.frm.doc =  JSON.parse(localStorage.getItem('doc'));
+		}
+
+		$.each(window.meta, function(i, data){
+			frappe.meta.sync(data)
+		})
+
+		this.print_template = frappe.render_template("print_template",
+			{content: window.print_template, title:"POS"})
+	},
+
+	setup: function(){
+		this.wrapper.html(frappe.render_template("pos", this.frm.doc));
+		this.set_transaction_defaults("Customer");
+		this.make();
+		this.set_primary_action();
+	},
+
+	set_transaction_defaults: function(party) {
+		var me = this;
+		this.party = party;
+		this.price_list = (party == "Customer" ?
+			this.frm.doc.selling_price_list : this.frm.doc.buying_price_list);
+		this.price_list_field = (party == "Customer" ? "selling_price_list" : "buying_price_list");
+		this.sales_or_purchase = (party == "Customer" ? "Sales" : "Purchase");
+	},
+
+	make: function() {
+		this.make_search();
+		this.make_customer();
+		this.make_item_list();
+		this.make_discount_field()
+	},
+
+	make_search: function() {
+		var me = this;
+		this.search = frappe.ui.form.make_control({
+			df: {
+				"fieldtype": "Data",
+				"label": "Item",
+				"fieldname": "pos_item",
+				"placeholder": "Search Item"
+			},
+			parent: this.wrapper.find(".search-area"),
+			only_input: true,
+		});
+
+		this.search.make_input();
+		this.search.$input.on("keyup", function() {
+			setTimeout(function() {
+				me.items = me.get_items();
+				me.make_item_list();
+			}, 1000);
+		});
+
+		this.party_field = frappe.ui.form.make_control({
+			df: {
+				"fieldtype": "Data",
+				"options": this.party,
+				"label": this.party,
+				"fieldname": this.party.toLowerCase(),
+				"placeholder": __("Select or add new customer")
+			},
+			parent: this.wrapper.find(".party-area"),
+			only_input: true,
+		});
+
+		this.party_field.make_input();
+	},
+
+	make_customer: function() {
+		var me = this;
+
+		if(this.default_customer && !this.frm.doc.customer){
+			this.party_field.$input.val(this.default_customer);
+			this.frm.doc.customer = this.default_customer;
+		}
+
+		this.party_field.$input.autocomplete({
+			autoFocus: true,
+			source: function (request, response) {
+				me.customer_data = me.get_customers(request.term)
+				response($.map(me.customer_data, function(data){
+					return {label: data.name, value: data.name,
+						customer_group: data.customer_group, territory: data.territory}
+				}))
+			},
+			change: function(event, ui){
+				if(ui.item){
+					me.frm.doc.customer = ui.item.label;
+					me.frm.doc.customer_name = ui.item.customer_name;
+					me.frm.doc.customer_group = ui.item.customer_group;
+					me.frm.doc.territory = ui.item.territory;
+				}else{
+					me.frm.doc.customer = me.party_field.$input.val();
+				}
+				me.refresh();
+			}
+		}).on("focus", function(){
+			setTimeout(function() {
+				if(!me.party_field.$input.val()) {
+					me.party_field.$input.autocomplete( "search", " " );
+				}
+			}, 500);
+		});
+	},
+
+	get_customers: function(key){
+		var me = this;
+		key = key.toLowerCase().trim()
+		if(key){
+			return $.grep(this.customers, function(data) {
+				if(data.name.toLowerCase().match(key)
+					|| data.customer_name.toLowerCase().match(key)
+					|| (data.customer_group && data.customer_group.toLowerCase().match(key))){
+					return data
+				}
+			})
+		}else{
+			customers = this.customers.sort(function(a,b){ return a.idx < b.idx })
+			return customers.slice(0, 20)
+		}
+	},
+
+	make_item_list: function() {
+		var me = this;
+		if(!this.price_list) {
+			msgprint(__("Price List not found or disabled"));
+			return;
+		}
+
+		me.item_timeout = null;
+
+		var $wrap = me.wrapper.find(".item-list");
+		me.wrapper.find(".item-list").empty();
+
+		if (this.items) {
+			$.each(this.items, function(index, obj) {
+				if(index < 16){
+					$(frappe.render_template("pos_item", {
+						item_code: obj.name,
+						item_price: format_currency(obj.price_list_rate, obj.currency),
+						item_name: obj.name===obj.item_name ? "" : obj.item_name,
+						item_image: obj.image ? "url('" + obj.image + "')" : null,
+						color: frappe.get_palette(obj.item_name),
+						abbr: frappe.get_abbr(obj.item_name)
+					})).tooltip().appendTo($wrap);
+				}
+			});
+		}
+
+		if(this.items.length == 1
+			&& this.search.$input.val()) {
+			this.search.$input.val("");
+			this.add_to_cart();
+		}
+
+		// if form is local then allow this function
+		$(me.wrapper).find("div.pos-item").on("click", function() {
+			me.customer_validate();
+			if(me.frm.doc.docstatus==0) {
+				me.items = me.get_items($(this).attr("data-item-code"))
+				me.add_to_cart();
+			}
+		});
+	},
+
+	get_items: function(item_code){
+		// To search item as per the key enter
+
+		var me = this;
+		this.item_serial_no = {};
+		this.item_batch_no = {};
+
+		if(item_code){
+			return $.grep(window.items, function(item){
+				if(item.item_code == item_code ){
+					return true
+				}
+			})
+		}
+
+		key = this.search.$input.val().toLowerCase();
+
+		if(key){
+			return $.grep(window.items, function(item){
+				if( (item.item_code.toLowerCase().match(key)) ||
+				(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key)) ){
+					return true
+				}else if(item.barcode == me.search.$input.val()){
+					return item.barcode == me.search.$input.val();
+				} else if (in_list(Object.keys(item.serial_nos), me.search.$input.val())){
+					me.item_serial_no[item.item_code] = [me.search.$input.val(), item.serial_nos[me.search.$input.val()]]
+					return true
+				} else if(in_list(item.batch_nos, me.search.$input.val())){
+					return me.item_batch_no[item.item_code] = me.search.$input.val()
+				}
+			})
+		}else{
+			return window.items;
+		}
+	},
+
+	update_qty: function() {
+		var me = this;
+
+		$(this.wrapper).find(".pos-item-qty").on("change", function(){
+			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
+			me.update_qty_rate_against_item_code(item_code, "qty", $(this).val());
+		})
+
+		$(this.wrapper).find("[data-action='increase-qty']").on("click", function(){
+			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
+			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) + 1;
+			me.update_qty_rate_against_item_code(item_code, "qty", qty);
+		})
+
+		$(this.wrapper).find("[data-action='decrease-qty']").on("click", function(){
+			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
+			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) - 1;
+			me.update_qty_rate_against_item_code(item_code, "qty", qty);
+		})
+	},
+
+	update_rate: function() {
+		var me = this;
+
+		$(this.wrapper).find(".pos-item-rate").on("change", function(){
+			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
+			me.update_qty_rate_against_item_code(item_code, "rate", $(this).val());
+		})
+	},
+
+	update_qty_rate_against_item_code: function(item_code, field, value){
+		var me = this;
+		if(value < 0){
+			frappe.throw(__("Enter value must be positive"));
+		}
+
+		this.remove_item = []
+		$.each(this.frm.doc["items"] || [], function(i, d) {
+			if (d.item_code == item_code && d.serial_no
+				&& field == 'qty' && cint(value) != value) {
+				d.qty = 0.0;
+				me.refresh();
+				frappe.throw(__("Serial no item cannot be a fraction"))
+			}
+
+			if (d.item_code == item_code) {
+				d[field] = flt(value);
+				d.amount = flt(d.rate) * flt(d.qty);
+				if(d.qty==0){
+					me.remove_item.push(d.idx)
+				}
+			}
+		});
+
+		if(field == 'qty'){
+			this.remove_zero_qty_item();
+		}
+
+		this.refresh();
+	},
+
+	remove_zero_qty_item: function(){
+		var me = this;
+		idx = 0
+		this.items = []
+		idx = 0
+		$.each(this.frm.doc["items"] || [], function(i, d) {
+			if(!in_list(me.remove_item, d.idx)){
+				d.idx = idx;
+				me.items.push(d);
+				idx++;
+			}
+		});
+
+		this.frm.doc["items"] = this.items;
+	},
+
+	make_discount_field: function(){
+		var me = this;
+
+		this.wrapper.find('input.discount-percentage').on("change", function() {
+			me.frm.doc.additional_discount_percentage = flt($(this).val(), precision("additional_discount_percentage"));
+			total = me.frm.doc.grand_total
+
+			if(me.frm.doc.apply_discount_on == 'Net Total'){
+				total = me.frm.doc.net_total
+			}
+
+			me.frm.doc.discount_amount = flt(total*flt(me.frm.doc.additional_discount_percentage) / 100, precision("discount_amount"));
+			me.wrapper.find('input.discount-amount').val(me.frm.doc.discount_amount)
+			me.refresh();
+		});
+
+		this.wrapper.find('input.discount-amount').on("change", function() {
+			me.frm.doc.discount_amount = flt($(this).val(), precision("discount_amount"));
+			me.frm.doc.additional_discount_percentage = 0.0;
+			me.wrapper.find('input.discount-percentage').val(0);
+			me.refresh();
+		});
+	},
+
+	customer_validate: function(){
+		var me = this;
+		if(!this.frm.doc.customer){
+			frappe.throw(__("Please select customer"))
+		}
+	},
+
+	add_to_cart: function() {
+		var me = this;
+		var caught = false;
+		var no_of_items = me.wrapper.find(".pos-bill-item").length;
+
+		this.customer_validate();
+		this.mandatory_batch_no();
+		this.validate_serial_no();
+		this.validate_warehouse();
+
+		if (no_of_items != 0) {
+			$.each(this.frm.doc["items"] || [], function(i, d) {
+				if (d.item_code == me.items[0].item_code) {
+					caught = true;
+					d.qty += 1;
+					d.amount = flt(d.rate) * flt(d.qty);
+					if(me.item_serial_no[d.item_code]){
+						d.serial_no += '\n' + me.item_serial_no[d.item_code][0]
+						d.warehouse = me.item_serial_no[d.item_code][1]
+					}
+
+					if(me.item_batch_no.length){
+						d.batch_no = me.item_batch_no[d.item_code]
+					}
+				}
+			});
+		}
+
+		// if item not found then add new item
+		if (!caught)
+			this.add_new_item_to_grid();
+
+		this.refresh();
+	},
+
+	add_new_item_to_grid: function() {
+		var me = this;
+		this.child = frappe.model.add_child(this.frm.doc, this.frm.doc.doctype + " Item", "items");
+		this.child.item_code = this.items[0].item_code;
+		this.child.item_name = this.items[0].item_name;
+		this.child.stock_uom = this.items[0].stock_uom;
+		this.child.description = this.items[0].description;
+		this.child.qty = 1;
+		this.child.item_group = this.items[0].item_group;
+		this.child.cost_center = this.items[0].cost_center;
+		this.child.income_account = this.items[0].income_account;
+		this.child.warehouse = (this.item_serial_no[this.child.item_code]
+			? this.item_serial_no[this.child.item_code][1] : this.items[0].default_warehouse);
+		this.child.price_list_rate = flt(this.items[0].price_list_rate, 9) / flt(this.frm.doc.conversion_rate, 9);
+		this.child.rate = flt(this.items[0].price_list_rate, 9) / flt(this.frm.doc.conversion_rate, 9);
+		this.child.actual_qty = this.items[0].actual_qty;
+		this.child.amount = flt(this.child.qty) * flt(this.child.rate);
+		this.child.batch_no = this.item_batch_no[this.child.item_code];
+		this.child.serial_no = (this.item_serial_no[this.child.item_code]
+			? this.item_serial_no[this.child.item_code][0] : '');
+	},
+
+	refresh: function(update_paid_amount) {
+		var me = this;
+		this.refresh_fields(update_paid_amount);
+		this.update_qty();
+		this.update_rate();
+		this.set_primary_action();
+	},
+	refresh_fields: function(update_paid_amount) {
+		this.apply_pricing_rule();
+		this.discount_amount_applied = false;
+		this._calculate_taxes_and_totals();
+		this.calculate_discount_amount();
+		this.show_items_in_item_cart();
+		this.set_taxes();
+		this.calculate_outstanding_amount(update_paid_amount);
+		this.set_totals();
+	},
+
+	get_company_currency: function() {
+		return erpnext.get_currency(this.frm.doc.company);
+	},
+
+	show_item_wise_taxes: function(){
+		return null;
+	},
+
+	show_items_in_item_cart: function() {
+		var me = this;
+		var $items = this.wrapper.find(".items").empty();
+		me.frm.doc.net_total = 0.0
+		$.each(this.frm.doc.items|| [], function(i, d) {
+			$(frappe.render_template("pos_bill_item", {
+				item_code: d.item_code,
+				item_name: (d.item_name===d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
+				qty: d.qty,
+				actual_qty: d.actual_qty,
+				projected_qty: d.projected_qty,
+				rate: format_number(d.rate, me.frm.doc.currency),
+				amount: format_currency(d.amount, me.frm.doc.currency)
+			})).appendTo($items);
+		});
+
+		this.wrapper.find("input.pos-item-qty").on("focus", function() {
+			$(this).select();
+		});
+
+		this.wrapper.find("input.pos-item-rate").on("focus", function() {
+			$(this).select();
+		});
+	},
+
+	set_taxes: function(){
+		var me = this;
+		me.frm.doc.total_taxes_and_charges = 0.0
+
+		var taxes = this.frm.doc.taxes || [];
+		$(this.wrapper)
+			.find(".tax-area").toggleClass("hide", (taxes && taxes.length) ? false : true)
+			.find(".tax-table").empty();
+
+		$.each(taxes, function(i, d) {
+			if (d.tax_amount && cint(d.included_in_print_rate) == 0) {
+				$(frappe.render_template("pos_tax_row", {
+					description: d.description,
+					tax_amount: format_currency(flt(d.tax_amount_after_discount_amount),
+						me.frm.doc.currency)
+				})).appendTo(me.wrapper.find(".tax-table"));
+			}
+		});
+	},
+
+	set_totals: function() {
+		var me = this;
+		this.wrapper.find(".net-total").text(format_currency(me.frm.doc.total, me.frm.doc.currency));
+		this.wrapper.find(".grand-total").text(format_currency(me.frm.doc.grand_total, me.frm.doc.currency));
+	},
+
+	set_primary_action: function() {
+		var me = this;
+
+		if (this.frm.doc.docstatus==0) {
+			this.page.set_primary_action(__("Pay"), function() {
+				me.validate()
+				me.create_invoice();
+				me.make_payment();
+			}, "octicon octicon-credit-card");
+		}else if(this.frm.doc.docstatus == 1) {
+			this.page.set_primary_action(__("Print"), function() {
+				html = frappe.render(me.print_template, me.frm.doc)
+				me.print_document(html)
+			})
+		}else {
+			this.page.clear_primary_action()
+		}
+
+		this.page.set_secondary_action(__("New"), function() {
+			me.save_previous_entry();
+			me.create_new();
+		}, "octicon octicon-plus").addClass("btn-primary");
+	},
+
+	print_document: function(html){
+		var w = window.open();
+		w.document.write(html);
+		w.document.close();
+		setTimeout(function(){
+			w.print();
+			w.close();
+		}, 1000)
+	},
+
+	write_off_amount: function(){
+		var me = this;
+		var value = 0.0;
+
+		if(this.frm.doc.outstanding_amount > 0){
+			dialog = new frappe.ui.Dialog({
+				title: 'Write Off Amount',
+				fields: [
+					{fieldtype: "Check", fieldname: "write_off_amount", label: __("Write off Outstanding Amount")},
+					{fieldtype: "Link", options:"Account", default:this.write_off_account, fieldname: "write_off_account", 
+					label: __("Write off Account"), get_query: function() {
+						return {
+							filters: {'is_group': 0, 'report_type': 'Profit and Loss'}
+						}
+					}}
+				]
+			});
+
+			dialog.show();
+
+			dialog.fields_dict.write_off_amount.$input.change(function(){
+				write_off_amount = dialog.get_values().write_off_amount;
+				me.frm.doc.write_off_outstanding_amount_automatically = write_off_amount;
+				me.frm.doc.base_write_off_amount = (write_off_amount==1) ? flt(me.frm.doc.grand_total - me.frm.doc.paid_amount, precision("outstanding_amount")) : 0;
+				me.frm.doc.write_off_account = (write_off_amount==1) ? dialog.get_values().write_off_account : '';
+				me.frm.doc.write_off_amount = flt(me.frm.doc.base_write_off_amount * me.frm.doc.conversion_rate, precision("write_off_amount"))
+				me.calculate_outstanding_amount();
+				me.set_primary_action();
+			})
+
+			dialog.fields_dict.write_off_account.$input.change(function(){
+				me.frm.doc.write_off_account = dialog.get_values().write_off_account;
+			})
+
+			dialog.set_primary_action(__("Submit"), function(){
+				dialog.hide()
+				me.submit_invoice()
+			})
+		}else{
+			this.submit_invoice()
+		}
+	},
+
+	submit_invoice: function(){
+		var me = this;
+		frappe.confirm(__("Do you really want to submit the invoice?"), function () {
+			me.change_status();
+			frappe.msgprint(__("Sales invoice submitted sucessfully."))
+		})
+	},
+
+	change_status: function(){
+		if(this.frm.doc.docstatus == 0){
+			this.frm.doc.docstatus = 1;
+			this.update_invoice();
+			this.disable_input_field();
+		}
+	},
+
+	disable_input_field: function(){
+		var pointer_events = 'inherit'
+		$(this.wrapper).find('input').attr("disabled", false);
+
+		if(this.frm.doc.docstatus == 1){
+			pointer_events = 'none';
+			$(this.wrapper).find('input').attr("disabled", true);
+		}
+
+		$(this.wrapper).find('.pos-bill-wrapper').css('pointer-events', pointer_events);
+		$(this.wrapper).find('.pos-items-section').css('pointer-events', pointer_events);
+		this.set_primary_action();
+	},
+
+	create_invoice: function(){
+		var me = this;
+		var invoice_data = {}
+		this.si_docs = this.get_doc_from_localstorage();
+		if(this.name){
+			this.update_invoice()
+		}else{
+			this.name = $.now();
+			invoice_data[this.name] = this.frm.doc
+			this.si_docs.push(invoice_data)
+			this.update_localstorage();
+			this.set_primary_action();
+		}
+	},
+
+	update_invoice: function(){
+		var me = this;
+		this.si_docs = this.get_doc_from_localstorage();
+		$.each(this.si_docs, function(index, data){
+			for(key in data){
+				if(key == me.name){
+					me.si_docs[index][key] = me.frm.doc;
+					me.update_localstorage();
+				}
+			}
+		})
+	},
+
+	update_localstorage: function(){
+		try{
+			localStorage.setItem('sales_invoice_doc', JSON.stringify(this.si_docs));
+		}catch(e){
+			frappe.throw(__("LocalStorage is full , did not save"))
+		}
+	},
+
+	get_doc_from_localstorage: function(){
+		try{
+			return JSON.parse(localStorage.getItem('sales_invoice_doc')) || [];
+		}catch(e){
+			return []
+		}
+	},
+
+	set_interval_for_si_sync: function(){
+		var me = this;
+		setInterval(function(){
+			me.sync_sales_invoice()
+		}, 60000)
+	},
+
+	sync_sales_invoice: function(){
+		var me = this;
+		this.si_docs = this.get_submitted_invoice();
+
+		if(this.si_docs.length){
+			frappe.call({
+				method: "erpnext.accounts.doctype.sales_invoice.pos.make_invoice",
+				args: {
+					doc_list: me.si_docs
+				},
+				callback: function(r){
+					if(r.message){
+						me.removed_items = r.message;
+						me.remove_doc_from_localstorage();
+					}
+				}
+			})
+		}
+	},
+
+	get_submitted_invoice: function(){
+		var invoices = [];
+		var index = 1;
+		docs = this.get_doc_from_localstorage();
+		if(docs){
+			invoices = $.map(docs, function(data){
+				for(key in data){
+					if(data[key].docstatus == 1 && index < 50){
+						index++
+						return data
+					}
+				}
+			});
+		}
+
+		return invoices
+	},
+
+	remove_doc_from_localstorage: function(){
+		var me = this;
+		this.si_docs = this.get_doc_from_localstorage();
+		this.new_si_docs = [];
+		if(this.removed_items){
+			$.each(this.si_docs, function(index, data){
+				for(key in data){
+					if(!in_list(me.removed_items, key)){
+						me.new_si_docs.push(data);
+					}
+				}
+			})
+			this.si_docs = this.new_si_docs;
+			this.update_localstorage();
+		}
+	},
+
+	validate: function(){
+		var me = this;
+		this.customer_validate();
+		this.item_validate();
+		this.validate_mode_of_payments();
+	},
+
+	item_validate: function(){
+		if(this.frm.doc.items.length == 0){
+			frappe.throw(__("Select items to save the invoice"))
+		}
+	},
+	
+	validate_mode_of_payments: function(){
+		if (this.frm.doc.payments.length === 0){
+			frappe.throw(__("Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile."))
+		}
+	},
+	
+	validate_serial_no: function(){
+		var me = this;
+		var item_code = serial_no = '';
+		for (key in this.item_serial_no){
+			item_code = key;
+			serial_no = me.item_serial_no[key][0];
+		}
+
+		if(item_code && serial_no){
+			$.each(this.frm.doc.items, function(index, data){
+				if(data.item_code == item_code){
+					if(in_list(data.serial_no.split('\n'), serial_no)){
+						frappe.throw(__(repl("Serial no %(serial_no)s is already taken", {
+							'serial_no': serial_no
+						})))
+					}
+				}
+			})
+		}
+
+		if(this.items[0].has_serial_no && serial_no == ""){
+			frappe.throw(__(repl("Error: Serial no is mandatory for item %(item)s", {
+				'item': this.items[0].item_code
+			})))
+		}
+	},
+
+	mandatory_batch_no: function(){
+		var me = this;
+		if(this.items[0].has_batch_no && !this.item_batch_no[this.items[0].item_code]){
+			frappe.throw(__(repl("Error: Batch no is mandatory for item %(item)s", {
+				'item': this.items[0].item_code
+			})))
+		}
+	},
+
+	apply_pricing_rule: function(){
+		var me = this;
+		$.each(this.frm.doc["items"], function(n, item) {
+			pricing_rule = me.get_pricing_rule(item)
+			me.validate_pricing_rule(pricing_rule)
+			if(pricing_rule.length){
+				item.margin_type = pricing_rule[0].margin_type;
+				item.price_list_rate = pricing_rule[0].price || item.price_list_rate;
+				item.margin_rate_or_amount = pricing_rule[0].margin_rate_or_amount;
+				item.discount_percentage = pricing_rule[0].discount_percentage || 0.0;
+				me.apply_pricing_rule_on_item(item)
+			}
+		})
+	},
+
+	get_pricing_rule: function(item){
+		var me = this;
+		return $.grep(this.pricing_rules, function(data){
+			if(data.item_code == item.item_code || in_list(['All Item Groups', item.item_group], data.item_group)) {
+				if(in_list(['Customer', 'Customer Group', 'Territory'], data.applicable_for)){
+					return me.validate_condition(data)
+				}else{
+					return true
+				}
+			}
+		})
+	},
+
+	validate_condition: function(data){
+		//This method check condition based on applicable for
+		condition = this.get_mapper_for_pricing_rule(data)[data.applicable_for]
+		if(in_list(condition[1], condition[0])){
+			return true
+		}
+	},
+
+	get_mapper_for_pricing_rule: function(data){
+		return {
+			'Customer': [data.customer, [this.frm.doc.customer]],
+			'Customer Group': [data.customer_group, [this.frm.doc.customer_group, 'All Customer Groups']],
+			'Territory': [data.territory, [this.frm.doc.territory, 'All Territories']],
+		}
+	},
+
+	validate_pricing_rule: function(pricing_rule){
+		//This method validate duplicate pricing rule
+		var pricing_rule_name = '';
+		var priority = 0;
+		var pricing_rule_list = [];
+		var priority_list = []
+
+		if(pricing_rule.length > 1){
+
+			$.each(pricing_rule, function(index, data){
+				pricing_rule_name += data.name + ','
+				priority_list.push(data.priority)
+				if(priority <= data.priority){
+					priority = data.priority
+					pricing_rule_list.push(data)
+				}
+			})
+
+			count = 0
+			$.each(priority_list, function(index, value){
+				if(value == priority){
+					count++
+				}
+			})
+
+			if(priority == 0 || count > 1){
+				frappe.throw(__(repl("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: %(pricing_rule)s", {
+					'pricing_rule': pricing_rule_name
+				})))
+			}
+
+			return pricing_rule_list
+		}
+	},
+
+	validate_warehouse: function(){
+		if(!this.items[0].default_warehouse){
+			frappe.throw(__("Deafault warehouse is required for selected item"))
+		}
+	}
+})
\ No newline at end of file
diff --git a/erpnext/accounts/page/pos/pos_page.html b/erpnext/accounts/page/pos/pos_page.html
deleted file mode 100644
index 5a4c538..0000000
--- a/erpnext/accounts/page/pos/pos_page.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="text-center" style="padding: 40px;">
-    <img src="/assets/erpnext/images/pos.svg"
-        style="width: 100px; height: 100px; margin-bottom: 30px; opacity: 0.2" class="text-muted">
-	<p>{%= __("Select type of transaction") %}</p>
-	<p class="select-type" style="margin: auto; max-width: 300px; margin-bottom: 30px;">
-
-	</p>
-	<p style="margin-bottom: 30px;">
-        <button class="btn btn-primary btn-lg">{%=  __("Start") %}</button>
-    </p>
-	<p class="pos-setting-message hide">
-        <a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
-		{%=  __("Make new POS Profile") %}</a>
-    </p>
-</div>
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 2101a25..c65a845 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -7,7 +7,7 @@
 import datetime
 from frappe import _, msgprint, scrub
 from frappe.defaults import get_user_permissions
-from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff
+from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff, add_years
 from erpnext.utilities.doctype.address.address import get_address_display
 from erpnext.utilities.doctype.contact.contact import get_contact_details
 from erpnext.exceptions import PartyFrozen, InvalidCurrency, PartyDisabled, InvalidAccountCurrency
@@ -16,7 +16,7 @@
 
 @frappe.whitelist()
 def get_party_details(party=None, account=None, party_type="Customer", company=None,
-	posting_date=None, price_list=None, currency=None, doctype=None):
+	posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False):
 
 	if not party:
 		return {}
@@ -25,7 +25,7 @@
 		frappe.throw(_("{0}: {1} does not exists").format(party_type, party))
 
 	return _get_party_details(party, account, party_type,
-		company, posting_date, price_list, currency, doctype)
+		company, posting_date, price_list, currency, doctype, ignore_permissions)
 
 def _get_party_details(party=None, account=None, party_type="Customer", company=None,
 	posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False):
@@ -181,8 +181,16 @@
 				{"parenttype": party_group_doctype, "parent": group, "company": company}, "account")
 
 		if not account:
-			default_account_name = "default_receivable_account" if party_type=="Customer" else "default_payable_account"
+			default_account_name = "default_receivable_account" \
+				if party_type=="Customer" else "default_payable_account"
 			account = frappe.db.get_value("Company", company, default_account_name)
+			
+		existing_gle_currency = get_party_gle_currency(party_type, party, company)
+		if existing_gle_currency:
+			if account:
+				account_currency = frappe.db.get_value("Account", account, "account_currency")
+			if (account and account_currency != existing_gle_currency) or not account:
+					account = get_party_gle_account(party_type, party, company)
 
 		return account
 
@@ -203,6 +211,17 @@
 
 	return frappe.local_cache("party_gle_currency", (party_type, party, company), generator,
 		regenerate_if_none=True)
+		
+def get_party_gle_account(party_type, party, company):
+	def generator():
+		existing_gle_account = frappe.db.sql("""select account from `tabGL Entry`
+			where docstatus=1 and company=%(company)s and party_type=%(party_type)s and party=%(party)s
+			limit 1""", { "company": company, "party_type": party_type, "party": party })
+
+		return existing_gle_account[0][0] if existing_gle_account else None
+
+	return frappe.local_cache("party_gle_account", (party_type, party, company), generator,
+		regenerate_if_none=True)
 
 def validate_party_gle_currency(party_type, party, company, party_account_currency=None):
 	"""Validate party account currency with existing GL Entry's currency"""
@@ -227,10 +246,16 @@
 
 		party_account_currency = frappe.db.get_value("Account", account.account, "account_currency")
 		existing_gle_currency = get_party_gle_currency(doc.doctype, doc.name, account.company)
+		company_default_currency = frappe.db.get_value("Company",
+			frappe.db.get_default("Company"), "default_currency", cache=True)
 
 		if existing_gle_currency and party_account_currency != existing_gle_currency:
 			frappe.throw(_("Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.").format(existing_gle_currency, account.company))
 
+		if doc.default_currency and party_account_currency and company_default_currency:
+			if doc.default_currency != party_account_currency and doc.default_currency != company_default_currency:
+				frappe.throw(_("Billing currency must be equal to either default comapany's currency or party account currency"))
+
 @frappe.whitelist()
 def get_due_date(posting_date, party_type, party, company):
 	"""Set Due Date = Posting Date + Credit Days"""
@@ -317,8 +342,17 @@
 	if party_type and party_name:
 		party = frappe.db.get_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
 		if party.disabled:
-			frappe.throw("{0} {1} is disabled".format(party_type, party_name), PartyDisabled)
+			frappe.throw(_("{0} {1} is disabled").format(party_type, party_name), PartyDisabled)
 		elif party.is_frozen:
 			frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier')
 			if not frozen_accounts_modifier in frappe.get_roles():
-				frappe.throw("{0} {1} is frozen".format(party_type, party_name), PartyFrozen)
+				frappe.throw(_("{0} {1} is frozen").format(party_type, party_name), PartyFrozen)
+
+def get_timeline_data(doctype, name):
+	'''returns timeline data for the past one year'''
+	from frappe.desk.form.load import get_communication_data
+	data = get_communication_data(doctype, name,
+		fields = 'unix_timestamp(date(creation)), count(name)',
+		after = add_years(None, -1).strftime('%Y-%m-%d'),
+		group_by='group by date(creation)', as_dict=False)
+	return dict(data)
\ No newline at end of file
diff --git a/erpnext/accounts/party_status.py b/erpnext/accounts/party_status.py
new file mode 100644
index 0000000..68b4818
--- /dev/null
+++ b/erpnext/accounts/party_status.py
@@ -0,0 +1,82 @@
+# 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 evaluate_filters
+from frappe.desk.notifications import get_filters_for
+
+# NOTE: if you change this also update triggers in erpnext/hooks.py
+status_depends_on = {
+	'Customer': ('Opportunity', 'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice', 'Project', 'Issue'),
+	'Supplier': ('Supplier Quotation', 'Purchase Order', 'Purchase Receipt', 'Purchase Invoice')
+}
+
+default_status = {
+	'Customer': 'Active',
+	'Supplier': None
+}
+
+def notify_status(doc, method=None):
+	'''Notify status to customer, supplier'''
+
+	party_type = None
+	for key, doctypes in status_depends_on.iteritems():
+		if doc.doctype in doctypes:
+			party_type = key
+			break
+
+	if not party_type:
+		return
+
+	name = doc.get(party_type.lower())
+	if not name:
+		return
+
+	party = frappe.get_doc(party_type, name)
+	filters = get_filters_for(doc.doctype)
+	party.flags.ignore_mandatory = True
+
+	status = None
+	if filters:
+		if evaluate_filters(doc, filters):
+			# filters match, passed document is open
+			status = 'Open'
+
+	if status=='Open':
+		if party.status != 'Open':
+			# party not open, make it open
+			party.status = 'Open'
+			party.save(ignore_permissions=True)
+
+	else:
+		if party.status == 'Open':
+			# may be open elsewhere, check
+			# default status
+			party.status = status
+			update_status(party)
+
+	party.update_modified()
+	party.notify_update()
+
+def get_party_status(doc):
+	'''return party status based on open documents'''
+	status = default_status[doc.doctype]
+	for doctype in status_depends_on[doc.doctype]:
+		filters = get_filters_for(doctype)
+		filters[doc.doctype.lower()] = doc.name
+		if filters:
+			open_count = frappe.get_all(doctype, fields='name', filters=filters, limit_page_length=1)
+			if len(open_count) > 0:
+				status = 'Open'
+				break
+
+	return status
+
+def update_status(doc):
+	'''Set status as open if there is any open notification'''
+	status = get_party_status(doc)
+	if doc.status != status:
+		doc.db_set('status', status)
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/print_format/point_of_sale/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/print_format/point_of_sale/__init__.py
diff --git a/erpnext/accounts/print_format/point_of_sale/point_of_sale.json b/erpnext/accounts/print_format/point_of_sale/point_of_sale.json
new file mode 100644
index 0000000..645fce6
--- /dev/null
+++ b/erpnext/accounts/print_format/point_of_sale/point_of_sale.json
@@ -0,0 +1,18 @@
+{
+ "creation": "2016-05-05 17:16:18.564460", 
+ "custom_format": 1, 
+ "disabled": 0, 
+ "doc_type": "Sales Invoice", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ company }}<br>\n\t{{  __(\"Invoice\") }}<br>\n</p>\n<p>\n\t<b>{{ __(\"Date\") }}:</b> {{ dateutil.global_date_format(posting_date) }}<br>\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ __(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ __(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{% for item in items %}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_name }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ format_currency(item.rate, currency) }}</td>\n\t\t\t<td class=\"text-right\">{{ format_currency(item.amount, currency) }}</td>\n\t\t</tr>\n\t\t{% endfor %}\n\t</tbody>\n</table>\n\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ __(\"Net Total\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% for row in taxes %}\n\t\t{% if not row.included_in_print_rate %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t{{ row.description }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(row.tax_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t{% endfor %}\n\t\t{% if discount_amount %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ __(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(discount_amount, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{% endif %}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ __(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ format_currency(grand_total, currency) }}\n\t\t\t</td>\n\t\t</tr>\n\t</tbody>\n</table>\n\n\n<hr>\n<p class=\"text-center\">{{ __(\"Thank you, please visit again.\") }}</p>", 
+ "idx": 0, 
+ "modified": "2016-05-21 00:25:20.359074", 
+ "modified_by": "Administrator", 
+ "name": "Point of Sale", 
+ "owner": "Administrator", 
+ "print_format_builder": 0, 
+ "print_format_type": "Js", 
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.html b/erpnext/accounts/report/accounts_payable/accounts_payable.html
index d3020b2..07f9e47 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.html
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.html
@@ -1 +1 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
index d3020b2..07f9e47 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.html
@@ -1 +1 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 365212a..3a594c8 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -16,7 +16,10 @@
 
 	def run(self, args):
 		party_naming_by = frappe.db.get_value(args.get("naming_by")[0], None, args.get("naming_by")[1])
-		return self.get_columns(party_naming_by, args), self.get_data(party_naming_by, args)
+		columns = self.get_columns(party_naming_by, args)
+		data = self.get_data(party_naming_by, args)
+		chart = self.get_chart_data(columns, data)
+		return columns, data, None, chart
 
 	def get_columns(self, party_naming_by, args):
 		columns = [_("Posting Date") + ":Date:80", _(args.get("party_type")) + ":Link/" + args.get("party_type") + ":200"]
@@ -39,6 +42,8 @@
 			})
 
 		columns += [_("Age (Days)") + ":Int:80"]
+		
+		self.ageing_col_idx_start = len(columns)
 
 		if not "range1" in self.filters:
 			self.filters["range1"] = "30"
@@ -46,7 +51,7 @@
 			self.filters["range2"] = "60"
 		if not "range3" in self.filters:
 			self.filters["range3"] = "90"
-
+			
 		for label in ("0-{range1}".format(**self.filters),
 			"{range1}-{range2}".format(**self.filters),
 			"{range2}-{range3}".format(**self.filters),
@@ -250,6 +255,23 @@
 		return self.gl_entries_map.get(party, {})\
 			.get(against_voucher_type, {})\
 			.get(against_voucher, [])
+			
+	def get_chart_data(self, columns, data):
+		ageing_columns = columns[self.ageing_col_idx_start : self.ageing_col_idx_start+4]
+		
+		rows = []
+		for d in data:
+			rows.append(d[self.ageing_col_idx_start : self.ageing_col_idx_start+4])
+
+		if rows:
+			rows.insert(0, [[d.get("label")] for d in ageing_columns])
+		
+		return {
+			"data": {
+				'rows': rows
+			},
+			"chart_type": 'pie'
+		}
 
 def execute(filters=None):
 	args = {
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
index d3020b2..07f9e47 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.html
@@ -1 +1 @@
-{% include "accounts/report/accounts_receivable/accounts_receivable.html" %}
+{% include "erpnext/accounts/report/accounts_receivable/accounts_receivable.html" %}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/report/asset_depreciation_ledger/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/report/asset_depreciation_ledger/__init__.py
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
new file mode 100644
index 0000000..9fa99c7
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
@@ -0,0 +1,41 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Asset Depreciation Ledger"] = {
+	"filters": [
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			"reqd": 1
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.get_today(),
+			"reqd": 1
+		},
+		{
+			"fieldname":"asset",
+			"label": __("Asset"),
+			"fieldtype": "Link",
+			"options": "Asset"
+		},
+		{
+			"fieldname":"asset_category",
+			"label": __("Asset Category"),
+			"fieldtype": "Link",
+			"options": "Asset Category"
+		}
+	]
+}
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
new file mode 100644
index 0000000..67c36fa
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-04-08 14:49:58.133098", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-04-08 14:49:58.133098", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Depreciation Ledger", 
+ "owner": "Administrator", 
+ "ref_doctype": "Asset", 
+ "report_name": "Asset Depreciation Ledger", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
new file mode 100644
index 0000000..5497384
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
@@ -0,0 +1,118 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	columns, data = get_columns(), get_data(filters)
+	return columns, data
+	
+def get_data(filters):
+	data = frappe.db.sql("""
+		select 
+			a.name as asset, a.asset_category, a.status, 
+			a.depreciation_method, a.purchase_date, a.gross_purchase_amount,
+			ds.schedule_date as depreciation_date, ds.depreciation_amount, 
+			ds.accumulated_depreciation_amount, 
+			(a.gross_purchase_amount - ds.accumulated_depreciation_amount) as amount_after_depreciation,
+			ds.journal_entry as depreciation_entry
+		from
+			`tabAsset` a, `tabDepreciation Schedule` ds
+		where
+			a.name = ds.parent
+			and a.docstatus=1
+			and ifnull(ds.journal_entry, '') != ''
+			and ds.schedule_date between %(from_date)s and %(to_date)s
+			and a.company = %(company)s
+			{conditions}
+		order by
+			a.name asc, ds.schedule_date asc
+	""".format(conditions=get_filter_conditions(filters)), filters, as_dict=1)
+		
+	return data
+	
+def get_filter_conditions(filters):
+	conditions = ""
+	
+	if filters.get("asset"):
+		conditions += " and a.name = %(asset)s"
+	
+	if filters.get("asset_category"):
+		conditions += " and a.asset_category = %(asset_category)s"
+		
+	return conditions
+	
+def get_columns():
+	return [
+		{
+			"label": _("Asset"),
+			"fieldname": "asset",
+			"fieldtype": "Link",
+			"options": "Asset",
+			"width": 120
+		},
+		{
+			"label": _("Depreciation Date"),
+			"fieldname": "depreciation_date",
+			"fieldtype": "Date",
+			"width": 120
+		},
+		{
+			"label": _("Purchase Amount"),
+			"fieldname": "gross_purchase_amount",
+			"fieldtype": "Currency",
+			"width": 120
+		},
+		{
+			"label": _("Depreciation Amount"),
+			"fieldname": "depreciation_amount",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Accumulated Depreciation Amount"),
+			"fieldname": "accumulated_depreciation_amount",
+			"fieldtype": "Currency",
+			"width": 210
+		},
+		{
+			"label": _("Amount After Depreciation"),
+			"fieldname": "amount_after_depreciation",
+			"fieldtype": "Currency",
+			"width": 180
+		},
+		{
+			"label": _("Depreciation Entry"),
+			"fieldname": "depreciation_entry",
+			"fieldtype": "Link",
+			"options": "Journal Entry",
+			"width": 140
+		},
+		{
+			"label": _("Asset Category"),
+			"fieldname": "asset_category",
+			"fieldtype": "Link",
+			"options": "Asset Category",
+			"width": 120
+		},
+		{
+			"label": _("Current Status"),
+			"fieldname": "status",
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"label": _("Depreciation Method"),
+			"fieldname": "depreciation_method",
+			"fieldtype": "Data",
+			"width": 130
+		},
+		{
+			"label": _("Purchase Date"),
+			"fieldname": "purchase_date",
+			"fieldtype": "Date",
+			"width": 120
+		}
+	]
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/accounts/report/asset_depreciations_and_balances/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/accounts/report/asset_depreciations_and_balances/__init__.py
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
new file mode 100644
index 0000000..1da35cd
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
@@ -0,0 +1,35 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Asset Depreciations and Balances"] = {
+	"filters": [
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			"default": frappe.defaults.get_user_default("year_start_date"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			"default": frappe.defaults.get_user_default("year_end_date"),
+			"reqd": 1
+		},
+		{
+			"fieldname":"asset_category",
+			"label": __("Asset Category"),
+			"fieldtype": "Link",
+			"options": "Asset Category"
+		}
+	]
+}
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json
new file mode 100644
index 0000000..1298d7c
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-04-08 14:56:37.235981", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-04-08 14:56:37.235981", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Depreciations and Balances", 
+ "owner": "Administrator", 
+ "ref_doctype": "Asset", 
+ "report_name": "Asset Depreciations and Balances", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
new file mode 100644
index 0000000..890833b
--- /dev/null
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -0,0 +1,184 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import formatdate, getdate, flt, add_days
+
+def execute(filters=None):
+	filters.day_before_from_date = add_days(filters.from_date, -1)
+	columns, data = get_columns(filters), get_data(filters)
+	return columns, data
+	
+def get_data(filters):
+	data = []
+	
+	asset_categories = get_asset_categories(filters)
+	assets = get_assets(filters)
+	asset_costs = get_asset_costs(assets, filters)
+	asset_depreciations = get_accumulated_depreciations(assets, filters)
+	
+	for asset_category in asset_categories:
+		row = frappe._dict()
+		row.asset_category = asset_category
+		row.update(asset_costs.get(asset_category))
+
+		row.cost_as_on_to_date = (flt(row.cost_as_on_from_date) + flt(row.cost_of_new_purchase)
+			- flt(row.cost_of_sold_asset) - flt(row.cost_of_scrapped_asset))
+			
+		row.update(asset_depreciations.get(asset_category))
+		row.accumulated_depreciation_as_on_to_date = (flt(row.accumulated_depreciation_as_on_from_date) + 
+			flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated))
+		
+		row.net_asset_value_as_on_from_date = (flt(row.cost_as_on_from_date) - 
+			flt(row.accumulated_depreciation_as_on_from_date))
+		
+		row.net_asset_value_as_on_to_date = (flt(row.cost_as_on_to_date) - 
+			flt(row.accumulated_depreciation_as_on_to_date))
+	
+		data.append(row)
+		
+	return data
+	
+def get_asset_categories(filters):
+	return frappe.db.sql_list("""
+		select distinct asset_category from `tabAsset` 
+		where docstatus=1 and company=%s and purchase_date <= %s
+	""", (filters.company, filters.to_date))
+	
+def get_assets(filters):
+	return frappe.db.sql("""
+		select name, asset_category, purchase_date, gross_purchase_amount, disposal_date, status
+		from `tabAsset` 
+		where docstatus=1 and company=%s and purchase_date <= %s""", 
+		(filters.company, filters.to_date), as_dict=1)
+		
+def get_asset_costs(assets, filters):
+	asset_costs = frappe._dict()
+	for d in assets:
+		asset_costs.setdefault(d.asset_category, frappe._dict({
+			"cost_as_on_from_date": 0,
+			"cost_of_new_purchase": 0,
+			"cost_of_sold_asset": 0,
+			"cost_of_scrapped_asset": 0
+		}))
+		
+		costs = asset_costs[d.asset_category]
+		
+		if getdate(d.purchase_date) < getdate(filters.from_date):
+			if not d.disposal_date or getdate(d.disposal_date) >= getdate(filters.from_date):
+				costs.cost_as_on_from_date += flt(d.gross_purchase_amount)
+		else:
+			costs.cost_of_new_purchase += flt(d.gross_purchase_amount)
+			
+			if d.disposal_date and getdate(d.disposal_date) >= getdate(filters.from_date) \
+					and getdate(d.disposal_date) <= getdate(filters.to_date):
+				if d.status == "Sold":
+					costs.cost_of_sold_asset += flt(d.gross_purchase_amount)
+				elif d.status == "Scrapped":
+					costs.cost_of_scrapped_asset += flt(d.gross_purchase_amount)
+			
+	return asset_costs
+	
+def get_accumulated_depreciations(assets, filters):
+	asset_depreciations = frappe._dict()
+	for d in assets:
+		asset = frappe.get_doc("Asset", d.name)
+		
+		asset_depreciations.setdefault(d.asset_category, frappe._dict({
+			"accumulated_depreciation_as_on_from_date": asset.opening_accumulated_depreciation,
+			"depreciation_amount_during_the_period": 0,
+			"depreciation_eliminated_during_the_period": 0
+		}))
+		
+		depr = asset_depreciations[d.asset_category]
+		
+		for schedule in asset.get("schedules"):
+			if getdate(schedule.schedule_date) < getdate(filters.from_date):
+				if not asset.disposal_date and getdate(asset.disposal_date) >= getdate(filters.from_date):
+					depr.accumulated_depreciation_as_on_from_date += flt(schedule.depreciation_amount)
+			elif getdate(schedule.schedule_date) <= getdate(filters.to_date):
+				depr.depreciation_amount_during_the_period += flt(schedule.depreciation_amount)
+				
+				if asset.disposal_date and getdate(schedule.schedule_date) > getdate(asset.disposal_date):
+					depr.depreciation_eliminated_during_the_period += flt(schedule.depreciation_amount)
+		
+	return asset_depreciations
+	
+def get_columns(filters):
+	return [
+		{
+			"label": _("Asset Category"),
+			"fieldname": "asset_category",
+			"fieldtype": "Link",
+			"options": "Asset Category",
+			"width": 120
+		},
+		{
+			"label": _("Cost as on") + " " + formatdate(filters.day_before_from_date),
+			"fieldname": "cost_as_on_from_date",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Cost of New Purchase"),
+			"fieldname": "cost_of_new_purchase",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Cost of Sold Asset"),
+			"fieldname": "cost_of_sold_asset",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Cost of Scrapped Asset"),
+			"fieldname": "cost_of_scrapped_asset",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Cost as on") + " " + formatdate(filters.to_date),
+			"fieldname": "cost_as_on_to_date",
+			"fieldtype": "Currency",
+			"width": 140
+		},
+		{
+			"label": _("Accumulated Depreciation as on") + " " + formatdate(filters.day_before_from_date),
+			"fieldname": "accumulated_depreciation_as_on_from_date",
+			"fieldtype": "Currency",
+			"width": 270
+		},
+		{
+			"label": _("Depreciation Amount during the period"),
+			"fieldname": "depreciation_amount_during_the_period",
+			"fieldtype": "Currency",
+			"width": 240
+		},
+		{
+			"label": _("Depreciation Eliminated due to disposal of assets"),
+			"fieldname": "depreciation_eliminated_during_the_period",
+			"fieldtype": "Currency",
+			"width": 300
+		},
+		{
+			"label": _("Accumulated Depreciation as on") + " " + formatdate(filters.to_date),
+			"fieldname": "accumulated_depreciation_as_on_to_date",
+			"fieldtype": "Currency",
+			"width": 270
+		},
+		{
+			"label": _("Net Asset value as on") + " " + formatdate(filters.day_before_from_date),
+			"fieldname": "net_asset_value_as_on_from_date",
+			"fieldtype": "Currency",
+			"width": 200
+		},
+		{
+			"label": _("Net Asset value as on") + " " + formatdate(filters.to_date),
+			"fieldname": "net_asset_value_as_on_to_date",
+			"fieldtype": "Currency",
+			"width": 200
+		}
+	]
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.html b/erpnext/accounts/report/balance_sheet/balance_sheet.html
index d4ae54d..14dc0a6 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.html
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.html
@@ -1 +1 @@
-{% include "accounts/report/financial_statements.html" %}
+{% include "erpnext/accounts/report/financial_statements.html" %}
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.js b/erpnext/accounts/report/balance_sheet/balance_sheet.js
index 933b40e..a20d47c 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.js
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.js
@@ -1,6 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/financial_statements.js");
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Balance Sheet"] = erpnext.financial_statements;
+});
 
-frappe.query_reports["Balance Sheet"] = erpnext.financial_statements;
+
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index 7e05b95..4efd098 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -9,24 +9,28 @@
 
 def execute(filters=None):
 	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
-	
+
 	asset = get_data(filters.company, "Asset", "Debit", period_list, only_current_fiscal_year=False)
 	liability = get_data(filters.company, "Liability", "Credit", period_list, only_current_fiscal_year=False)
 	equity = get_data(filters.company, "Equity", "Credit", period_list, only_current_fiscal_year=False)
-	
-	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity, 
+
+	provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity,
 		period_list, filters.company)
 
+	message = check_opening_balance(asset, liability, equity)
+
 	data = []
 	data.extend(asset or [])
-	data.extend(liability or [])	
+	data.extend(liability or [])
 	data.extend(equity or [])
 	if provisional_profit_loss:
 		data.append(provisional_profit_loss)
 
 	columns = get_columns(filters.periodicity, period_list, company=filters.company)
+	
+	chart = get_chart_data(columns, asset, liability, equity)
 
-	return columns, data
+	return columns, data, message, chart
 
 def get_provisional_profit_loss(asset, liability, equity, period_list, company):
 	if asset and (liability or equity):
@@ -51,9 +55,50 @@
 
 			if provisional_profit_loss[period.key]:
 				has_value = True
-			
+
 			total += flt(provisional_profit_loss[period.key])
 			provisional_profit_loss["total"] = total
 
 		if has_value:
 			return provisional_profit_loss
+
+def check_opening_balance(asset, liability, equity):
+	# Check if previous year balance sheet closed
+	opening_balance = 0
+	if asset:
+		opening_balance = flt(asset[0].get("opening_balance", 0))
+	if liability:
+		opening_balance -= flt(liability[0].get("opening_balance", 0))
+	if equity:
+		opening_balance -= flt(asset[0].get("opening_balance", 0))
+
+	if opening_balance:
+		return _("Previous Financial Year is not closed")
+		
+def get_chart_data(columns, asset, liability, equity):
+	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
+	
+	asset_data, liability_data, equity_data = [], [], []
+	
+	for p in columns[2:]:
+		if asset:
+			asset_data.append(asset[-2].get(p.get("fieldname")))
+		if liability:
+			liability_data.append(liability[-2].get(p.get("fieldname")))
+		if equity:
+			equity_data.append(equity[-2].get(p.get("fieldname")))
+		
+	columns = [x_intervals]
+	if asset_data:
+		columns.append(["Assets"] + asset_data)
+	if liability_data:
+		columns.append(["Liabilities"] + liability_data)
+	if equity_data:
+		columns.append(["Equity"] + equity_data)
+
+	return {
+		"data": {
+			'x': 'x',
+			'columns': columns
+		}
+	}
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
index 37d8130..ac3366c 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
@@ -22,6 +22,7 @@
 			"fieldtype": "Link",
 			"options": "Account",
 			"reqd": 1,
+			"default": locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
 			"get_query": function() {
 				return {
 					"query": "erpnext.controllers.queries.get_account_list",
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index cfb677f..d9bac3c 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -3,39 +3,48 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _, msgprint
+from frappe import _
+from frappe.utils import nowdate, getdate
 
 def execute(filters=None):
 	if not filters: filters = {}
-	
+
 	columns = get_columns()
 	data = get_entries(filters)
-	
+
 	return columns, data
-	
+
 def get_columns():
-	return [_("Journal Entry") + ":Link/Journal Entry:140", _("Account") + ":Link/Account:140", 
-		_("Posting Date") + ":Date:100", _("Clearance Date") + ":Date:110", _("Against Account") + ":Link/Account:200", 
-		_("Debit") + ":Currency:120", _("Credit") + ":Currency:120"
+	return [
+		_("Payment Document") + ":Link/DocType:130",
+		_("Payment Entry") + ":Dynamic Link/"+_("Payment Document")+":110",
+		_("Posting Date") + ":Date:100",
+		_("Cheque/Reference No") + "::120",
+		_("Clearance Date") + ":Date:100",
+		_("Against Account") + ":Link/Account:170",
+		_("Amount") + ":Currency:120"
 	]
 
 def get_conditions(filters):
 	conditions = ""
-	if not filters.get("account"):
-		msgprint(_("Please select Bank Account"), raise_exception=1)
-	else:
-		conditions += " and jvd.account = %(account)s"
-		
-	if filters.get("from_date"): conditions += " and jv.posting_date>=%(from_date)s"
-	if filters.get("to_date"): conditions += " and jv.posting_date<=%(to_date)s"
-	
+
+	if filters.get("from_date"): conditions += " and posting_date>=%(from_date)s"
+	if filters.get("to_date"): conditions += " and posting_date<=%(to_date)s"
+
 	return conditions
-	
+
 def get_entries(filters):
 	conditions = get_conditions(filters)
-	entries =  frappe.db.sql("""select jv.name, jvd.account, jv.posting_date, 
-		jv.clearance_date, jvd.against_account, jvd.debit, jvd.credit
-		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv 
-		where jvd.parent = jv.name and jv.docstatus=1 %s
-		order by jv.name DESC""" % conditions, filters, as_list=1)
-	return entries
\ No newline at end of file
+	journal_entries =  frappe.db.sql("""select "Journal Entry", jv.name, jv.posting_date,
+		jv.cheque_no, jv.clearance_date, jvd.against_account, (jvd.debit - jvd.credit)
+		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
+		where jvd.parent = jv.name and jv.docstatus=1 and jvd.account = %(account)s {0}
+		order by posting_date DESC, jv.name DESC""".format(conditions), filters, as_list=1)
+
+	payment_entries =  frappe.db.sql("""select "Payment Entry", name, posting_date,
+		reference_no, clearance_date, party, if(paid_from=%(account)s, paid_amount, received_amount)
+		from `tabPayment Entry`
+		where docstatus=1 and (paid_from = %(account)s or paid_to = %(account)s) {0}
+		order by posting_date DESC, name DESC""".format(conditions), filters, as_list=1)
+
+	return sorted(journal_entries + payment_entries, key=lambda k: k[2] or getdate(nowdate()))
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
index 581531b..ca8e50b 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
@@ -8,6 +8,7 @@
 			"label": __("Bank Account"),
 			"fieldtype": "Link",
 			"options": "Account",
+			"default": locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
 			"reqd": 1,
 			"get_query": function() {
 				return {
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 581a7c8..76e0de2 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt
+from frappe.utils import flt, getdate, nowdate
 from frappe import _
 
 def execute(filters=None):
@@ -24,16 +24,8 @@
 	for d in data:
 		total_debit += flt(d.debit)
 		total_credit += flt(d.credit)
-
-	amounts_not_reflected_in_system = frappe.db.sql("""
-		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'
-		""", (filters["account"], filters["report_date"], filters["report_date"]))
-
-	amounts_not_reflected_in_system = flt(amounts_not_reflected_in_system[0][0]) \
-		if amounts_not_reflected_in_system else 0.0
+		
+	amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
 
 	bank_bal = flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) \
 		+ amounts_not_reflected_in_system
@@ -42,7 +34,7 @@
 		get_balance_row(_("Bank Statement balance as per General Ledger"), balance_as_per_system, account_currency),
 		{},
 		{
-			"journal_entry": _("Outstanding Cheques and Deposits to clear"),
+			"payment_entry": _("Outstanding Cheques and Deposits to clear"),
 			"debit": total_debit,
 			"credit": total_credit,
 			"account_currency": account_currency
@@ -61,13 +53,21 @@
 			"fieldname": "posting_date",
 			"label": _("Posting Date"),
 			"fieldtype": "Date",
-			"width": 100
+			"width": 90
 		},
 		{
-			"fieldname": "journal_entry",
-			"label": _("Journal Entry"),
+			"fieldname": "payment_document",
+			"label": _("Payment Document"),
 			"fieldtype": "Link",
-			"options": "Journal Entry",
+			"options": "DocType",
+			"width": 120,
+			"hidden": 1
+		},
+		{
+			"fieldname": "payment_entry",
+			"label": _("Payment Entry"),
+			"fieldtype": "Dynamic Link",
+			"options": "payment_document",
 			"width": 220
 		},
 		{
@@ -92,7 +92,7 @@
 			"width": 200
 		},
 		{
-			"fieldname": "reference",
+			"fieldname": "reference_no",
 			"label": _("Reference"),
 			"fieldtype": "Data",
 			"width": 100
@@ -119,31 +119,67 @@
 	]
 
 def get_entries(filters):
-	entries = frappe.db.sql("""select
-			jv.posting_date, jv.name as journal_entry, jvd.debit_in_account_currency as debit, 
+	journal_entries = frappe.db.sql("""
+		select "Journal Entry" as payment_document, jv.posting_date, 
+			jv.name as payment_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
+			jv.cheque_no as reference_no, 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.posting_date DESC,jv.name DESC""", filters, as_dict=1)
+			and ifnull(jv.is_opening, 'No') = 'No'""", filters, as_dict=1)
+			
+	payment_entries = frappe.db.sql("""
+		select 
+			"Payment Entry" as payment_document, name as payment_entry, 
+			reference_no, reference_date as ref_date, 
+			if(paid_to=%(account)s, received_amount, 0) as debit, 
+			if(paid_from=%(account)s, paid_amount, 0) as credit, 
+			posting_date, party as against_account, clearance_date,
+			if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
+		from `tabPayment Entry`
+		where
+			(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
+			and posting_date <= %(report_date)s
+			and ifnull(clearance_date, '4000-01-01') > %(report_date)s
+	""", filters, as_dict=1)
 
-	return entries
+	return sorted(list(payment_entries)+list(journal_entries), 
+			key=lambda k: k['posting_date'] or getdate(nowdate()))
+			
+def get_amounts_not_reflected_in_system(filters):
+	je_amount = frappe.db.sql("""
+		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=%(account)s
+		and jv.posting_date > %(report_date)s and jv.clearance_date <= %(report_date)s 
+		and ifnull(jv.is_opening, 'No') = 'No' """, filters)
+
+	je_amount = flt(je_amount[0][0]) if je_amount else 0.0
+	
+	pe_amount = frappe.db.sql("""
+		select sum(if(paid_from=%(account)s, paid_amount, received_amount))
+		from `tabPayment Entry`
+		where (paid_from=%(account)s or paid_to=%(account)s) and docstatus=1 
+		and posting_date > %(report_date)s and clearance_date <= %(report_date)s""", filters)
+
+	pe_amount = flt(pe_amount[0][0]) if pe_amount else 0.0
+	
+	return je_amount + pe_amount
 
 def get_balance_row(label, amount, account_currency):
 	if amount > 0:
 		return {
-			"journal_entry": label,
+			"payment_entry": label,
 			"debit": amount,
 			"credit": 0,
 			"account_currency": account_currency
 		}
 	else:
 		return {
-			"journal_entry": label,
+			"payment_entry": label,
 			"debit": 0,
 			"credit": abs(amount),
 			"account_currency": account_currency
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index a58b8f2..8cfbc83 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -8,7 +8,8 @@
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: sys_defaults.fiscal_year
+			default: sys_defaults.fiscal_year,
+			reqd: 1
 		},
 		{
 			fieldname: "period",
@@ -20,14 +21,16 @@
 				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
 				{ "value": "Yearly", "label": __("Yearly") }
 			],
-			default: "Monthly"
+			default: "Monthly",
+			reqd: 1
 		},
 		{
 			fieldname: "company",
 			label: __("Company"),
 			fieldtype: "Link",
 			options: "Company",
-			default: frappe.defaults.get_user_default("Company")
-		},
+			default: frappe.defaults.get_user_default("Company"),
+			reqd: 1
+		}
 	]
 }
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index f8cd134..b67e2b6 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -3,48 +3,43 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _, msgprint
+from frappe import _
 from frappe.utils import flt
 from frappe.utils import formatdate
-import time
-from erpnext.accounts.utils import get_fiscal_year
 from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
 
 def execute(filters=None):
 	if not filters: filters = {}
 
 	columns = get_columns(filters)
+	cost_centers = get_cost_centers(filters.company)
 	period_month_ranges = get_period_month_ranges(filters["period"], filters["fiscal_year"])
-	cam_map = get_costcenter_account_month_map(filters)
+	cam_map = get_cost_center_account_month_map(filters)
 
 	data = []
-	for cost_center, cost_center_items in cam_map.items():
-		for account, monthwise_data in cost_center_items.items():
-			row = [cost_center, account]
-			totals = [0, 0, 0]
-			for relevant_months in period_month_ranges:
-				period_data = [0, 0, 0]
-				for month in relevant_months:
-					month_data = monthwise_data.get(month, {})
-					for i, fieldname in enumerate(["target", "actual", "variance"]):
-						value = flt(month_data.get(fieldname))
-						period_data[i] += value
-						totals[i] += value
-				period_data[2] = period_data[0] - period_data[1]
-				row += period_data
-			totals[2] = totals[0] - totals[1]
-			row += totals
-			data.append(row)
+	for cost_center in cost_centers:
+		cost_center_items = cam_map.get(cost_center)
+		if cost_center_items:
+			for account, monthwise_data in cost_center_items.items():
+				row = [cost_center, account]
+				totals = [0, 0, 0]
+				for relevant_months in period_month_ranges:
+					period_data = [0, 0, 0]
+					for month in relevant_months:
+						month_data = monthwise_data.get(month, {})
+						for i, fieldname in enumerate(["target", "actual", "variance"]):
+							value = flt(month_data.get(fieldname))
+							period_data[i] += value
+							totals[i] += value
+					period_data[2] = period_data[0] - period_data[1]
+					row += period_data
+				totals[2] = totals[0] - totals[1]
+				row += totals
+				data.append(row)
 
-	return columns, sorted(data, key=lambda x: (x[0], x[1]))
+	return columns, data
 
 def get_columns(filters):
-	for fieldname in ["fiscal_year", "period", "company"]:
-		if not filters.get(fieldname):
-			label = (" ".join(fieldname.split("_"))).title()
-			msgprint(_("Please specify") + ": " + label,
-				raise_exception=True)
-
 	columns = [_("Cost Center") + ":Link/Cost Center:120", _("Account") + ":Link/Account:120"]
 
 	group_months = False if filters["period"] == "Monthly" else True
@@ -52,7 +47,7 @@
 	for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]):
 		for label in [_("Target") + " (%s)", _("Actual") + " (%s)", _("Variance") + " (%s)"]:
 			if group_months:
-				label = label % (formatdate(from_date, format_string="MMM") + " - " + formatdate(from_date, format_string="MMM"))
+				label = label % (formatdate(from_date, format_string="MMM") + " - " + formatdate(to_date, format_string="MMM"))
 			else:
 				label = label % formatdate(from_date, format_string="MMM")
 
@@ -60,20 +55,21 @@
 
 	return columns + [_("Total Target") + ":Float:120", _("Total Actual") + ":Float:120",
 		_("Total Variance") + ":Float:120"]
+		
+def get_cost_centers(company):
+	return frappe.db.sql_list("select name from `tabCost Center` where company=%s order by lft", company)
 
 #Get cost center & target details
-def get_costcenter_target_details(filters):
-	return frappe.db.sql("""select cc.name, cc.distribution_id,
-		cc.parent_cost_center, bd.account, bd.budget_allocated
-		from `tabCost Center` cc, `tabBudget Detail` bd
-		where bd.parent=cc.name and bd.fiscal_year=%s and
-		cc.company=%s order by cc.name""" % ('%s', '%s'),
-		(filters.get("fiscal_year"), filters.get("company")), as_dict=1)
+def get_cost_center_target_details(filters):
+	return frappe.db.sql("""
+			select b.cost_center, b.monthly_distribution, ba.account, ba.budget_amount
+			from `tabBudget` b, `tabBudget Account` ba
+			where b.name=ba.parent and b.fiscal_year=%s and b.company=%s
+		""", (filters.fiscal_year, filters.company), as_dict=True)
 
 #Get target distribution details of accounts of cost center
 def get_target_distribution_details(filters):
 	target_details = {}
-
 	for d in frappe.db.sql("""select md.name, mdp.month, mdp.percentage_allocation
 		from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
 		where mdp.parent=md.name and md.fiscal_year=%s""", (filters["fiscal_year"]), as_dict=1):
@@ -82,45 +78,51 @@
 	return target_details
 
 #Get actual details from gl entry
-def get_actual_details(filters):
+def get_actual_details(cost_center, fiscal_year):
+	cc_lft, cc_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
+	
 	ac_details = frappe.db.sql("""select gl.account, gl.debit, gl.credit,
-		gl.cost_center, MONTHNAME(gl.posting_date) as month_name
-		from `tabGL Entry` gl, `tabBudget Detail` bd
-		where gl.fiscal_year=%s and company=%s
-		and bd.account=gl.account and bd.parent=gl.cost_center""" % ('%s', '%s'),
-		(filters.get("fiscal_year"), filters.get("company")), as_dict=1)
+		MONTHNAME(gl.posting_date) as month_name, b.cost_center
+		from `tabGL Entry` gl, `tabBudget Account` ba, `tabBudget` b
+		where 
+			b.name = ba.parent
+			and ba.account=gl.account 
+			and gl.fiscal_year=%s 
+			and b.cost_center=%s
+			and exists(select name from `tabCost Center` where name=gl.cost_center and lft>=%s and rgt<=%s)
+	""", (fiscal_year, cost_center, cc_lft, cc_rgt), as_dict=1)
 
 	cc_actual_details = {}
 	for d in ac_details:
-		cc_actual_details.setdefault(d.cost_center, {}).setdefault(d.account, []).append(d)
+		cc_actual_details.setdefault(d.account, []).append(d)
 
 	return cc_actual_details
 
-def get_costcenter_account_month_map(filters):
+def get_cost_center_account_month_map(filters):
 	import datetime
-	costcenter_target_details = get_costcenter_target_details(filters)
+	cost_center_target_details = get_cost_center_target_details(filters)
 	tdd = get_target_distribution_details(filters)
-	actual_details = get_actual_details(filters)
 
 	cam_map = {}
 
-	for ccd in costcenter_target_details:
+	for ccd in cost_center_target_details:
+		actual_details = get_actual_details(ccd.cost_center, filters.fiscal_year)
+		
 		for month_id in range(1, 13):
 			month = datetime.date(2013, month_id, 1).strftime('%B')
 
-			cam_map.setdefault(ccd.name, {}).setdefault(ccd.account, {})\
+			cam_map.setdefault(ccd.cost_center, {}).setdefault(ccd.account, {})\
 				.setdefault(month, frappe._dict({
 					"target": 0.0, "actual": 0.0
 				}))
 
-			tav_dict = cam_map[ccd.name][ccd.account][month]
+			tav_dict = cam_map[ccd.cost_center][ccd.account][month]
+			month_percentage = tdd.get(ccd.monthly_distribution, {}).get(month, 0) \
+				if ccd.monthly_distribution else 100.0/12
 
-			month_percentage = tdd.get(ccd.distribution_id, {}).get(month, 0) \
-				if ccd.distribution_id else 100.0/12
-
-			tav_dict.target = flt(ccd.budget_allocated) * month_percentage / 100
-
-			for ad in actual_details.get(ccd.name, {}).get(ccd.account, []):
+			tav_dict.target = flt(ccd.budget_amount) * month_percentage / 100
+			
+			for ad in actual_details.get(ccd.account, []):
 				if ad.month_name == month:
 						tav_dict.actual += flt(ad.debit) - flt(ad.credit)
 
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js
index 464bd17..f5ddd15 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -1,12 +1,12 @@
 // Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.require("assets/erpnext/js/financial_statements.js");
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Cash Flow"] = erpnext.financial_statements;
 
-frappe.query_reports["Cash Flow"] = erpnext.financial_statements;
-
-frappe.query_reports["Cash Flow"]["filters"].push({
-	"fieldname": "accumulated_values",
-	"label": __("Accumulated Values"),
-	"fieldtype": "Check"
-})
\ No newline at end of file
+	frappe.query_reports["Cash Flow"]["filters"].push({
+		"fieldname": "accumulated_values",
+		"label": __("Accumulated Values"),
+		"fieldtype": "Check"
+	});
+});
\ No newline at end of file
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index 681e563..3407526 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -19,7 +19,7 @@
 			{"account_type": "Depreciation", "label": _("Depreciation")},
 			{"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
 			{"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
-			{"account_type": "Warehouse", "label": _("Net Change in Inventory")}
+			{"account_type": "Stock", "label": _("Net Change in Inventory")}
 		]
 	}
 
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 3e70a0e..c930952 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -112,7 +112,7 @@
 	out = filter_out_zero_value_rows(out, parent_children_map)
 	
 	if out:
-		add_total_row(out, balance_must_be, period_list, company_currency)
+		add_total_row(out, root_type, balance_must_be, period_list, company_currency)
 
 	return out
 
@@ -125,14 +125,20 @@
 				if entry.posting_date <= period.to_date:
 					if accumulated_values or entry.posting_date >= period.from_date:
 						d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
+						
+			if entry.posting_date < period_list[0].year_start_date:
+				d["opening_balance"] = d.get("opening_balance", 0.0) + flt(entry.debit) - flt(entry.credit)
 
 def accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values):
 	"""accumulate children's values in parent accounts"""
 	for d in reversed(accounts):
 		if d.parent_account:
 			for period in period_list:
-				accounts_by_name[d.parent_account][period.key] = accounts_by_name[d.parent_account].get(period.key, 0.0) + \
-					d.get(period.key, 0.0)
+				accounts_by_name[d.parent_account][period.key] = \
+					accounts_by_name[d.parent_account].get(period.key, 0.0) + d.get(period.key, 0.0)
+			
+			accounts_by_name[d.parent_account]["opening_balance"] = \
+				accounts_by_name[d.parent_account].get("opening_balance", 0.0) + d.get("opening_balance", 0.0)
 
 def prepare_data(accounts, balance_must_be, period_list, company_currency):
 	data = []
@@ -150,13 +156,14 @@
 			"indent": flt(d.indent),
 			"year_start_date": year_start_date,
 			"year_end_date": year_end_date,
-			"currency": company_currency
+			"currency": company_currency,
+			"opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be=="Debit" else -1)
 		})
 		for period in period_list:
-			if d.get(period.key):
+			if d.get(period.key) and balance_must_be=="Credit":
 				# change sign based on Debit or Credit, since calculation is done using (debit - credit)
-				d[period.key] *= (1 if balance_must_be=="Debit" else -1)
-
+				d[period.key] *= -1
+		
 			row[period.key] = flt(d.get(period.key, 0.0), 3)
 
 			if abs(row[period.key]) >= 0.005:
@@ -186,9 +193,9 @@
 
 	return data_with_value
 
-def add_total_row(out, balance_must_be, period_list, company_currency):
+def add_total_row(out, root_type, balance_must_be, period_list, company_currency):
 	total_row = {
-		"account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
+		"account_name": "'" + _("Total {0} ({1})").format(root_type, balance_must_be) + "'",
 		"account": None,
 		"currency": company_currency
 	}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index c53ed99..d10b3d9 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -87,7 +87,8 @@
 	columns += [
 		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
 		_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
-		_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
+		_("Project") + ":Link/Project:100", _("Cost Center") + ":Link/Cost Center:100", 
+		_("Remarks") + "::400"
 	]
 
 	return columns
@@ -109,9 +110,12 @@
 	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,
+	gl_entries = frappe.db.sql("""
+		select 
+			posting_date, account, party_type, party,
 			sum(debit) as debit, sum(credit) as credit,
-			voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields}
+			voucher_type, voucher_no, cost_center, project,
+			remarks, against, is_opening {select_fields}
 		from `tabGL Entry`
 		where company=%(company)s {conditions}
 		{group_by_condition}
@@ -283,7 +287,7 @@
 			row += [d.get("debit_in_account_currency"), d.get("credit_in_account_currency")]
 
 		row += [d.get("voucher_type"), d.get("voucher_no"), d.get("against"),
-			d.get("party_type"), d.get("party"), d.get("cost_center"), d.get("remarks")
+			d.get("party_type"), d.get("party"), d.get("project"), d.get("cost_center"), d.get("remarks")
 		]
 
 		result.append(row)
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 4ae0e67..aa0232b 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -215,7 +215,7 @@
 	def get_average_buying_rate(self, item_code):
 		if not item_code in self.average_buying_rate:
 			if item_code in self.non_stock_items:
-				self.average_buying_rate[item_code] = flt(frappe.db.sql("""select sum(base_net_amount) / sum(qty)
+				self.average_buying_rate[item_code] = flt(frappe.db.sql("""select sum(base_net_amount) / sum(qty * conversion_factor)
 					from `tabPurchase Invoice Item`
 					where item_code = %s and docstatus=1""", item_code)[0][0])
 			else:
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 6fc7349..9f30349 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
@@ -21,7 +21,7 @@
 		"width": 80
 	})
 	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
-	
+
 	data = []
 	for d in item_list:
 		delivery_note = None
@@ -33,7 +33,7 @@
 
 		row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date, d.customer, d.customer_name,
 			d.customer_group, d.debit_to, d.mode_of_payment, d.territory, d.project, d.company, d.sales_order,
-			delivery_note, d.income_account, d.qty, d.base_net_rate, d.base_net_amount]
+			delivery_note, d.income_account, d.cost_center, d.qty, d.base_net_rate, d.base_net_amount]
 
 		for tax in tax_accounts:
 			row.append(item_row_tax.get(d.name, {}).get(tax, 0))
@@ -51,12 +51,14 @@
 		_("Item Group") + ":Link/Item Group:100", _("Invoice") + ":Link/Sales Invoice:120",
 		_("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120",
 		_("Customer Name") + "::120", _("Customer Group") + ":Link/Customer Group:120",
-		_("Receivable Account") + ":Link/Account:120", 
-		_("Mode of Payment") + ":Link/Mode of Payment:80", _("Territory") + ":Link/Territory:80", 
+		_("Receivable Account") + ":Link/Account:120",
+		_("Mode of Payment") + ":Link/Mode of Payment:80", _("Territory") + ":Link/Territory:80",
 		_("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100",
 		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
-		_("Income Account") + ":Link/Account:140", _("Qty") + ":Float:120",
-		_("Rate") + ":Currency/currency:120", _("Amount") + ":Currency/currency:120"
+		_("Income Account") + ":Link/Account:140", _("Cost Center") + ":Link/Cost Center:140",
+		_("Qty") + ":Float:120",
+		_("Rate") + ":Currency/currency:120",
+		_("Amount") + ":Currency/currency:120"
 	]
 
 def get_conditions(filters):
@@ -78,9 +80,9 @@
 	return frappe.db.sql("""
 		select
 			si_item.name, si_item.parent, si.posting_date, si.debit_to, si.project,
-			si.customer, si.remarks, si.territory, si.company, si.base_net_total, 
-			si_item.item_code, si_item.item_name, si_item.item_group, si_item.sales_order, 
-			si_item.delivery_note, si_item.income_account, si_item.qty, 
+			si.customer, si.remarks, si.territory, si.company, si.base_net_total,
+			si_item.item_code, si_item.item_name, si_item.item_group, si_item.sales_order,
+			si_item.delivery_note, si_item.income_account, si_item.cost_center, si_item.qty,
 			si_item.base_net_rate, si_item.base_net_amount, si.customer_name,
 			si.customer_group, si_item.so_detail, si.mode_of_payment
 		from `tabSales Invoice` si, `tabSales Invoice Item` si_item
@@ -98,12 +100,12 @@
 		item_row_map.setdefault(d.parent, {}).setdefault(d.item_code, []).append(d)
 
 	tax_details = frappe.db.sql("""
-		select 
+		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 
+		from `tabSales Taxes and Charges`
+		where
+			parenttype = 'Sales Invoice' and docstatus = 1
 			and (account_head is not null and account_head != '')
 			and parent in (%s)
 	""" % ', '.join(['%s']*len(invoice_item_row)), tuple(invoice_item_row.keys()))
@@ -111,21 +113,21 @@
 	for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		if account_head not in tax_accounts:
 			tax_accounts.append(account_head)
-			
+
 		if item_wise_tax_detail:
 			try:
 				item_wise_tax_detail = json.loads(item_wise_tax_detail)
 
 				for item_code, tax_amount in item_wise_tax_detail.items():
 					tax_amount = flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
-					
-					item_net_amount = sum([flt(d.base_net_amount) 
+
+					item_net_amount = sum([flt(d.base_net_amount)
 						for d in item_row_map.get(parent, {}).get(item_code, [])])
-						
+
 					for d in item_row_map.get(parent, {}).get(item_code, []):
 						item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) if item_net_amount else 0
 						item_row_tax.setdefault(d.name, {})[account_head] = item_tax_amount
-			
+
 			except ValueError:
 				continue
 		elif charge_type == "Actual" and tax_amount:
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index 20bdae8..85c7daa 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -5,7 +5,7 @@
 import frappe
 from frappe import _
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
-from frappe.utils import flt, getdate
+from frappe.utils import getdate, flt
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -14,21 +14,21 @@
 	columns = get_columns(filters)
 	entries = get_entries(filters)
 	invoice_details = get_invoice_posting_date_map(filters)
-	against_date = ""
 
 	data = []
 	for d in entries:
-		invoice = invoice_details.get(d.reference_name) or frappe._dict()
+		invoice = invoice_details.get(d.against_voucher) or frappe._dict()
+		
 		if d.reference_type=="Purchase Invoice":
 			payment_amount = flt(d.debit) or -1 * flt(d.credit)
 		else:
 			payment_amount = flt(d.credit) or -1 * flt(d.debit)
 
-		row = [d.name, d.party_type, d.party, d.posting_date, d.reference_name, invoice.posting_date, 
-			invoice.due_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]
+		row = [d.voucher_type, d.voucher_no, d.party_type, d.party, d.posting_date, d.against_voucher, 
+			invoice.posting_date, invoice.due_date, d.debit, d.credit, d.remarks]
 
-		if d.reference_name:
-			row += get_ageing_data(30, 60, 90, d.posting_date, against_date, payment_amount)
+		if d.against_voucher:
+			row += get_ageing_data(30, 60, 90, d.posting_date, invoice.posting_date, payment_amount)
 		else:
 			row += ["", "", "", "", ""]
 		if invoice.due_date:
@@ -46,7 +46,8 @@
 
 def get_columns(filters):
 	return [
-		_("Journal Entry") + ":Link/Journal Entry:140",
+		_("Payment Document") + ":Link/DocType: 100",
+		_("Payment Entry") + ":Dynamic Link/"+_("Payment Document")+":140",
 		_("Party Type") + "::100", 
 		_("Party") + ":Dynamic Link/Party Type:140",
 		_("Posting Date") + ":Date:100",
@@ -55,8 +56,6 @@
 		_("Payment Due Date") + ":Date:130", 
 		_("Debit") + ":Currency:120", 
 		_("Credit") + ":Currency:120",
-		_("Reference No") + "::100", 
-		_("Reference Date") + ":Date:100", 
 		_("Remarks") + "::150", 
 		_("Age") +":Int:40",
 		"0-30:Currency:100", 
@@ -69,45 +68,36 @@
 def get_conditions(filters):
 	conditions = []
 
-	if not filters.get("party_type"):
-		if filters.get("payment_type") == "Outgoing":
-			filters["party_type"] = "Supplier"
+	if not filters.party_type:
+		if filters.payment_type == "Outgoing":
+			filters.party_type = "Supplier"
 		else:
-			filters["party_type"] = "Customer"
+			filters.party_type = "Customer"
 
-	if filters.get("party_type"):
-		conditions.append("jvd.party_type=%(party_type)s")
+	if filters.party_type:
+		conditions.append("party_type=%(party_type)s")
 
-	if filters.get("party"):
-		conditions.append("jvd.party=%(party)s")
+	if filters.party:
+		conditions.append("party=%(party)s")
 		
-	if filters.get("party_type"):
-		conditions.append("jvd.reference_type=%(reference_type)s")
-		if filters.get("party_type") == "Customer":
-			filters["reference_type"] = "Sales Invoice"
-		else:
-			filters["reference_type"] = "Purchase Invoice"
-		
-	if filters.get("company"):
-		conditions.append("jv.company=%(company)s")
+	if filters.party_type:
+		conditions.append("against_voucher_type=%(reference_type)s")
+		filters["reference_type"] = "Sales Invoice" if filters.party_type=="Customer" else "Purchase Invoice"
 
 	if filters.get("from_date"):
-		conditions.append("jv.posting_date >= %(from_date)s")
+		conditions.append("posting_date >= %(from_date)s")
+		
 	if filters.get("to_date"):
-		conditions.append("jv.posting_date <= %(to_date)s")
+		conditions.append("posting_date <= %(to_date)s")
 
-	return "and {}".format(" and ".join(conditions)) if conditions else ""
+	return "and " + " and ".join(conditions) if conditions else ""
 
 def get_entries(filters):
-	conditions = get_conditions(filters)
-	entries =  frappe.db.sql("""select jv.name, jvd.party_type, jvd.party, jv.posting_date,
-		jvd.reference_type, jvd.reference_name, jvd.debit, jvd.credit,
-		jv.cheque_no, jv.cheque_date, jv.remark
-		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
-		where jvd.parent = jv.name and jv.docstatus=1 %s order by jv.name DESC""" %
-		conditions, filters, as_dict=1)
-
-	return entries
+	return frappe.db.sql("""select 
+		voucher_type, voucher_no, party_type, party, posting_date, debit, credit, remarks, against_voucher
+		from `tabGL Entry`
+		where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') {0}
+	""".format(get_conditions(filters)), filters, as_dict=1)
 
 def get_invoice_posting_date_map(filters):
 	invoice_details = {}
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html
index d4ae54d..14dc0a6 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.html
@@ -1 +1 @@
-{% include "accounts/report/financial_statements.html" %}
+{% include "erpnext/accounts/report/financial_statements.html" %}
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index fcbc469..0f7a6b6 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -1,12 +1,13 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/financial_statements.js");
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Profit and Loss Statement"] = $.extend({},
+		erpnext.financial_statements);
 
-frappe.query_reports["Profit and Loss Statement"] = erpnext.financial_statements;
-
-frappe.query_reports["Profit and Loss Statement"]["filters"].push({
-	"fieldname": "accumulated_values",
-	"label": __("Accumulated Values"),
-	"fieldtype": "Check"
-})
\ No newline at end of file
+	frappe.query_reports["Profit and Loss Statement"]["filters"].push({
+		"fieldname": "accumulated_values",
+		"label": __("Accumulated Values"),
+		"fieldtype": "Check"
+	});
+});
\ No newline at end of file
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index 7c33db2..62d6e69 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -24,8 +24,10 @@
 		data.append(net_profit_loss)
 
 	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
+	
+	chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
 
-	return columns, data
+	return columns, data, None, chart
 
 def get_net_profit_loss(income, expense, period_list, company):
 	if income and expense:
@@ -50,3 +52,36 @@
 		
 		if has_value:
 			return net_profit_loss
+
+def get_chart_data(filters, columns, income, expense, net_profit_loss):
+	x_intervals = ['x'] + [d.get("label") for d in columns[2:-1]]
+	
+	income_data, expense_data, net_profit = [], [], []
+	
+	for p in columns[2:]:
+		if income:
+			income_data.append(income[-2].get(p.get("fieldname")))
+		if expense:
+			expense_data.append(expense[-2].get(p.get("fieldname")))
+		if net_profit_loss:
+			net_profit.append(net_profit_loss.get(p.get("fieldname")))
+			
+	columns = [x_intervals]
+	if income_data:
+		columns.append(["Income"] + income_data)
+	if expense_data:
+		columns.append(["Expense"] + expense_data)
+	if net_profit:
+		columns.append(["Net Profit/Loss"] + net_profit)
+		
+	chart = {
+		"data": {
+			'x': 'x',
+			'columns': columns
+		}
+	}
+	
+	if not filters.accumulated_values:
+		chart["chart_type"] = "bar"
+		
+	return chart
\ No newline at end of file
diff --git a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
index 4b34ae5..cc00b2a 100644
--- a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/purchase_trends_filters.js");
-
-frappe.query_reports["Purchase Invoice Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
+frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
+	frappe.query_reports["Purchase Invoice Trends"] = {
+		filters: get_filters()
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
index 471e7ba..0f92223 100644
--- a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/sales_trends_filters.js");
-
-frappe.query_reports["Sales Invoice Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
+frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
+	frappe.query_reports["Sales Invoice Trends"] = {
+		filters: get_filters()
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.html b/erpnext/accounts/report/trial_balance/trial_balance.html
index d4ae54d..14dc0a6 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.html
+++ b/erpnext/accounts/report/trial_balance/trial_balance.html
@@ -1 +1 @@
-{% include "accounts/report/financial_statements.html" %}
+{% include "erpnext/accounts/report/financial_statements.html" %}
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index 97c8f6c..a20b1cb 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -1,65 +1,66 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/financial_statements.js");
-
-frappe.query_reports["Trial Balance"] = {
-	"filters": [
-		{
-			"fieldname": "company",
-			"label": __("Company"),
-			"fieldtype": "Link",
-			"options": "Company",
-			"default": frappe.defaults.get_user_default("Company"),
-			"reqd": 1
-		},
-		{
-			"fieldname": "fiscal_year",
-			"label": __("Fiscal Year"),
-			"fieldtype": "Link",
-			"options": "Fiscal Year",
-			"default": frappe.defaults.get_user_default("fiscal_year"),
-			"reqd": 1,
-			"on_change": function(query_report) {
-				var fiscal_year = query_report.get_values().fiscal_year;
-				if (!fiscal_year) {
-					return;
+frappe.require("assets/erpnext/js/financial_statements.js", function() {
+	frappe.query_reports["Trial Balance"] = {
+		"filters": [
+			{
+				"fieldname": "company",
+				"label": __("Company"),
+				"fieldtype": "Link",
+				"options": "Company",
+				"default": frappe.defaults.get_user_default("Company"),
+				"reqd": 1
+			},
+			{
+				"fieldname": "fiscal_year",
+				"label": __("Fiscal Year"),
+				"fieldtype": "Link",
+				"options": "Fiscal Year",
+				"default": frappe.defaults.get_user_default("fiscal_year"),
+				"reqd": 1,
+				"on_change": function(query_report) {
+					var fiscal_year = query_report.get_values().fiscal_year;
+					if (!fiscal_year) {
+						return;
+					}
+					frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+						var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+						query_report.filters_by_name.from_date.set_input(fy.year_start_date);
+						query_report.filters_by_name.to_date.set_input(fy.year_end_date);
+						query_report.trigger_refresh();
+					});
 				}
-				frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
-					var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
-					query_report.filters_by_name.from_date.set_input(fy.year_start_date);
-					query_report.filters_by_name.to_date.set_input(fy.year_end_date);
-					query_report.trigger_refresh();
-				});
-			}
-		},
-		{
-			"fieldname": "from_date",
-			"label": __("From Date"),
-			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_start_date"),
-		},
-		{
-			"fieldname": "to_date",
-			"label": __("To Date"),
-			"fieldtype": "Date",
-			"default": frappe.defaults.get_user_default("year_end_date"),
-		},
-		{
-			"fieldname": "with_period_closing_entry",
-			"label": __("Period Closing Entry"),
-			"fieldtype": "Check",
-			"default": 1
-		},
-		{
-			"fieldname": "show_zero_values",
-			"label": __("Show zero values"),
-			"fieldtype": "Check"
-		},
-	],
-	"formatter": erpnext.financial_statements.formatter,
-	"tree": true,
-	"name_field": "account",
-	"parent_field": "parent_account",
-	"initial_depth": 3
-}
+			},
+			{
+				"fieldname": "from_date",
+				"label": __("From Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_start_date"),
+			},
+			{
+				"fieldname": "to_date",
+				"label": __("To Date"),
+				"fieldtype": "Date",
+				"default": frappe.defaults.get_user_default("year_end_date"),
+			},
+			{
+				"fieldname": "with_period_closing_entry",
+				"label": __("Period Closing Entry"),
+				"fieldtype": "Check",
+				"default": 1
+			},
+			{
+				"fieldname": "show_zero_values",
+				"label": __("Show zero values"),
+				"fieldtype": "Check"
+			},
+		],
+		"formatter": erpnext.financial_statements.formatter,
+		"tree": true,
+		"name_field": "account",
+		"parent_field": "parent_account",
+		"initial_depth": 3
+	}
+});
+
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 48668fa..635197f 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -4,16 +4,16 @@
 from __future__ import unicode_literals
 
 import frappe
-from frappe.utils import nowdate, cstr, flt, now, getdate, add_months
+from frappe.utils import nowdate, cstr, flt, cint, now, getdate
 from frappe import throw, _
 from frappe.utils import formatdate
-import frappe.desk.reportview
 
 # imported to enable erpnext.accounts.utils.get_account_currency
 from erpnext.accounts.doctype.account.account import get_account_currency
+import frappe.defaults
+from erpnext.accounts.report.financial_statements import sort_root_accounts
 
 class FiscalYearError(frappe.ValidationError): pass
-class BudgetError(frappe.ValidationError): pass
 
 @frappe.whitelist()
 def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False):
@@ -53,7 +53,7 @@
 			throw(_("{0} '{1}' not in Fiscal Year {2}").format(label, formatdate(date), fiscal_year))
 
 @frappe.whitelist()
-def get_balance_on(account=None, date=None, party_type=None, party=None, in_account_currency=True):
+def get_balance_on(account=None, date=None, party_type=None, party=None, company=None, in_account_currency=True):
 	if not account and frappe.form_dict.get("account"):
 		account = frappe.form_dict.get("account")
 	if not date and frappe.form_dict.get("date"):
@@ -110,6 +110,9 @@
 	if party_type and party:
 		cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
 			(frappe.db.escape(party_type), frappe.db.escape(party, percent=False)))
+			
+	if company:
+		cond.append("""gle.company = "%s" """ % (frappe.db.escape(company, percent=False)))
 
 	if account or (party_type and party):
 		if in_account_currency:
@@ -129,13 +132,24 @@
 	if not args:
 		args = frappe.local.form_dict
 		args.pop("cmd")
-
+	
 	ac = frappe.new_doc("Account")
+
+	if args.get("ignore_permissions"):
+		ac.flags.ignore_permissions = True
+		args.pop("ignore_permissions")
+
 	ac.update(args)
+
+	if not ac.parent_account:
+		ac.parent_account = args.get("parent")
+	
 	ac.old_parent = ""
 	ac.freeze_account = "No"
-	if ac.get("is_root"):
+	if cint(ac.get("is_root")):
+		ac.parent_account = None
 		ac.flags.ignore_mandatory = True
+
 	ac.insert()
 
 	return ac.name
@@ -148,6 +162,10 @@
 
 	cc = frappe.new_doc("Cost Center")
 	cc.update(args)
+
+	if not cc.parent_cost_center:
+		cc.parent_cost_center = args.get("parent")
+
 	cc.old_parent = ""
 	cc.insert()
 	return cc.name
@@ -157,53 +175,77 @@
 		Cancel JV, Update aginst document, split if required and resubmit jv
 	"""
 	for d in args:
-		check_if_jv_modified(d)
+		
+		check_if_advance_entry_modified(d)			
 		validate_allocated_amount(d)
+		
+		# cancel advance entry
+		doc = frappe.get_doc(d.voucher_type, d.voucher_no)
 
-		# cancel JV
-		jv_obj = frappe.get_doc('Journal Entry', d['voucher_no'])
+		doc.make_gl_entries(cancel=1, adv_adj=1)
 
-		jv_obj.make_gl_entries(cancel=1, adv_adj=1)
+		# update ref in advance entry
+		if d.voucher_type == "Journal Entry":
+			update_reference_in_journal_entry(d, doc)
+		else:
+			update_reference_in_payment_entry(d, doc)
 
-		# update ref in JV Detail
-		update_against_doc(d, jv_obj)
+		# re-submit advance entry
+		doc = frappe.get_doc(d.voucher_type, d.voucher_no)
+		doc.make_gl_entries(cancel = 0, adv_adj =1)
 
-		# re-submit JV
-		jv_obj = frappe.get_doc('Journal Entry', d['voucher_no'])
-		jv_obj.make_gl_entries(cancel = 0, adv_adj =1)
-
-
-def check_if_jv_modified(args):
+def check_if_advance_entry_modified(args):
 	"""
 		check if there is already a voucher reference
 		check if amount is same
 		check if jv is submitted
 	"""
-	ret = frappe.db.sql("""
-		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 (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)
+	ret = None
+	if args.voucher_type == "Journal Entry":
+		ret = frappe.db.sql("""
+			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 (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)
+	else:
+		party_account_field = "paid_from" if args.party_type == "Customer" else "paid_to"
+		if args.voucher_detail_no:
+			ret = frappe.db.sql("""select t1.name 			
+				from `tabPayment Entry` t1, `tabPayment Entry Reference` t2 
+				where
+					t1.name = t2.parent and t1.docstatus = 1 
+					and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
+					and t1.party_type = %(party_type)s and t1.party = %(party)s and t1.{0} = %(account)s
+					and t2.reference_doctype in ("", "Sales Order", "Purchase Order") 
+					and t2.allocated_amount = %(unadjusted_amount)s
+			""".format(party_account_field), args)
+		else:
+			ret = frappe.db.sql("""select name from `tabPayment Entry`
+				where
+					name = %(voucher_no)s and docstatus = 1
+					and party_type = %(party_type)s and party = %(party)s and {0} = %(account)s
+					and unallocated_amount = %(unadjusted_amount)s
+			""".format(party_account_field), args)
 
 	if not ret:
 		throw(_("""Payment Entry has been modified after you pulled it. Please pull it again."""))
 
 def validate_allocated_amount(args):
-	if args.get("allocated_amt") < 0:
+	if args.get("allocated_amount") < 0:
 		throw(_("Allocated amount can not be negative"))
-	elif args.get("allocated_amt") > args.get("unadjusted_amt"):
-		throw(_("Allocated amount can not greater than unadusted amount"))
+	elif args.get("allocated_amount") > args.get("unadjusted_amount"):
+		throw(_("Allocated amount can not greater than unadjusted amount"))
 
-def update_against_doc(d, jv_obj):
+def update_reference_in_journal_entry(d, jv_obj):
 	"""
 		Updates against document, if partial amount splits into rows
 	"""
 	jv_detail = jv_obj.get("accounts", {"name": d["voucher_detail_no"]})[0]
-	jv_detail.set(d["dr_or_cr"], d["allocated_amt"])
+	jv_detail.set(d["dr_or_cr"], d["allocated_amount"])
 	jv_detail.set('debit' if d['dr_or_cr']=='debit_in_account_currency' else 'credit',
-		d["allocated_amt"]*flt(jv_detail.exchange_rate))
+		d["allocated_amount"]*flt(jv_detail.exchange_rate))
 
 	original_reference_type = jv_detail.reference_type
 	original_reference_name = jv_detail.reference_name
@@ -211,14 +253,14 @@
 	jv_detail.set("reference_type", d["against_voucher_type"])
 	jv_detail.set("reference_name", d["against_voucher"])
 
-	if d['allocated_amt'] < d['unadjusted_amt']:
+	if d['allocated_amount'] < d['unadjusted_amount']:
 		jvd = frappe.db.sql("""
 			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)
 
-		amount_in_account_currency = flt(d['unadjusted_amt']) - flt(d['allocated_amt'])
+		amount_in_account_currency = flt(d['unadjusted_amount']) - flt(d['allocated_amount'])
 		amount_in_company_currency = amount_in_account_currency * flt(jvd[0]['exchange_rate'])
 
 		# new entry with balance amount
@@ -248,6 +290,39 @@
 	# will work as update after submit
 	jv_obj.flags.ignore_validate_update_after_submit = True
 	jv_obj.save(ignore_permissions=True)
+	
+def update_reference_in_payment_entry(d, payment_entry):
+	reference_details = {
+		"reference_doctype": d.against_voucher_type,
+		"reference_name": d.against_voucher,
+		"total_amount": d.grand_total,
+		"outstanding_amount": d.outstanding_amount,
+		"allocated_amount": d.allocated_amount,
+		"exchange_rate": d.exchange_rate
+	}
+		
+	if d.voucher_detail_no:
+		existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
+		original_row = existing_row.as_dict().copy()
+		existing_row.update(reference_details)
+		
+		if d.allocated_amount < original_row.allocated_amount:
+			new_row = payment_entry.append("references")
+			new_row.docstatus = 1
+			for field in reference_details.keys():
+				new_row.set(field, original_row[field])
+			
+			new_row.allocated_amount = original_row.allocated_amount - d.allocated_amount
+	else:
+		new_row = payment_entry.append("references")
+		new_row.docstatus = 1
+		new_row.update(reference_details)
+		
+	payment_entry.flags.ignore_validate_update_after_submit = True
+	payment_entry.setup_party_account_field()
+	payment_entry.set_missing_values()
+	payment_entry.set_amounts()
+	payment_entry.save(ignore_permissions=True)
 
 def remove_against_link_from_jv(ref_type, ref_no):
 	linked_jv = frappe.db.sql_list("""select parent from `tabJournal Entry Account`
@@ -275,7 +350,7 @@
 	value = frappe.db.get_value("Company", company, fieldname)
 
 	if not value:
-		throw(_("Please set default value {0} in Company {1}").format(frappe.get_meta("Company").get_label(fieldname), company))
+		throw(_("Please set default {0} in Company {1}").format(frappe.get_meta("Company").get_label(fieldname), company))
 
 	return value
 
@@ -303,7 +378,7 @@
 	difference = {}
 
 	account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount
-		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')
+		where account_type = 'Stock' and (warehouse is not null and warehouse != '') and is_group=0
 		and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list))
 
 	for account, warehouse in account_warehouse.items():
@@ -314,72 +389,6 @@
 
 	return difference
 
-def validate_expense_against_budget(args):
-	args = frappe._dict(args)
-	if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
-			budget = frappe.db.sql("""
-				select bd.budget_allocated, cc.distribution_id
-				from `tabCost Center` cc, `tabBudget Detail` bd
-				where cc.name=bd.parent and cc.name=%s and account=%s and bd.fiscal_year=%s
-			""", (args.cost_center, args.account, args.fiscal_year), as_dict=True)
-
-			if budget and budget[0].budget_allocated:
-				yearly_action, monthly_action = frappe.db.get_value("Company", args.company,
-					["yearly_bgt_flag", "monthly_bgt_flag"])
-				action_for = action = ""
-
-				if monthly_action in ["Stop", "Warn"]:
-					budget_amount = get_allocated_budget(budget[0].distribution_id,
-						args.posting_date, args.fiscal_year, budget[0].budget_allocated)
-
-					args["month_end_date"] = frappe.db.sql("select LAST_DAY(%s)",
-						args.posting_date)[0][0]
-					action_for, action = _("Monthly"), monthly_action
-
-				elif yearly_action in ["Stop", "Warn"]:
-					budget_amount = budget[0].budget_allocated
-					action_for, action = _("Annual"), yearly_action
-
-				if action_for:
-					actual_expense = get_actual_expense(args)
-					if actual_expense > budget_amount:
-						frappe.msgprint(_("{0} budget for Account {1} against Cost Center {2} will exceed by {3}").format(
-							_(action_for), args.account, args.cost_center, cstr(actual_expense - budget_amount)))
-						if action=="Stop":
-							raise BudgetError
-
-def get_allocated_budget(distribution_id, posting_date, fiscal_year, yearly_budget):
-	if distribution_id:
-		distribution = {}
-		for d in frappe.db.sql("""select mdp.month, mdp.percentage_allocation
-			from `tabMonthly Distribution Percentage` mdp, `tabMonthly Distribution` md
-			where mdp.parent=md.name and md.fiscal_year=%s""", fiscal_year, as_dict=1):
-				distribution.setdefault(d.month, d.percentage_allocation)
-
-	dt = frappe.db.get_value("Fiscal Year", fiscal_year, "year_start_date")
-	budget_percentage = 0.0
-
-	while(dt <= getdate(posting_date)):
-		if distribution_id:
-			budget_percentage += distribution.get(getdate(dt).strftime("%B"), 0)
-		else:
-			budget_percentage += 100.0/12
-
-		dt = add_months(dt, 1)
-
-	return yearly_budget * budget_percentage / 100
-
-def get_actual_expense(args):
-	args["condition"] = " and posting_date<='%s'" % args.month_end_date \
-		if args.get("month_end_date") else ""
-
-	return flt(frappe.db.sql("""
-		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
-	""" % (args))[0][0])
-
 def get_currency_precision(currency=None):
 	if not currency:
 		currency = frappe.db.get_value("Company",
@@ -428,15 +437,13 @@
 		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,
+	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)
+				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
+				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
@@ -446,17 +453,15 @@
 		from
 			`tabGL Entry` invoice_gl_entry
 		where
-			party_type = %(party_type)s
-			and party = %(party)s
-			and account = %(account)s
-			and {dr_or_cr} > 0
+			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'))
+					and (against_voucher = '' or against_voucher is null))
+				or (voucher_type not in ('Journal Entry', 'Payment Entry')))
 		group by voucher_type, voucher_no
-		having (invoice_amount - payment_amount) > 0.005""".format(
+		having (invoice_amount - payment_amount) > 0.005
+		order by posting_date, name""".format(
 			dr_or_cr = dr_or_cr,
 			payment_dr_or_cr = payment_dr_or_cr,
 			condition = condition or ""
@@ -467,16 +472,18 @@
 		}, as_dict=True)
 
 	for d in invoice_list:
-		outstanding_invoices.append({
+		outstanding_invoices.append(frappe._dict({
 			'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),
-			'due_date': frappe.db.get_value(d.voucher_type, d.voucher_no, "due_date")
-		})
-
+			'due_date': frappe.db.get_value(d.voucher_type, d.voucher_no, "due_date"),
+		}))
+		
+	outstanding_invoices = sorted(outstanding_invoices, key=lambda k: k['due_date'] or getdate(nowdate()))
+	
 	return outstanding_invoices
 
 
@@ -489,3 +496,51 @@
 		"account_currency": account_currency or frappe.defaults.get_defaults().currency,
 		"company": company or frappe.defaults.get_defaults().company
 	}, "name")
+
+@frappe.whitelist()
+def get_companies():
+	"""get a list of companies based on permission"""
+	return [d.name for d in frappe.get_list("Company", fields=["name"],
+		order_by="name")]
+
+@frappe.whitelist()
+def get_children():
+	args = frappe.local.form_dict
+	doctype, company = args['doctype'], args['company']
+	fieldname = frappe.db.escape(doctype.lower().replace(' ','_'))
+	doctype = frappe.db.escape(doctype)
+
+	# root
+	if args['parent'] in ("Accounts", "Cost Centers"):
+		fields = ", root_type, report_type, account_currency" if doctype=="Account" else ""
+		acc = frappe.db.sql(""" select
+			name as value, is_group as expandable {fields}
+			from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = ''
+			and `company` = %s	and docstatus<2
+			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
+				company, as_dict=1)
+
+		if args["parent"]=="Accounts":
+			sort_root_accounts(acc)
+	else:
+		# other
+		fields = ", account_currency" if doctype=="Account" else ""
+		acc = frappe.db.sql("""select
+			name as value, is_group as expandable, parent_{fieldname} as parent {fields}
+			from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = %s
+			and docstatus<2
+			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
+				args['parent'], as_dict=1)
+
+	if doctype == 'Account':
+		company_currency = frappe.db.get_value("Company", company, "default_currency")
+		for each in acc:
+			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/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 9b316e4..1806d93 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -4,13 +4,24 @@
 frappe.provide("erpnext.buying");
 
 cur_frm.cscript.tax_table = "Purchase Taxes and Charges";
-{% include 'accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js' %}
 
-frappe.require("assets/erpnext/js/controllers/transaction.js");
+{% include 'erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js' %}
 
 cur_frm.email_field = "contact_email";
 
 erpnext.buying.BuyingController = erpnext.TransactionController.extend({
+	setup: function() {
+		this._super();
+		if(!in_list(["Material Request", "Request for Quotation"], this.frm.doc.doctype)){
+			this.frm.get_field('items').grid.editable_fields = [
+				{fieldname: 'item_code', columns: 3},
+				{fieldname: 'qty', columns: 2},
+				{fieldname: 'rate', columns: 3},
+				{fieldname: 'amount', columns: 2}
+			];
+		}
+	},
+
 	onload: function() {
 		this.setup_queries();
 		this._super();
@@ -62,14 +73,13 @@
 
 		this.frm.set_query("item_code", "items", function() {
 			if(me.frm.doc.is_subcontracted == "Yes") {
-				 return{
+				return{
 					query: "erpnext.controllers.queries.item_query",
 					filters:{ 'is_sub_contracted_item': 1 }
 				}
 			} else {
 				return{
-					query: "erpnext.controllers.queries.item_query",
-					filters: { 'is_purchase_item': 1 }
+					query: "erpnext.controllers.queries.item_query"
 				}
 			}
 		});
@@ -135,8 +145,49 @@
 	},
 
 	qty: function(doc, cdt, cdn) {
+		if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
+			var item = frappe.get_doc(cdt, cdn);
+			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
+			if(!(item.received_qty || item.rejected_qty) && item.qty) {
+				item.received_qty = item.qty;
+			}
+
+			if(item.qty > item.received_qty) {
+				msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "qty", item.name)),
+							__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]))
+				item.qty = item.rejected_qty = 0.0;
+			} else {
+				item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item));
+			}
+		}
+
 		this._super(doc, cdt, cdn);
 		this.conversion_factor(doc, cdt, cdn);
+
+	},
+
+	received_qty: function(doc, cdt, cdn) {
+		var item = frappe.get_doc(cdt, cdn);
+		frappe.model.round_floats_in(item, ["qty", "received_qty"]);
+
+		item.qty = (item.qty < item.received_qty) ? item.qty : item.received_qty;
+		this.qty(doc, cdt, cdn);
+	},
+
+	rejected_qty: function(doc, cdt, cdn) {
+		var item = frappe.get_doc(cdt, cdn);
+		frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);
+
+		if(item.rejected_qty > item.received_qty) {
+			msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "rejected_qty", item.name)),
+						__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]));
+			item.qty = item.rejected_qty = 0.0;
+		} else {
+
+			item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
+		}
+
+		this.qty(doc, cdt, cdn);
 	},
 
 	conversion_factor: function(doc, cdt, cdn) {
@@ -196,6 +247,10 @@
 		var me = this;
 		erpnext.utils.get_address_display(this.frm, "shipping_address",
 			"shipping_address_display", is_your_company_address=true)
+	},
+
+	tc_name: function() {
+		this.get_terms();
 	}
 });
 
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
index df63e29..8435f3b 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.py
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.py
@@ -51,13 +51,13 @@
 				item_code = %s and warehouse = %s""", (d.item_code, d.warehouse), as_dict=1)
 
 			f_lst ={'projected_qty': bin and flt(bin[0]['projected_qty']) or 0, 'ordered_qty': 0, 'received_qty' : 0}
-			if d.doctype == 'Purchase Receipt Item':
+			if d.doctype in ('Purchase Receipt Item', 'Purchase Invoice Item'):
 				f_lst.pop('received_qty')
 			for x in f_lst :
 				if d.meta.get_field(x):
 					d.set(x, f_lst[x])
 
-			item = frappe.db.sql("""select is_stock_item, is_purchase_item,
+			item = frappe.db.sql("""select is_stock_item,
 				is_sub_contracted_item, end_of_life, disabled from `tabItem` where name=%s""",
 				d.item_code, as_dict=1)[0]
 
@@ -68,34 +68,15 @@
 			if item.is_stock_item==1 and d.qty and not d.warehouse:
 				frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
 
-			# validate purchase item
-			if not (obj.doctype=="Material Request" and getattr(obj, "material_request_type", None)=="Material Transfer"):
-				if item.is_purchase_item != 1 and item.is_sub_contracted_item != 1:
-					frappe.throw(_("{0} must be a Purchased or Sub-Contracted Item in row {1}").format(d.item_code, d.idx))
-
 			items.append(cstr(d.item_code))
 
 		if items and len(items) != len(set(items)) and \
 			not cint(frappe.db.get_single_value("Buying Settings", "allow_multiple_items") or 0):
-			frappe.msgprint(_("Warning: Same item has been entered multiple times."))
+			frappe.msgprint(_("Warning: Same item has been entered multiple times."), alert=True)
 
 
 	def check_for_closed_status(self, doctype, docname):
 		status = frappe.db.get_value(doctype, docname, "status")
-		
-		if status == "Closed":
-			frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
-		
-	def check_docstatus(self, check, doctype, docname, detail_doctype = ''):
-		if check == 'Next':
-			submitted = frappe.db.sql("""select t1.name from `tab%s` t1,`tab%s` t2
-				where t1.name = t2.parent and t2.prevdoc_docname = %s and t1.docstatus = 1"""
-				% (doctype, detail_doctype, '%s'), docname)
-			if submitted:
-				frappe.throw(_("{0} {1} has already been submitted").format(doctype, submitted[0][0]))
 
-		if check == 'Previous':
-			submitted = frappe.db.sql("""select name from `tab%s`
-				where docstatus = 1 and name = %s""" % (doctype, '%s'), docname)
-			if not submitted:
-				frappe.throw(_("{0} {1} is not submitted").format(doctype, submitted[0][0]))
+		if status == "Closed":
+			frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 617beff..15356fd 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -3,13 +3,17 @@
 
 frappe.provide("erpnext.buying");
 
-{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
 
 frappe.ui.form.on("Purchase Order", {
 	onload: function(frm) {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(frm.doc);
 		});
+
+		frm.set_indicator_formatter('item_code',
+			function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
+
 	}
 });
 
@@ -17,7 +21,6 @@
 	refresh: function(doc, cdt, cdn) {
 		var me = this;
 		this._super();
-		// this.frm.dashboard.reset();
 		var allow_receipt = false;
 		var is_drop_ship = false;
 
@@ -76,7 +79,7 @@
 					this.make_purchase_invoice, __("Make"));
 
 			if(flt(doc.per_billed)==0 && doc.status != "Delivered") {
-				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
+				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_payment_entry, __("Make"));
 			}
 			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 
@@ -84,7 +87,7 @@
 	},
 
 	get_items_from_open_material_requests: function() {
-		frappe.model.map_current_doc({
+		erpnext.utils.map_current_doc({
 			method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
 			source_name: this.frm.doc.supplier,
 			get_query_filters: {
@@ -93,6 +96,15 @@
 		});
 	},
 
+	validate: function() {
+		// set default schedule date as today if missing.
+		(this.frm.doc.items || []).forEach(function(d) {
+			if(!d.schedule_date) {
+				d.schedule_date = frappe.datetime.nowdate();
+			}
+		})
+	},
+
 	make_stock_entry: function() {
 		var items = $.map(cur_frm.doc.items, function(d) { return d.bom ? d.item_code : false; });
 		var me = this;
@@ -138,7 +150,7 @@
 	add_from_mappers: function() {
 		cur_frm.add_custom_button(__('Material Request'),
 			function() {
-				frappe.model.map_current_doc({
+				erpnext.utils.map_current_doc({
 					method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
 					source_doctype: "Material Request",
 					get_query_filters: {
@@ -153,7 +165,7 @@
 
 		cur_frm.add_custom_button(__('Supplier Quotation'),
 			function() {
-				frappe.model.map_current_doc({
+				erpnext.utils.map_current_doc({
 					method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
 					source_doctype: "Supplier Quotation",
 					get_query_filters: {
@@ -175,20 +187,6 @@
 		this.frm.script_manager.copy_from_first_row("items", row, ["schedule_date"]);
 	},
 
-	make_bank_entry: function() {
-		return frappe.call({
-			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order",
-			args: {
-				"dt": "Purchase Order",
-				"dn": cur_frm.doc.name
-			},
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		});
-	},
-
 	unclose_purchase_order: function(){
 		cur_frm.cscript.update_status('Re-open', 'Submitted')
 	},
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 2b4b989..923a3ed 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-21 16:16:39", 
  "custom": 0, 
  "docstatus": 0, 
@@ -51,7 +52,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -119,7 +120,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.supplier && doc.docstatus===0 && !(doc.items && doc.items.length)", 
+   "depends_on": "eval:doc.supplier && doc.docstatus===0 && (!(doc.items && doc.items.length) || (doc.items.length==1 && !doc.items[0].item_code))", 
    "fieldname": "get_items_from_open_material_requests", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -169,7 +170,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -221,6 +222,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "Today", 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -353,7 +355,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "customer_name", 
@@ -1002,7 +1004,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -1829,7 +1831,7 @@
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -2686,14 +2688,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
- "idx": 1, 
+ "idx": 105, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-21 13:13:07.334625", 
+ "modified": "2016-07-07 11:32:05.248626", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
@@ -2765,26 +2768,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Supplier", 
-   "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, 
@@ -2800,11 +2783,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, transaction_date, supplier,grand_total", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 5dd59e8..79b22ae 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -5,7 +5,7 @@
 import frappe
 import json
 from frappe.utils import cstr, flt
-from frappe import msgprint, _, throw
+from frappe import msgprint, _
 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
@@ -23,13 +23,13 @@
 		self.status_updater = [{
 			'source_dt': 'Purchase Order Item',
 			'target_dt': 'Material Request Item',
-			'join_field': 'prevdoc_detail_docname',
+			'join_field': 'material_request_item',
 			'target_field': 'ordered_qty',
 			'target_parent_dt': 'Material Request',
 			'target_parent_field': 'per_ordered',
 			'target_ref_field': 'qty',
 			'source_field': 'stock_qty',
-			'percent_join_field': 'prevdoc_docname',
+			'percent_join_field': 'material_request',
 			'overflow_type': 'order'
 		}]
 
@@ -81,9 +81,9 @@
 
 	def get_schedule_dates(self):
 		for d in self.get('items'):
-			if d.prevdoc_detail_docname and not d.schedule_date:
+			if d.material_request_item and not d.schedule_date:
 				d.schedule_date = frappe.db.get_value("Material Request Item",
-						d.prevdoc_detail_docname, "schedule_date")
+						d.material_request_item, "schedule_date")
 
 
 	def get_last_purchase_rate(self):
@@ -103,10 +103,7 @@
 					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
-					for field in ("base_price_list_rate", "base_rate",
-						"price_list_rate", "rate", "discount_percentage"):
-							d.set(field, 0)
+					msgprint(_("Last purchase rate not found"))
 
 					item_last_purchase_rate = frappe.db.get_value("Item", d.item_code, "last_purchase_rate")
 					if item_last_purchase_rate:
@@ -117,15 +114,15 @@
 	def check_for_closed_status(self, pc_obj):
 		check_list =[]
 		for d in self.get('items'):
-			if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list:
-				check_list.append(d.prevdoc_docname)
-				pc_obj.check_for_closed_status( d.prevdoc_doctype, d.prevdoc_docname)
+			if d.meta.get_field('material_request') and d.material_request and d.material_request not in check_list:
+				check_list.append(d.material_request)
+				pc_obj.check_for_closed_status('Material Request', d.material_request)
 
 	def update_requested_qty(self):
 		material_request_map = {}
 		for d in self.get("items"):
-			if d.prevdoc_doctype and d.prevdoc_doctype == "Material Request" and d.prevdoc_detail_docname:
-				material_request_map.setdefault(d.prevdoc_docname, []).append(d.prevdoc_detail_docname)
+			if d.material_request_item:
+				material_request_map.setdefault(d.material_request, []).append(d.material_request_item)
 
 		for mr, mr_item_rows in material_request_map.items():
 			if mr and mr_item_rows:
@@ -192,17 +189,6 @@
 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_closed_status(pc_obj)
 
-		# Check if Purchase Receipt has been submitted against current Purchase Order
-		pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Receipt', docname = self.name, detail_doctype = 'Purchase Receipt Item')
-
-		# Check if Purchase Invoice has been submitted against current Purchase Order
-		submitted = frappe.db.sql_list("""select t1.name
-			from `tabPurchase Invoice` t1,`tabPurchase Invoice Item` t2
-			where t1.name = t2.parent and t2.purchase_order = %s and t1.docstatus = 1""",
-			self.name)
-		if submitted:
-			throw(_("Purchase Invoice {0} is already submitted").format(", ".join(submitted)))
-
 		frappe.db.set(self,'status','Cancelled')
 
 		self.update_prevdoc_status()
@@ -228,9 +214,9 @@
 		"""Update delivered qty in Sales Order for drop ship"""
 		sales_orders_to_update = []
 		for item in self.items:
-			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)
+			if item.sales_order and item.delivered_by_supplier == 1:
+				if item.sales_order not in sales_orders_to_update:
+					sales_orders_to_update.append(item.sales_order)
 
 		for so_name in sales_orders_to_update:
 			so = frappe.get_doc("Sales Order", so_name)
@@ -242,7 +228,7 @@
 		return any([d.delivered_by_supplier for d in self.items])
 
 	def is_against_so(self):
-		return any([d.prevdoc_doctype for d in self.items if d.prevdoc_doctype=="Sales Order"])
+		return any([d.sales_order for d in self.items if d.sales_order])
 
 	def set_received_qty_for_drop_ship_items(self):
 		for item in self.items:
@@ -291,9 +277,8 @@
 		"Purchase Order Item": {
 			"doctype": "Purchase Receipt Item",
 			"field_map": {
-				"name": "prevdoc_detail_docname",
-				"parent": "prevdoc_docname",
-				"parenttype": "prevdoc_doctype",
+				"name": "purchase_order_item",
+				"parent": "purchase_order",
 			},
 			"postprocess": update_item,
 			"condition": lambda doc: abs(doc.received_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1
@@ -311,7 +296,7 @@
 	def postprocess(source, target):
 		set_missing_values(source, target)
 		#Get the advance paid Journal Entries in Purchase Invoice Advance
-		target.get_advances()
+		target.set_advances()
 
 	def update_item(obj, target, source_parent):
 		target.amount = flt(obj.amount) - flt(obj.billed_amt)
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
new file mode 100644
index 0000000..0812790
--- /dev/null
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -0,0 +1,12 @@
+from frappe import _
+
+data = {
+	'docstatus': 1,
+	'fieldname': 'purchase_order',
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Purchase Receipt', 'Purchase Invoice', 'Stock Entry']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 94dd070..c24bcdc 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -45,6 +45,32 @@
 
 		po.load_from_db()
 		self.assertEquals(po.get("items")[0].received_qty, 4)
+		
+	def test_ordered_qty_against_pi_with_update_stock(self):
+		existing_ordered_qty = get_ordered_qty()
+
+		po = create_purchase_order()
+		
+		self.assertEqual(get_ordered_qty(), existing_ordered_qty + 10)
+
+		frappe.db.set_value('Item', '_Test Item', 'tolerance', 50)
+
+		pi = make_purchase_invoice(po.name)
+		pi.update_stock = 1
+		pi.items[0].qty = 12
+		pi.insert()
+		pi.submit()
+		
+		self.assertEqual(get_ordered_qty(), existing_ordered_qty)
+
+		po.load_from_db()
+		self.assertEquals(po.get("items")[0].received_qty, 12)
+
+		pi.cancel()
+		self.assertEqual(get_ordered_qty(), existing_ordered_qty + 10)
+
+		po.load_from_db()
+		self.assertEquals(po.get("items")[0].received_qty, 0)
 
 	def test_make_purchase_invoice(self):
 		po = create_purchase_order(do_not_submit=True)
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 aaf0ae8..adb4bde 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-24 19:29:06", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -959,46 +961,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_doctype", 
+   "fieldname": "material_request", 
    "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "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": "prevdoc_docname", 
-   "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Reference Name", 
+   "label": "Material Request", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Link", 
-   "options": "prevdoc_doctype", 
+   "options": "Material Request", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1015,14 +990,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_detail_docname", 
+   "fieldname": "material_request_item", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Material Request Detail No", 
+   "label": "Material Request Item", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
@@ -1041,6 +1016,57 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "sales_order", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Order", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Sales Order", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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": "sales_order_item", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Order Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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, 
@@ -1378,20 +1404,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:08:54.505417", 
+ "modified": "2016-07-11 03:28:05.251792", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ 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 bad9e0e..4a87037 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:42", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -24,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Raw Material Item Code", 
@@ -48,6 +53,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,6 +69,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplied Qty", 
@@ -72,6 +79,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -87,6 +95,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
@@ -97,6 +106,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,6 +122,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
@@ -122,6 +133,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +149,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM Detail No", 
@@ -146,6 +159,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -161,6 +175,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
@@ -170,6 +185,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -185,6 +201,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
@@ -194,6 +211,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -209,6 +227,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Uom", 
@@ -219,6 +238,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -230,18 +250,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.025077", 
+ "modified": "2016-07-11 03:28:05.533063", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item Supplied", 
  "owner": "dhanalekshmi@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 070909d..d92aa78 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:42", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -24,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Raw Material Item Code", 
@@ -48,6 +53,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,6 +69,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -72,6 +79,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -89,6 +97,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
@@ -97,6 +106,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,6 +122,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
@@ -119,6 +130,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -134,12 +146,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -155,6 +169,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Required Qty", 
@@ -164,6 +179,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -179,6 +195,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Consumed Qty", 
@@ -188,6 +205,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -203,6 +221,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Uom", 
@@ -213,6 +232,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -228,6 +248,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
@@ -238,6 +259,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -253,6 +275,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
@@ -263,6 +286,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -278,6 +302,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
@@ -287,6 +312,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -302,6 +328,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Stock", 
@@ -311,6 +338,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -326,6 +354,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
@@ -335,6 +364,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -350,6 +380,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM Detail No", 
@@ -359,6 +390,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -370,20 +402,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.573531", 
+ "modified": "2016-07-11 03:28:05.972909", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Receipt Item Supplied", 
  "owner": "wasim@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 046d79d..099c768 100644
--- a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:43", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
@@ -25,6 +28,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Acceptance Criteria", 
@@ -49,6 +54,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -64,6 +70,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 1", 
@@ -73,6 +80,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,6 +96,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 2", 
@@ -97,6 +106,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,6 +122,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 3", 
@@ -121,6 +132,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -136,6 +148,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 4", 
@@ -145,6 +158,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -160,6 +174,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 5", 
@@ -169,6 +184,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -184,6 +200,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 6", 
@@ -193,6 +210,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -208,6 +226,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 7", 
@@ -217,6 +236,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -232,6 +252,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 8", 
@@ -241,6 +262,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -256,6 +278,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 9", 
@@ -265,6 +288,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -280,6 +304,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 10", 
@@ -289,6 +314,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -305,6 +331,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Status", 
@@ -315,6 +342,7 @@
    "options": "Accepted\nRejected", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -326,18 +354,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:54.873250", 
+ "modified": "2016-07-11 03:28:06.296900", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quality Inspection Reading", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/buying/doctype/request_for_quotation/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/buying/doctype/request_for_quotation/__init__.py
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
new file mode 100644
index 0000000..5eafb81
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -0,0 +1,164 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
+
+cur_frm.add_fetch('contact', 'email_id', 'email_id')
+
+frappe.ui.form.on("Request for Quotation",{
+	setup: function(frm) {
+		frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn){
+			var d =locals[cdt][cdn];
+			return {
+				filters: {'supplier': d.supplier}
+			}
+		}
+
+		frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 3},
+			{fieldname: 'qty', columns: 2},
+			{fieldname: 'schedule_date', columns: 2},
+			{fieldname: 'warehouse', columns: 3},
+		];
+
+		frm.get_field('suppliers').grid.editable_fields = [
+			{fieldname: 'supplier', columns: 4},
+			{fieldname: 'contact', columns: 3},
+			{fieldname: 'email_id', columns: 3}
+		];
+	},
+
+	onload: function(frm) {
+		frm.add_fetch('standard_reply', 'response', 'response');
+
+		if(!frm.doc.message_for_supplier) {
+			frm.set_value("message_for_supplier", __("Please supply the specified items at the best possible rates"))
+		}
+	},
+
+	refresh: function(frm, cdt, cdn) {
+		if (frm.doc.docstatus === 1) {
+			frm.add_custom_button(__("Make"),
+				function(){ frm.trigger("make_suppplier_quotation") }, __("Supplier Quotation"));
+
+			frm.add_custom_button(__("View"),
+				function(){ frappe.set_route('List', 'Supplier Quotation',
+					{'request_for_quotation': frm.doc.name}) }, __("Supplier Quotation"));
+
+			frm.add_custom_button(__("Send Supplier Emails"), function() {
+				frappe.call({
+					method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.send_supplier_emails',
+					freeze: true,
+					args: {
+						rfq_name: frm.doc.name
+					}
+				});
+			});
+		}
+	},
+
+	make_suppplier_quotation: function(frm) {
+		var doc = frm.doc;
+		var dialog = new frappe.ui.Dialog({
+			title: __("For Supplier"),
+			fields: [
+				{"fieldtype": "Select", "label": __("Supplier"),
+					"fieldname": "supplier", "options":"Supplier",
+					"options": $.map(doc.suppliers,
+						function(d) { return d.supplier }), "reqd": 1 },
+				{"fieldtype": "Button", "label": __("Make Supplier Quotation"),
+					"fieldname": "make_supplier_quotation", "cssClass": "btn-primary"},
+			]
+		});
+
+		dialog.fields_dict.make_supplier_quotation.$input.click(function() {
+			args = dialog.get_values();
+			if(!args) return;
+			dialog.hide();
+			return frappe.call({
+				type: "GET",
+				method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation",
+				args: {
+					"source_name": doc.name,
+					"for_supplier": args.supplier
+				},
+				freeze: true,
+				callback: function(r) {
+					if(!r.exc) {
+						var doc = frappe.model.sync(r.message);
+						frappe.set_route("Form", r.message.doctype, r.message.name);
+					}
+				}
+			});
+		});
+		dialog.show()
+	}
+})
+
+frappe.ui.form.on("Request for Quotation Supplier",{
+	supplier: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn]
+		frappe.call({
+			method:"erpnext.accounts.party.get_party_details",
+			args:{
+				party: d.supplier,
+				party_type: 'Supplier'
+			},
+			callback: function(r){
+				if(r.message){
+					frappe.model.set_value(cdt, cdn, 'contact', r.message.contact_person)
+					frappe.model.set_value(cdt, cdn, 'email_id', r.message.contact_email)
+				}
+			}
+		})
+	},
+
+	download_pdf: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn]
+
+		var w = window.open(
+			frappe.urllib.get_full_url("/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?"
+			+"doctype="+encodeURIComponent(frm.doc.doctype)
+			+"&name="+encodeURIComponent(frm.doc.name)
+			+"&supplier_idx="+encodeURIComponent(child.idx)
+			+"&no_letterhead=0"));
+		if(!w) {
+			msgprint(__("Please enable pop-ups")); return;
+		}
+	}
+})
+
+erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.extend({
+	refresh: function() {
+		this._super();
+		if (this.frm.doc.docstatus===0) {
+			cur_frm.add_custom_button(__('Material Request'),
+				function() {
+					erpnext.utils.map_current_doc({
+						method: "erpnext.stock.doctype.material_request.material_request.make_request_for_quotation",
+						source_doctype: "Material Request",
+						get_query_filters: {
+							material_request_type: "Purchase",
+							docstatus: 1,
+							status: ["!=", "Stopped"],
+							per_ordered: ["<", 99.99],
+							company: cur_frm.doc.company
+						}
+					})
+				}, __("Get items from"));
+		}
+	},
+
+	calculate_taxes_and_totals: function() {
+		return;
+	},
+
+	tc_name: function() {
+		this.get_terms();
+	}
+});
+
+
+// for backward compatibility: combine new and previous states
+$.extend(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
new file mode 100644
index 0000000..2ce5c5c
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -0,0 +1,798 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2016-02-25 01:24:07.224790", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "naming_series", 
+   "oldfieldtype": "Select", 
+   "options": "RFQ-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "description": "", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "For individual supplier", 
+   "fieldname": "vendor", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "50%", 
+   "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": "transaction_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "transaction_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "suppliers_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "suppliers", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Detail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Request for Quotation Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "items_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-shopping-cart", 
+   "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": "items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "po_details", 
+   "oldfieldtype": "Table", 
+   "options": "Request for Quotation Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "supplier_response_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "standard_reply", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Standard Reply", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Standard Reply", 
+   "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": "message_for_supplier", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Message for Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": 1, 
+   "collapsible_depends_on": "terms", 
+   "fieldname": "terms_section_break", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Terms and Conditions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-legal", 
+   "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": "tc_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "precision": "", 
+   "print_hide": 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": "terms", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Terms and Conditions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "terms", 
+   "oldfieldtype": "Text Editor", 
+   "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": 1, 
+   "fieldname": "printing_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "select_print_heading", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "precision": "", 
+   "print_hide": 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": 1, 
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "status", 
+   "oldfieldtype": "Select", 
+   "options": "\nDraft\nSubmitted\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "fiscal_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "column_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Request for Quotation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-shopping-cart", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-06-30 01:57:49.233065", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Request for Quotation", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "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": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "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": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Stock User", 
+   "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": "Supplier", 
+   "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": 0, 
+   "role": "Purchase Manager", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "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": 0, 
+   "role": "All", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 1, 
+ "search_fields": "status, transaction_date", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "timeline_field": "", 
+ "title_field": "", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
new file mode 100644
index 0000000..b01d3e8
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -0,0 +1,257 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe import _
+from frappe.model.mapper import get_mapped_doc
+from frappe.utils import get_url, random_string, cint
+from frappe.utils.user import get_user_fullname
+from frappe.utils.print_format import download_pdf
+from frappe.desk.form.load import get_attachments
+from frappe.core.doctype.communication.email import make
+from erpnext.accounts.party import get_party_account_currency, get_party_details
+from erpnext.stock.doctype.material_request.material_request import set_missing_values
+from erpnext.controllers.buying_controller import BuyingController
+
+STANDARD_USERS = ("Guest", "Administrator")
+
+class RequestforQuotation(BuyingController):
+	def validate(self):
+		self.validate_duplicate_supplier()
+		self.validate_common()
+		self.update_email_id()
+
+	def validate_duplicate_supplier(self):
+		supplier_list = [d.supplier for d in self.suppliers]
+		if len(supplier_list) != len(set(supplier_list)):
+			frappe.throw(_("Same supplier has been entered multiple times"))
+
+	def validate_common(self):
+		pc = frappe.get_doc('Purchase Common')
+		pc.validate_for_items(self)
+
+	def update_email_id(self):
+		for rfq_supplier in self.suppliers:
+			if not rfq_supplier.email_id:
+				rfq_supplier.email_id = frappe.db.get_value("Contact", rfq_supplier.contact, "email_id")
+
+	def validate_email_id(self, args):
+		if not args.email_id:
+			frappe.throw(_("Row {0}: For supplier {0} email id is required to send email").format(args.idx, args.supplier))
+
+	def on_submit(self):
+		frappe.db.set(self, 'status', 'Submitted')
+
+	def on_cancel(self):
+		frappe.db.set(self, 'status', 'Cancelled')
+
+	def send_to_supplier(self):
+		for rfq_supplier in self.suppliers:
+			if rfq_supplier.send_email:
+				self.validate_email_id(rfq_supplier)
+
+				# make new user if required
+				update_password_link = self.update_supplier_contact(rfq_supplier, self.get_link())
+
+				self.update_supplier_part_no(rfq_supplier)
+				self.supplier_rfq_mail(rfq_supplier, update_password_link, self.get_link())
+
+	def get_link(self):
+		# RFQ link for supplier portal
+		return get_url("/rfq/" + self.name)
+
+	def update_supplier_part_no(self, args):
+		self.vendor = args.supplier
+		for item in self.items:
+			item.supplier_part_no = frappe.db.get_value('Item Supplier',
+				{'parent': item.item_code, 'supplier': args.supplier}, 'supplier_part_no')
+
+	def update_supplier_contact(self, rfq_supplier, link):
+		'''Create a new user for the supplier if not set in contact'''
+		update_password_link = ''
+
+		if frappe.db.exists("User", rfq_supplier.email_id):
+			user = frappe.get_doc("User", rfq_supplier.email_id)
+		else:
+			user, update_password_link = self.create_user(rfq_supplier, link)
+
+		self.update_contact_of_supplier(rfq_supplier, user)
+
+		return update_password_link
+
+	def update_contact_of_supplier(self, rfq_supplier, user):
+		if rfq_supplier.contact:
+			contact = frappe.get_doc("Contact", rfq_supplier.contact)
+		else:
+			contact = frappe.new_doc("Contact")
+			contact.first_name = rfq_supplier.supplier_name or rfq_supplier.supplier
+			contact.supplier = rfq_supplier.supplier
+
+		if not contact.email_id and not contact.user:
+			contact.email_id = user.name
+			contact.user = user.name
+
+		contact.save(ignore_permissions=True)
+
+	def create_user(self, rfq_supplier, link):
+		user = frappe.get_doc({
+			'doctype': 'User',
+			'send_welcome_email': 0,
+			'email': rfq_supplier.email_id,
+			'first_name': rfq_supplier.supplier_name or rfq_supplier.supplier,
+			'user_type': 'Website User',
+			'redirect_url': link
+		})
+		user.save(ignore_permissions=True)
+		update_password_link = user.reset_password()
+
+		return user, update_password_link
+
+	def supplier_rfq_mail(self, data, update_password_link, rfq_link):
+		full_name = get_user_fullname(frappe.session['user'])
+		if full_name == "Guest":
+			full_name = "Administrator"
+
+		args = {
+			'update_password_link': update_password_link,
+			'message': frappe.render_template(self.message_for_supplier, data.as_dict()),
+			'rfq_link': rfq_link,
+			'user_fullname': full_name
+		}
+
+		subject = _("Request for Quotation")
+		template = "templates/emails/request_for_quotation.html"
+		sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None
+		message = frappe.get_template(template).render(args)
+		attachments = self.get_attachments()
+
+		self.send_email(data, sender, subject, message, attachments)
+
+	def send_email(self, data, sender, subject, message, attachments):
+		make(subject = subject, content=message,recipients=data.email_id, 
+			sender=sender,attachments = attachments, send_email=True)["name"]
+
+		frappe.msgprint(_("Email sent to supplier {0}").format(data.supplier))
+
+	def get_attachments(self):
+		attachments = [d.name for d in get_attachments(self.doctype, self.name)]
+		attachments.append(frappe.attach_print(self.doctype, self.name, doc=self))
+		return attachments
+
+@frappe.whitelist()
+def send_supplier_emails(rfq_name):
+	check_portal_enabled('Request for Quotation')
+	rfq = frappe.get_doc("Request for Quotation", rfq_name)
+	if rfq.docstatus==1:
+		rfq.send_to_supplier()
+
+def check_portal_enabled(reference_doctype):
+	if not frappe.db.get_value('Portal Menu Item',
+		{'reference_doctype': reference_doctype}, 'enabled'):
+		frappe.throw(_("Request for Quotation is disabled to access from portal, for more check portal settings."))
+
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context["show_sidebar"] = True
+	return list_context
+
+# This method is used to make supplier quotation from material request form.
+@frappe.whitelist()
+def make_supplier_quotation(source_name, for_supplier, target_doc=None):
+	def postprocess(source, target_doc):
+		target_doc.supplier = for_supplier
+		args = get_party_details(for_supplier, party_type="Supplier", ignore_permissions=True)
+		target_doc.currency = args.currency or get_party_account_currency('Supplier', for_supplier, source.company)
+		target_doc.buying_price_list = args.buying_price_list or frappe.db.get_value('Buying Settings', None, 'buying_price_list')
+		set_missing_values(source, target_doc)
+
+	doclist = get_mapped_doc("Request for Quotation", source_name, {
+		"Request for Quotation": {
+			"doctype": "Supplier Quotation",
+			"validation": {
+				"docstatus": ["=", 1]
+			}
+		},
+		"Request for Quotation Item": {
+			"doctype": "Supplier Quotation Item",
+			"field_map": {
+				"name": "request_for_quotation_item",
+				"parent": "request_for_quotation"
+			},
+		}
+	}, target_doc, postprocess)
+
+	return doclist
+
+# This method is used to make supplier quotation from supplier's portal.
+@frappe.whitelist()
+def create_supplier_quotation(doc):
+	if isinstance(doc, basestring):
+		doc = json.loads(doc)
+
+	validate_duplicate_supplier_quotation(doc)
+
+	try:
+		sq_doc = frappe.get_doc({
+			"doctype": "Supplier Quotation",
+			"supplier": doc.get('supplier'),
+			"terms": doc.get("terms"),
+			"company": doc.get("company"),
+			"currency": doc.get('currency') or get_party_account_currency('Supplier', doc.get('supplier'), doc.get('company')),
+			"buying_price_list": doc.get('buying_price_list') or frappe.db.get_value('Buying Settings', None, 'buying_price_list')
+		})
+		add_items(sq_doc, doc.get('supplier'), doc.get('items'))
+		sq_doc.flags.ignore_permissions = True
+		sq_doc.run_method("set_missing_values")
+		sq_doc.save()
+		frappe.msgprint(_("Supplier Quotation {0} created").format(sq_doc.name))
+		return sq_doc.name
+	except Exception:
+		return
+
+def add_items(sq_doc, supplier, items):
+	for data in items:
+		if data.get("qty") > 0:
+			if isinstance(data, dict):
+				data = frappe._dict(data)
+
+			create_rfq_items(sq_doc, supplier, data)
+
+def create_rfq_items(sq_doc, supplier, data):
+	sq_doc.append('items', {
+		"item_code": data.item_code,
+		"item_name": data.item_name,
+		"description": data.description,
+		"qty": data.qty,
+		"rate": data.rate,
+		"supplier_part_no": frappe.db.get_value("Item Supplier", {'parent': data.item_code, 'supplier': supplier}, "supplier_part_no"),
+		"warehouse": data.warehouse or '',
+		"request_for_quotation_item": data.name,
+		"request_for_quotation": data.parent
+	})
+
+@frappe.whitelist()
+def get_pdf(doctype, name, supplier_idx):
+	doc = get_rfq_doc(doctype, name, supplier_idx)
+	if doc:
+		download_pdf(doctype, name, doc=doc)
+
+def get_rfq_doc(doctype, name, supplier_idx):
+	if cint(supplier_idx):
+		doc = frappe.get_doc(doctype, name)
+		args = doc.get('suppliers')[cint(supplier_idx) - 1]
+		doc.update_supplier_part_no(args)
+		return doc
+
+@frappe.whitelist()
+def validate_duplicate_supplier_quotation(args):
+	data = frappe.db.sql("""select sq.name as name from `tabSupplier Quotation` sq, 
+		`tabSupplier Quotation Item` sqi where sqi.parent = sq.name and sq.supplier = %(supplier)s 
+		and sqi.request_for_quotation = %(rfq)s and sq.docstatus < 2""",
+		{'supplier': args.get('supplier'), 'rfq': args.get('name')}, as_dict=True)
+
+	if data and data[0] and data[0].name:
+		frappe.throw(_("Already supplier quotation has created"))
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
new file mode 100644
index 0000000..4bb4d76
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
@@ -0,0 +1,12 @@
+from frappe import _
+
+data = {
+	'docstatus': 1,
+	'fieldname': 'request_for_quotation',
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Supplier Quotation']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
new file mode 100644
index 0000000..4f205c5
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import nowdate
+
+class TestRequestforQuotation(unittest.TestCase):
+	def test_make_supplier_quotation(self):
+		from erpnext.buying.doctype.request_for_quotation.request_for_quotation import make_supplier_quotation
+		rfq = make_request_for_quotation()
+		
+		sq = make_supplier_quotation(rfq.name, rfq.get('suppliers')[0].supplier)
+		sq.submit()
+		
+		sq1 = make_supplier_quotation(rfq.name, rfq.get('suppliers')[1].supplier)
+		sq1.submit()
+		
+		self.assertEquals(sq.supplier, rfq.get('suppliers')[0].supplier)
+		self.assertEquals(sq.get('items')[0].request_for_quotation, rfq.name)
+		self.assertEquals(sq.get('items')[0].item_code, "_Test Item")
+		self.assertEquals(sq.get('items')[0].qty, 5)
+		
+		self.assertEquals(sq1.supplier, rfq.get('suppliers')[1].supplier)
+		self.assertEquals(sq1.get('items')[0].request_for_quotation, rfq.name)
+		self.assertEquals(sq1.get('items')[0].item_code, "_Test Item")
+		self.assertEquals(sq1.get('items')[0].qty, 5)
+
+	def test_make_supplier_quotation_from_portal(self):
+		from erpnext.buying.doctype.request_for_quotation.request_for_quotation import create_supplier_quotation
+		rfq = make_request_for_quotation()
+		rfq.get('items')[0].rate = 100
+		rfq.supplier = rfq.suppliers[0].supplier
+		supplier_quotation_name = create_supplier_quotation(rfq)
+		
+		supplier_quotation_doc = frappe.get_doc('Supplier Quotation', supplier_quotation_name)
+		
+		self.assertEquals(supplier_quotation_doc.supplier, rfq.get('suppliers')[0].supplier)
+		self.assertEquals(supplier_quotation_doc.get('items')[0].request_for_quotation, rfq.name)
+		self.assertEquals(supplier_quotation_doc.get('items')[0].item_code, "_Test Item")
+		self.assertEquals(supplier_quotation_doc.get('items')[0].qty, 5)
+		self.assertEquals(supplier_quotation_doc.get('items')[0].amount, 500)
+		
+
+def make_request_for_quotation():
+	supplier_data = get_supplier_data()
+	rfq = frappe.new_doc('Request for Quotation')
+	rfq.transaction_date = nowdate()
+	rfq.status = 'Draft'
+	rfq.company = '_Test Company'
+	rfq.message_for_supplier = 'Please supply the specified items at the best possible rates.'
+	
+	for data in supplier_data:
+		rfq.append('suppliers', data)
+	
+	rfq.append("items", {
+		"item_code": "_Test Item",
+		"description": "_Test Item",
+		"uom": "_Test UOM",
+		"qty": 5,
+		"warehouse": "_Test Warehouse - _TC",
+		"schedule_date": nowdate()
+	})
+	
+	rfq.submit()
+	
+	return rfq
+	
+def get_supplier_data():
+	return [{
+		"supplier": "_Test Supplier",
+		"supplier_name": "_Test Supplier"
+	},
+	{
+		"supplier": "_Test Supplier 1",
+		"supplier_name": "_Test Supplier 1"
+	}]
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/buying/doctype/request_for_quotation_item/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/buying/doctype/request_for_quotation_item/__init__.py
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
new file mode 100644
index 0000000..720cb23
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -0,0 +1,643 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2016-02-25 08:04:02.452958", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "supplier_part_no", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Part No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": 1, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "quantity", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Today", 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Required Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "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": "warehouse_and_reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse and Reference", 
+   "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": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "project_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Project Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "material_request", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Material Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Material Request", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "material_request_item", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Material Request Item", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "brand", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Brand", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Link", 
+   "options": "Brand", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "page_break", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Page Break", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "page_break", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:06.681590", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Request for Quotation Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.py b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.py
new file mode 100644
index 0000000..cc897af
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class RequestforQuotationItem(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/buying/doctype/request_for_quotation_supplier/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/buying/doctype/request_for_quotation_supplier/__init__.py
diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
new file mode 100644
index 0000000..efd81b7
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
@@ -0,0 +1,216 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-03-29 05:59:11.896885", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "1", 
+   "fieldname": "send_email", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Send Email", 
+   "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": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "contact", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Contact", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Contact", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "supplier_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Supplier Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "supplier.supplier_name", 
+   "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": "email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Email Id", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "contact.email_id", 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "download_pdf", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Download PDF", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:06.830030", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Request for Quotation Supplier", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.py b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.py
new file mode 100644
index 0000000..4b0bbbe
--- /dev/null
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class RequestforQuotationSupplier(Document):
+	pass
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 95a1aff..1df1eec 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -6,8 +6,6 @@
 		frappe.setup_language_field(frm);
 	},
 	refresh: function(frm) {
-		frm.cscript.make_dashboard(frm.doc);
-
 		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
 		} else {
@@ -22,59 +20,9 @@
 		  	unhide_field(['address_html','contact_html']);
 			erpnext.utils.render_address_and_contact(frm);
 		}
-
-		frm.events.add_custom_buttons(frm);
-	},
-	add_custom_buttons: function(frm) {
-		["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"].forEach(function(doctype, i) {
-			if(frappe.model.can_read(doctype)) {
-				frm.add_custom_button(__(doctype), function() {
-					frappe.route_options = {"supplier": frm.doc.name};
-					frappe.set_route("List", doctype);
-				}, __("View"));
-			}
-			if(frappe.model.can_create(doctype)) {
-				frm.add_custom_button(__(doctype), function() {
-					frappe.route_options = {"supplier": frm.doc.name};
-					new_doc(doctype);
-				}, __("Make"));
-			}
-		});
 	},
 });
 
-cur_frm.cscript.make_dashboard = function(doc) {
-	cur_frm.dashboard.reset();
-	if(doc.__islocal)
-		return;
-	if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager"))
-		cur_frm.dashboard.set_headline('<span class="text-muted">' + __('Loading') + '</span>')
-
-	cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier");
-	cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier");
-	cur_frm.dashboard.add_doctype_badge("Purchase Receipt", "supplier");
-	cur_frm.dashboard.add_doctype_badge("Purchase Invoice", "supplier");
-
-	return frappe.call({
-		type: "GET",
-		method: "erpnext.buying.doctype.supplier.supplier.get_dashboard_info",
-		args: {
-			supplier: cur_frm.doc.name
-		},
-		callback: function(r) {
-			if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
-				cur_frm.dashboard.set_headline(
-					__("Total billing this year") + ": <b>"
-					+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
-					+ '</b> / <span class="text-muted">' + __("Total Unpaid") + ": <b>"
-					+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)
-					+ '</b></span>');
-			}
-			cur_frm.dashboard.set_badge_count(r.message);
-		}
-	})
-}
-
 cur_frm.fields_dict['default_price_list'].get_query = function(doc, cdt, cdn) {
 	return{
 		filters:{'buying': 1}
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 3542c9e..ca95bbb 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -18,9 +18,10 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "", 
+   "label": "Name and Type", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
@@ -43,6 +44,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -63,12 +65,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
@@ -90,10 +93,88 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "country", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "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": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nOpen", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -117,6 +198,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier Type", 
@@ -137,6 +219,32 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Loading...", 
+   "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": 1, 
    "collapsible": 0, 
    "default": "0", 
@@ -144,6 +252,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
@@ -163,13 +272,15 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -191,6 +302,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Currency", 
@@ -211,10 +323,35 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
@@ -234,59 +371,12 @@
   {
    "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, 
-   "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": "language", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Print Language", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Loading...", 
-   "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": 1, 
    "fieldname": "section_credit_limit", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
@@ -311,6 +401,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days Based On", 
@@ -337,6 +428,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
@@ -361,6 +453,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address and Contacts", 
@@ -386,6 +479,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address HTML", 
@@ -409,6 +503,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -432,6 +527,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact HTML", 
@@ -456,6 +552,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Payable Accounts", 
@@ -481,6 +578,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
@@ -506,6 +604,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -530,6 +629,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website", 
@@ -556,6 +656,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Details", 
@@ -581,6 +682,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Frozen", 
@@ -601,14 +703,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-user", 
- "idx": 1, 
+ "idx": 370, 
+ "image_field": "image", 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-02-22 16:50:55.710869", 
+ "modified": "2016-04-28 17:36:44.742525", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
@@ -755,9 +858,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "supplier_name, supplier_type", 
  "sort_order": "ASC", 
- "title_field": "supplier_name"
-}
+ "title_field": "supplier_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index f010626..a4ee326 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -8,7 +8,8 @@
 from frappe.model.naming import make_autoname
 from erpnext.utilities.address_and_contact import load_address_and_contact
 from erpnext.utilities.transaction_base import TransactionBase
-from erpnext.accounts.party import validate_party_accounts
+from erpnext.accounts.party import validate_party_accounts, get_timeline_data # keep this
+from erpnext.accounts.party_status import get_party_status
 
 class Supplier(TransactionBase):
 	def get_feed(self):
@@ -47,6 +48,7 @@
 				msgprint(_("Series is mandatory"), raise_exception=1)
 
 		validate_party_accounts(self)
+		self.status = get_party_status(self)
 
 	def get_contacts(self,nm):
 		if nm:
@@ -80,32 +82,4 @@
 	def update_supplier_address(self, newdn, set_field):
 		frappe.db.sql("""update `tabAddress` set address_title=%(newdn)s
 			{set_field} where supplier=%(newdn)s"""\
-			.format(set_field=set_field), ({"newdn": newdn}))
-
-@frappe.whitelist()
-def get_dashboard_info(supplier):
-	if not frappe.has_permission("Supplier", "read", supplier):
-		frappe.throw(_("No permission"))
-
-	out = {}
-	for doctype in ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"]:
-		out[doctype] = frappe.db.get_value(doctype,
-			{"supplier": supplier, "docstatus": ["!=", 2] }, "count(*)")
-
-	billing_this_year = frappe.db.sql("""
-		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""",
-		(supplier, frappe.db.get_default("fiscal_year")))
-
-	total_unpaid = frappe.db.sql("""select sum(outstanding_amount)
-		from `tabPurchase Invoice`
-		where supplier=%s and docstatus = 1""", supplier)
-
-
-	out["billing_this_year"] = billing_this_year[0][0] if billing_this_year else 0
-	out["total_unpaid"] = total_unpaid[0][0] if total_unpaid else 0
-	out["company_currency"] = frappe.db.sql_list("select distinct default_currency from tabCompany")
-
-	return out
+			.format(set_field=set_field), ({"newdn": newdn}))
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
new file mode 100644
index 0000000..ab123e2
--- /dev/null
+++ b/erpnext/buying/doctype/supplier/supplier_dashboard.py
@@ -0,0 +1,17 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on transactions against this Supplier. See timeline below for details'),
+	'fieldname': 'supplier',
+	'transactions': [
+		{
+			'label': _('Procurement'),
+			'items': ['Request for Quotation', 'Supplier Quotation']
+		},
+		{
+			'label': _('Orders'),
+			'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier_list.js b/erpnext/buying/doctype/supplier/supplier_list.js
index d26932c..acf8e68 100644
--- a/erpnext/buying/doctype/supplier/supplier_list.js
+++ b/erpnext/buying/doctype/supplier/supplier_list.js
@@ -1,3 +1,8 @@
 frappe.listview_settings['Supplier'] = {
-	add_fields: ["supplier_name", "supplier_type"]
+	add_fields: ["supplier_name", "supplier_type", 'status'],
+	get_indicator: function(doc) {
+		if(doc.status==="Open") {
+			return [doc.status, "red", "status,=," + doc.status];
+		}
+	}
 };
diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json
index f335d5c..d2b3995 100644
--- a/erpnext/buying/doctype/supplier/test_records.json
+++ b/erpnext/buying/doctype/supplier/test_records.json
@@ -1,6 +1,12 @@
 [
  {
   "doctype": "Supplier",
+  "supplier_name": "_Test Supplier with Country",
+  "supplier_type": "_Test Supplier Type",
+  "country": "Greece"
+ },
+ {
+  "doctype": "Supplier",
   "supplier_name": "_Test Supplier",
   "supplier_type": "_Test Supplier Type"
  },
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index a7a65f1..1d089e7 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -70,3 +70,18 @@
         frappe.db.set_value("Supplier", "_Test Supplier", "disabled", 0)
 
         po.save()
+
+
+    def test_supplier_country(self):
+        # Test that country field exists in Supplier DocType
+        supplier = frappe.get_doc('Supplier', '_Test Supplier with Country')
+        self.assertTrue('country' in supplier.as_dict())
+
+        # Test if test supplier field record is 'Greece'
+        self.assertEqual(supplier.country, "Greece")
+
+        # Test update Supplier instance country value
+        supplier = frappe.get_doc('Supplier', '_Test Supplier')
+        supplier.country = 'Greece'
+        supplier.save()
+        self.assertEqual(supplier.country, "Greece")
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 96d6911..1859cf5 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -2,12 +2,11 @@
 // License: GNU General Public License v3. See license.txt
 
 // attach required files
-{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
 
 erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.extend({
 	refresh: function() {
 		this._super();
-
 		if (this.frm.doc.docstatus === 1) {
 			cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order,
 				__("Make"));
@@ -16,7 +15,7 @@
 		else if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('Material Request'),
 				function() {
-					frappe.model.map_current_doc({
+					erpnext.utils.map_current_doc({
 						method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
 						source_doctype: "Material Request",
 						get_query_filters: {
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 6466643..56ddd6b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -3,11 +3,13 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-21 16:16:45", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -51,7 +53,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
@@ -117,7 +119,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
@@ -169,6 +171,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "Today", 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -672,7 +675,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -1473,7 +1476,7 @@
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1772,7 +1775,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-shopping-cart", 
- "idx": 1, 
+ "idx": 29, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -1780,7 +1784,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-16 15:36:05.481917", 
+ "modified": "2016-07-08 06:48:04.162164", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -1843,7 +1847,7 @@
    "role": "Purchase User", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 0, 
+   "submit": 1, 
    "write": 1
   }, 
   {
@@ -1872,26 +1876,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Supplier", 
-   "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, 
@@ -1907,11 +1891,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, transaction_date, supplier,grand_total", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index 2beb559..b6a3376 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -78,9 +78,8 @@
 				["parent", "supplier_quotation"],
 				["uom", "stock_uom"],
 				["uom", "uom"],
-				["prevdoc_detail_docname", "prevdoc_detail_docname"],
-				["prevdoc_doctype", "prevdoc_doctype"],
-				["prevdoc_docname", "prevdoc_docname"]
+				["material_request", "material_request"],
+				["material_request_item", "material_request_item"]
 			],
 			"postprocess": update_item
 		},
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
new file mode 100644
index 0000000..6c8ae7c
--- /dev/null
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
@@ -0,0 +1,20 @@
+from frappe import _
+
+data = {
+	'fieldname': 'supplier_quotation',
+	'internal_links': {
+		'Material Request': ['items', 'material_request'],
+		'Request for Quotation': ['items', 'request_for_quotation'],
+		'Project': ['items', 'project'],
+	},
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Purchase Order']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Material Request', 'Request for Quotation', 'Project']
+		},
+	]
+}
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 b09667b..f7183b9 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-22 12:43:10", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -854,16 +856,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_docname", 
+   "fieldname": "material_request", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Material Request No", 
+   "label": "Material Request", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Link", 
    "options": "Material Request", 
@@ -883,6 +885,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "request_for_quotation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Request for Quotation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Request for Quotation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "col_break4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -906,16 +934,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_detail_docname", 
+   "fieldname": "material_request_item", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Material Request Detail No", 
+   "label": "Material Request Item", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
@@ -932,6 +960,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "request_for_quotation_item", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Request for Quotation Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "brand", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1040,20 +1093,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:15:03.936587", 
+ "modified": "2016-07-11 03:28:09.043961", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index afb615f..3e6f23b 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -110,7 +110,7 @@
 		this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
 
 		this.show_zero_check()
-		this.setup_plot_check();
+		this.setup_chart_check();
 	},
 	init_filter_values: function() {
 		this._super();
@@ -248,9 +248,5 @@
 		if(!this.checked) {
 			this.data[0].checked = true;
 		}
-	},
-	get_plot_points: function(item, col, idx) {
-		return [[dateutil.str_to_obj(col.id).getTime(), item[col.field]],
-			[dateutil.user_to_obj(col.name).getTime(), item[col.field]]];
 	}
 });
diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
index dcf1df1..f7fe90f 100644
--- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/purchase_trends_filters.js");
-
-frappe.query_reports["Purchase Order Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
+frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
+	frappe.query_reports["Purchase Order Trends"] = {
+		filters: get_filters()
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/buying/report/quoted_item_comparison/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/buying/report/quoted_item_comparison/__init__.py
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
new file mode 100644
index 0000000..45bc738
--- /dev/null
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Quoted Item Comparison"] = {
+	"filters": [
+	{
+		"fieldname":"item",
+		"label": __("Item"),
+		"fieldtype": "Link",
+		"options": "Item",
+		"default": ""
+		
+	}
+	]
+}
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json
new file mode 100644
index 0000000..00e89f0
--- /dev/null
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-07-21 08:31:05.890362", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-07-21 12:32:45.733155", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Quoted Item Comparison", 
+ "owner": "Administrator", 
+ "ref_doctype": "Supplier Quotation", 
+ "report_name": "Quoted Item Comparison", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
new file mode 100644
index 0000000..5bf9c7b
--- /dev/null
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
@@ -0,0 +1,100 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute(filters=None):
+	
+	qty_list = get_quantity_list(filters.item)
+	
+	data = get_quote_list(filters.item, qty_list)
+	
+	columns = get_columns(qty_list)
+	
+	return columns, data
+
+	
+def get_quote_list(item, qty_list):
+	
+	out = []
+	
+	if item:
+		price_data = []
+		suppliers = []
+		# Get the list of suppliers
+		for root in frappe.db.sql("""select parent, qty, rate from `tabSupplier Quotation Item` where item_code=%s and docstatus < 2""", item, as_dict=1):
+			for splr in frappe.db.sql("""SELECT supplier from `tabSupplier Quotation` where name =%s and docstatus < 2""", root.parent, as_dict=1):
+				ip = frappe._dict({
+				"supplier": splr.supplier,
+				"qty": root.qty,
+				"parent": root.parent,
+				"rate": root.rate})
+				price_data.append(ip)
+				suppliers.append(splr.supplier)
+			
+		#Add a row for each supplier
+		for root in set(suppliers):
+			row = frappe._dict({
+				"supplier_name": root
+			})
+			for col in qty_list:
+				# Get the quantity for this row
+				for item_price in price_data:
+					if str(item_price.qty) == col.key and item_price.supplier == root:
+						row[col.key] = item_price.rate
+						row[col.key + "QUOTE"] = item_price.parent
+						break
+					else:
+						row[col.key] = ""
+						row[col.key + "QUOTE"] = ""
+			out.append(row)
+			
+
+	
+	return out
+	
+def get_quantity_list(item):
+	
+	out = []
+	
+			
+	if item:
+		qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item` where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1)
+		qty_list.sort(reverse=False)
+		for qt in qty_list:
+			col = frappe._dict({
+				"key": str(qt.qty),
+				"label": "Qty: " + str(int(qt.qty))
+			})
+			out.append(col)
+
+	return out
+	
+def get_columns(qty_list):
+	columns = [{
+		"fieldname": "supplier_name",
+		"label": "Supplier",
+		"fieldtype": "Link",
+		"options": "Supplier",
+		"width": 200
+	}]
+
+	for qty in qty_list:
+		columns.append({
+			"fieldname": qty.key,
+			"label": qty.label,
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 80
+		})
+		columns.append({
+			"fieldname": qty.key + "QUOTE",
+			"label": "Quotation",
+			"fieldtype": "Link",
+			"options": "Supplier Quotation",
+			"width": 90
+		})
+
+
+	return columns
\ No newline at end of file
diff --git a/erpnext/change_log/v5/v5_6_0.md b/erpnext/change_log/v5/v5_6_0.md
index 0ef5a3a..4fb4115 100644
--- a/erpnext/change_log/v5/v5_6_0.md
+++ b/erpnext/change_log/v5/v5_6_0.md
@@ -3,4 +3,4 @@
   Now additional costs like shipping charges, operating costs etc can be added in Stock Entry in item valuation
 - **Update Finished Goods** in Production Order can now use the items from **Transfer Materials for Manufacture** step instead of items from the Bill of Materials. This can be configured in Manufacturing Settings
 - Added field **Tax ID** in Customer
-- Bug fixes in Item, Time Log Batch, Pricing Rule, Salary Slip, Address and Stock Entry
+- Bug fixes in Item, Time Sheet, Pricing Rule, Salary Slip, Address and Stock Entry
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index bbc8671..a0fcb63 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -22,9 +22,14 @@
 					"description": _("Payment Request")
 				},
 				{
+					"type": "doctype",
+					"name": "Payment Entry",
+					"description": _("Bank/Cash transactions against party or for internal transfer")
+				},
+				{
 					"type": "report",
 					"name": "Accounts Receivable",
-					"doctype": "Sales Invoice",
+					"doctype": "Sales Invoice",	
 					"is_query_report": True
 				},
 				{
@@ -50,13 +55,12 @@
 					"description": _("Accounting journal entries.")
 				},
 				{
-					"type": "page",
-					"name": "Accounts Browser",
+					"type": "doctype",
+					"name": "Account",
 					"icon": "icon-sitemap",
 					"label": _("Chart of Accounts"),
-					"route": "Accounts Browser/Account",
+					"route": "Tree/Account",
 					"description": _("Tree of financial accounts."),
-					"doctype": "Account",
 				},
 				{
 					"type": "report",
@@ -83,6 +87,14 @@
 					"type": "doctype",
 					"name": "Item",
 				},
+				{
+					"type": "doctype",
+					"name": "Asset",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Category",
+				}
 			]
 		},
 		{
@@ -119,11 +131,6 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Payment Tool",
-					"description": _("Create Payment Entries against Orders or Invoices.")
-				},
-				{
-					"type": "doctype",
 					"label": _("Update Bank Transaction Dates"),
 					"name": "Bank Reconciliation",
 					"description": _("Update bank payment dates with journals.")
@@ -184,13 +191,17 @@
 			"label": _("Budget and Cost Center"),
 			"items": [
 				{
-					"type": "page",
-					"name": "Accounts Browser",
+					"type": "doctype",
+					"name": "Cost Center",
 					"icon": "icon-sitemap",
 					"label": _("Chart of Cost Centers"),
-					"route": "Accounts Browser/Cost Center",
+					"route": "Tree/Cost Center",
 					"description": _("Tree of financial Cost Centers."),
-					"doctype": "Cost Center",
+				},
+				{
+					"type": "doctype",
+					"name": "Budget",
+					"description": _("Define budget for a financial year.")
 				},
 				{
 					"type": "report",
@@ -213,6 +224,16 @@
 					"name": "Period Closing Voucher",
 					"description": _("Close Balance Sheet and book Profit or Loss.")
 				},
+				{
+					"type": "doctype",
+					"name": "Asset Movement",
+					"description": _("Transfer an asset from one warehouse to another")
+				},
+				{
+					"type": "doctype",
+					"name": "Cheque Print Template",
+					"description": _("Setup cheque dimensions for printing")
+				},
 			]
 		},
 		{
@@ -303,12 +324,6 @@
 			"label": _("Analytics"),
 			"items": [
 				{
-					"type": "page",
-					"name": "financial-analytics",
-					"label": _("Financial Analytics"),
-					"icon": "icon-bar-chart",
-				},
-				{
 					"type": "report",
 					"name": "Gross Profit",
 					"doctype": "Sales Invoice",
@@ -334,6 +349,18 @@
 			"items": [
 				{
 					"type": "report",
+					"name": "Asset Depreciation Ledger",
+					"doctype": "Asset",
+					"is_query_report": True,
+				},
+				{
+					"type": "report",
+					"name": "Asset Depreciations and Balances",
+					"doctype": "Asset",
+					"is_query_report": True,
+				},
+				{
+					"type": "report",
 					"name": "Trial Balance for Party",
 					"doctype": "GL Entry",
 					"is_query_report": True,
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index c259f06..3c947cb 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -14,6 +14,11 @@
 				},
 				{
 					"type": "doctype",
+					"name": "Request for Quotation",
+					"description": _("Request for quotation."),
+				},
+				{
+					"type": "doctype",
 					"name": "Supplier Quotation",
 					"description": _("Quotations received from Suppliers."),
 				},
@@ -91,13 +96,12 @@
 					"description": _("Price List master.")
 				},
 				{
-					"type": "page",
-					"name": "Sales Browser",
+					"type": "doctype",
+					"name": "Item Group",
 					"icon": "icon-sitemap",
 					"label": _("Item Group"),
-					"link": "Sales Browser/Item Group",
+					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
-					"doctype": "Item Group",
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index 26e9e03..e25493c 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -40,6 +40,12 @@
 				},
 				{
 					"type": "report",
+					"name": "Minutes to First Response for Opportunity",
+					"doctype": "Opportunity",
+					"is_query_report": True
+				},
+				{
+					"type": "report",
 					"is_query_report": True,
 					"name": "Lead Details",
 					"doctype": "Lead"
@@ -64,11 +70,6 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Newsletter",
-					"description": _("Newsletters to contacts, leads."),
-				},
-				{
-					"type": "doctype",
 					"name": "Communication",
 					"description": _("Record of all communications of type email, phone, chat, visit, etc."),
 				},
@@ -84,36 +85,28 @@
 					"description": _("Sales campaigns."),
 				},
 				{
-					"type": "page",
+					"type": "doctype",
 					"label": _("Customer Group"),
-					"name": "Sales Browser",
+					"name": "Customer Group",
 					"icon": "icon-sitemap",
-					"link": "Sales Browser/Customer Group",
+					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
-					"doctype": "Customer Group",
-				},
-				{
-					"type": "page",
-					"label": _("Territory"),
-					"name": "Sales Browser",
-					"icon": "icon-sitemap",
-					"link": "Sales Browser/Territory",
-					"description": _("Manage Territory Tree."),
-					"doctype": "Territory",
-				},
-				{
-					"type": "page",
-					"label": _("Sales Person"),
-					"name": "Sales Browser",
-					"icon": "icon-sitemap",
-					"link": "Sales Browser/Sales Person",
-					"description": _("Manage Sales Person Tree."),
-					"doctype": "Sales Person",
 				},
 				{
 					"type": "doctype",
-					"name": "Newsletter List",
-					"description": _("Newsletter Mailing List"),
+					"label": _("Territory"),
+					"name": "Territory",
+					"icon": "icon-sitemap",
+					"link": "Tree/Territory",
+					"description": _("Manage Territory Tree."),
+				},
+				{
+					"type": "doctype",
+					"label": _("Sales Person"),
+					"name": "Sales Person",
+					"icon": "icon-sitemap",
+					"link": "Tree/Sales Person",
+					"description": _("Manage Sales Person Tree."),
 				},
 			]
 		},
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index e15f2b6..08f9d23 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -4,37 +4,108 @@
 def get_data():
 	return [
 		{
+			"module_name": "Item",
+			"_doctype": "Item",
+			"color": "#f39c12",
+			"icon": "octicon octicon-package",
+			"type": "link",
+			"link": "List/Item"
+		},
+		{
+			"module_name": "Customer",
+			"_doctype": "Customer",
+			"color": "#1abc9c",
+			"icon": "octicon octicon-tag",
+			"type": "link",
+			"link": "List/Customer"
+		},
+		{
+			"module_name": "Supplier",
+			"_doctype": "Supplier",
+			"color": "#c0392b",
+			"icon": "octicon octicon-briefcase",
+			"type": "link",
+			"link": "List/Supplier"
+		},
+		{
+			"_doctype": "Employee",
+			"module_name": "Employee",
+			"color": "#2ecc71",
+			"icon": "octicon octicon-organization",
+			"type": "link",
+			"link": "List/Employee"
+		},
+		{
+			"module_name": "Project",
+			"_doctype": "Project",
+			"color": "#8e44ad",
+			"icon": "octicon octicon-rocket",
+			"type": "link",
+			"link": "List/Project"
+		},
+		{
+			"module_name": "Issue",
+			"color": "#2c3e50",
+			"icon": "octicon octicon-issue-opened",
+			"_doctype": "Issue",
+			"type": "link",
+			"link": "List/Issue"
+		},
+		{
+			"module_name": "Lead",
+			"icon": "octicon octicon-broadcast",
+			"type": "module",
+			"_doctype": "Lead",
+			"type": "link",
+			"link": "List/Lead"
+		},
+		{
+			"module_name": "Profit and Loss Statment",
+			"_doctype": "Account",
+			"color": "#3498db",
+			"icon": "octicon octicon-repo",
+			"type": "link",
+			"link": "query-report/Profit and Loss Statement"
+		},
+
+		# old
+		{
 			"module_name": "Accounts",
 			"color": "#3498db",
 			"icon": "octicon octicon-repo",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Stock",
 			"color": "#f39c12",
 			"icon": "icon-truck",
 			"icon": "octicon octicon-package",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "CRM",
 			"color": "#EF4DB6",
 			"icon": "octicon octicon-broadcast",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Selling",
 			"color": "#1abc9c",
 			"icon": "icon-tag",
 			"icon": "octicon octicon-tag",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Buying",
 			"color": "#c0392b",
 			"icon": "icon-shopping-cart",
 			"icon": "octicon octicon-briefcase",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "HR",
@@ -42,14 +113,16 @@
 			"icon": "icon-group",
 			"icon": "octicon octicon-organization",
 			"label": _("Human Resources"),
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Manufacturing",
 			"color": "#7f8c8d",
 			"icon": "icon-cogs",
 			"icon": "octicon octicon-tools",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "POS",
@@ -65,14 +138,16 @@
 			"color": "#8e44ad",
 			"icon": "icon-puzzle-piece",
 			"icon": "octicon octicon-rocket",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Support",
 			"color": "#2c3e50",
 			"icon": "icon-phone",
 			"icon": "octicon octicon-issue-opened",
-			"type": "module"
+			"type": "module",
+			"hidden": 1
 		},
 		{
 			"module_name": "Learn",
@@ -80,6 +155,120 @@
 			"icon": "octicon octicon-device-camera-video",
 			"type": "module",
 			"is_help": True,
-			"label": _("Learn")
+			"label": _("Learn"),
+			"hidden": 1
+		},
+		{
+			"module_name": "Maintenance",
+			"color": "#FF888B",
+			"icon": "octicon octicon-tools",
+			"type": "module",
+			"label": _("Maintenance")
+		},
+		{
+			"module_name": "Student",
+			"color": "#c0392b",
+			"icon": "octicon octicon-person",
+			"label": _("Student"),
+			"link": "List/Student",
+			"_doctype": "Student",
+			"type": "list"
+		},
+		{
+			"module_name": "Student Group",
+			"color": "#d59919",
+			"icon": "octicon octicon-organization",
+			"label": _("Student Group"),
+			"link": "List/Student Group",
+			"_doctype": "Student Group",
+			"type": "list"
+		},
+		{
+			"module_name": "Course Schedule",
+			"color": "#fd784f",
+			"icon": "octicon octicon-calendar",
+			"label": _("Course Schedule"),
+			"link": "Calendar/Course Schedule",
+			"_doctype": "Course Schedule",
+			"type": "list"
+		},
+		{
+			"module_name": "Student Attendance",
+			"color": "#3aacba",
+			"icon": "octicon octicon-checklist",
+			"label": _("Student Attendance"),
+			"link": "List/Student Attendance",
+			"_doctype": "Student Attendance",
+			"type": "list"
+		},
+		{
+			"module_name": "Course",
+			"color": "#8e44ad",
+			"icon": "octicon octicon-book",
+			"label": _("Course"),
+			"link": "List/Course",
+			"_doctype": "Course",
+			"type": "list"
+		},
+		{
+			"module_name": "Program",
+			"color": "#9b59b6",
+			"icon": "octicon octicon-repo",
+			"label": _("Program"),
+			"link": "List/Program",
+			"_doctype": "Program",
+			"type": "list"
+		},
+		{
+			"module_name": "Student Applicant",
+			"color": "#4d927f",
+			"icon": "octicon octicon-clippy",
+			"label": _("Student Applicant"),
+			"link": "List/Student Applicant",
+			"_doctype": "Student Applicant",
+			"type": "list"
+		},
+		{
+			"module_name": "Examination",
+			"color": "#8a70be",
+			"icon": "icon-file-text-alt",
+			"label": _("Examination"),
+			"link": "List/Examination",
+			"_doctype": "Examination",
+			"type": "list"
+		},
+		{
+			"module_name": "Fees",
+			"color": "#83C21E",
+			"icon": "icon-money",
+			"label": _("Fees"),
+			"link": "List/Fees",
+			"_doctype": "Fees",
+			"type": "list"
+		},
+		{
+			"module_name": "Instructor",
+			"color": "#a99e4c",
+			"icon": "octicon octicon-broadcast",
+			"label": _("Instructor"),
+			"link": "List/Instructor",
+			"_doctype": "Instructor",
+			"type": "list"
+		},
+		{
+			"module_name": "Room",
+			"color": "#f22683",
+			"icon": "icon-map-marker",
+			"label": _("Room"),
+			"link": "List/Room",
+			"_doctype": "Examination",
+			"type": "list"
+		},
+		{
+			"module_name": "Schools",
+			"color": "#DE2B37",
+			"icon": "octicon octicon-mortar-board",
+			"type": "module",
+			"label": _("Schools")
 		}
 	]
diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py
index 82cb1fb..07d14b6 100644
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -19,6 +19,7 @@
 splash_light_background = True
 
 def get_context(context):
+	context.brand_html = "ERPNext"
 	context.app.splash_light_background = True
 	context.top_bar_items = [
 		{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index eea65b8..51c258b 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -15,7 +15,7 @@
 					"type": "doctype",
 					"name": "Employee Attendance Tool",
 					"label": _("Employee Attendance Tool"),
-					"description":_("Mark Employee Attendance in Bulk"),
+					"description":_("Mark Attendance for multiple employees"),
 					"hide_count": True
 				},
 				{
@@ -111,13 +111,9 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Earning Type",
-					"description": _("Salary components.")
-				},
-				{
-					"type": "doctype",
-					"name": "Deduction Type",
-					"description": _("Tax and other salary deductions.")
+					"name": "Salary Component",
+					"label": _("Salary Components"),
+					"description": _("Earnings, Deductions and other Salary components")
 				},
 
 			]
@@ -210,7 +206,7 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Employee Holiday Attendance",
+					"name": "Employees working on a holiday",
 					"doctype": "Employee"
 				},
 				{
diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py
new file mode 100644
index 0000000..aa2f87c
--- /dev/null
+++ b/erpnext/config/maintenance.py
@@ -0,0 +1,32 @@
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Maintenance"),
+			"icon": "icon-star",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Maintenance Schedule",
+					"description": _("Plan for maintenance visits."),
+				},
+				{
+					"type": "doctype",
+					"name": "Maintenance Visit",
+					"description": _("Visit report for maintenance call."),
+				},
+				{
+					"type": "report",
+					"name": "Maintenance Schedules",
+					"is_query_report": True,
+					"doctype": "Maintenance Schedule"
+				},
+				{
+					"type": "doctype",
+					"name": "Warranty Claim",
+					"description": _("Warranty Claim against Serial No."),
+				},
+			]
+		}
+	]
\ No newline at end of file
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index 2ae49fe..d2432b6 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -23,8 +23,8 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Time Log",
-					"description": _("Time Logs for manufacturing."),
+					"name": "Timesheet",
+					"description": _("Time Sheet for manufacturing."),
 				},
 
 			]
@@ -39,12 +39,12 @@
 					"label": _("Bill of Materials")
 				},
 				{
-					"type": "page",
-					"name": "bom-browser",
+					"type": "doctype",
+					"name": "BOM",
 					"icon": "icon-sitemap",
 					"label": _("BOM Browser"),
 					"description": _("Tree of Bill of Materials"),
-					"doctype": "BOM"
+					"link": "Tree/BOM",
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index 3deaeba..e6c9578 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -31,18 +31,13 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Time Log",
-					"description": _("Time Log for tasks."),
-				},
-				{
-					"type": "doctype",
-					"name": "Time Log Batch",
-					"description": _("Batch Time Logs for billing."),
+					"name": "Timesheet",
+					"description": _("Timesheet for tasks."),
 				},
 				{
 					"type": "doctype",
 					"name": "Activity Type",
-					"description": _("Types of activities for Time Sheets"),
+					"description": _("Types of activities for Time Logs"),
 				},
 				{
 					"type": "doctype",
@@ -58,8 +53,8 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Daily Time Log Summary",
-					"doctype": "Time Log"
+					"name": "Daily Timesheet Summary",
+					"doctype": "Timesheet"
 				},
 				{
 					"type": "report",
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
new file mode 100644
index 0000000..ee1a8cb
--- /dev/null
+++ b/erpnext/config/schools.py
@@ -0,0 +1,110 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Student"),
+			"items": [
+
+				{
+					"type": "doctype",
+					"name": "Student"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Group"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Applicant"
+				},
+				{
+					"type": "doctype",
+					"name": "Program Enrollment"
+				},
+				{
+					"type": "doctype",
+					"name": "Program Enrollment Tool"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Group Creation Tool"
+				}
+			]
+		},
+		{
+			"label": _("Schedule"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Course Schedule",
+					"route": "Calendar/Course Schedule"
+				},
+				{
+					"type": "doctype",
+					"name": "Student Attendance"
+				},
+				{
+					"type": "doctype",
+					"name": "Scheduling Tool"
+				},
+				{
+					"type": "doctype",
+					"name": "Examination"
+				}
+			]
+		},
+		{
+			"label": _("Fees"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Fees"
+				},
+				{
+					"type": "doctype",
+					"name": "Fee Structure"
+				},
+				{
+					"type": "doctype",
+					"name": "Fee Category"
+				},
+				{
+					"type": "report",
+					"name": "Student Fee Collection",
+					"doctype": "Fees",
+					"is_query_report": True
+				}
+			]
+		},
+		{
+			"label": _("Setup"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Course"
+				},
+				{
+					"type": "doctype",
+					"name": "Program"
+				},
+				{
+					"type": "doctype",
+					"name": "Instructor"
+				},
+				{
+					"type": "doctype",
+					"name": "Room"
+				},
+				{
+					"type": "doctype",
+					"name": "Academic Term"
+				},
+				{
+					"type": "doctype",
+					"name": "Academic Year"
+				}
+			]
+		},
+	]
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 771a0d7..45ec1f7 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -28,13 +28,12 @@
 					"description": _("Customer database."),
 				},
 				{
-					"type": "page",
+					"type": "doctype",
 					"label": _("Customer Group"),
-					"name": "Sales Browser",
+					"name": "Customer Group",
 					"icon": "icon-sitemap",
-					"link": "Sales Browser/Customer Group",
+					"link": "Tree/Customer Group",
 					"description": _("Manage Customer Group Tree."),
-					"doctype": "Customer Group",
 				},
 				{
 					"type": "doctype",
@@ -68,13 +67,12 @@
 					"description": _("Price List master.")
 				},
 				{
-					"type": "page",
-					"name": "Sales Browser",
+					"type": "doctype",
+					"name": "Item Group",
 					"icon": "icon-sitemap",
 					"label": _("Item Group"),
-					"link": "Sales Browser/Item Group",
+					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
-					"doctype": "Item Group",
 				},
 				{
 					"type": "doctype",
@@ -99,13 +97,12 @@
 			"label": _("Sales Partners and Territory"),
 			"items": [
 				{
-					"type": "page",
+					"type": "doctype",
 					"label": _("Territory"),
-					"name": "Sales Browser",
+					"name": "Territory",
 					"icon": "icon-sitemap",
-					"link": "Sales Browser/Territory",
+					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
-					"doctype": "Territory",
 				},
 				{
 					"type": "doctype",
@@ -113,13 +110,12 @@
 					"description": _("Manage Sales Partners."),
 				},
 				{
-					"type": "page",
+					"type": "doctype",
 					"label": _("Sales Person"),
-					"name": "Sales Browser",
+					"name": "Sales Person",
 					"icon": "icon-sitemap",
-					"link": "Sales Browser/Sales Person",
+					"link": "Tree/Sales Person",
 					"description": _("Manage Sales Person Tree."),
-					"doctype": "Sales Person",
 				},
 				{
 					"type": "report",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index a660942..5ad6403 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -79,11 +79,6 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Features Setup",
-					"description": _("Show / Hide features like Serial Nos, POS etc.")
-				},
-				{
-					"type": "doctype",
 					"name": "Authorization Rule",
 					"description": _("Create rules to restrict transactions based on values.")
 				},
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index cf3a7ba..5b78ca3 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -77,13 +77,12 @@
 					"description": _("Price List master.")
 				},
 				{
-					"type": "page",
-					"name": "Sales Browser",
+					"type": "doctype",
+					"name": "Item Group",
 					"icon": "icon-sitemap",
 					"label": _("Item Group"),
-					"link": "Sales Browser/Item Group",
+					"link": "Tree/Item Group",
 					"description": _("Tree of Item Groups."),
-					"doctype": "Item Group",
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/config/support.py b/erpnext/config/support.py
index ca97164..a4a4c22 100644
--- a/erpnext/config/support.py
+++ b/erpnext/config/support.py
@@ -19,27 +19,6 @@
 			]
 		},
 		{
-			"label": _("Maintenance"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Maintenance Schedule",
-					"description": _("Plan for maintenance visits."),
-				},
-				{
-					"type": "doctype",
-					"name": "Maintenance Visit",
-					"description": _("Visit report for maintenance call."),
-				},
-				{
-					"type": "report",
-					"name": "Maintenance Schedules",
-					"is_query_report": True,
-					"doctype": "Maintenance Schedule"
-				},
-			]
-		},
-		{
 			"label": _("Warranty"),
 			"items": [
 				{
@@ -64,6 +43,12 @@
 					"label": _("Support Analytics"),
 					"icon": "icon-bar-chart"
 				},
+				{
+					"type": "report",
+					"name": "Minutes to First Response for Issues",
+					"doctype": "Issue",
+					"is_query_report": True
+				},
 			]
 		},
 	]
diff --git a/erpnext/config/website.py b/erpnext/config/website.py
index 45fad66..237c49c 100644
--- a/erpnext/config/website.py
+++ b/erpnext/config/website.py
@@ -3,11 +3,15 @@
 def get_data():
 	return [
 		{
-			"label": _("Shopping Cart"),
-			"icon": "icon-wrench",
+			"label": _("Portal"),
 			"items": [
 				{
 					"type": "doctype",
+					"name": "Homepage",
+					"description": _("Settings for website homepage"),
+				},
+				{
+					"type": "doctype",
 					"name": "Shopping Cart Settings",
 					"label": _("Shopping Cart Settings"),
 					"description": _("Settings for online shopping cart such as shipping rules, price list etc."),
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index bcaa9fb..432d09a 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, throw
-from frappe.utils import today, flt, cint, fmt_money
+from frappe.utils import today, flt, cint, fmt_money, formatdate, getdate
 from erpnext.setup.utils import get_company_currency, get_exchange_rate
-from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year, get_account_currency
+from erpnext.accounts.utils import get_fiscal_years, validate_fiscal_year, get_account_currency
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.controllers.recurring_document import convert_to_recurring, validate_recurring_document
 from erpnext.controllers.sales_and_purchase_return import validate_return
@@ -33,6 +33,7 @@
 
 		if self.meta.get_field("currency"):
 			self.calculate_taxes_and_totals()
+
 			if not self.meta.get_field("is_return") or not self.is_return:
 				self.validate_value("base_grand_total", ">=", 0)
 
@@ -41,16 +42,39 @@
 
 		if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
 			self.validate_due_date()
+			self.validate_advance_entries()
 
 		if self.meta.get_field("taxes_and_charges"):
 			self.validate_enabled_taxes_and_charges()
 
 		self.validate_party()
 		self.validate_currency()
-		
-		if self.meta.get_field("is_recurring") and not self.get("__islocal"):
-			validate_recurring_document(self)
-			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+
+		if self.meta.get_field("is_recurring"):
+			if self.amended_from and self.recurring_id:
+				self.recurring_id = None
+			if not self.get("__islocal"):
+				validate_recurring_document(self)
+				convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
+
+		if self.doctype == 'Purchase Invoice':
+			self.validate_paid_amount()
+
+	def validate_paid_amount(self):
+		if hasattr(self, "is_pos") or hasattr(self, "is_paid"):
+			is_paid = self.get("is_pos") or self.get("is_paid")
+			if cint(is_paid) == 1:
+				if flt(self.paid_amount) == 0 and flt(self.outstanding_amount) > 0:
+					if self.cash_bank_account:
+						self.paid_amount = flt(flt(self.grand_total) - flt(self.write_off_amount),
+							self.precision("paid_amount"))
+						self.base_paid_amount = flt(self.paid_amount * self.conversion_rate, self.precision("base_paid_amount"))
+					else:
+						# show message that the amount is not paid
+						self.paid_amount = 0
+						frappe.throw(_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"))
+			else:
+				frappe.db.set(self,'paid_amount',0)
 
 	def on_update_after_submit(self):
 		if self.meta.get_field("is_recurring"):
@@ -58,12 +82,11 @@
 			convert_to_recurring(self, self.get("posting_date") or self.get("transaction_date"))
 
 	def set_missing_values(self, for_validate=False):
-		for fieldname in ["posting_date", "transaction_date"]:
-			if not self.get(fieldname) and self.meta.get_field(fieldname):
-				self.set(fieldname, today())
-				if self.meta.get_field("fiscal_year") and not self.fiscal_year:
-					self.fiscal_year = get_fiscal_year(self.get(fieldname))[0]
-				break
+		if frappe.flags.in_test:
+			for fieldname in ["posting_date","transaction_date"]:
+				if self.meta.get_field(fieldname) and not self.get(fieldname):
+					self.set(fieldname, today())
+					break
 
 	def calculate_taxes_and_totals(self):
 		from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
@@ -125,19 +148,15 @@
 		"""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 = {}
 			for fieldname in self.meta.get_valid_columns():
 				parent_dict[fieldname] = self.get(fieldname)
 
+			if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
+				document_type = "{} Item".format(self.doctype)
+				parent_dict.update({"document_type": document_type})
+
 			for item in self.get("items"):
 				if item.get("item_code"):
 					args = parent_dict.copy()
@@ -154,6 +173,7 @@
 
 					ret = get_item_details(args)
 
+
 					for fieldname, value in ret.items():
 						if item.meta.get_field(fieldname) and value is not None:
 							if (item.get(fieldname) is None or fieldname in force_item_fields):
@@ -166,6 +186,7 @@
 								item.set(fieldname, value)
 
 					if ret.get("pricing_rule"):
+						# if user changed the discount percentage then set user's discount percentage ?
 						item.set("discount_percentage", ret.get("discount_percentage"))
 						if ret.get("pricing_rule_for") == "Price":
 							item.set("pricing_list_rate", ret.get("pricing_list_rate"))
@@ -174,14 +195,8 @@
 							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
+			if self.doctype == "Purchase Invoice":
+				self.set_expense_account()
 
 	def set_taxes(self):
 		if not self.meta.get_field("taxes"):
@@ -214,10 +229,17 @@
 
 	def get_gl_dict(self, args, account_currency=None):
 		"""this method populates the common properties of a gl entry record"""
+
+		fiscal_years = get_fiscal_years(self.posting_date, company=self.company)
+		if len(fiscal_years) > 1:
+			frappe.throw(_("Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year").format(formatdate(self.posting_date)))
+		else:
+			fiscal_year = fiscal_years[0][0]
+
 		gl_dict = frappe._dict({
 			'company': self.company,
 			'posting_date': self.posting_date,
-			'fiscal_year': get_fiscal_year(self.posting_date, company=self.company)[0],
+			'fiscal_year': fiscal_year,
 			'voucher_type': self.doctype,
 			'voucher_no': self.name,
 			'remarks': self.get("remarks"),
@@ -227,14 +249,15 @@
 			'credit_in_account_currency': 0,
 			'is_opening': self.get("is_opening") or "No",
 			'party_type': None,
-			'party': None
+			'party': None,
+			'project': self.get("project")
 		})
 		gl_dict.update(args)
 
 		if not account_currency:
 			account_currency = get_account_currency(gl_dict.account)
 
-		if self.doctype not in ["Journal Entry", "Period Closing Voucher"]:
+		if self.doctype not in ["Journal Entry", "Period Closing Voucher", "Payment Entry"]:
 			self.validate_account_currency(gl_dict.account, account_currency)
 			set_balance_in_account_currency(gl_dict, account_currency, self.get("conversion_rate"), self.company_currency)
 
@@ -255,71 +278,114 @@
 		frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
 			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):
+	def set_advances(self):
 		"""Returns list of advances against Account, Party, Reference"""
-		order_list = list(set([d.get(against_order_field) for d in self.get("items") if d.get(against_order_field)]))
 
-		# conver sales_order to "Sales Order"
-		reference_type = against_order_field.replace("_", " ").title()
+		res = self.get_advance_entries()
 
-		condition = ""
-		if order_list:
-			in_placeholder = ', '.join(['%s'] * len(order_list))
-			condition = "or (t2.reference_type = '{0}' and ifnull(t2.reference_name, '') in ({1}))"\
-				.format(reference_type, in_placeholder)
-
-		res = frappe.db.sql("""
-			select
-				t1.name as jv_no, t1.remark, t2.{0} as amount, t2.name as jv_detail_no,
-				reference_name as against_order
-			from
-				`tabJournal Entry` t1, `tabJournal Entry Account` t2
-			where
-				t1.name = t2.parent and t2.account = %s
-				and t2.party_type = %s and t2.party = %s
-				and t2.is_advance = 'Yes' and t1.docstatus = 1
-				and (ifnull(t2.reference_type, '')='' {1})
-			order by t1.posting_date""".format(dr_or_cr, condition),
-			[account_head, party_type, party] + order_list, as_dict=1)
-
-		self.set(parentfield, [])
+		self.set("advances", [])
 		for d in res:
-			self.append(parentfield, {
-				"doctype": child_doctype,
-				"journal_entry": d.jv_no,
-				"jv_detail_no": d.jv_detail_no,
-				"remarks": d.remark,
+			self.append("advances", {
+				"doctype": self.doctype + " Advance",
+				"reference_type": d.reference_type,
+				"reference_name": d.reference_name,
+				"reference_row": d.reference_row,
+				"remarks": d.remarks,
 				"advance_amount": flt(d.amount),
 				"allocated_amount": flt(d.amount) if d.against_order else 0
 			})
 
-	def validate_advance_jv(self, reference_type):
-		against_order_field = frappe.scrub(reference_type)
-		order_list = list(set([d.get(against_order_field) for d in self.get("items") if d.get(against_order_field)]))
-		if order_list:
-			account = self.get("debit_to" if self.doctype=="Sales Invoice" else "credit_to")
+	def get_advance_entries(self, include_unallocated=True):
+		if self.doctype == "Sales Invoice":
+			party_account = self.debit_to
+			party_type = "Customer"
+			party = self.customer
+			amount_field = "credit_in_account_currency"
+			order_field = "sales_order"
+			order_doctype = "Sales Order"
+		else:
+			party_account = self.credit_to
+			party_type = "Supplier"
+			party = self.supplier
+			amount_field = "debit_in_account_currency"
+			order_field = "purchase_order"
+			order_doctype = "Purchase Order"
 
-			jv_against_order = frappe.db.sql("""select parent, reference_name as against_order
-				from `tabJournal Entry Account`
-				where docstatus=1 and account=%s and ifnull(is_advance, 'No') = 'Yes'
-				and reference_type=%s
-				and ifnull(reference_name, '') in ({0})
-				group by parent, reference_name""".format(', '.join(['%s']*len(order_list))),
-					tuple([account, reference_type] + order_list), as_dict=1)
+		order_list = list(set([d.get(order_field)
+			for d in self.get("items") if d.get(order_field)]))
 
-			if jv_against_order:
-				order_jv_map = {}
-				for d in jv_against_order:
-					order_jv_map.setdefault(d.against_order, []).append(d.parent)
+		journal_entries = get_advance_journal_entries(party_type, party, party_account,
+			amount_field, order_doctype, order_list, include_unallocated)
 
-				advance_jv_against_si = [d.journal_entry for d in self.get("advances")]
+		payment_entries = get_advance_payment_entries(party_type, party, party_account,
+			order_doctype, order_list, include_unallocated)
 
-				for order, jv_list in order_jv_map.items():
-					for jv in jv_list:
-						if not advance_jv_against_si or jv not in advance_jv_against_si:
-							frappe.msgprint(_("Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
-								.format(jv, order))
+		res = journal_entries + payment_entries
 
+		return res
+
+	def validate_advance_entries(self):
+		order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order"
+		order_list = list(set([d.get(order_field)
+			for d in self.get("items") if d.get(order_field)]))
+
+		if not order_list: return
+
+		advance_entries = self.get_advance_entries(include_unallocated=False)
+
+		if advance_entries:
+			advance_entries_against_si = [d.reference_name for d in self.get("advances")]
+			for d in advance_entries:
+				if not advance_entries_against_si or d.reference_name not in advance_entries_against_si:
+					frappe.msgprint(_("Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
+						.format(d.reference_name, d.against_order))
+
+	def update_against_document_in_jv(self):
+		"""
+			Links invoice and advance voucher:
+				1. cancel advance voucher
+				2. split into multiple rows if partially adjusted, assign against voucher
+				3. submit advance voucher
+		"""
+
+		if self.doctype == "Sales Invoice":
+			party_type = "Customer"
+			party = self.customer
+			party_account = self.debit_to
+			dr_or_cr = "credit_in_account_currency"
+		else:
+			party_type = "Supplier"
+			party = self.supplier
+			party_account = self.credit_to
+			dr_or_cr = "debit_in_account_currency"
+
+		lst = []
+		for d in self.get('advances'):
+			if flt(d.allocated_amount) > 0:
+				args = frappe._dict({
+					'voucher_type': d.reference_type,
+					'voucher_no' : d.reference_name,
+					'voucher_detail_no' : d.reference_row,
+					'against_voucher_type' : self.doctype,
+					'against_voucher'  : self.name,
+					'account' : party_account,
+					'party_type': party_type,
+					'party': party,
+					'is_advance' : 'Yes',
+					'dr_or_cr' : dr_or_cr,
+					'unadjusted_amount' : flt(d.advance_amount),
+					'allocated_amount' : flt(d.allocated_amount),
+					'exchange_rate': (self.conversion_rate
+						if self.party_account_currency != self.company_currency else 1),
+					'grand_total': (self.base_grand_total
+						if self.party_account_currency==self.company_currency else self.grand_total),
+					'outstanding_amount': self.outstanding_amount
+				})
+				lst.append(args)
+
+		if lst:
+			from erpnext.accounts.utils import reconcile_against_document
+			reconcile_against_document(lst)
 
 	def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on, parentfield):
 		from erpnext.controllers.status_updater import get_tolerance_for
@@ -375,10 +441,10 @@
 			select
 				account_currency, sum({dr_or_cr}) as amount
 			from
-				`tabJournal Entry Account`
+				`tabGL Entry`
 			where
-				reference_type = %s and reference_name = %s and party=%s
-				and docstatus = 1 and is_advance = "Yes"
+				against_voucher_type = %s and against_voucher = %s and party=%s
+				and docstatus = 1
 		""".format(dr_or_cr=dr_or_cr), (self.doctype, self.name, party), as_dict=1)
 
 		if advance:
@@ -399,12 +465,12 @@
 				formatted_order_total = fmt_money(order_total, precision=self.precision("base_grand_total"),
 					currency=advance.account_currency)
 
-			if order_total >= advance_paid:
-				frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
-			else:
+			if self.currency == self.company_currency and advance_paid > order_total:
 				frappe.throw(_("Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})")
 					.format(formatted_advance_paid, self.name, formatted_order_total))
 
+			frappe.db.set_value(self.doctype, self.name, "advance_paid", advance_paid)
+
 	@property
 	def company_abbr(self):
 		if not hasattr(self, "_abbr"):
@@ -451,9 +517,50 @@
 				# at quotation / sales order level and we shouldn't stop someone
 				# from creating a sales invoice if sales order is already created
 
+	def validate_fixed_asset(self):
+		for d in self.get("items"):
+			if d.is_fixed_asset:
+				if d.qty > 1:
+					frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
+
+				if d.meta.get_field("asset"):
+					if not d.asset:
+						frappe.throw(_("Row #{0}: Asset is mandatory for fixed asset purchase/sale")
+							.format(d.idx))
+					else:
+						asset = frappe.get_doc("Asset", d.asset)
+
+						if asset.company != self.company:
+							frappe.throw(_("Row #{0}: Asset {1} does not belong to company {2}")
+								.format(d.idx, d.asset, self.company))
+
+						elif asset.item_code != d.item_code:
+							frappe.throw(_("Row #{0}: Asset {1} does not linked to Item {2}")
+								.format(d.idx, d.asset, d.item_code))
+
+						elif asset.docstatus != 1:
+							frappe.throw(_("Row #{0}: Asset {1} must be submitted").format(d.idx, d.asset))
+
+						elif self.doctype == "Purchase Invoice":
+							if asset.status != "Submitted":
+								frappe.throw(_("Row #{0}: Asset {1} is already {2}")
+									.format(d.idx, d.asset, asset.status))
+							elif getdate(asset.purchase_date) != getdate(self.posting_date):
+								frappe.throw(_("Row #{0}: Posting Date must be same as purchase date {1} of asset {2}").format(d.idx, asset.purchase_date, d.asset))
+							elif asset.is_existing_asset:
+								frappe.throw(_("Row #{0}: Purchase Invoice cannot be made against an existing asset {1}").format(d.idx, d.asset))
+
+						elif self.docstatus=="Sales Invoice" and self.docstatus == 1:
+							if self.update_stock:
+								frappe.throw(_("'Update Stock' cannot be checked for fixed asset sale"))
+
+							elif asset.status in ("Scrapped", "Cancelled", "Sold"):
+								frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}")
+									.format(d.idx, d.asset, asset.status))
+
 @frappe.whitelist()
 def get_tax_rate(account_head):
-	return frappe.db.get_value("Account", account_head, "tax_rate")
+	return frappe.db.get_value("Account", account_head, ["tax_rate", "account_name"], as_dict=True)
 
 @frappe.whitelist()
 def get_default_taxes_and_charges(master_doctype):
@@ -538,3 +645,77 @@
 	if flt(gl_dict.credit) and not flt(gl_dict.credit_in_account_currency):
 		gl_dict.credit_in_account_currency = gl_dict.credit if account_currency==company_currency \
 			else flt(gl_dict.credit / conversion_rate, 2)
+
+
+def get_advance_journal_entries(party_type, party, party_account, amount_field,
+		order_doctype, order_list, include_unallocated=True):
+
+	dr_or_cr = "credit_in_account_currency" if party_type=="Customer" else "debit_in_account_currency"
+
+	conditions = []
+	if include_unallocated:
+		conditions.append("ifnull(t2.reference_name, '')=''")
+
+	if order_list:
+		order_condition = ', '.join(['%s'] * len(order_list))
+		conditions.append(" (t2.reference_type = '{0}' and ifnull(t2.reference_name, '') in ({1}))"\
+			.format(order_doctype, order_condition))
+
+	reference_condition = " and (" + " or ".join(conditions) + ")" if conditions else ""
+
+	journal_entries = frappe.db.sql("""
+		select
+			"Journal Entry" as reference_type, t1.name as reference_name,
+			t1.remark as remarks, t2.{0} as amount, t2.name as reference_row,
+			t2.reference_name as against_order
+		from
+			`tabJournal Entry` t1, `tabJournal Entry Account` t2
+		where
+			t1.name = t2.parent and t2.account = %s
+			and t2.party_type = %s and t2.party = %s
+			and t2.is_advance = 'Yes' and t1.docstatus = 1
+			and {1} > 0
+			and (ifnull(t2.reference_name, '')='' {2})
+		order by t1.posting_date""".format(amount_field, dr_or_cr, reference_condition),
+		[party_account, party_type, party] + order_list, as_dict=1)
+
+	return list(journal_entries)
+
+def get_advance_payment_entries(party_type, party, party_account,
+		order_doctype, order_list=None, include_unallocated=True, against_all_orders=False):
+	party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
+	payment_type = "Receive" if party_type == "Customer" else "Pay"
+	payment_entries_against_order, unallocated_payment_entries = [], []
+
+	if order_list or against_all_orders:
+		if order_list:
+			reference_condition = " and t2.reference_name in ({0})"\
+				.format(', '.join(['%s'] * len(order_list)))
+		else:
+			reference_condition = ""
+			order_list = []
+
+		payment_entries_against_order = frappe.db.sql("""
+			select
+				"Payment Entry" as reference_type, t1.name as reference_name,
+				t1.remarks, t2.allocated_amount as amount, t2.name as reference_row,
+				t2.reference_name as against_order, t1.posting_date
+			from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
+			where
+				t1.name = t2.parent and t1.{0} = %s and t1.payment_type = %s
+				and t1.party_type = %s and t1.party = %s and t1.docstatus = 1
+				and t2.reference_doctype = %s {1}
+		""".format(party_account_field, reference_condition),
+		[party_account, payment_type, party_type, party, order_doctype] + order_list, as_dict=1)
+
+	if include_unallocated:
+		unallocated_payment_entries = frappe.db.sql("""
+				select "Payment Entry" as reference_type, name as reference_name,
+				remarks, unallocated_amount as amount
+				from `tabPayment Entry`
+				where
+					{0} = %s and party_type = %s and party = %s and payment_type = %s
+					and docstatus = 1 and unallocated_amount > 0
+			""".format(party_account_field), (party_account, party_type, party, payment_type), as_dict=1)
+
+	return list(payment_entries_against_order) + list(unallocated_payment_entries)
\ No newline at end of file
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index c9b660d..88acfb7 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, msgprint
-from frappe.utils import flt
+from frappe.utils import flt,cint, cstr
 
 from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_details
@@ -20,18 +20,38 @@
 			}
 
 	def get_feed(self):
-		return _("From {0} | {1} {2}").format(self.supplier_name, self.currency,
-			self.grand_total)
+		if self.get("supplier_name"):
+			return _("From {0} | {1} {2}").format(self.supplier_name, self.currency,
+				self.grand_total)
 
 	def validate(self):
 		super(BuyingController, self).validate()
 		if getattr(self, "supplier", None) and not self.supplier_name:
 			self.supplier_name = frappe.db.get_value("Supplier", self.supplier, "supplier_name")
-		self.is_item_table_empty()
+
 		self.set_qty_as_per_stock_uom()
 		self.validate_stock_or_nonstock_items()
 		self.validate_warehouse()
 
+		if self.doctype=="Purchase Invoice":
+			self.validate_purchase_receipt_if_update_stock()
+
+		if self.doctype=="Purchase Receipt" or (self.doctype=="Purchase Invoice" and self.update_stock):
+			self.validate_purchase_return()
+			self.validate_rejected_warehouse()
+			self.validate_accepted_rejected_qty()
+
+			pc_obj = frappe.get_doc('Purchase Common')
+			pc_obj.validate_for_items(self)
+
+			#sub-contracting
+			self.validate_for_subcontracting()
+			self.create_raw_materials_supplied("supplied_items")
+			self.set_landed_cost_voucher_amount()
+
+		if self.doctype in ("Purchase Receipt", "Purchase Invoice"):
+			self.update_valuation_rate("items")
+
 	def set_missing_values(self, for_validate=False):
 		super(BuyingController, self).set_missing_values(for_validate)
 
@@ -40,7 +60,7 @@
 
 		# set contact and address details for supplier, if they are not mentioned
 		if getattr(self, "supplier", None):
-			self.update_if_missing(get_party_details(self.supplier, party_type="Supplier"))
+			self.update_if_missing(get_party_details(self.supplier, party_type="Supplier", ignore_permissions=self.flags.ignore_permissions))
 
 		self.set_missing_item_details()
 
@@ -59,6 +79,13 @@
 			if tax_for_valuation:
 				frappe.throw(_("Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items"))
 
+	def set_landed_cost_voucher_amount(self):
+		for d in self.get("items"):
+			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
+
 	def set_total_in_words(self):
 		from frappe.utils import money_in_words
 		company_currency = get_company_currency(self.company)
@@ -93,7 +120,6 @@
 			if item.item_code and item.qty and item.item_code in stock_items:
 				item_proportion = flt(item.base_net_amount) / stock_items_amount if stock_items_amount \
 					else flt(item.qty) / stock_items_qty
-
 				if i == (last_stock_item_idx - 1):
 					item.item_tax_amount = flt(valuation_amount_adjustment,
 						self.precision("item_tax_amount", item))
@@ -103,14 +129,14 @@
 					valuation_amount_adjustment -= item.item_tax_amount
 
 				self.round_floats_in(item)
-				if flt(item.conversion_factor)==0:
+				if flt(item.conversion_factor)==0.0:
 					item.conversion_factor = get_conversion_factor(item.item_code, item.uom).get("conversion_factor") or 1.0
 
 				qty_in_stock_uom = flt(item.qty * item.conversion_factor)
-				rm_supp_cost = flt(item.rm_supp_cost) if self.doctype=="Purchase Receipt" else 0.0
+				rm_supp_cost = flt(item.rm_supp_cost) if self.doctype in ["Purchase Receipt", "Purchase Invoice"] else 0.0
 
 				landed_cost_voucher_amount = flt(item.landed_cost_voucher_amount) \
-					if self.doctype == "Purchase Receipt" else 0.0
+					if self.doctype in ["Purchase Receipt", "Purchase Invoice"] else 0.0
 
 				item.valuation_rate = ((item.base_net_amount + item.item_tax_amount + rm_supp_cost
 					 + landed_cost_voucher_amount) / qty_in_stock_uom)
@@ -122,7 +148,7 @@
 			frappe.throw(_("Please enter 'Is Subcontracted' as Yes or No"))
 
 		if self.is_subcontracted == "Yes":
-			if self.doctype == "Purchase Receipt" and not self.supplier_warehouse:
+			if self.doctype in ["Purchase Receipt", "Purchase Invoice"] and not self.supplier_warehouse:
 				frappe.throw(_("Supplier Warehouse mandatory for sub-contracted Purchase Receipt"))
 
 			for item in self.get("items"):
@@ -138,7 +164,7 @@
 		if self.is_subcontracted=="Yes":
 			parent_items = []
 			for item in self.get("items"):
-				if self.doctype == "Purchase Receipt":
+				if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
 					item.rm_supp_cost = 0.0
 				if item.item_code in self.sub_contracted_items:
 					self.update_raw_materials_supplied(item, raw_material_table)
@@ -148,7 +174,7 @@
 
 			self.cleanup_raw_materials_supplied(parent_items, raw_material_table)
 
-		elif self.doctype == "Purchase Receipt":
+		elif self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
 			for item in self.get("items"):
 				item.rm_supp_cost = 0.0
 
@@ -178,7 +204,7 @@
 
 			rm.conversion_factor = item.conversion_factor
 
-			if self.doctype == "Purchase Receipt":
+			if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
 				rm.consumed_qty = required_qty
 				rm.description = bom_item.description
 				if item.batch_no and not rm.batch_no:
@@ -204,7 +230,7 @@
 			rm.amount = required_qty * flt(rm.rate)
 			raw_materials_cost += flt(rm.amount)
 
-		if self.doctype == "Purchase Receipt":
+		if self.doctype in ("Purchase Receipt", "Purchase Invoice"):
 			item.rm_supp_cost = raw_materials_cost
 
 	def cleanup_raw_materials_supplied(self, parent_items, raw_material_table):
@@ -250,26 +276,116 @@
 
 		return self._sub_contracted_items
 
-	@property
-	def purchase_items(self):
-		if not hasattr(self, "_purchase_items"):
-			self._purchase_items = []
-			item_codes = list(set(item.item_code for item in
-				self.get("items")))
-			if item_codes:
-				self._purchase_items = [r[0] for r in frappe.db.sql("""select name
-					from `tabItem` where name in (%s) and is_purchase_item='Yes'""" % \
-					(", ".join((["%s"]*len(item_codes))),), item_codes)]
-
-		return self._purchase_items
-
-	def is_item_table_empty(self):
-		if not len(self.get("items")):
-			frappe.throw(_("Item table can not be blank"))
-
 	def set_qty_as_per_stock_uom(self):
 		for d in self.get("items"):
 			if d.meta.get_field("stock_qty"):
 				if not d.conversion_factor:
 					frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx))
 				d.stock_qty = flt(d.qty) * flt(d.conversion_factor)
+
+	def validate_purchase_return(self):
+		for d in self.get("items"):
+			if self.is_return and flt(d.rejected_qty) != 0:
+				frappe.throw(_("Row #{0}: Rejected Qty can not be entered in Purchase Return").format(d.idx))
+
+			# validate rate with ref PR
+
+	def validate_rejected_warehouse(self):
+		for d in self.get("items"):
+			if flt(d.rejected_qty) and not d.rejected_warehouse:
+				if self.rejected_warehouse:
+					d.rejected_warehouse = self.rejected_warehouse
+
+				if not d.rejected_warehouse:
+					frappe.throw(_("Row #{0}: Rejected Warehouse is mandatory against rejected Item {1}").format(d.idx, d.item_code))
+
+	# validate accepted and rejected qty
+	def validate_accepted_rejected_qty(self):
+		for d in self.get("items"):
+			if not flt(d.received_qty) and flt(d.qty):
+				d.received_qty = flt(d.qty) - flt(d.rejected_qty)
+
+			elif not flt(d.qty) and flt(d.rejected_qty):
+				d.qty = flt(d.received_qty) - flt(d.rejected_qty)
+
+			elif not flt(d.rejected_qty):
+				d.rejected_qty = flt(d.received_qty) -  flt(d.qty)
+
+			# Check Received Qty = Accepted Qty + Rejected Qty
+			if ((flt(d.qty) + flt(d.rejected_qty)) != flt(d.received_qty)):
+				frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code))
+
+	def update_stock_ledger(self, allow_negative_stock=False, via_landed_cost_voucher=False):
+		self.update_ordered_qty()
+
+		sl_entries = []
+		stock_items = self.get_stock_items()
+
+		for d in self.get('items'):
+			if d.item_code in stock_items and d.warehouse:
+				pr_qty = flt(d.qty) * flt(d.conversion_factor)
+
+				if pr_qty:
+					sle = self.get_sl_entries(d, {
+						"actual_qty": flt(pr_qty),
+						"serial_no": cstr(d.serial_no).strip()
+					})
+					if self.is_return:
+						original_incoming_rate = frappe.db.get_value("Stock Ledger Entry",
+							{"voucher_type": "Purchase Receipt", "voucher_no": self.return_against,
+							"item_code": d.item_code}, "incoming_rate")
+
+						sle.update({
+							"outgoing_rate": original_incoming_rate
+						})
+					else:
+						val_rate_db_precision = 6 if cint(self.precision("valuation_rate", d)) <= 6 else 9
+						incoming_rate = flt(d.valuation_rate, val_rate_db_precision)
+						sle.update({
+							"incoming_rate": incoming_rate
+						})
+					sl_entries.append(sle)
+
+				if flt(d.rejected_qty) > 0:
+					sl_entries.append(self.get_sl_entries(d, {
+						"warehouse": d.rejected_warehouse,
+						"actual_qty": flt(d.rejected_qty) * flt(d.conversion_factor),
+						"serial_no": cstr(d.rejected_serial_no).strip(),
+						"incoming_rate": 0.0
+					}))
+
+		self.make_sl_entries_for_supplier_warehouse(sl_entries)
+		self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock,
+			via_landed_cost_voucher=via_landed_cost_voucher)
+
+	def update_ordered_qty(self):
+		po_map = {}
+		for d in self.get("items"):
+			if self.doctype=="Purchase Receipt" \
+				and d.purchase_order:
+					po_map.setdefault(d.purchase_order, []).append(d.purchase_order_item)
+
+			elif self.doctype=="Purchase Invoice" and d.purchase_order and d.po_detail:
+				po_map.setdefault(d.purchase_order, []).append(d.po_detail)
+
+		for po, po_item_rows in po_map.items():
+			if po and po_item_rows:
+				po_obj = frappe.get_doc("Purchase Order", po)
+
+				if po_obj.status in ["Closed", "Cancelled"]:
+					frappe.throw(_("{0} {1} is cancelled or closed").format(_("Purchase Order"), po),
+						frappe.InvalidStatusError)
+
+				po_obj.update_ordered_qty(po_item_rows)
+
+	def make_sl_entries_for_supplier_warehouse(self, sl_entries):
+		if hasattr(self, 'supplied_items'):
+			for d in self.get('supplied_items'):
+				# negative quantity is passed, as raw material qty has to be decreased
+				# when PR is submitted and it has to be increased when PR is cancelled
+				sl_entries.append(self.get_sl_entries(d, {
+					"item_code": d.rm_item_code,
+					"warehouse": self.supplier_warehouse,
+					"actual_qty": -1*flt(d.consumed_qty),
+				}))
+
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 0ea0734..ba1d242 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -24,24 +24,23 @@
 	if not args:
 		frappe.throw(_("Please specify at least one attribute in the Attributes table"))
 
-	validate_item_variant_attributes(template, args)
-
 	return find_variant(template, args, variant)
 
-def validate_item_variant_attributes(item, args):
-	attribute_values = {}
-	for t in frappe.get_all("Item Attribute Value", fields=["parent", "attribute_value"],
-		filters={"parent": ["in", args.keys()]}):
-		
-		(attribute_values.setdefault(t.parent.lower(), [])).append(t.attribute_value)
+def validate_item_variant_attributes(item, args=None):
+	if isinstance(item, basestring):
+		item = frappe.get_doc('Item', item)
 
-	numeric_attributes = frappe._dict((t.attribute.lower(), t) for t in \
-		frappe.db.sql("""select attribute, from_range, to_range, increment from `tabItem Variant Attribute`
-		where parent = %s and numeric_values=1""", (item), as_dict=1))
-		
+	if not args:
+		args = {d.attribute.lower():d.attribute_value for d in item.attributes}
+
+	attribute_values, numeric_values = get_attribute_values()
+
 	for attribute, value in args.items():
-		if attribute.lower() in numeric_attributes:
-			numeric_attribute = numeric_attributes[attribute.lower()]
+		if not value:
+			continue
+
+		if attribute.lower() in numeric_values:
+			numeric_attribute = numeric_values[attribute.lower()]
 
 			from_range = numeric_attribute.from_range
 			to_range = numeric_attribute.to_range
@@ -56,15 +55,32 @@
 			#avoid precision error by rounding the remainder
 			remainder = flt((flt(value) - from_range) % increment, precision)
 
-			is_incremental = remainder==0 or remainder==0 or remainder==increment
+			is_incremental = remainder==0 or remainder==increment
 
 			if not (is_in_range and is_incremental):
-				frappe.throw(_("Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3}")\
-					.format(attribute, from_range, to_range, increment), InvalidItemAttributeValueError)
-		
+				frappe.throw(_("Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4}")\
+					.format(attribute, from_range, to_range, increment, item.name),
+					InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+
 		elif value not in attribute_values.get(attribute.lower(), []):
-			frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values").format(
-				value, attribute))
+			frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2}").format(
+				value, attribute, item.name), InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+
+def get_attribute_values():
+	if not frappe.flags.attribute_values:
+		attribute_values = {}
+		numeric_values = {}
+		for t in frappe.get_all("Item Attribute Value", fields=["parent", "attribute_value"]):
+			attribute_values.setdefault(t.parent.lower(), []).append(t.attribute_value)
+
+		for t in frappe.get_all('Item Attribute',
+			fields=["name", "from_range", "to_range", "increment"], filters={'numeric_values': 1}):
+			numeric_values[t.name.lower()] = t
+
+		frappe.flags.attribute_values = attribute_values
+		frappe.flags.numeric_values = numeric_values
+
+	return frappe.flags.attribute_values, frappe.flags.numeric_values
 
 def find_variant(template, args, variant_item_code=None):
 	conditions = ["""(iv_attribute.attribute="{0}" and iv_attribute.attribute_value="{1}")"""\
@@ -118,7 +134,7 @@
 
 	variant.set("attributes", variant_attributes)
 	copy_attributes_to_variant(template, variant)
-	make_variant_item_code(template, variant)
+	make_variant_item_code(template.item_code, variant)
 
 	return variant
 
@@ -136,7 +152,7 @@
 		for d in variant.attributes:
 			variant.description += "<p>" + d.attribute + ": " + cstr(d.attribute_value) + "</p>"
 
-def make_variant_item_code(template, variant):
+def make_variant_item_code(template_item_code, variant):
 	"""Uses template's item code and abbreviations to make variant's item code"""
 	if variant.item_code:
 		return
@@ -152,8 +168,10 @@
 			}, as_dict=True)
 
 		if not item_attribute:
-			# somehow an invalid item attribute got used
 			return
+			# frappe.throw(_('Invalid attribute {0} {1}').format(frappe.bold(attr.attribute),
+			# 	frappe.bold(attr.attribute_value)), title=_('Invalid Attribute'),
+			# 	exc=InvalidItemAttributeValueError)
 
 		if item_attribute[0].numeric_values:
 			# don't generate item code if one of the attributes is numeric
@@ -162,7 +180,7 @@
 		abbreviations.append(item_attribute[0].abbr)
 
 	if abbreviations:
-		variant.item_code = "{0}-{1}".format(template.item_code, "-".join(abbreviations))
+		variant.item_code = "{0}-{1}".format(template_item_code, "-".join(abbreviations))
 
 	if variant.item_code:
 		variant.item_name = variant.item_code
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
index 5d27b03..25ae1b2 100644
--- a/erpnext/controllers/print_settings.py
+++ b/erpnext/controllers/print_settings.py
@@ -12,7 +12,7 @@
 	}
 	doc.hide_in_print_layout = ["uom", "stock_uom"]
 
-	doc.flags.compact_item_print = cint(frappe.db.get_value("Features Setup", None, "compact_item_print"))
+	doc.flags.compact_item_print = cint(frappe.db.get_value("Print Settings", None, "compact_item_print"))
 
 	if doc.flags.compact_item_print:
 		doc.print_templates["description"] = "templates/print_formats/includes/item_table_description.html"
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 91cd0da..0debe4a 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -85,6 +85,9 @@
 		fields = ["name", "customer_group", "territory"]
 	else:
 		fields = ["name", "customer_name", "customer_group", "territory"]
+		
+	meta = frappe.get_meta("Customer")
+	fields = fields + [f for f in meta.get_search_fields() if not f in fields]
 
 	fields = ", ".join(fields)
 
@@ -160,10 +163,10 @@
 
 	return tax_accounts
 
-def item_query(doctype, txt, searchfield, start, page_len, filters):
+def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=False):
 	conditions = []
 
-	return frappe.db.sql("""select tabItem.name,tabItem.item_group,
+	return frappe.db.sql("""select tabItem.name, tabItem.item_group, tabItem.image,
 		if(length(tabItem.item_name) > 40,
 			concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
 		if(length(tabItem.description) > 40, \
@@ -192,7 +195,7 @@
 				"_txt": txt.replace("%", ""),
 				"start": start,
 				"page_len": page_len
-			})
+			}, as_dict=as_dict)
 
 def bom(doctype, txt, searchfield, start, page_len, filters):
 	conditions = []
@@ -209,11 +212,11 @@
 		limit %(start)s, %(page_len)s """.format(
 			fcond=get_filters_cond(doctype, filters, conditions),
 			mcond=get_match_cond(doctype),
-			key=frappe.db.escape(searchfield)), 
+			key=frappe.db.escape(searchfield)),
 		{
 			'txt': "%%%s%%" % frappe.db.escape(txt),
 			'_txt': txt.replace("%", ""),
-			'start': start, 
+			'start': start,
 			'page_len': page_len
 		})
 
@@ -341,3 +344,27 @@
 				'txt': "%%%s%%" % frappe.db.escape(txt),
 				'company': filters.get("company", "")
 			})
+
+
+@frappe.whitelist()
+def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
+	from erpnext.controllers.queries import get_match_cond
+
+	if not filters: filters = {}
+
+	condition = ""
+	if filters.get("company"):
+		condition += "and tabAccount.company = %(company)s"
+
+	return frappe.db.sql("""select tabAccount.name from `tabAccount`
+		where (tabAccount.report_type = "Profit and Loss"
+				or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary"))
+			and tabAccount.is_group=0
+			and tabAccount.docstatus!=2
+			and tabAccount.{key} LIKE %(txt)s
+			{condition} {match_condition}"""
+		.format(condition=condition, key=frappe.db.escape(searchfield),
+			match_condition=get_match_cond(doctype)), {
+			'company': filters.get("company", ""),
+			'txt': "%%%s%%" % frappe.db.escape(txt)
+		})
diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index 2df7352..a036760 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 import frappe
+import calendar
 import frappe.utils
 import frappe.defaults
 
@@ -166,14 +167,24 @@
 
 		elif not (doc.from_date and doc.to_date):
 			frappe.throw(_("Period From and Period To dates mandatory for recurring {0}").format(doc.doctype))
-			
+
 def validate_recurring_next_date(doc):
 	posting_date = doc.get("posting_date") or doc.get("transaction_date")
 	if getdate(posting_date) > getdate(doc.next_date):
 		frappe.throw(_("Next Date must be greater than Posting Date"))
 
-	if getdate(doc.next_date).day != doc.repeat_on_day_of_month:
-		frappe.throw(_("Next Date's day and Repeat on Day of Month must be equal"))
+	next_date = getdate(doc.next_date)
+	if next_date.day != doc.repeat_on_day_of_month:
+
+		# if the repeat day is the last day of the month (31)
+		# and the current month does not have as many days,
+		# then the last day of the current month is a valid date
+		lastday = calendar.monthrange(next_date.year, next_date.month)[1]
+		if doc.repeat_on_day_of_month < lastday:
+
+			# the specified day of the month is not same as the day specified
+			# or the last day of the month
+			frappe.throw(_("Next Date's day and Repeat on Day of Month must be equal"))
 
 def convert_to_recurring(doc, posting_date):
 	if doc.is_recurring:
@@ -182,12 +193,11 @@
 
 		set_next_date(doc, posting_date)
 
+		if doc.next_date:
+			validate_recurring_next_date(doc)
+
 	elif doc.recurring_id:
-		frappe.db.sql("""update `tab%s` set is_recurring = 0
-			where recurring_id = %s""" % (doc.doctype, '%s'), (doc.recurring_id))
-			
-	if doc.next_date:
-		validate_recurring_next_date(doc)
+		doc.db_set("recurring_id", None)
 
 def validate_notification_email_id(doc):
 	if doc.notify_by_email:
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index a48d7b7..37b13c3 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -171,6 +171,7 @@
 			target_doc.prevdoc_docname = source_doc.prevdoc_docname
 			target_doc.prevdoc_detail_docname = source_doc.prevdoc_detail_docname
 		elif doctype == "Purchase Invoice":
+			target_doc.received_qty = -1* source_doc.qty
 			target_doc.purchase_order = source_doc.purchase_order
 			target_doc.purchase_receipt = source_doc.purchase_receipt
 			target_doc.po_detail = source_doc.po_detail
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index d12486d..b9b94f5 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -7,6 +7,7 @@
 from erpnext.setup.utils import get_company_currency
 from frappe import _, throw
 from erpnext.stock.get_item_details import get_bin_details
+from erpnext.stock.utils import get_incoming_rate
 
 from erpnext.controllers.stock_controller import StockController
 
@@ -228,15 +229,87 @@
 				status = frappe.db.get_value("Sales Order", d.get(ref_fieldname), "status")
 				if status == "Closed":
 					frappe.throw(_("Sales Order {0} is {1}").format(d.get(ref_fieldname), status))
+					
+	def update_reserved_qty(self):
+		so_map = {}
+		for d in self.get("items"):
+			if d.so_detail:
+				if self.doctype == "Delivery Note" and d.against_sales_order:
+					so_map.setdefault(d.against_sales_order, []).append(d.so_detail)
+				elif self.doctype == "Sales Invoice" and d.sales_order and self.update_stock:
+					so_map.setdefault(d.sales_order, []).append(d.so_detail)
+
+		for so, so_item_rows in so_map.items():
+			if so and so_item_rows:
+				sales_order = frappe.get_doc("Sales Order", so)
+
+				if sales_order.status in ["Closed", "Cancelled"]:
+					frappe.throw(_("{0} {1} is cancelled or closed").format(_("Sales Order"), so),
+						frappe.InvalidStatusError)
+
+				sales_order.update_reserved_qty(so_item_rows)
+
+	def update_stock_ledger(self):
+		self.update_reserved_qty()
+
+		sl_entries = []
+		for d in self.get_item_list():
+			if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 and flt(d.qty):
+				return_rate = 0
+				if cint(self.is_return) and self.return_against and self.docstatus==1:
+					return_rate = self.get_incoming_rate_for_sales_return(d.item_code, self.return_against)
+
+				# On cancellation or if return entry submission, make stock ledger entry for
+				# target warehouse first, to update serial no values properly
+
+				if d.warehouse and ((not cint(self.is_return) and self.docstatus==1)
+					or (cint(self.is_return) and self.docstatus==2)):
+						sl_entries.append(self.get_sl_entries(d, {
+							"actual_qty": -1*flt(d.qty),
+							"incoming_rate": return_rate
+						}))
+
+				if d.target_warehouse:
+					target_warehouse_sle = self.get_sl_entries(d, {
+						"actual_qty": flt(d.qty),
+						"warehouse": d.target_warehouse
+					})
+
+					if self.docstatus == 1:
+						if not cint(self.is_return):
+							args = frappe._dict({
+								"item_code": d.item_code,
+								"warehouse": d.warehouse,
+								"posting_date": self.posting_date,
+								"posting_time": self.posting_time,
+								"qty": -1*flt(d.qty),
+								"serial_no": d.serial_no
+							})
+							target_warehouse_sle.update({
+								"incoming_rate": get_incoming_rate(args)
+							})
+						else:
+							target_warehouse_sle.update({
+								"outgoing_rate": return_rate
+							})
+					sl_entries.append(target_warehouse_sle)
+
+				if d.warehouse and ((not cint(self.is_return) and self.docstatus==2)
+					or (cint(self.is_return) and self.docstatus==1)):
+						sl_entries.append(self.get_sl_entries(d, {
+							"actual_qty": -1*flt(d.qty),
+							"incoming_rate": return_rate
+						}))
+
+		self.make_sl_entries(sl_entries)
 
 def check_active_sales_items(obj):
 	for d in obj.get("items"):
 		if d.item_code:
-			item = frappe.db.sql("""select docstatus, is_sales_item,
+			item = frappe.db.sql("""select docstatus,
 				income_account from tabItem where name = %s""",
 				d.item_code, as_dict=True)[0]
-			if item.is_sales_item == 0:
-				frappe.throw(_("Item {0} must be a Sales Item in {1}").format(d.item_code, d.idx))
+                
 			if getattr(d, "income_account", None) and not item.income_account:
 				frappe.db.set_value("Item", d.item_code, "income_account",
 					d.income_account)
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 5c5719e..2c25f5c 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -4,8 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import flt, comma_or
-from frappe import msgprint, _, throw
+from frappe import _
 from frappe.model.document import Document
+from erpnext.accounts.party_status import notify_status
 
 def validate_status(status, options):
 	if status not in options:
@@ -17,9 +18,11 @@
 		["Opportunity", "has_opportunity"],
 	],
 	"Opportunity": [
-		["Lost", "eval:self.status=='Lost'"],
 		["Quotation", "has_quotation"],
-		["Converted", "has_ordered_quotation"]
+		["Converted", "has_ordered_quotation"],
+		["Lost", "eval:self.status=='Lost'"],
+		["Closed", "eval:self.status=='Closed'"]
+
 	],
 	"Quotation": [
 		["Draft", None],
@@ -104,8 +107,7 @@
 				self.add_comment("Label", _(self.status))
 
 			if update:
-				frappe.db.set_value(self.doctype, self.name, "status", self.status,
-					update_modified=update_modified)
+				self.db_set('status', self.status, update_modified = update_modified)
 
 	def validate_qty(self):
 		"""Validates qty at row level"""
@@ -133,15 +135,12 @@
 						item['idx'] = d.idx
 						item['target_ref_field'] = args['target_ref_field'].replace('_', ' ')
 
-						if not item[args['target_ref_field']]:
-							msgprint(_("Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0").format(item.item_code))
-						elif args.get('no_tolerance'):
+						# if not item[args['target_ref_field']]:
+						# 	msgprint(_("Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0").format(item.item_code))
+						if args.get('no_tolerance'):
 							item['reduce_by'] = item[args['target_field']] - item[args['target_ref_field']]
 							if item['reduce_by'] > .01:
-								msgprint(_("Allowance for over-{0} crossed for Item {1}")
-									.format(args["overflow_type"], item.item_code))
-								throw(_("{0} must be reduced by {1} or you should increase overflow tolerance")
-									.format(_(item.target_ref_field.title()), item["reduce_by"]))
+								self.limits_crossed_error(args, item)
 
 						else:
 							self.check_overflow_with_tolerance(item, args)
@@ -160,10 +159,20 @@
 			item['max_allowed'] = flt(item[args['target_ref_field']] * (100+tolerance)/100)
 			item['reduce_by'] = item[args['target_field']] - item['max_allowed']
 
-			msgprint(_("Allowance for over-{0} crossed for Item {1}.")
-				.format(args["overflow_type"], item["item_code"]))
-			throw(_("{0} must be reduced by {1} or you should increase overflow tolerance")
-				.format(_(item["target_ref_field"].title()), item["reduce_by"]))
+			self.limits_crossed_error(args, item)
+
+	def limits_crossed_error(self, args, item):
+		'''Raise exception for limits crossed'''
+		frappe.throw(_('This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?')
+			.format(
+				frappe.bold(_(item["target_ref_field"].title())),
+				frappe.bold(item["reduce_by"]),
+				frappe.bold(_(args.get('target_dt'))),
+				frappe.bold(_(self.doctype)),
+				frappe.bold(item.get('item_code'))
+			) + '<br><br>' +
+				_('To allow over-billing or over-ordering, update "Allowance" in Stock Settings or the Item.'),
+			title = _('Limit Crossed'))
 
 	def update_qty(self, update_modified=True):
 		"""Updates qty or amount at row level
@@ -254,6 +263,7 @@
 			target = frappe.get_doc(args["target_parent_dt"], args["name"])
 			target.set_status(update=True)
 			target.notify_update()
+			notify_status(target)
 
 	def _update_modified(self, args, update_modified):
 		args['update_modified'] = ''
@@ -287,14 +297,16 @@
 
 			per_billed = ((ref_doc_qty if billed_qty > ref_doc_qty else billed_qty)\
 				/ ref_doc_qty)*100
-			frappe.db.set_value(ref_dt, ref_dn, "per_billed", per_billed)
+
+			ref_doc = frappe.get_doc(ref_dt, ref_dn)
+
+			ref_doc.db_set("per_billed", per_billed)
 
 			if frappe.get_meta(ref_dt).get_field("billing_status"):
 				if per_billed < 0.001: billing_status = "Not Billed"
 				elif per_billed >= 99.99: billing_status = "Fully Billed"
 				else: billing_status = "Partly Billed"
-
-				frappe.db.set_value(ref_dt, ref_dn, "billing_status", billing_status)
+				ref_doc.db_set('billing_status', billing_status)
 
 def get_tolerance_for(item_code, item_tolerance={}, global_tolerance=None):
 	"""
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index a832ab7..46ed9bc 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -8,8 +8,6 @@
 import frappe.defaults
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map
-from erpnext.stock.utils import get_incoming_rate
-
 from erpnext.controllers.accounts_controller import AccountsController
 
 class StockController(AccountsController):
@@ -64,6 +62,7 @@
 							"cost_center": detail.cost_center,
 							"remarks": self.get("remarks") or "Accounting Entry for Stock",
 							"credit": flt(sle.stock_value_difference, 2),
+							"project": detail.get("project") or self.get("project")
 						}))
 					elif sle.warehouse not in warehouse_with_no_account:
 						warehouse_with_no_account.append(sle.warehouse)
@@ -169,7 +168,7 @@
 		else:
 			is_expense_account = frappe.db.get_value("Account",
 				item.get("expense_account"), "report_type")=="Profit and Loss"
-			if self.doctype not in ("Purchase Receipt", "Stock Reconciliation", "Stock Entry") and not is_expense_account:
+			if self.doctype not in ("Purchase Receipt", "Purchase Invoice", "Stock Reconciliation", "Stock Entry") and not is_expense_account:
 				frappe.throw(_("Expense / Difference account ({0}) must be a 'Profit or Loss' account")
 					.format(item.get("expense_account")))
 			if is_expense_account and not item.get("cost_center"):
@@ -230,79 +229,6 @@
 			incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0
 
 		return incoming_rate
-
-	def update_reserved_qty(self):
-		so_map = {}
-		for d in self.get("items"):
-			if d.so_detail:
-				if self.doctype == "Delivery Note" and d.against_sales_order:
-					so_map.setdefault(d.against_sales_order, []).append(d.so_detail)
-				elif self.doctype == "Sales Invoice" and d.sales_order and self.update_stock:
-					so_map.setdefault(d.sales_order, []).append(d.so_detail)
-
-		for so, so_item_rows in so_map.items():
-			if so and so_item_rows:
-				sales_order = frappe.get_doc("Sales Order", so)
-
-				if sales_order.status in ["Closed", "Cancelled"]:
-					frappe.throw(_("{0} {1} is cancelled or closed").format(_("Sales Order"), so),
-						frappe.InvalidStatusError)
-
-				sales_order.update_reserved_qty(so_item_rows)
-
-	def update_stock_ledger(self):
-		self.update_reserved_qty()
-
-		sl_entries = []
-		for d in self.get_item_list():
-			if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 and flt(d.qty):
-				return_rate = 0
-				if cint(self.is_return) and self.return_against and self.docstatus==1:
-					return_rate = self.get_incoming_rate_for_sales_return(d.item_code, self.return_against)
-
-				# On cancellation or if return entry submission, make stock ledger entry for
-				# target warehouse first, to update serial no values properly
-
-				if d.warehouse and ((not cint(self.is_return) and self.docstatus==1)
-					or (cint(self.is_return) and self.docstatus==2)):
-						sl_entries.append(self.get_sl_entries(d, {
-							"actual_qty": -1*flt(d.qty),
-							"incoming_rate": return_rate
-						}))
-
-				if d.target_warehouse:
-					target_warehouse_sle = self.get_sl_entries(d, {
-						"actual_qty": flt(d.qty),
-						"warehouse": d.target_warehouse
-					})
-
-					if self.docstatus == 1:
-						if not cint(self.is_return):
-							args = frappe._dict({
-								"item_code": d.item_code,
-								"warehouse": d.warehouse,
-								"posting_date": self.posting_date,
-								"posting_time": self.posting_time,
-								"qty": -1*flt(d.qty),
-								"serial_no": d.serial_no
-							})
-							target_warehouse_sle.update({
-								"incoming_rate": get_incoming_rate(args)
-							})
-						else:
-							target_warehouse_sle.update({
-								"outgoing_rate": return_rate
-							})
-					sl_entries.append(target_warehouse_sle)
-
-				if d.warehouse and ((not cint(self.is_return) and self.docstatus==2)
-					or (cint(self.is_return) and self.docstatus==1)):
-						sl_entries.append(self.get_sl_entries(d, {
-							"actual_qty": -1*flt(d.qty),
-							"incoming_rate": return_rate
-						}))
-
-		self.make_sl_entries(sl_entries)
 		
 	def validate_warehouse(self):
 		from erpnext.stock.utils import validate_warehouse_company
@@ -395,6 +321,7 @@
 	warehouse_account = frappe._dict()
 
 	for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount
-		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')""", as_dict=1):
+		where account_type = 'Stock' and (warehouse is not null and warehouse != ''
+		and is_group != 1) and is_group=0 """, 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 49e0bd3..eb75dee 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -59,6 +59,11 @@
 					item.rate = flt(item.price_list_rate *
 						(1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
 
+				if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item']:
+					item.total_margin = self.calculate_margin(item)
+					item.rate = flt(item.total_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))\
+						if item.total_margin > 0 else item.rate
+
 				item.net_rate = item.rate
 				item.amount = flt(item.rate * item.qty,	item.precision("amount"))
 				item.net_amount = item.amount
@@ -430,10 +435,50 @@
 					- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
 
 		if self.doc.doctype == "Sales Invoice":
+			self.calculate_paid_amount()
 			self.doc.round_floats_in(self.doc, ["paid_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"))
+
+			self.doc.outstanding_amount = 0
+			if total_amount_to_pay > paid_amount:
+				self.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount),
+					self.doc.precision("outstanding_amount"))
+			self.change_amount()
+
 		elif self.doc.doctype == "Purchase Invoice":
 			self.doc.outstanding_amount = flt(total_amount_to_pay, self.doc.precision("outstanding_amount"))
+		
+	def calculate_paid_amount(self):
+		paid_amount = base_paid_amount = 0.0
+		for payment in self.doc.get('payments'):
+			payment.base_amount = flt(payment.amount * self.doc.conversion_rate)
+			paid_amount += payment.amount
+			base_paid_amount += payment.base_amount
+
+		self.doc.paid_amount = flt(paid_amount, self.doc.precision("paid_amount"))
+		self.doc.base_paid_amount = flt(base_paid_amount, self.doc.precision("base_paid_amount"))
+
+	def change_amount(self):
+		change_amount = 0.0
+		if self.doc.paid_amount > self.doc.grand_total:
+			change_amount = flt(self.doc.paid_amount - self.doc.grand_total, 
+				self.doc.precision("change_amount"))
+
+		self.doc.change_amount = change_amount;
+		self.doc.base_change_amount = flt(change_amount * self.doc.conversion_rate, 
+			self.doc.precision("base_change_amount"))
+
+	def calculate_margin(self, item):
+		total_margin = 0.0
+		if item.price_list_rate:
+			if item.pricing_rule and not self.doc.ignore_pricing_rule: 
+				pricing_rule = frappe.get_doc('Pricing Rule', item.pricing_rule)
+				item.margin_type = pricing_rule.margin_type
+				item.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
+
+			if item.margin_type and item.margin_rate_or_amount:
+				margin_value = item.margin_rate_or_amount if item.margin_type == 'Amount' else flt(item.price_list_rate) * flt(item.margin_rate_or_amount) / 100
+				total_margin = flt(item.price_list_rate) + flt(margin_value)
+
+		return total_margin 
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index ae6e9e4..75c6e08 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -19,7 +19,7 @@
 	}
 
 def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20):
-	from frappe.templates.pages.list import get_list
+	from frappe.www.list import get_list
 	user = frappe.session.user
 	key = None
 
@@ -28,15 +28,16 @@
 	filters.append((doctype, "docstatus", "=", 1))
 
 	if user != "Guest" and is_website_user():
+		parties_doctype = 'Request for Quotation Supplier' if doctype == 'Request for Quotation' else doctype
 		# find party for this contact
-		customers, suppliers = get_customers_suppliers(doctype, user)
+		customers, suppliers = get_customers_suppliers(parties_doctype, user)
 
-		if customers:
-			key, parties = "customer", customers
-		elif suppliers:
-			key, parties = "supplier", suppliers
-		else:
-			key, parties = "customer", []
+		if not customers and not suppliers: return []
+
+		key, parties = get_party_details(customers, suppliers)
+
+		if doctype == 'Request for Quotation':
+			return rfq_transaction_list(parties_doctype, doctype, parties, limit_start, limit_page_length)
 
 		filters.append((doctype, key, "in", parties))
 
@@ -52,6 +53,23 @@
 	return post_process(doctype, get_list(doctype, txt, filters, limit_start, limit_page_length,
 		fields="name", order_by = "modified desc"))
 
+def get_party_details(customers, suppliers):
+	if customers:
+		key, parties = "customer", customers
+	elif suppliers:
+		key, parties = "supplier", suppliers
+	else:
+		key, parties = "customer", []
+
+	return key, parties
+
+def rfq_transaction_list(parties_doctype, doctype, parties, limit_start, limit_page_length):
+	data = frappe.db.sql("""select distinct parent as name, supplier from `tab{doctype}`
+			where supplier = '{supplier}' and docstatus=1  order by modified desc limit {start}, {len}""".
+			format(doctype=parties_doctype, supplier=parties[0], start=limit_start, len = limit_page_length), as_dict=1)
+
+	return post_process(doctype, data)
+
 def post_process(doctype, data):
 	result = []
 	for d in data:
@@ -72,7 +90,7 @@
 			doc.set_indicator()
 
 		doc.status_display = ", ".join(doc.status_display)
-		doc.items_preview = ", ".join([d.item_name for d in doc.items])
+		doc.items_preview = ", ".join([d.item_name for d in doc.items if d.item_name])
 		result.append(doc)
 
 	return result
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 270f94a..7cd9d60 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -1,1019 +1,1046 @@
 {
- "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, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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,
+   "ignore_xss_filter": 0,
+   "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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "lead_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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, 
-   "ignore_xss_filter": 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, 
-   "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,
+   "ignore_xss_filter": 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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Source", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "source", 
-   "oldfieldtype": "Select", 
-   "options": "\nAdvertisement\nBlog Post\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "source",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Source",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "source",
+   "oldfieldtype": "Select",
+   "options": "\nAdvertisement\nBlog Post\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail",
+   "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, 
-   "depends_on": "eval:doc.source == 'Customer'", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "From Customer",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "Customer",
+   "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, 
-   "depends_on": "eval:doc.source == 'Campaign'", 
-   "description": "", 
-   "fieldname": "campaign_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "section_break_12", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Image",
+   "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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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": "section_break_12",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "__user",
+   "fieldname": "lead_owner",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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": "contact_by", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "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": "column_break_14",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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
+  },
+  {
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "contact_by",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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, 
-   "ignore_xss_filter": 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, 
-   "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,
+   "description": "Add to calendar on this date",
+   "fieldname": "contact_date",
+   "fieldtype": "Datetime",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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,
+   "print_hide_if_no_value": 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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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, 
-   "depends_on": "eval:doc.__islocal", 
-   "fieldname": "address_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address Desc", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address Desc",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 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": "address_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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,
+   "ignore_xss_filter": 0,
+   "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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "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,
+   "ignore_xss_filter": 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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "mobile_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "fax", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Fax", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "fax", 
-   "oldfieldtype": "Data", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "fax",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Fax",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fax",
+   "oldfieldtype": "Data",
+   "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": "website", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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,
+   "ignore_xss_filter": 0,
+   "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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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": "",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 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,
+   "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": 1, 
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "market_segment", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "industry", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "request_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "column_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "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,
+   "ignore_xss_filter": 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,
+   "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, 
-   "ignore_xss_filter": 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, 
-   "print_hide_if_no_value": 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,
+   "ignore_xss_filter": 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,
+   "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": "unsubscribed", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Unsubscribed", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "unsubscribed",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Unsubscribed",
+   "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": "blog_subscriber", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Blog Subscriber", 
-   "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, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "blog_subscriber",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Blog Subscriber",
+   "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
   }
- ], 
- "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": "2016-04-20 11:01:14.179322", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Lead", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-user",
+ "idx": 5,
+ "image_field": "image",
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-04-20 11:01:14.179325",
+ "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", 
- "title_field": "lead_name"
-}
\ No newline at end of file
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "lead_name,lead_owner,status",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "lead_name",
+ "track_seen": 0
+}
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index a743e56..0c3652f 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import cstr, validate_email_add, cint, comma_and
+from frappe.utils import cstr, validate_email_add, cint, comma_and, has_gravatar
 from frappe import session
 from frappe.model.mapper import get_mapped_doc
 
@@ -44,6 +44,8 @@
 				# Lead Owner cannot be same as the Lead
 				self.lead_owner = None
 
+			self.image = has_gravatar(self.email_id)
+
 	def on_update(self):
 		self.add_calendar_event()
 
diff --git a/erpnext/crm/doctype/newsletter/newsletter.js b/erpnext/crm/doctype/newsletter/newsletter.js
deleted file mode 100644
index 77eecac..0000000
--- a/erpnext/crm/doctype/newsletter/newsletter.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.cscript.onload = function(doc) {
-	return frappe.call({
-		method: "erpnext.crm.doctype.newsletter.newsletter.get_lead_options",
-		type: "GET",
-		callback: function(r) {
-			set_field_options("lead_source", r.message.sources.join("\n"))
-			set_field_options("lead_status", r.message.statuses.join("\n"))
-		}
-	});
-}
-
-cur_frm.cscript.refresh = function(doc) {
-	erpnext.toggle_naming_series();
-	if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
-			&& inList(frappe.boot.user.can_write, doc.doctype)) {
-		cur_frm.add_custom_button(__('Send'), function() {
-			return $c_obj(doc, 'send_emails', '', function(r) {
-				cur_frm.refresh();
-			});
-		}, "icon-play", "btn-success");
-	}
-
-	cur_frm.cscript.setup_dashboard();
-
-	if(doc.__islocal && !doc.send_from) {
-		cur_frm.set_value("send_from",
-			repl("%(fullname)s <%(email)s>", frappe.user_info(doc.owner)));
-	}
-}
-
-cur_frm.cscript.setup_dashboard = function() {
-	cur_frm.dashboard.reset();
-	if(!cur_frm.doc.__islocal && cint(cur_frm.doc.email_sent) && cur_frm.doc.__onload && cur_frm.doc.__onload.status_count) {
-		var stat = cur_frm.doc.__onload.status_count;
-		var total = frappe.utils.sum($.map(stat, function(v) { return v; }));
-		if(total) {
-			$.each(stat, function(k, v) {
-				stat[k] = flt(v * 100 / total, 2);
-			});
-
-			cur_frm.dashboard.add_progress("Status", [
-				{
-					title: stat["Sent"] + "% Sent",
-					width: stat["Sent"],
-					progress_class: "progress-bar-success"
-				},
-				{
-					title: stat["Sending"] + "% Sending",
-					width: stat["Sending"],
-					progress_class: "progress-bar-warning"
-				},
-				{
-					title: stat["Error"] + "% Error",
-					width: stat["Error"],
-					progress_class: "progress-bar-danger"
-				}
-			]);
-		}
-	}
-}
diff --git a/erpnext/crm/doctype/newsletter/newsletter.json b/erpnext/crm/doctype/newsletter/newsletter.json
deleted file mode 100644
index d93f88e..0000000
--- a/erpnext/crm/doctype/newsletter/newsletter.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:subject", 
- "creation": "2013-01-10 16:34:31", 
- "custom": 0, 
- "description": "Create and Send Newsletters", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "newsletter_list", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Newsletter List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Newsletter List", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "subject", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Subject", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "description": "", 
-   "fieldname": "send_from", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sender", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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": "email_sent", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Email Sent?", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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": "newsletter_content", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "message", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "description": "", 
-   "fieldname": "test_the_newsletter", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "A Lead with this email id should exist", 
-   "fieldname": "test_email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Test Email Id", 
-   "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": "test_send", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Test", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "test_send", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-envelope", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2016-02-05 11:48:43.081204", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Newsletter", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Newsletter Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC", 
- "title_field": "subject", 
- "version": 0
-}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/newsletter.py b/erpnext/crm/doctype/newsletter/newsletter.py
deleted file mode 100644
index 52d3178..0000000
--- a/erpnext/crm/doctype/newsletter/newsletter.py
+++ /dev/null
@@ -1,169 +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
-import frappe.utils
-from frappe import throw, _
-from frappe.model.document import Document
-from frappe.email.bulk import check_bulk_limit
-from frappe.utils.verified_command import get_signed_params, verify_request
-import erpnext.tasks
-from erpnext.crm.doctype.newsletter_list.newsletter_list import add_subscribers
-
-class Newsletter(Document):
-	def onload(self):
-		if self.email_sent:
-			self.get("__onload").status_count = dict(frappe.db.sql("""select status, count(name)
-				from `tabBulk Email` where reference_doctype=%s and reference_name=%s
-				group by status""", (self.doctype, self.name))) or None
-
-	def test_send(self, doctype="Lead"):
-		self.recipients = frappe.utils.split_emails(self.test_email_id)
-		self.send_bulk()
-		frappe.msgprint(_("Scheduled to send to {0}").format(self.test_email_id))
-
-	def send_emails(self):
-		"""send emails to leads and customers"""
-		if self.email_sent:
-			throw(_("Newsletter has already been sent"))
-
-		self.recipients = self.get_recipients()
-
-		if getattr(frappe.local, "is_ajax", False):
-			# to avoid request timed out!
-			self.validate_send()
-
-			# hack! event="bulk_long" to queue in longjob queue
-			erpnext.tasks.send_newsletter.delay(frappe.local.site, self.name, event="bulk_long")
-		else:
-			self.send_bulk()
-
-		frappe.msgprint(_("Scheduled to send to {0} recipients").format(len(self.recipients)))
-
-		frappe.db.set(self, "email_sent", 1)
-
-	def send_bulk(self):
-		if not self.get("recipients"):
-			# in case it is called via worker
-			self.recipients = self.get_recipients()
-
-		self.validate_send()
-
-		sender = self.send_from or frappe.utils.get_formatted_email(self.owner)
-
-		from frappe.email.bulk import send
-
-		if not frappe.flags.in_test:
-			frappe.db.auto_commit_on_many_writes = True
-
-		send(recipients = self.recipients, sender = sender,
-			subject = self.subject, message = self.message,
-			reference_doctype = self.doctype, reference_name = self.name,
-			unsubscribe_method = "/api/method/erpnext.crm.doctype.newsletter.newsletter.unsubscribe",
-			unsubscribe_params = {"name": self.newsletter_list},
-			bulk_priority = 0)
-
-		if not frappe.flags.in_test:
-			frappe.db.auto_commit_on_many_writes = False
-
-	def get_recipients(self):
-		"""Get recipients from Newsletter List"""
-		return [d.email for d in frappe.db.get_all("Newsletter List Subscriber", ["email"],
-			{"unsubscribed": 0, "newsletter_list": self.newsletter_list})]
-
-	def validate_send(self):
-		if self.get("__islocal"):
-			throw(_("Please save the Newsletter before sending"))
-		check_bulk_limit(self.recipients)
-
-@frappe.whitelist()
-def get_lead_options():
-	return {
-		"sources": ["All"] + filter(None,
-			frappe.db.sql_list("""select distinct source from tabLead""")),
-		"statuses": ["All"] + filter(None,
-			frappe.db.sql_list("""select distinct status from tabLead"""))
-	}
-
-
-@frappe.whitelist(allow_guest=True)
-def unsubscribe(email, name):
-	if not verify_request():
-		return
-
-	subs_id = frappe.db.get_value("Newsletter List Subscriber", {"email": email, "newsletter_list": name})
-	if subs_id:
-		subscriber = frappe.get_doc("Newsletter List Subscriber", subs_id)
-		subscriber.unsubscribed = 1
-		subscriber.save(ignore_permissions=True)
-
-	frappe.db.commit()
-
-	return_unsubscribed_page(email)
-
-def return_unsubscribed_page(email):
-	frappe.respond_as_web_page(_("Unsubscribed"), _("{0} has been successfully unsubscribed from this list.").format(email))
-
-def create_lead(email_id):
-	"""create a lead if it does not exist"""
-	from email.utils import parseaddr
-	from frappe.model.naming import get_default_naming_series
-	real_name, email_id = parseaddr(email_id)
-
-	if frappe.db.get_value("Lead", {"email_id": email_id}):
-		return
-
-	lead = frappe.get_doc({
-		"doctype": "Lead",
-		"email_id": email_id,
-		"lead_name": real_name or email_id,
-		"status": "Lead",
-		"naming_series": get_default_naming_series("Lead"),
-		"company": frappe.db.get_default("Company"),
-		"source": "Email"
-	})
-	lead.insert()
-
-
-@frappe.whitelist(allow_guest=True)
-def subscribe(email):
-	url = frappe.utils.get_url("/api/method/erpnext.crm.doctype.newsletter.newsletter.confirm_subscription") +\
-		"?" + get_signed_params({"email": email})
-
-	messages = (
-		_("Thank you for your interest in subscribing to our updates"),
-		_("Please verify your email id"),
-		url,
-		_("Click here to verify")
-	)
-
-	content = """
-	<p>{0}. {1}.</p>
-	<p><a href="{2}">{3}</a></p>
-	"""
-
-	frappe.sendmail(email, subject=_("Confirm Your Email"), content=content.format(*messages), bulk=True)
-
-@frappe.whitelist(allow_guest=True)
-def confirm_subscription(email):
-	if not verify_request():
-		return
-
-	if not frappe.db.exists("Newsletter List", _("Website")):
-		frappe.get_doc({
-			"doctype": "Newsletter List",
-			"title": _("Website")
-		}).insert(ignore_permissions=True)
-
-
-	frappe.flags.ignore_permissions = True
-
-	add_subscribers(_("Website"), email)
-	frappe.db.commit()
-
-	frappe.respond_as_web_page(_("Confirmed"), _("{0} has been successfully added to our Newsletter list.").format(email))
-
-
-
diff --git a/erpnext/crm/doctype/newsletter/newsletter_list.js b/erpnext/crm/doctype/newsletter/newsletter_list.js
deleted file mode 100644
index e95d295..0000000
--- a/erpnext/crm/doctype/newsletter/newsletter_list.js
+++ /dev/null
@@ -1,10 +0,0 @@
-frappe.listview_settings['Newsletter'] = {
-	add_fields: ["subject", "email_sent"],
-	get_indicator: function(doc) {
-		if(doc.email_sent) {
-			return [__("Sent"), "green", "email_sent,=,Yes"];
-		} else {
-			return [__("Not Sent"), "orange", "email_sent,=,No"];
-		}
-	}
-};
diff --git a/erpnext/crm/doctype/newsletter/test_newsletter.py b/erpnext/crm/doctype/newsletter/test_newsletter.py
deleted file mode 100644
index 580982a..0000000
--- a/erpnext/crm/doctype/newsletter/test_newsletter.py
+++ /dev/null
@@ -1,51 +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, unittest
-
-from erpnext.crm.doctype.newsletter.newsletter import unsubscribe
-from urllib import unquote
-
-class TestNewsletter(unittest.TestCase):
-	def setUp(self):
-		if not frappe.get_all("Newsletter List Subscriber"):
-			for email in ["test_subscriber1@example.com", "test_subscriber2@example.com", 
-				"test_subscriber3@example.com"]:
-					frappe.get_doc({
-						"doctype": "Newsletter List Subscriber",
-						"email": email,
-						"newsletter_list": "_Test Newsletter List"
-					}).insert()
-		else:
-			frappe.db.sql("update `tabNewsletter List Subscriber` set unsubscribed = 0")
-
-	def test_send(self):
-		self.send_newsletter()
-		self.assertEquals(len(frappe.get_all("Bulk Email")), 3)
-
-	def test_unsubscribe(self):
-		# test unsubscribe
-		self.send_newsletter()
-
-		email = unquote(frappe.local.flags.signed_query_string.split("email=")[1].split("&")[0])
-
-		unsubscribe(email, "_Test Newsletter List")
-
-		self.send_newsletter()
-		self.assertEquals(len(frappe.get_all("Bulk Email")), 2)
-
-	def send_newsletter(self):
-		frappe.db.sql("delete from `tabBulk Email`")
-		frappe.delete_doc("Newsletter", "_Test Newsletting")
-		newsletter = frappe.get_doc({
-			"doctype": "Newsletter",
-			"subject": "_Test Newsletting",
-			"newsletter_list": "_Test Newsletter List",
-			"send_from": "Test Sender <test_sender@example.com>",
-			"message": "Testing my news."
-		}).insert(ignore_permissions=True)
-
-		newsletter.send_emails()
-
-test_dependencies = ["Newsletter List"]
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.js b/erpnext/crm/doctype/newsletter_list/newsletter_list.js
deleted file mode 100644
index d6cda45..0000000
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.js
+++ /dev/null
@@ -1,46 +0,0 @@
-frappe.ui.form.on("Newsletter List", "refresh", function(frm) {
-	if(!frm.is_new()) {
-		frm.add_custom_button(__("View Subscribers"), function() {
-			frappe.route_options = {"newsletter_list": frm.doc.name};
-			frappe.set_route("Report", "Newsletter List Subscriber");
-		}, __("View"));
-
-		frm.add_custom_button(__("Import Subscribers"), function() {
-			frappe.prompt({fieldtype:"Select", options: frm.doc.__onload.import_types,
-				label:__("Import Email From"), fieldname:"doctype", reqd:1}, function(data) {
-					frappe.call({
-						method: "erpnext.crm.doctype.newsletter_list.newsletter_list.import_from",
-						args: {
-							"name": frm.doc.name,
-							"doctype": data.doctype
-						},
-						callback: function(r) {
-							frm.set_value("total_subscribers", r.message);
-						}
-					})
-				}, __("Import Subscribers"), __("Import"));
-		}, __("Action"));
-
-		frm.add_custom_button(__("Add Subscribers"), function() {
-			frappe.prompt({fieldtype:"Text",
-				label:__("Email Ids"), fieldname:"email_list", reqd:1}, function(data) {
-					frappe.call({
-						method: "erpnext.crm.doctype.newsletter_list.newsletter_list.add_subscribers",
-						args: {
-							"name": frm.doc.name,
-							"email_list": data.email_list
-						},
-						callback: function(r) {
-							frm.set_value("total_subscribers", r.message);
-						}
-					})
-				}, __("Add Subscribers"), __("Add"));
-		}, __("Action"));
-
-		frm.add_custom_button(__("New Newsletter"), function() {
-			frappe.route_options = {"newsletter_list": frm.doc.name};
-			new_doc("Newsletter");
-		}, __("Action"));
-
-	}
-});
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.json b/erpnext/crm/doctype/newsletter_list/newsletter_list.json
deleted file mode 100644
index 597116f..0000000
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "field:title", 
- "creation": "2015-03-18 06:08:32.729800", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "default": "0", 
-   "fieldname": "total_subscribers", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Total Subscribers", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.643141", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Newsletter List", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Newsletter Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC"
-}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.py b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
deleted file mode 100644
index d56b5ad..0000000
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe.utils import validate_email_add
-from frappe import _
-from email.utils import parseaddr
-
-class NewsletterList(Document):
-	def onload(self):
-		singles = [d.name for d in frappe.db.get_all("DocType", "name", {"issingle": 1})]
-		self.get("__onload").import_types = [{"value": d.parent, "label": "{0} ({1})".format(d.parent, d.label)} \
-			for d in frappe.db.get_all("DocField", ("parent", "label"), {"options": "Email"}) if d.parent not in singles]
-
-	def import_from(self, doctype):
-		"""Extract email ids from given doctype and add them to the current list"""
-		meta = frappe.get_meta(doctype)
-		email_field = [d.fieldname for d in meta.fields if d.fieldtype in ("Data", "Small Text") and d.options=="Email"][0]
-		unsubscribed_field = "unsubscribed" if meta.get_field("unsubscribed") else None
-		added = 0
-
-		for user in frappe.db.get_all(doctype, [email_field, unsubscribed_field or "name"]):
-			try:
-				email = parseaddr(user.get(email_field))[1]
-				if email:
-					frappe.get_doc({
-						"doctype": "Newsletter List Subscriber",
-						"newsletter_list": self.name,
-						"email": email,
-						"unsubscribed": user.get(unsubscribed_field) if unsubscribed_field else 0
-					}).insert(ignore_permissions=True)
-
-					added += 1
-			except frappe.UniqueValidationError:
-				pass
-
-		frappe.msgprint(_("{0} subscribers added").format(added))
-
-		return self.update_total_subscribers()
-
-	def update_total_subscribers(self):
-		self.total_subscribers = self.get_total_subscribers()
-		self.db_update()
-		return self.total_subscribers
-
-	def get_total_subscribers(self):
-		return frappe.db.sql("""select count(*) from `tabNewsletter List Subscriber`
-			where newsletter_list=%s""", self.name)[0][0]
-
-	def on_trash(self):
-		for d in frappe.get_all("Newsletter List Subscriber", "name", {"newsletter_list": self.name}):
-			frappe.delete_doc("Newsletter List Subscriber", d.name)
-
-@frappe.whitelist()
-def import_from(name, doctype):
-	nlist = frappe.get_doc("Newsletter List", name)
-	if nlist.has_permission("write"):
-		return nlist.import_from(doctype)
-
-@frappe.whitelist()
-def add_subscribers(name, email_list):
-	if not isinstance(email_list, (list, tuple)):
-		email_list = email_list.replace(",", "\n").split("\n")
-	count = 0
-	for email in email_list:
-		email = email.strip()
-		valid = validate_email_add(email, False)
-
-		if valid:
-			if not frappe.db.get_value("Newsletter List Subscriber",
-				{"newsletter_list": name, "email": email}):
-				frappe.get_doc({
-					"doctype": "Newsletter List Subscriber",
-					"newsletter_list": name,
-					"email": email
-				}).insert(ignore_permissions = frappe.flags.ignore_permissions)
-
-				count += 1
-			else:
-				pass
-		else:
-			frappe.msgprint(_("{0} is not a valid email id").format(email))
-
-	frappe.msgprint(_("{0} subscribers added").format(count))
-
-	return frappe.get_doc("Newsletter List", name).update_total_subscribers()
diff --git a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
deleted file mode 100644
index ebc094e..0000000
--- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-class TestNewletterList(unittest.TestCase):
-	def test_import(self):
-		new_list = frappe.get_doc({
-			"doctype": "Newsletter List",
-			"title": "_Test Newsletter List 1"
-		}).insert()
-
-		n_leads = frappe.db.sql("select count(distinct email_id) from `tabLead`")[0][0]
-		
-		added = new_list.import_from("Lead")
-		self.assertEquals(added, n_leads)
-
-	def tearDown(self):
-		frappe.delete_doc("Newsletter List", "_Test Newsletter List 1")
-
-test_dependencies = ["Lead"]
-
diff --git a/erpnext/crm/doctype/newsletter_list/test_records.json b/erpnext/crm/doctype/newsletter_list/test_records.json
deleted file mode 100644
index ed2f89e..0000000
--- a/erpnext/crm/doctype/newsletter_list/test_records.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-	{
-		"doctype": "Newsletter List",
-		"title": "_Test Newsletter List"
-	}
-]
diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/__init__.py b/erpnext/crm/doctype/newsletter_list_subscriber/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/crm/doctype/newsletter_list_subscriber/__init__.py
+++ /dev/null
diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json
deleted file mode 100644
index 08208b8..0000000
--- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2015-03-18 06:15:59.321619", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "newsletter_list", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Newsletter List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Newsletter List", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "email", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "unsubscribed", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Unsubscribed", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.675306", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Newsletter List Subscriber", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Newsletter Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "email"
-}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
deleted file mode 100644
index c036adc..0000000
--- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class NewsletterListSubscriber(Document):
-	pass
-
-def after_doctype_insert():
-	frappe.db.add_unique("Newsletter List Subscriber", ("newsletter_list", "email"))
diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/test_newsletter_list_subscriber.py b/erpnext/crm/doctype/newsletter_list_subscriber/test_newsletter_list_subscriber.py
deleted file mode 100644
index 24a0788..0000000
--- a/erpnext/crm/doctype/newsletter_list_subscriber/test_newsletter_list_subscriber.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Newsletter List Subscriber')
-
-class TestNewsletterListSubscriber(unittest.TestCase):
-	pass
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 9bf11df..21a7429 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext.crm");
-frappe.require("assets/erpnext/js/utils.js");
+
 cur_frm.email_field = "contact_email";
 frappe.ui.form.on("Opportunity", {
 	customer: function(frm) {
@@ -51,8 +51,7 @@
 
 		this.frm.set_query("item_code", "items", function() {
 			return {
-				query: "erpnext.controllers.queries.item_query",
-				filters: {"is_sales_item": 1}
+				query: "erpnext.controllers.queries.item_query"
 			};
 		});
 
@@ -83,23 +82,23 @@
 			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
 				frm.save();
-			}, __("Status"));
+			});
 		} else {
 			frm.add_custom_button(__("Reopen"), function() {
 				frm.set_value("status", "Open");
 				frm.save();
-			}, __("Status"));
+			});
 		}
 	}
 
 	if(doc.status!=="Lost") {
 		if(doc.status!=="Quotation") {
 			cur_frm.add_custom_button(__('Lost'),
-				cur_frm.cscript['Declare Opportunity Lost'], __("Status"));
+				cur_frm.cscript['Declare Opportunity Lost']);
 		}
 
-		cur_frm.add_custom_button(__('Quotation'),cur_frm.cscript.create_quotation, __("Make"));
-		cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+		cur_frm.add_custom_button(__('Quotation'),
+			cur_frm.cscript.create_quotation);
 	}
 
 }
@@ -129,7 +128,7 @@
 
 cur_frm.cscript.lead = function(doc, cdt, cdn) {
 	cur_frm.toggle_display("contact_info", doc.customer || doc.lead);
-	frappe.model.map_current_doc({
+	erpnext.utils.map_current_doc({
 		method: "erpnext.crm.doctype.lead.lead.make_opportunity",
 		source_name: cur_frm.doc.lead,
 		frm: cur_frm
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index d117d06..2a0820b 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 18:50:30", 
  "custom": 0, 
  "description": "Potential Sales Deal", 
@@ -147,7 +148,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "customer_name", 
@@ -303,6 +304,31 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "mins_to_first_response", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mins to first response", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "with_items", 
@@ -967,14 +993,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-info-sign", 
- "idx": 1, 
+ "idx": 195, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-03 06:13:49.728079", 
+ "modified": "2016-06-14 15:50:55.080217", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 
@@ -1021,11 +1048,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 1aa1e67..1e57878 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, json
-from frappe.utils import cstr, cint
+from frappe.utils import cstr, cint, get_fullname
 from frappe import msgprint, _
 from frappe.model.mapper import get_mapped_doc
 from erpnext.setup.utils import get_exchange_rate
@@ -46,10 +46,22 @@
 		if not (self.lead or self.customer):
 			lead_name = frappe.db.get_value("Lead", {"email_id": self.contact_email})
 			if not lead_name:
+				sender_name = get_fullname(self.contact_email)
+				if sender_name == self.contact_email:
+					sender_name = None
+
+				if not sender_name and self.contact_email.index('@'):
+					email_name = self.contact_email[0:self.contact_email.index('@')]
+
+					email_split = email_name.split('.')
+					sender_name = ''
+					for s in email_split:
+						sender_name += s.capitalize() + ' '
+
 				lead = frappe.get_doc({
 					"doctype": "Lead",
 					"email_id": self.contact_email,
-					"lead_name": self.contact_email
+					"lead_name": sender_name
 				})
 				lead.insert(ignore_permissions=True)
 				lead_name = lead.name
@@ -180,14 +192,16 @@
 		quotation = frappe.get_doc(target)
 
 		company_currency = frappe.db.get_value("Company", quotation.company, "default_currency")
-		party_account_currency = get_party_account_currency("Customer", quotation.customer, quotation.company)
-
-		if company_currency == party_account_currency:
-			exchange_rate = 1
-		else:
-			exchange_rate = get_exchange_rate(party_account_currency, company_currency)
+		party_account_currency = get_party_account_currency("Customer", quotation.customer,
+			quotation.company) if quotation.customer else company_currency
 
 		quotation.currency = party_account_currency or company_currency
+
+		if company_currency == quotation.currency:
+			exchange_rate = 1
+		else:
+			exchange_rate = get_exchange_rate(quotation.currency, company_currency)
+
 		quotation.conversion_rate = exchange_rate
 
 		quotation.run_method("set_missing_values")
diff --git a/erpnext/crm/doctype/opportunity/opportunity_dashboard.py b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py
new file mode 100644
index 0000000..08d5657
--- /dev/null
+++ b/erpnext/crm/doctype/opportunity/opportunity_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+data = {
+	'fieldname': 'prevdoc_docname',
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Quotation']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 1715c55..043d6f5 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -25,6 +28,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,12 +44,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -61,6 +67,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -70,6 +77,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -86,6 +94,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Group", 
@@ -96,6 +105,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -111,6 +121,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
@@ -121,6 +132,7 @@
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -136,6 +148,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -143,6 +156,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -158,6 +172,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -168,6 +183,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -183,6 +199,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -192,6 +209,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -207,6 +225,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -216,6 +235,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -233,6 +253,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -240,6 +261,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -255,6 +277,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -264,6 +287,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -279,6 +303,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -288,6 +313,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,6 +329,7 @@
    "fieldtype": "Currency", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Rate", 
@@ -313,6 +340,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -324,18 +352,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.062309", 
+ "modified": "2016-07-11 03:28:02.856524", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/crm/report/__init__.py
similarity index 100%
rename from erpnext/crm/doctype/newsletter/__init__.py
rename to erpnext/crm/report/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/crm/report/minutes_to_first_response_for_opportunity/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/crm/report/minutes_to_first_response_for_opportunity/__init__.py
diff --git a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
new file mode 100644
index 0000000..b1e4917
--- /dev/null
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
@@ -0,0 +1,43 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Minutes to First Response for Opportunity"] = {
+    "filters": [
+        {
+            "fieldname":"from_date",
+            "label": __("From Date"),
+            "fieldtype": "Date",
+			'reqd': 1,
+            "default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
+        },
+        {
+            "fieldname":"to_date",
+            "label": __("To Date"),
+            "fieldtype": "Date",
+			'reqd': 1,
+            "default":frappe.datetime.nowdate()
+        },
+    ],
+	get_chart_data: function(columns, result) {
+		return {
+			data: {
+				x: 'Date',
+				columns: [
+					['Date'].concat($.map(result, function(d) { return d[0]; })),
+					['Mins to first response'].concat($.map(result, function(d) { return d[1]; }))
+				]
+				// rows: [['Date', 'Mins to first response']].concat(result)
+			},
+		    axis: {
+		        x: {
+		            type: 'timeseries',
+		            tick: {
+		                format: frappe.ui.py_date_format
+		            }
+		        }
+		    },
+			chart_type: 'line',
+
+		}
+	}
+}
diff --git a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json
new file mode 100644
index 0000000..a366b3e
--- /dev/null
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 0, 
+ "creation": "2016-06-17 11:28:25.867258", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-06-17 11:28:25.867258", 
+ "modified_by": "Administrator", 
+ "module": "CRM", 
+ "name": "Minutes to First Response for Opportunity", 
+ "owner": "Administrator", 
+ "ref_doctype": "Opportunity", 
+ "report_name": "Minutes to First Response for Opportunity", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.py b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.py
new file mode 100644
index 0000000..54e3a60
--- /dev/null
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute(filters=None):
+	columns = [
+		{
+			'fieldname': 'creation_date',
+			'label': 'Date',
+			'fieldtype': 'Date'
+		},
+		{
+			'fieldname': 'mins',
+			'fieldtype': 'Float',
+			'label': 'Mins to First Response'
+		},
+	]
+
+	data = frappe.db.sql('''select date(creation) as creation_date,
+		avg(mins_to_first_response) as mins
+		from tabOpportunity
+			where date(creation) between %s and %s
+			and mins_to_first_response > 0
+		group by creation_date order by creation_date desc''', (filters.from_date, filters.to_date))
+
+	return columns, data
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/demo/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/demo/__init__.py
diff --git a/erpnext/demo/data/account.json b/erpnext/demo/data/account.json
new file mode 100644
index 0000000..b50b0c9
--- /dev/null
+++ b/erpnext/demo/data/account.json
@@ -0,0 +1,18 @@
+[{
+  "account_name": "Debtors EUR",
+  "parent_account": "Accounts Receivable",
+  "account_type": "Receivable",
+  "account_currency": "EUR"
+},
+{
+  "account_name": "Creditors EUR",
+  "parent_account": "Accounts Payable",
+  "account_type": "Payable",
+  "account_currency": "EUR"
+},
+{
+  "account_name": "Paypal",
+  "parent_account": "Bank Accounts",
+  "account_type": "Bank",
+  "account_currency": "EUR"
+}]
\ No newline at end of file
diff --git a/erpnext/demo/data/address.json b/erpnext/demo/data/address.json
new file mode 100644
index 0000000..be4d5ec
--- /dev/null
+++ b/erpnext/demo/data/address.json
@@ -0,0 +1,245 @@
+[
+ {
+  "address_line1": "254 Theotokopoulou Str.", 
+  "address_type": "Office", 
+  "city": "Larnaka", 
+  "country": "Cyprus", 
+  "customer": "Adaptas", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "R Patr\u00e3o Caramelho 116", 
+  "address_type": "Office", 
+  "city": "Fajozes", 
+  "country": "Portugal", 
+  "customer": "Asian Fusion", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "30 Fulford Road", 
+  "address_type": "Office", 
+  "city": "PENTRE-PIOD", 
+  "country": "United Kingdom", 
+  "customer": "Asian Junction", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Schoenebergerstrasse 13", 
+  "address_type": "Office", 
+  "city": "Raschau", 
+  "country": "Germany", 
+  "customer": "Big D Supermarkets", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Hoheluftchaussee 43", 
+  "address_type": "Office", 
+  "city": "Kieritzsch", 
+  "country": "Germany", 
+  "customer": "Buttrey Food & Drug", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "R Cimo Vila 6", 
+  "address_type": "Office", 
+  "city": "Rebordosa", 
+  "country": "Portugal", 
+  "customer": "Chi-Chis", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "R 5 Outubro 9", 
+  "address_type": "Office", 
+  "city": "Quinta Nova S\u00e3o Domingos", 
+  "country": "Portugal", 
+  "customer": "Choices", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Avenida Macambira 953", 
+  "address_type": "Office", 
+  "city": "Goi\u00e2nia", 
+  "country": "Brazil", 
+  "customer": "Consumers and Consumers Express", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "2342 Goyeau Ave", 
+  "address_type": "Office", 
+  "city": "Windsor", 
+  "country": "Canada", 
+  "customer": "Crafts Canada", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Laukaantie 82", 
+  "address_type": "Office", 
+  "city": "KOKKOLA", 
+  "country": "Finland", 
+  "customer": "Endicott Shoes", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "9 Brown Street", 
+  "address_type": "Office", 
+  "city": "PETERSHAM", 
+  "country": "Australia", 
+  "customer": "Fayva", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Via Donnalbina 41", 
+  "address_type": "Office", 
+  "city": "Cala Gonone", 
+  "country": "Italy", 
+  "customer": "Intelacard", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Liljerum Grenadj\u00e4rtorpet 69", 
+  "address_type": "Office", 
+  "city": "TOMTEBODA", 
+  "country": "Sweden", 
+  "customer": "Landskip Yard Care", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "72 Bishopgate Street", 
+  "address_type": "Office", 
+  "city": "SEAHAM", 
+  "country": "United Kingdom", 
+  "customer": "Life Plan Counselling", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "\u03a3\u03ba\u03b1\u03c6\u03af\u03b4\u03b9\u03b1 105", 
+  "address_type": "Office", 
+  "city": "\u03a0\u0391\u03a1\u0395\u039a\u039a\u039b\u0397\u03a3\u0399\u0391", 
+  "country": "Cyprus", 
+  "customer": "Mr Fables", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Mellemvej 7", 
+  "address_type": "Office", 
+  "city": "Aabybro", 
+  "country": "Denmark", 
+  "customer": "Nelson Brothers", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "Plougg\u00e5rdsvej 98", 
+  "address_type": "Office", 
+  "city": "Karby", 
+  "country": "Denmark", 
+  "customer": "Netobill", 
+  "phone": "23566775757", 
+  "supplier": null
+ }, 
+ {
+  "address_line1": "176 Michalakopoulou Street", 
+  "address_type": "Office", 
+  "city": "Agio Georgoudi", 
+  "country": "Cyprus", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Helios Air"
+ }, 
+ {
+  "address_line1": "Fibichova 1102", 
+  "address_type": "Office", 
+  "city": "Kokor\u00edn", 
+  "country": "Czech Republic", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Ks Merchandise"
+ }, 
+ {
+  "address_line1": "Zahradn\u00ed 888", 
+  "address_type": "Office", 
+  "city": "Cecht\u00edn", 
+  "country": "Czech Republic", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "HomeBase"
+ }, 
+ {
+  "address_line1": "ul. Grochowska 94", 
+  "address_type": "Office", 
+  "city": "Warszawa", 
+  "country": "Poland", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Scott Ties"
+ }, 
+ {
+  "address_line1": "Norra Esplanaden 87", 
+  "address_type": "Office", 
+  "city": "HELSINKI", 
+  "country": "Finland", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Reliable Investments"
+ }, 
+ {
+  "address_line1": "2038 Fallon Drive", 
+  "address_type": "Office", 
+  "city": "Dresden", 
+  "country": "Canada", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Nan Duskin"
+ }, 
+ {
+  "address_line1": "77 cours Franklin Roosevelt", 
+  "address_type": "Office", 
+  "city": "MARSEILLE", 
+  "country": "France", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Rainbow Records"
+ }, 
+ {
+  "address_line1": "ul. Tuwima Juliana 85", 
+  "address_type": "Office", 
+  "city": "\u0141\u00f3d\u017a", 
+  "country": "Poland", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "New World Realty"
+ }, 
+ {
+  "address_line1": "Gl. Sygehusvej 41", 
+  "address_type": "Office", 
+  "city": "Narsaq", 
+  "country": "Greenland", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Asiatic Solutions"
+ }, 
+ {
+  "address_line1": "Gosposka ulica 50", 
+  "address_type": "Office", 
+  "city": "Nova Gorica", 
+  "country": "Slovenia", 
+  "customer": null, 
+  "phone": "23566775757", 
+  "supplier": "Eagle Hardware"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/asset.json b/erpnext/demo/data/asset.json
new file mode 100644
index 0000000..b158218
--- /dev/null
+++ b/erpnext/demo/data/asset.json
@@ -0,0 +1,37 @@
+[
+	{
+		"asset_name": "Macbook Pro - 1",
+		"item_code": "Computer",
+		"gross_purchase_amount": 100000
+	},
+	{
+		"asset_name": "Macbook Air - 1",
+		"item_code": "Computer",
+		"gross_purchase_amount": 60000
+	},
+	{
+		"asset_name": "Conferrence Table",
+		"item_code": "Table",
+		"gross_purchase_amount": 30000
+	},
+	{
+		"asset_name": "Lunch Table",
+		"item_code": "Table",
+		"gross_purchase_amount": 20000
+	},
+	{
+		"asset_name": "ERPNext",
+		"item_code": "ERP",
+		"gross_purchase_amount": 100000
+	},
+	{
+		"asset_name": "Chair 1",
+		"item_code": "Chair",
+		"gross_purchase_amount": 10000
+	},
+	{
+		"asset_name": "Chair 2",
+		"item_code": "Chair",
+		"gross_purchase_amount": 10000
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/asset_category.json b/erpnext/demo/data/asset_category.json
new file mode 100644
index 0000000..54f779d
--- /dev/null
+++ b/erpnext/demo/data/asset_category.json
@@ -0,0 +1,38 @@
+[
+	{
+		"asset_category_name": "Furnitures",
+		"depreciation_method": "Straight Line",
+		"total_number_of_depreciations": 5,
+		"frequency_of_depreciation": 12, 
+		"accounts": [{
+			"company_name": "Wind Power LLC",
+			"fixed_asset_account": "Furnitures and Fixtures - WPL",
+			"accumulated_depreciation_account": "Accumulated Depreciation - WPL",
+			"depreciation_expense_account": "Depreciation - WPL"
+		}]
+	},
+	{
+		"asset_category_name": "Electronic Equipments",
+		"depreciation_method": "Double Declining Balance",
+		"total_number_of_depreciations": 10,
+		"frequency_of_depreciation": 6, 
+		"accounts": [{
+			"company_name": "Wind Power LLC",
+			"fixed_asset_account": "Electronic Equipments - WPL",
+			"accumulated_depreciation_account": "Accumulated Depreciation - WPL",
+			"depreciation_expense_account": "Depreciation - WPL"
+		}]
+	},
+	{
+		"asset_category_name": "Softwares",
+		"depreciation_method": "Straight Line",
+		"total_number_of_depreciations": 10,
+		"frequency_of_depreciation": 12, 
+		"accounts": [{
+			"company_name": "Wind Power LLC",
+			"fixed_asset_account": "Softwares - WPL",
+			"accumulated_depreciation_account": "Accumulated Depreciation - WPL",
+			"depreciation_expense_account": "Depreciation - WPL"
+		}]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/bom.json b/erpnext/demo/data/bom.json
new file mode 100644
index 0000000..3085435
--- /dev/null
+++ b/erpnext/demo/data/bom.json
@@ -0,0 +1,180 @@
+[
+ {
+  "item": "Bearing Assembly",
+  "items": [
+   {
+    "item_code": "Base Bearing Plate",
+    "qty": 1.0,
+    "rate": 15.0
+   },
+   {
+    "item_code": "Bearing Block",
+    "qty": 1.0,
+    "rate": 10.0
+   },
+   {
+    "item_code": "Bearing Collar",
+    "qty": 2.0,
+    "rate": 20.0
+   },
+   {
+    "item_code": "Bearing Pipe",
+    "qty": 1.0,
+    "rate": 15.0
+   },
+   {
+    "item_code": "Upper Bearing Plate",
+    "qty": 1.0,
+    "rate": 50.0
+   }
+  ]
+ },
+ {
+  "item": "Wind Mill A Series",
+  "items": [
+   {
+    "item_code": "Base Bearing Plate",
+    "qty": 1.0,
+    "rate": 15.0
+   },
+   {
+    "item_code": "Base Plate",
+    "qty": 1.0,
+    "rate": 20.0
+   },
+   {
+    "item_code": "Bearing Block",
+    "qty": 1.0,
+    "rate": 10.0
+   },
+   {
+    "item_code": "Bearing Pipe",
+    "qty": 1.0,
+    "rate": 15.0
+   },
+   {
+    "item_code": "External Disc",
+    "qty": 1.0,
+    "rate": 45.0
+   },
+   {
+    "item_code": "Shaft",
+    "qty": 1.0,
+    "rate": 30.0
+   },
+   {
+    "item_code": "Wing Sheet",
+    "qty": 4.0,
+    "rate": 22.0
+   }
+  ]
+ },
+ {
+  "item": "Wind MIll C Series",
+  "items": [
+   {
+    "item_code": "Base Plate",
+    "qty": 2.0,
+    "rate": 20.0
+   },
+   {
+    "item_code": "Internal Disc",
+    "qty": 1.0,
+    "rate": 33.0
+   },
+   {
+    "item_code": "External Disc",
+    "qty": 1.0,
+    "rate": 45.0
+   },
+   {
+    "item_code": "Bearing Assembly",
+    "qty": 1.0,
+    "rate": 130.0
+   },
+   {
+    "item_code": "Wing Sheet",
+    "qty": 3.0,
+    "rate": 22.0
+   }
+  ]
+ },
+ {
+  "item": "Wind Turbine-S",
+  "with_operations": 1,
+  "operations": [
+   {
+    "operation": "Prepare Frame",
+    "time_in_mins": 30.0,
+    "workstation": "Drilling Machine 1"
+   },
+   {
+    "operation": "Setup Fixtures",
+    "time_in_mins": 15.0,
+    "workstation": "Assembly Station 1"
+   },
+   {
+    "operation": "Assembly Operation",
+    "time_in_mins": 30.0,
+    "workstation": "Assembly Station 1"
+   },
+   {
+    "operation": "Wiring",
+    "time_in_mins": 20.0,
+    "workstation": "Assembly Station 1"
+   },
+   {
+    "operation": "Testing",
+    "time_in_mins": 10.0,
+    "workstation": "Packing and Testing Station"
+   },
+   {
+    "operation": "Packing",
+    "time_in_mins": 25.0,
+    "workstation": "Packing and Testing Station"
+   }
+  ],
+  "items": [
+   {
+    "item_code": "Base Bearing Plate",
+    "qty": 1.0,
+    "rate": 15.0
+   },
+   {
+    "item_code": "Base Plate",
+    "qty": 1.0,
+    "rate": 20.0
+   },
+   {
+    "item_code": "Bearing Collar",
+    "qty": 1.0,
+    "rate": 20.0
+   },
+   {
+    "item_code": "Blade Rib",
+    "qty": 1.0,
+    "rate": 10.0
+   },
+   {
+    "item_code": "Shaft",
+    "qty": 1.0,
+    "rate": 30.0
+   },
+   {
+    "item_code": "Wing Sheet",
+    "qty": 2.0,
+    "rate": 22.0
+   }
+  ]
+ },
+ {
+  "item": "Base Plate",
+  "items": [
+   {
+    "item_code": "Base Plate Un Painted",
+    "qty": 1.0,
+    "rate": 16.0
+   }
+  ]
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/contact.json b/erpnext/demo/data/contact.json
new file mode 100644
index 0000000..130845b
--- /dev/null
+++ b/erpnext/demo/data/contact.json
@@ -0,0 +1,191 @@
+[
+ {
+  "customer": "Adaptas", 
+  "email_id": "JanVaclavik@example.com", 
+  "first_name": "January", 
+  "last_name": "V\u00e1clav\u00edk", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Asian Fusion", 
+  "email_id": "ChidumagaTobeolisa@example.com", 
+  "first_name": "Chidumaga", 
+  "last_name": "Tobeolisa", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Asian Junction", 
+  "email_id": "JanaKubanova@example.com", 
+  "first_name": "Jana", 
+  "last_name": "Kub\u00e1\u0148ov\u00e1", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Big D Supermarkets", 
+  "email_id": "XuChaoXuan@example.com", 
+  "first_name": "\u7d39\u8431", 
+  "last_name": "\u4e8e", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Buttrey Food & Drug", 
+  "email_id": "OzlemVerwijmeren@example.com", 
+  "first_name": "\u00d6zlem", 
+  "last_name": "Verwijmeren", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Chi-Chis", 
+  "email_id": "HansRasmussen@example.com", 
+  "first_name": "Hans", 
+  "last_name": "Rasmussen", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Choices", 
+  "email_id": "SatomiShigeki@example.com", 
+  "first_name": "Satomi", 
+  "last_name": "Shigeki", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Consumers and Consumers Express", 
+  "email_id": "SimonVJessen@example.com", 
+  "first_name": "Simon", 
+  "last_name": "Jessen", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Crafts Canada", 
+  "email_id": "NeguaranShahsaah@example.com", 
+  "first_name": "\u0646\u06af\u0627\u0631\u06cc\u0646", 
+  "last_name": "\u0634\u0627\u0647 \u0633\u06cc\u0627\u0647", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Endicott Shoes", 
+  "email_id": "Lom-AliBataev@example.com", 
+  "first_name": "Lom-Ali", 
+  "last_name": "Bataev", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Fayva", 
+  "email_id": "VanNgocTien@example.com", 
+  "first_name": "Ti\u00ean", 
+  "last_name": "V\u0103n", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Intelacard", 
+  "email_id": "QuimeyOsorioRuelas@example.com", 
+  "first_name": "Quimey", 
+  "last_name": "Osorio", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Landskip Yard Care", 
+  "email_id": "EdgardaSalcedoRaya@example.com", 
+  "first_name": "Edgarda", 
+  "last_name": "Salcedo", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Life Plan Counselling", 
+  "email_id": "HafsteinnBjarnarsonar@example.com", 
+  "first_name": "Hafsteinn", 
+  "last_name": "Bjarnarsonar", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Mr Fables", 
+  "email_id": "\u0434\u0430\u043d\u0438\u0438\u043b@example.com", 
+  "first_name": "\u0414\u0430\u043d\u0438\u0438\u043b", 
+  "last_name": "\u041a\u043e\u043d\u043e\u0432\u0430\u043b\u043e\u0432", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Nelson Brothers", 
+  "email_id": "SelmaMAndersen@example.com", 
+  "first_name": "Selma", 
+  "last_name": "Andersen", 
+  "supplier": null
+ }, 
+ {
+  "customer": "Netobill", 
+  "email_id": "LadislavKolaja@example.com", 
+  "first_name": "Ladislav", 
+  "last_name": "Kolaja", 
+  "supplier": null
+ }, 
+ {
+  "customer": null, 
+  "email_id": "TewoldeAbaalom@example.com", 
+  "first_name": "Tewolde", 
+  "last_name": "Abaalom", 
+  "supplier": "Helios Air"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "LeilaFernandesRodrigues@example.com", 
+  "first_name": "Leila", 
+  "last_name": "Rodrigues", 
+  "supplier": "Ks Merchandise"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "DmitryBulgakov@example.com", 
+  "first_name": "Dmitry", 
+  "last_name": "Bulgakov", 
+  "supplier": "HomeBase"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "HaiducWhitfoot@example.com", 
+  "first_name": "Haiduc", 
+  "last_name": "Whitfoot", 
+  "supplier": "Scott Ties"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "SesseljaPetursdottir@example.com", 
+  "first_name": "Sesselja", 
+  "last_name": "P\u00e9tursd\u00f3ttir", 
+  "supplier": "Reliable Investments"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "HajdarPignar@example.com", 
+  "first_name": "Hajdar", 
+  "last_name": "Pignar", 
+  "supplier": "Nan Duskin"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "GustavaLorenzo@example.com", 
+  "first_name": "Gustava", 
+  "last_name": "Lorenzo", 
+  "supplier": "Rainbow Records"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "BethanyWood@example.com", 
+  "first_name": "Bethany", 
+  "last_name": "Wood", 
+  "supplier": "New World Realty"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "GlorianaBrownlock@example.com", 
+  "first_name": "Gloriana", 
+  "last_name": "Brownlock", 
+  "supplier": "Asiatic Solutions"
+ }, 
+ {
+  "customer": null, 
+  "email_id": "JensonFraser@gustr.com", 
+  "first_name": "Jenson", 
+  "last_name": "Fraser", 
+  "supplier": "Eagle Hardware"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/employee.json b/erpnext/demo/data/employee.json
new file mode 100644
index 0000000..d9f4d2a
--- /dev/null
+++ b/erpnext/demo/data/employee.json
@@ -0,0 +1,72 @@
+[
+ {
+  "date_of_birth": "1982-01-03", 
+  "date_of_joining": "2001-10-10", 
+  "employee_name": "Dikman Shervashidze Shervashidze", 
+  "gender": "Female", 
+  "user_id": "DikmanShervashidze@example.com"
+ }, 
+ {
+  "date_of_birth": "1959-02-03", 
+  "date_of_joining": "1976-09-16", 
+  "employee_name": "Zukutakitoteka", 
+  "gender": "Female", 
+  "user_id": "Zukutakitoteka@example.com"
+ }, 
+ {
+  "date_of_birth": "1982-03-03", 
+  "date_of_joining": "2000-06-16", 
+  "employee_name": "Hatsue Kashiwagi", 
+  "gender": "Female", 
+  "user_id": "HatsueKashiwagi@example.com"
+ }, 
+ {
+  "date_of_birth": "1945-04-04", 
+  "date_of_joining": "1969-07-01", 
+  "employee_name": "Nuran Verkleij", 
+  "gender": "Female", 
+  "user_id": "NuranVerkleij@example.com"
+ }, 
+ {
+  "date_of_birth": "1978-05-03", 
+  "date_of_joining": "1999-12-24", 
+  "employee_name": "\u0414\u043c\u0438\u0442\u0440\u0438\u0439 \u041f\u0438\u0440\u043e\u0433\u043e\u0432", 
+  "gender": "Male", 
+  "user_id": "aromn@example.com"
+ }, 
+ {
+  "date_of_birth": "1964-06-03", 
+  "date_of_joining": "1981-08-05", 
+  "employee_name": "Tilde Lindqvist", 
+  "gender": "Female", 
+  "user_id": "TildeLindqvist@example.com"
+ }, 
+ {
+  "date_of_birth": "1982-07-03", 
+  "date_of_joining": "2006-06-10", 
+  "employee_name": "Micha\u0142 Sobczak", 
+  "gender": "Male", 
+  "user_id": "MichalSobczak@example.com"
+ }, 
+ {
+  "date_of_birth": "1969-08-03", 
+  "date_of_joining": "1993-10-21", 
+  "employee_name": "Gabrielle Loftus", 
+  "gender": "Female", 
+  "user_id": "GabrielleLoftus@example.com"
+ }, 
+ {
+  "date_of_birth": "1982-09-03", 
+  "date_of_joining": "2005-09-06", 
+  "employee_name": "Vakhita Ryzaev", 
+  "gender": "Male", 
+  "user_id": "VakhitaRyzaev@example.com"
+ }, 
+ {
+  "date_of_birth": "1985-10-03", 
+  "date_of_joining": "2007-12-25", 
+  "employee_name": "Charmaine Gaudreau", 
+  "gender": "Female", 
+  "user_id": "CharmaineGaudreau@example.com"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/item.json b/erpnext/demo/data/item.json
new file mode 100644
index 0000000..e208522
--- /dev/null
+++ b/erpnext/demo/data/item.json
@@ -0,0 +1,279 @@
+[
+ {
+  "default_supplier": "Asiatic Solutions",
+  "default_warehouse": "Stores",
+  "description": "For Upper Bearing",
+  "image": "/assets/erpnext_demo/images/disc.png",
+  "item_code": "Disc Collars",
+  "item_group": "Raw Material",
+  "item_name": "Disc Collars"
+ },
+ {
+  "default_supplier": "Nan Duskin",
+  "default_warehouse": "Stores",
+  "description": "CAST IRON, MCMASTER PART NO. 3710T13",
+  "image": "/assets/erpnext_demo/images/bearing.jpg",
+  "item_code": "Bearing Block",
+  "item_group": "Raw Material",
+  "item_name": "Bearing Block"
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Wind Mill C Series for Commercial Use 18ft",
+  "image": "/assets/erpnext_demo/images/wind-turbine-2.png",
+  "item_code": "Wind MIll C Series",
+  "item_group": "Products",
+  "item_name": "Wind MIll C Series"
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Wind Mill A Series for Home Use 9ft",
+  "image": "/assets/erpnext_demo/images/wind-turbine.png",
+  "item_code": "Wind Mill A Series",
+  "item_group": "Products",
+  "item_name": "Wind Mill A Series"
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->",
+  "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
+  "item_code": "Wind Turbine",
+  "item_group": "Products",
+  "item_name": "Wind Turbine",
+  "has_variants": 1,
+  "has_serial_no": 1,
+  "attributes":[
+      { "attribute": "Size" }
+  ]
+ },
+ {
+  "default_supplier": "HomeBase",
+  "default_warehouse": "Stores",
+  "description": "1.5 in. Diameter x 36 in. Mild Steel Tubing",
+  "image": null,
+  "item_code": "Bearing Pipe",
+  "item_group": "Raw Material",
+  "item_name": "Bearing Pipe"
+ },
+ {
+  "default_supplier": "New World Realty",
+  "default_warehouse": "Stores",
+  "description": "1/32 in. x 24 in. x 47 in. HDPE Opaque Sheet",
+  "image": null,
+  "item_code": "Wing Sheet",
+  "item_group": "Raw Material",
+  "item_name": "Wing Sheet"
+ },
+ {
+  "default_supplier": "Eagle Hardware",
+  "default_warehouse": "Stores",
+  "description": "3/16 in. x 6 in. x 6 in. Low Carbon Steel Plate",
+  "image": null,
+  "item_code": "Upper Bearing Plate",
+  "item_group": "Raw Material",
+  "item_name": "Upper Bearing Plate"
+ },
+ {
+  "default_supplier": "Asiatic Solutions",
+  "default_warehouse": "Stores",
+  "description": "Bearing Assembly",
+  "image": null,
+  "item_code": "Bearing Assembly",
+  "item_group": "Sub Assemblies",
+  "item_name": "Bearing Assembly"
+ },
+ {
+  "default_supplier": "HomeBase",
+  "default_warehouse": "Stores",
+  "description": "3/4 in. x 2 ft. x 4 ft. Pine Plywood",
+  "image": null,
+  "item_code": "Base Plate",
+  "item_group": "Raw Material",
+  "item_name": "Base Plate",
+  "is_sub_contracted_item": 1
+ },
+ {
+  "default_supplier": "Scott Ties",
+  "default_warehouse": "Stores",
+  "description": "N/A",
+  "image": null,
+  "item_code": "Stand",
+  "item_group": "Raw Material",
+  "item_name": "Stand"
+ },
+ {
+  "default_supplier": "Eagle Hardware",
+  "default_warehouse": "Stores",
+  "description": "1 in. x 3 in. x 1 ft. Multipurpose Al Alloy Bar",
+  "image": null,
+  "item_code": "Bearing Collar",
+  "item_group": "Raw Material",
+  "item_name": "Bearing Collar"
+ },
+ {
+  "default_supplier": "Eagle Hardware",
+  "default_warehouse": "Stores",
+  "description": "1/4 in. x 6 in. x 6 in. Mild Steel Plate",
+  "image": null,
+  "item_code": "Base Bearing Plate",
+  "item_group": "Raw Material",
+  "item_name": "Base Bearing Plate"
+ },
+ {
+  "default_supplier": "HomeBase",
+  "default_warehouse": "Stores",
+  "description": "15/32 in. x 4 ft. x 8 ft. 3-Ply Rtd Sheathing",
+  "image": null,
+  "item_code": "External Disc",
+  "item_group": "Raw Material",
+  "item_name": "External Disc"
+ },
+ {
+  "default_supplier": "Eagle Hardware",
+  "default_warehouse": "Stores",
+  "description": "1.25 in. Diameter x 6 ft. Mild Steel Tubing",
+  "image": null,
+  "item_code": "Shaft",
+  "item_group": "Raw Material",
+  "item_name": "Shaft"
+ },
+ {
+  "default_supplier": "Ks Merchandise",
+  "default_warehouse": "Stores",
+  "description": "1/2 in. x 2 ft. x 4 ft. Pine Plywood",
+  "image": null,
+  "item_code": "Blade Rib",
+  "item_group": "Raw Material",
+  "item_name": "Blade Rib"
+ },
+ {
+  "default_supplier": "HomeBase",
+  "default_warehouse": "Stores",
+  "description": "For Bearing Collar",
+  "image": null,
+  "item_code": "Internal Disc",
+  "item_group": "Raw Material",
+  "item_name": "Internal Disc"
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Small</p>",
+  "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
+  "item_code": "Wind Turbine-S",
+  "item_group": "Products",
+  "item_name": "Wind Turbine-S",
+  "variant_of": "Wind Turbine",
+  "attributes":[
+      {
+       "attribute": "Size",
+       "attribute_value": "Small"
+      }
+  ]
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Medium</p>",
+  "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
+  "item_code": "Wind Turbine-M",
+  "item_group": "Products",
+  "item_name": "Wind Turbine-M",
+  "variant_of": "Wind Turbine",
+  "attributes":[
+      {
+       "attribute": "Size",
+       "attribute_value": "Medium"
+      }
+  ]
+ },
+ {
+  "default_supplier": null,
+  "default_warehouse": "Finished Goods",
+  "description": "Small Wind Turbine for Home Use\n\n\n<!-- html -->\n<p>Size: Large</p>",
+  "image": "/assets/erpnext_demo/images/wind-turbine-1.jpg",
+  "item_code": "Wind Turbine-L",
+  "item_group": "Products",
+  "item_name": "Wind Turbine-L",
+  "variant_of": "Wind Turbine",
+  "attributes":[
+      {
+       "attribute": "Size",
+       "attribute_value": "Large"
+      }
+  ]
+ },
+ {
+  "is_stock_item": 0,
+  "description": "Wind Mill A Series with Spare Bearing",
+  "item_code": "Wind Mill A Series with Spare Bearing",
+  "item_group": "Products",
+  "item_name": "Wind Mill A Series with Spare Bearing"
+ },
+ {
+  "default_supplier": "HomeBase",
+  "default_warehouse": "Stores",
+  "description": "3/4 in. x 2 ft. x 4 ft. Pine Plywood",
+  "image": null,
+  "item_code": "Base Plate Un Painted",
+  "item_group": "Raw Material",
+  "item_name": "Base Plate Un Painted"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Furnitures",
+  "is_stock_item": 0,
+  "description": "Table",
+  "item_code": "Table",
+  "item_name": "Table",
+  "item_group": "Products"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Furnitures",
+  "is_stock_item": 0,
+  "description": "Chair",
+  "item_code": "Chair",
+  "item_name": "Chair",
+  "item_group": "Products"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Electronic Equipments",
+  "is_stock_item": 0,
+  "description": "Computer",
+  "item_code": "Computer",
+  "item_name": "Computer",
+  "item_group": "Products"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Electronic Equipments",
+  "is_stock_item": 0,
+  "description": "Mobile",
+  "item_code": "Mobile",
+  "item_name": "Mobile",
+  "item_group": "Products"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Softwares",
+  "is_stock_item": 0,
+  "description": "ERP",
+  "item_code": "ERP",
+  "item_name": "ERP",
+  "item_group": "All Item Groups"
+ },
+ {
+  "is_fixed_asset": 1,
+  "asset_category": "Softwares",
+  "is_stock_item": 0,
+  "description": "Autocad",
+  "item_code": "Autocad",
+  "item_name": "Autocad",
+  "item_group": "All Item Groups"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/lead.json b/erpnext/demo/data/lead.json
new file mode 100644
index 0000000..ff78877
--- /dev/null
+++ b/erpnext/demo/data/lead.json
@@ -0,0 +1,127 @@
+[
+ {
+  "company_name": "Zany Brainy", 
+  "email_id": "MartLakeman@example.com", 
+  "lead_name": "Mart Lakeman"
+ }, 
+ {
+  "company_name": "Patterson-Fletcher", 
+  "email_id": "SagaLundqvist@example.com", 
+  "lead_name": "Saga Lundqvist"
+ }, 
+ {
+  "company_name": "Griff's Hamburgers", 
+  "email_id": "AdnaSjoberg@example.com", 
+  "lead_name": "Adna Sj\u00f6berg"
+ }, 
+ {
+  "company_name": "Rhodes Furniture", 
+  "email_id": "IdaDSvendsen@example.com", 
+  "lead_name": "Ida Svendsen"
+ }, 
+ {
+  "company_name": "Burger Chef", 
+  "email_id": "EmppuHameenniemi@example.com", 
+  "lead_name": "Emppu H\u00e4meenniemi"
+ }, 
+ {
+  "company_name": "Stratabiz", 
+  "email_id": "EugenioPisano@example.com", 
+  "lead_name": "Eugenio Pisano"
+ }, 
+ {
+  "company_name": "Home Quarters Warehouse", 
+  "email_id": "SemharHagos@example.com", 
+  "lead_name": "Semhar Hagos"
+ }, 
+ {
+  "company_name": "Enviro Architectural Designs", 
+  "email_id": "BranimiraIvankovic@example.com", 
+  "lead_name": "Branimira Ivankovi\u0107"
+ }, 
+ {
+  "company_name": "Ideal Garden Management", 
+  "email_id": "ShellyLFields@example.com", 
+  "lead_name": "Shelly Fields"
+ }, 
+ {
+  "company_name": "Listen Up", 
+  "email_id": "LeoMikulic@example.com", 
+  "lead_name": "Leo Mikuli\u0107"
+ }, 
+ {
+  "company_name": "I. Magnin", 
+  "email_id": "DenisaJarosova@example.com", 
+  "lead_name": "Denisa Jaro\u0161ov\u00e1"
+ }, 
+ {
+  "company_name": "First Rate Choice", 
+  "email_id": "JanekRutkowski@example.com", 
+  "lead_name": "Janek Rutkowski"
+ }, 
+ {
+  "company_name": "Multi Tech Development", 
+  "email_id": "mm@example.com", 
+  "lead_name": "\u7f8e\u6708 \u5b87\u85e4"
+ }, 
+ {
+  "company_name": "National Auto Parts", 
+  "email_id": "dd@example.com", 
+  "lead_name": "\u0414\u0430\u043d\u0438\u0438\u043b \u0410\u0444\u0430\u043d\u0430\u0441\u044c\u0435\u0432"
+ }, 
+ {
+  "company_name": "Integra Investment Plan", 
+  "email_id": "ZorislavPetkovic@example.com", 
+  "lead_name": "Zorislav Petkovi\u0107"
+ }, 
+ {
+  "company_name": "The Lawn Guru", 
+  "email_id": "NanaoNiwa@example.com", 
+  "lead_name": "Nanao Niwa"
+ }, 
+ {
+  "company_name": "Buena Vista Realty Service", 
+  "email_id": "HreiarJorundsson@example.com", 
+  "lead_name": "Hrei\u00f0ar J\u00f6rundsson"
+ }, 
+ {
+  "company_name": "Bountiful Harvest Health Food Store", 
+  "email_id": "ChuThiBichLai@example.com", 
+  "lead_name": "Lai Chu"
+ }, 
+ {
+  "company_name": "P. Samuels Men's Clothiers", 
+  "email_id": "VictorAksakov@example.com", 
+  "lead_name": "Victor Aksakov"
+ }, 
+ {
+  "company_name": "Vinyl Fever", 
+  "email_id": "SaidalimBisliev@example.com", 
+  "lead_name": "Saidalim Bisliev"
+ }, 
+ {
+  "company_name": "Garden Master", 
+  "email_id": "TotteJakobsson@example.com", 
+  "lead_name": "Totte Jakobsson"
+ }, 
+ {
+  "company_name": "Big Apple", 
+  "email_id": "NanaArmasRobles@example.com", 
+  "lead_name": "Nan\u00e1 Armas"
+ }, 
+ {
+  "company_name": "Monk House Sales", 
+  "email_id": "WalerianDuda@example.com", 
+  "lead_name": "Walerian Duda"
+ }, 
+ {
+  "company_name": "ManCharm", 
+  "email_id": "Moarimikashi@example.com", 
+  "lead_name": "Moarimikashi"
+ }, 
+ {
+  "company_name": "Custom Lawn Care", 
+  "email_id": "DobromilDabrowski@example.com", 
+  "lead_name": "Dobromi\u0142 D\u0105browski"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/operation.json b/erpnext/demo/data/operation.json
new file mode 100644
index 0000000..47f26d1
--- /dev/null
+++ b/erpnext/demo/data/operation.json
@@ -0,0 +1,32 @@
+[
+ {
+  "description": "Setup Fixtures for Assembly", 
+  "name": "Setup Fixtures", 
+  "workstation": "Assembly Station 1"
+ }, 
+ {
+  "description": "Assemble Unit as per Standard Operating Procedures", 
+  "name": "Assembly Operation", 
+  "workstation": "Assembly Station 1"
+ }, 
+ {
+  "description": "Final Testing Checklist", 
+  "name": "Testing", 
+  "workstation": "Packing and Testing Station"
+ }, 
+ {
+  "description": "Final Packing and add Instructions", 
+  "name": "Packing", 
+  "workstation": "Packing and Testing Station"
+ }, 
+ {
+  "description": "Prepare frame for assembly", 
+  "name": "Prepare Frame", 
+  "workstation": "Drilling Machine 1"
+ }, 
+ {
+  "description": "Connect wires", 
+  "name": "Wiring", 
+  "workstation": "Assembly Station 1"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/user.json b/erpnext/demo/data/user.json
new file mode 100644
index 0000000..e353efb
--- /dev/null
+++ b/erpnext/demo/data/user.json
@@ -0,0 +1,112 @@
+[
+ {
+  "email": "test_demo@erpnext.com",
+  "first_name": "Test",
+  "last_name": "User"
+ },
+ {
+  "email": "DikmanShervashidze@example.com",
+  "first_name": "Dikman",
+  "last_name": "Shervashidze"
+ },
+ {
+  "email": "Zukutakitoteka@example.com",
+  "first_name": "Zukutakitoteka",
+  "last_name": null
+ },
+ {
+  "email": "HatsueKashiwagi@example.com",
+  "first_name": "Hatsue",
+  "last_name": "Kashiwagi"
+ },
+ {
+  "email": "NuranVerkleij@example.com",
+  "first_name": "Nuran",
+  "last_name": "Verkleij"
+ },
+ {
+  "email": "aromn@example.com",
+  "first_name": "\u0414\u043c\u0438\u0442\u0440\u0438\u0439",
+  "last_name": "\u041f\u0438\u0440\u043e\u0433\u043e\u0432"
+ },
+ {
+  "email": "TildeLindqvist@example.com",
+  "first_name": "Tilde",
+  "last_name": "Lindqvist"
+ },
+ {
+  "email": "MichalSobczak@example.com",
+  "first_name": "Micha\u0142",
+  "last_name": "Sobczak"
+ },
+ {
+  "email": "GabrielleLoftus@example.com",
+  "first_name": "Gabrielle",
+  "last_name": "Loftus"
+ },
+ {
+  "email": "VakhitaRyzaev@example.com",
+  "first_name": "Vakhita",
+  "last_name": "Ryzaev"
+ },
+ {
+  "email": "CharmaineGaudreau@example.com",
+  "first_name": "Charmaine",
+  "last_name": "Gaudreau"
+ },
+ {
+  "email": "RafaelaMaartens@example.com",
+  "first_name": "Rafa\u00ebla",
+  "last_name": "Maartens"
+ },
+ {
+  "email": "NuguseYohannes@example.com",
+  "first_name": "Nuguse",
+  "last_name": "Yohannes"
+ },
+ {
+  "email": "panca@example.com",
+  "first_name": "\u0420\u0430\u0438\u0441\u0430",
+  "last_name": "\u0411\u0435\u043b\u044f\u043a\u043e\u0432\u0430"
+ },
+ {
+  "email": "CaYinLong@example.com",
+  "first_name": "\u80e4\u9686",
+  "last_name": "\u8521"
+ },
+ {
+  "email": "FreddieScott@example.com",
+  "first_name": "Freddie",
+  "last_name": "Scott"
+ },
+ {
+  "email": "BergoraVigfusdottir@example.com",
+  "first_name": "Berg\u00fe\u00f3ra",
+  "last_name": "Vigf\u00fasd\u00f3ttir"
+ },
+ {
+  "email": "WardNajmalDinKalb@example.com",
+  "first_name": "Ward",
+  "last_name": "Kalb"
+ },
+ {
+  "email": "WanMai@example.com",
+  "first_name": "Wan",
+  "last_name": "Mai"
+ },
+ {
+  "email": "LeonAbdulov@example.com",
+  "first_name": "Leon",
+  "last_name": "Abdulov"
+ },
+ {
+  "email": "SabinaNovotna@example.com",
+  "first_name": "Sabina",
+  "last_name": "Novotn\u00e1"
+ },
+ {
+  "email": "demo@erpnext.com",
+  "first_name": "Demo",
+  "last_name": "User"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
new file mode 100644
index 0000000..2435029
--- /dev/null
+++ b/erpnext/demo/demo.py
@@ -0,0 +1,82 @@
+from __future__ import unicode_literals
+
+import frappe, sys
+import erpnext
+import frappe.utils
+from erpnext.demo.setup_data import setup_data
+from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset
+
+"""
+Make a demo
+
+1. Start with a fresh account
+
+bench --site demo.erpnext.dev reinstall
+
+2. Install Demo
+
+bench --site demo.erpnext.dev execute erpnext.demo.demo.make
+
+3. If Demo breaks, to continue
+
+bench --site demo.erpnext.dev execute erpnext.demo.demo.simulate
+
+"""
+
+def make(domain='Manufacturing'):
+	frappe.flags.domain = domain
+	frappe.flags.mute_emails = True
+	setup_data()
+	site = frappe.local.site
+	frappe.destroy()
+	frappe.init(site)
+	frappe.connect()
+	simulate()
+
+def simulate():
+	runs_for = frappe.flags.runs_for or 150
+	frappe.flags.company = erpnext.get_default_company()
+	frappe.flags.mute_emails = True
+
+	if not frappe.flags.start_date:
+		# start date = 100 days back
+		frappe.flags.start_date = frappe.utils.add_days(frappe.utils.nowdate(), -1 * runs_for)
+
+	current_date = frappe.utils.getdate(frappe.flags.start_date)
+
+	# continue?
+	demo_last_date = frappe.db.get_global('demo_last_date')
+	if demo_last_date:
+		current_date = frappe.utils.add_days(demo_last_date, 1)
+
+	# run till today
+	if not runs_for:
+		runs_for = frappe.utils.date_diff(frappe.utils.nowdate(), current_date)
+		# runs_for = 100
+		
+	fixed_asset.work()
+
+	for i in xrange(runs_for):
+		sys.stdout.write("\rSimulating {0}".format(current_date.strftime("%Y-%m-%d")))
+		sys.stdout.flush()
+		frappe.flags.current_date = current_date
+
+		if current_date.weekday() in (5, 6):
+			current_date = frappe.utils.add_days(current_date, 1)
+			continue
+
+		hr.work()
+		sales.work()
+		purchase.work()
+		manufacturing.work()
+		stock.work()
+		accounts.work()
+		projects.run_projects(current_date)
+		# run_stock()
+		# run_accounts()
+		# run_projects()
+		# run_messages()
+
+		current_date = frappe.utils.add_days(current_date, 1)
+
+		frappe.db.commit()
diff --git a/erpnext/demo/domains.py b/erpnext/demo/domains.py
new file mode 100644
index 0000000..0217f24
--- /dev/null
+++ b/erpnext/demo/domains.py
@@ -0,0 +1,16 @@
+from __future__ import unicode_literals
+
+data = {
+	'Manufacturing': {
+		'company_name': 'Wind Power LLC'
+	},
+	'Retail': {
+		'company_name': 'Annapurna Dairy Shop',
+	},
+	'Distribution': {
+		'company_name': 'Soltice Hardware',
+	},
+	'Services': {
+		'company_name': 'Acme Consulting'
+	}
+}
\ No newline at end of file
diff --git a/erpnext/demo/setup_data.py b/erpnext/demo/setup_data.py
new file mode 100644
index 0000000..918fd54
--- /dev/null
+++ b/erpnext/demo/setup_data.py
@@ -0,0 +1,404 @@
+from __future__ import unicode_literals
+
+import random, json
+from frappe.utils.make_random import add_random_children, get_random
+from erpnext.demo.domains import data
+import frappe, erpnext
+from frappe.utils import flt, now_datetime, cstr, nowdate, add_days
+from frappe import _
+
+def setup_data():
+	domain = frappe.flags.domain
+	complete_setup(domain)
+	setup_demo_page()
+	setup_fiscal_year()
+	setup_holiday_list()
+	setup_customer()
+	setup_supplier()
+	import_json("Asset Category")
+	setup_item()
+	setup_warehouse()
+	setup_asset()
+	import_json('Address')
+	import_json('Contact')
+	setup_workstation()
+	import_json('Operation')
+	import_json('Lead')
+	setup_item_price()
+	show_item_groups_in_website()
+	setup_currency_exchange()
+	import_json('BOM', submit=True)
+	setup_user()
+	setup_employee()
+	setup_salary_structure()
+	setup_salary_structure_for_timesheet()
+	setup_account_to_expense_type()
+	setup_user_roles()
+	setup_budget()
+	frappe.db.commit()
+	frappe.clear_cache()
+
+def complete_setup(domain='Manufacturing'):
+	print "Complete Setup..."
+	from frappe.desk.page.setup_wizard.setup_wizard import setup_complete
+
+	if not frappe.get_all('Company', limit=1):
+		setup_complete({
+			"first_name": "Test",
+			"last_name": "User",
+			"email": "test_demo@erpnext.com",
+			"company_tagline": 'Awesome Products and Services',
+			"password": "test",
+			"fy_start_date": "2015-01-01",
+			"fy_end_date": "2015-12-31",
+			"bank_account": "National Bank",
+			"domain": domain,
+			"company_name": data.get(domain).get('company_name'),
+			"chart_of_accounts": "Standard",
+			"company_abbr": ''.join([d[0] for d in data.get(domain).get('company_name').split()]).upper(),
+			"currency": 'USD',
+			"timezone": 'America/New_York',
+			"country": 'United States',
+			"language": "english"
+		})
+
+def setup_demo_page():
+	# home page should always be "start"
+	website_settings = frappe.get_doc("Website Settings", "Website Settings")
+	website_settings.home_page = "demo"
+	website_settings.save()
+
+def setup_fiscal_year():
+	fiscal_year = None
+	for year in xrange(2010, now_datetime().year + 1, 1):
+		try:
+			fiscal_year = frappe.get_doc({
+				"doctype": "Fiscal Year",
+				"year": cstr(year),
+				"year_start_date": "{0}-01-01".format(year),
+				"year_end_date": "{0}-12-31".format(year)
+			}).insert()
+		except frappe.DuplicateEntryError:
+			pass
+
+	# set the last fiscal year (current year) as default
+	fiscal_year.set_as_default()
+
+def setup_holiday_list():
+	"""Setup Holiday List for the current year"""
+	year = now_datetime().year
+	holiday_list = frappe.get_doc({
+		"doctype": "Holiday List",
+		"holiday_list_name": str(year),
+		"from_date": "{0}-01-01".format(year),
+		"to_date": "{0}-12-31".format(year),
+	})
+	holiday_list.insert()
+	holiday_list.weekly_off = "Saturday"
+	holiday_list.get_weekly_off_dates()
+	holiday_list.weekly_off = "Sunday"
+	holiday_list.get_weekly_off_dates()
+	holiday_list.save()
+
+	frappe.set_value("Company", erpnext.get_default_company(), "default_holiday_list", holiday_list.name)
+
+def setup_customer():
+	customers = [u'Asian Junction', u'Life Plan Counselling', u'Two Pesos', u'Mr Fables', u'Intelacard', u'Big D Supermarkets', u'Adaptas', u'Nelson Brothers', u'Landskip Yard Care', u'Buttrey Food & Drug', u'Fayva', u'Asian Fusion', u'Crafts Canada', u'Consumers and Consumers Express', u'Netobill', u'Choices', u'Chi-Chis', u'Red Food', u'Endicott Shoes', u'Hind Enterprises']
+	for c in customers:
+		frappe.get_doc({
+			"doctype": "Customer",
+			"customer_name": c,
+			"customer_group": "Commercial",
+			"customer_type": random.choice(["Company", "Individual"]),
+			"territory": "Rest Of The World"
+		}).insert()
+
+def setup_supplier():
+	suppliers = [u'Helios Air', u'Ks Merchandise', u'HomeBase', u'Scott Ties', u'Reliable Investments', u'Nan Duskin', u'Rainbow Records', u'New World Realty', u'Asiatic Solutions', u'Eagle Hardware', u'Modern Electricals']
+	for s in suppliers:
+		frappe.get_doc({
+			"doctype": "Supplier",
+			"supplier_name": s,
+			"supplier_type": random.choice(["Services", "Raw Material"]),
+		}).insert()
+
+def setup_workstation():
+	workstations = [u'Drilling Machine 1', u'Lathe 1', u'Assembly Station 1', u'Assembly Station 2', u'Packing and Testing Station']
+	for w in workstations:
+		frappe.get_doc({
+			"doctype": "Workstation",
+			"workstation_name": w,
+			"holiday_list": frappe.get_all("Holiday List")[0].name,
+			"hour_rate_consumable": int(random.random() * 20),
+			"hour_rate_electricity": int(random.random() * 10),
+			"hour_rate_labour": int(random.random() * 40),
+			"hour_rate_rent": int(random.random() * 10),
+			"working_hours": [
+				{
+					"enabled": 1,
+				    "start_time": "8:00:00",
+					"end_time": "15:00:00"
+				}
+			]
+		}).insert()
+
+def show_item_groups_in_website():
+	"""set show_in_website=1 for Item Groups"""
+	products = frappe.get_doc("Item Group", "Products")
+	products.show_in_website = 1
+	products.route = 'products'
+	products.save()
+
+def setup_item():
+	items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item.json')).read())
+	for i in items:
+		item = frappe.new_doc('Item')
+		item.update(i)
+		item.min_order_qty = random.randint(10, 30)
+		item.default_warehouse = frappe.get_all('Warehouse', filters={'warehouse_name': item.default_warehouse}, limit=1)[0].name
+		item.insert()
+
+def setup_warehouse():
+	w = frappe.new_doc('Warehouse')
+	w.warehouse_name = 'Supplier'
+	w.insert()
+
+def setup_asset():
+	assets = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'asset.json')).read())
+	for d in assets:
+		asset = frappe.new_doc('Asset')
+		asset.update(d)
+		asset.purchase_date = add_days(nowdate(), -random.randint(20, 1500))
+		asset.next_depreciation_date = add_days(asset.purchase_date, 30)
+		asset.warehouse = "Stores - WPL"
+		asset.set_missing_values()
+		asset.make_depreciation_schedule()
+		asset.flags.ignore_validate = True
+		asset.save()
+		asset.submit()
+
+def setup_currency_exchange():
+	frappe.get_doc({
+		'doctype': 'Currency Exchange',
+		'from_currency': 'EUR',
+		'to_currency': 'USD',
+		'exchange_rate': 1.13
+	}).insert()
+
+	frappe.get_doc({
+		'doctype': 'Currency Exchange',
+		'from_currency': 'CNY',
+		'to_currency': 'USD',
+		'exchange_rate': 0.16
+	}).insert()
+
+def setup_product_bundle():
+	frappe.get_doc({
+		'doctype': 'Product Bundle',
+		'new_item_code': 'Wind Mill A Series with Spare Bearing',
+		'items': [
+			{'item_code': 'Wind Mill A Series', 'qty': 1},
+			{'item_code': 'Bearing Collar', 'qty': 1},
+			{'item_code': 'Bearing Assembly', 'qty': 1},
+		]
+	}).insert()
+
+def setup_user():
+	frappe.db.sql('delete from tabUser where name not in ("Guest", "Administrator")')
+	for u in json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'user.json')).read()):
+		user = frappe.new_doc("User")
+		user.update(u)
+		user.flags.no_welcome_mail
+		user.password = 'demo'
+		user.insert()
+
+def import_json(doctype, submit=False, values=None):
+	frappe.flags.in_import = True
+	data = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data',
+		frappe.scrub(doctype) + '.json')).read())
+	for d in data:
+		doc = frappe.new_doc(doctype)
+		doc.update(d)
+		doc.insert()
+		if submit:
+			doc.submit()
+
+	frappe.db.commit()
+
+def setup_employee():
+	frappe.db.set_value("HR Settings", None, "emp_created_by", "Naming Series")
+	frappe.db.commit()
+
+	import_json('Employee')
+
+def setup_item_price():
+	frappe.db.sql("delete from `tabItem Price`")
+
+	standard_selling = {
+		"Base Bearing Plate": 28,
+		"Base Plate": 21,
+		"Bearing Assembly": 300,
+		"Bearing Block": 14,
+		"Bearing Collar": 103.6,
+		"Bearing Pipe": 63,
+		"Blade Rib": 46.2,
+		"Disc Collars": 42,
+		"External Disc": 56,
+		"Internal Disc": 70,
+		"Shaft": 340,
+		"Stand": 400,
+		"Upper Bearing Plate": 300,
+		"Wind Mill A Series": 320,
+		"Wind Mill A Series with Spare Bearing": 750,
+		"Wind MIll C Series": 400,
+		"Wind Turbine": 400,
+		"Wing Sheet": 30.8
+	}
+
+	standard_buying = {
+		"Base Bearing Plate": 20,
+		"Base Plate": 28,
+		"Base Plate Un Painted": 16,
+		"Bearing Block": 13,
+		"Bearing Collar": 96.4,
+		"Bearing Pipe": 55,
+		"Blade Rib": 38,
+		"Disc Collars": 34,
+		"External Disc": 50,
+		"Internal Disc": 60,
+		"Shaft": 250,
+		"Stand": 300,
+		"Upper Bearing Plate": 200,
+		"Wing Sheet": 25
+	}
+
+	for price_list in ("standard_buying", "standard_selling"):
+		for item, rate in locals().get(price_list).iteritems():
+			frappe.get_doc({
+				"doctype": "Item Price",
+				"price_list": price_list.replace("_", " ").title(),
+				"item_code": item,
+				"selling": 1 if price_list=="standard_selling" else 0,
+				"buying": 1 if price_list=="standard_buying" else 0,
+				"price_list_rate": rate,
+				"currency": "USD"
+			}).insert()
+
+def setup_salary_structure():
+	f = frappe.get_doc('Fiscal Year', frappe.defaults.get_global_default('fiscal_year'))
+
+	for e in frappe.get_all('Employee', fields=['name', 'date_of_joining']):
+		ss = frappe.new_doc('Salary Structure')
+		ss.employee = e.name
+
+		if not e.date_of_joining:
+			continue
+
+		ss.from_date = e.date_of_joining if (e.date_of_joining
+			and e.date_of_joining > f.year_start_date) else f.year_start_date
+		ss.to_date = f.year_end_date
+		ss.append('earnings', {
+			'salary_component': 'Basic',
+			'amount': random.random() * 10000
+		})
+		ss.append('deductions', {
+			'salary_component': 'Income Tax',
+			'amount': random.random() * 1000
+		})
+
+		ss.insert()
+
+def setup_salary_structure_for_timesheet():
+	for e in frappe.get_all('Salary Structure', fields=['name'], filters={'is_active': 'Yes'}, limit=2):
+		ss_doc = frappe.get_doc("Salary Structure", e.name)
+		ss_doc.salary_slip_based_on_timesheet = 1
+		ss_doc.salary_component = 'Basic'
+		ss_doc.hour_rate = flt(random.random() * 10, 2)
+		ss_doc.save(ignore_permissions=True)
+
+def setup_account():
+	frappe.flags.in_import = True
+	data = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data',
+		'account.json')).read())
+	for d in data:
+		doc = frappe.new_doc('Account')
+		doc.update(d)
+		doc.parent_account = frappe.db.get_value('Account', {'account_name': doc.parent_account})
+		doc.insert()
+
+def setup_account_to_expense_type():
+	expense_types = [{'name': _('Calls'), "account": "Sales Expenses - WPL"},
+		{'name': _('Food'), "account": "Entertainment Expenses - WPL"},
+		{'name': _('Medical'), "account": "Utility Expenses - WPL"},
+		{'name': _('Others'), "account": "Miscellaneous Expenses - WPL"},
+		{'name': _('Travel'), "account": "Travel Expenses - WPL"}]
+
+	for expense_type in expense_types:
+		doc = frappe.get_doc("Expense Claim Type", expense_type["name"])
+		doc.append("accounts", {
+			"company" : erpnext.get_default_company(),
+			"default_account" : expense_type["account"]
+		})
+		doc.save(ignore_permissions=True)
+
+def setup_budget():
+	fiscal_years = frappe.get_all("Fiscal Year", order_by="year_start_date")[-2:]
+
+	for fy in fiscal_years:
+		budget = frappe.new_doc("Budget")
+		budget.cost_center = get_random("Cost Center")
+		budget.fiscal_year = fy.name
+		budget.action_if_annual_budget_exceeded = "Warn"
+		expense_ledger_count = frappe.db.count("Account", {"is_group": "0", "root_type": "Expense"})
+
+		add_random_children(budget, "accounts", rows=random.randint(10, expense_ledger_count), randomize = { 			"account": ("Account", {"is_group": "0", "root_type": "Expense"})
+		}, unique="account")
+
+		for d in budget.accounts:
+			d.budget_amount = random.randint(5, 100) * 10000
+
+		budget.save()
+		budget.submit()
+
+
+def setup_user_roles():
+	if not frappe.db.get_global('demo_hr_user'):
+		user = frappe.get_doc('User', 'CharmaineGaudreau@example.com')
+		user.add_roles('HR User', 'HR Manager', 'Accounts User')
+		frappe.db.set_global('demo_hr_user', user.name)
+
+	if not frappe.db.get_global('demo_sales_user_1'):
+		user = frappe.get_doc('User', 'VakhitaRyzaev@example.com')
+		user.add_roles('Sales User')
+		frappe.db.set_global('demo_sales_user_1', user.name)
+
+	if not frappe.db.get_global('demo_sales_user_2'):
+		user = frappe.get_doc('User', 'GabrielleLoftus@example.com')
+		user.add_roles('Sales User', 'Sales Manager', 'Accounts User')
+		frappe.db.set_global('demo_sales_user_2', user.name)
+
+	if not frappe.db.get_global('demo_purchase_user'):
+		user = frappe.get_doc('User', 'MichalSobczak@example.com')
+		user.add_roles('Purchase User', 'Purchase Manager', 'Accounts User', 'Stock User')
+		frappe.db.set_global('demo_purchase_user', user.name)
+
+	if not frappe.db.get_global('demo_manufacturing_user'):
+		user = frappe.get_doc('User', 'NuranVerkleij@example.com')
+		user.add_roles('Manufacturing User', 'Stock User', 'Purchase User', 'Accounts User')
+		frappe.db.set_global('demo_manufacturing_user', user.name)
+
+	if not frappe.db.get_global('demo_stock_user'):
+		user = frappe.get_doc('User', 'HatsueKashiwagi@example.com')
+		user.add_roles('Manufacturing User', 'Stock User', 'Purchase User', 'Accounts User')
+		frappe.db.set_global('demo_stock_user', user.name)
+
+	if not frappe.db.get_global('demo_accounts_user'):
+		user = frappe.get_doc('User', 'LeonAbdulov@example.com')
+		user.add_roles('Accounts User', 'Accounts Manager', 'Sales User', 'Purchase User')
+		frappe.db.set_global('demo_accounts_user', user.name)
+
+	if not frappe.db.get_global('demo_projects_user'):
+		user = frappe.get_doc('User', 'panca@example.com')
+		user.add_roles('HR User', 'Projects User')
+		frappe.db.set_global('demo_projects_user', user.name)
+
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/demo/user/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/demo/user/__init__.py
diff --git a/erpnext/demo/user/accounts.py b/erpnext/demo/user/accounts.py
new file mode 100644
index 0000000..e7dceb3
--- /dev/null
+++ b/erpnext/demo/user/accounts.py
@@ -0,0 +1,72 @@
+
+# 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
+import random
+from frappe.utils import random_string
+from frappe.desk import query_report
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry_against_invoice
+from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_accounts_user'))
+
+	if random.random() <= 0.6:
+		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
+		report = "Ordered Items to be Billed"
+		for so in list(set([r[0] for r in query_report.run(report)["result"]
+				if r[0]!="Total"]))[:random.randint(1, 5)]:
+			si = frappe.get_doc(make_sales_invoice(so))
+			si.posting_date = frappe.flags.current_date
+			for d in si.get("items"):
+				if not d.income_account:
+					d.income_account = "Sales - {}".format(frappe.db.get_value('Company', si.company, 'abbr'))
+			si.insert()
+			si.submit()
+			frappe.db.commit()
+
+	if random.random() <= 0.6:
+		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
+		report = "Received Items to be Billed"
+		for pr in list(set([r[0] for r in query_report.run(report)["result"]
+			if r[0]!="Total"]))[:random.randint(1, 5)]:
+			pi = frappe.get_doc(make_purchase_invoice(pr))
+			pi.posting_date = frappe.flags.current_date
+			pi.bill_no = random_string(6)
+			pi.insert()
+			pi.submit()
+			frappe.db.commit()
+
+	if random.random() < 0.5:
+		make_payment_entries("Sales Invoice", "Accounts Receivable")
+
+	if random.random() < 0.5:
+		make_payment_entries("Purchase Invoice", "Accounts Payable")
+
+def make_payment_entries(ref_doctype, report):
+	outstanding_invoices = list(set([r[3] for r in query_report.run(report, 
+	{"report_date": frappe.flags.current_date })["result"] if r[2]==ref_doctype]))
+	
+	# make Payment Entry
+	for inv in outstanding_invoices[:random.randint(1, 2)]:
+		pe = get_payment_entry(ref_doctype, inv)
+		pe.posting_date = frappe.flags.current_date
+		pe.reference_no = random_string(6)
+		pe.reference_date = frappe.flags.current_date
+		pe.insert()
+		pe.submit()
+		frappe.db.commit()
+		outstanding_invoices.remove(inv)
+		
+	# make payment via JV
+	for inv in outstanding_invoices[:1]:
+		jv = frappe.get_doc(get_payment_entry_against_invoice(ref_doctype, inv))
+		jv.posting_date = frappe.flags.current_date
+		jv.cheque_no = random_string(6)
+		jv.cheque_date = frappe.flags.current_date
+		jv.insert()
+		jv.submit()
+		frappe.db.commit()		
\ No newline at end of file
diff --git a/erpnext/demo/user/fixed_asset.py b/erpnext/demo/user/fixed_asset.py
new file mode 100644
index 0000000..bf3199e
--- /dev/null
+++ b/erpnext/demo/user/fixed_asset.py
@@ -0,0 +1,59 @@
+
+# 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.make_random import get_random
+from erpnext.accounts.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
+from erpnext.accounts.doctype.asset.depreciation import post_depreciation_entries, scrap_asset
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_accounts_user'))
+
+	asset_list = make_asset_purchase_entry()
+
+	if not asset_list:
+		# fixed_asset.work() already run
+		return
+		
+	# post depreciation entries as on today
+	post_depreciation_entries()
+	
+	# scrap a random asset
+	frappe.db.set_value("Company", "Wind Power LLC", "disposal_account", "Gain/Loss on Asset Disposal - WPL")
+	
+	asset = get_random_asset()
+	scrap_asset(asset.name)
+	
+	# Sell a random asset
+	sell_an_asset()	
+
+def make_asset_purchase_entry():
+	asset_list = frappe.get_all("Asset", filters={"purchase_invoice": ["in", ("", None)]}, 
+		fields=["name", "item_code", "gross_purchase_amount", "company", "purchase_date"])
+				
+	# make purchase invoice
+	for asset in asset_list:
+		pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount, 
+			asset.company, asset.purchase_date)
+		pi.supplier = get_random("Supplier")
+		pi.save()
+		pi.submit()
+		
+	return asset_list
+
+def sell_an_asset():
+	asset = get_random_asset()
+	si = make_sales_invoice(asset.name, asset.item_code, "Wind Power LLC")
+	si.customer = get_random("Customer")
+	si.get("items")[0].rate = asset.value_after_depreciation * 0.8 \
+		if asset.value_after_depreciation else asset.gross_purchase_amount * 0.9
+	si.save()
+	si.submit()
+	
+def get_random_asset():
+	return frappe.db.sql(""" select name, item_code, value_after_depreciation, gross_purchase_amount
+		from `tabAsset` 
+		where docstatus=1 and status not in ("Scrapped", "Sold") order by rand() limit 1""", as_dict=1)[0]
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
new file mode 100644
index 0000000..219fa20
--- /dev/null
+++ b/erpnext/demo/user/hr.py
@@ -0,0 +1,123 @@
+from __future__ import unicode_literals
+import frappe
+import random
+from frappe.utils import random_string
+from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
+from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
+from frappe.utils.make_random import how_many, get_random
+from erpnext.hr.doctype.expense_claim.expense_claim import get_expense_approver, make_bank_entry
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_hr_user'))
+	year, month = frappe.flags.current_date.strftime("%Y-%m").split("-")
+
+	# process payroll
+	if not frappe.db.get_value("Salary Slip", {"month": month, "fiscal_year": year}):
+		process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
+		process_payroll.company = frappe.flags.company
+		process_payroll.month = month
+		process_payroll.fiscal_year = year
+		process_payroll.create_sal_slip()
+		process_payroll.submit_salary_slip()
+		r = process_payroll.make_journal_entry(frappe.get_value('Account',
+			{'account_name': 'Salary'}))
+
+		journal_entry = frappe.get_doc(r)
+		journal_entry.cheque_no = random_string(10)
+		journal_entry.cheque_date = frappe.flags.current_date
+		journal_entry.posting_date = frappe.flags.current_date
+		journal_entry.insert()
+		journal_entry.submit()
+	
+	if frappe.db.get_global('demo_hr_user'):
+		make_timesheet_records()
+	
+		#expense claim
+		expense_claim = frappe.new_doc("Expense Claim")
+		expense_claim.extend('expenses', get_expenses())
+		expense_claim.employee = get_random("Employee")
+		expense_claim.company = frappe.flags.company
+		expense_claim.posting_date = frappe.flags.current_date
+		expense_claim.exp_approver = filter((lambda x: x[0] != 'Administrator'), get_expense_approver(None, '', None, 0, 20, None))[0][0]
+		expense_claim.insert()
+
+		rand = random.random()
+
+		if rand < 0.4:
+			expense_claim.approval_status = "Approved"
+			update_sanctioned_amount(expense_claim)
+			expense_claim.submit()
+
+			if random.randint(0, 1):
+				#make journal entry against expense claim
+				je = frappe.get_doc(make_bank_entry(expense_claim.name))
+				je.posting_date = frappe.flags.current_date
+				je.cheque_no = random_string(10)
+				je.cheque_date = frappe.flags.current_date
+				je.flags.ignore_permissions = 1
+				je.submit()
+
+		elif rand < 0.2:
+			expense_claim.approval_status = "Rejected"
+			expense_claim.submit()
+
+def get_expenses():
+	expenses = []
+	expese_types = frappe.db.sql("""select ect.name, eca.default_account from `tabExpense Claim Type` ect,
+		`tabExpense Claim Account` eca where eca.parent=ect.name
+		and eca.company=%s """, frappe.flags.company,as_dict=1)
+
+	for expense_type in expese_types[:random.randint(1,4)]:
+		claim_amount = random.randint(1,20)*10
+
+		expenses.append({
+			"expense_date": frappe.flags.current_date,
+			"expense_type": expense_type.name,
+			"default_account": expense_type.default_account or "Miscellaneous Expenses - WPL",
+			"claim_amount": claim_amount,
+			"sanctioned_amount": claim_amount
+		})
+
+	return expenses
+
+def update_sanctioned_amount(expense_claim):
+	for expense in expense_claim.expenses:
+		sanctioned_amount = random.randint(1,20)*10
+
+		if sanctioned_amount < expense.claim_amount:
+			expense.sanctioned_amount = sanctioned_amount
+
+def get_timesheet_based_salary_slip_employee():
+	return frappe.get_all('Salary Structure', fields = ["distinct employee as name"],
+		filters = {'salary_slip_based_on_timesheet': 1})
+	
+def make_timesheet_records():
+	employees = get_timesheet_based_salary_slip_employee()
+	for employee in employees:
+		ts = make_timesheet(employee.name, simulate = True, billable = 1, activity_type=get_random("Activity Type"))
+
+		rand = random.random()
+		if rand >= 0.3:
+			make_salary_slip_for_timesheet(ts.name)
+
+		rand = random.random()
+		if rand >= 0.2:
+			make_sales_invoice_for_timesheet(ts.name)
+
+def make_salary_slip_for_timesheet(name):
+	salary_slip = make_salary_slip(name)
+	salary_slip.insert()
+	salary_slip.submit()
+
+def make_sales_invoice_for_timesheet(name):
+	sales_invoice = make_sales_invoice(name)
+	sales_invoice.customer = get_random("Customer")
+	sales_invoice.append('items', {
+		'item_code': get_random("Item", {"has_variants": 0, "is_stock_item": 0, "is_fixed_asset": 0}),
+		'qty': 1,
+		'rate': 1000
+	})
+	sales_invoice.set_missing_values()
+	sales_invoice.calculate_taxes_and_totals()
+	sales_invoice.insert()
+	sales_invoice.submit()
\ No newline at end of file
diff --git a/erpnext/demo/user/manufacturing.py b/erpnext/demo/user/manufacturing.py
new file mode 100644
index 0000000..80d140a
--- /dev/null
+++ b/erpnext/demo/user/manufacturing.py
@@ -0,0 +1,88 @@
+# 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, random, erpnext
+from frappe.utils.make_random import how_many
+from frappe.desk import query_report
+from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError
+from erpnext.manufacturing.doctype.production_order.test_production_order import make_prod_order_test_record
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_manufacturing_user'))
+
+	from erpnext.projects.doctype.timesheet.timesheet import OverlapError
+
+	ppt = frappe.get_doc("Production Planning Tool", "Production Planning Tool")
+	ppt.company = erpnext.get_default_company()
+	ppt.use_multi_level_bom = 1
+	ppt.get_items_from = "Sales Order"
+	ppt.purchase_request_for_warehouse = "Stores - WPL"
+	ppt.run_method("get_open_sales_orders")
+	ppt.run_method("get_items")
+	ppt.run_method("raise_production_orders")
+	ppt.run_method("raise_material_requests")
+	frappe.db.commit()
+
+	# submit production orders
+	for pro in frappe.db.get_values("Production Order", {"docstatus": 0}, "name"):
+		b = frappe.get_doc("Production Order", pro[0])
+		b.wip_warehouse = "Work in Progress - WPL"
+		b.submit()
+		frappe.db.commit()
+
+	# submit material requests
+	for pro in frappe.db.get_values("Material Request", {"docstatus": 0}, "name"):
+		b = frappe.get_doc("Material Request", pro[0])
+		b.submit()
+		frappe.db.commit()
+
+	# stores -> wip
+	if random.random() < 0.3:
+		for pro in query_report.run("Open Production Orders")["result"][:how_many("Stock Entry for WIP")]:
+			make_stock_entry_from_pro(pro[0], "Material Transfer for Manufacture")
+
+	# wip -> fg
+	if random.random() < 0.3:
+		for pro in query_report.run("Production Orders in Progress")["result"][:how_many("Stock Entry for FG")]:
+			make_stock_entry_from_pro(pro[0], "Manufacture")
+
+	for bom in frappe.get_all('BOM', fields=['item'], filters = {'with_operations': 1}):
+		pro_order = make_prod_order_test_record(item=bom.item, qty=2,
+			source_warehouse="Stores - WPL", wip_warehouse = "Work in Progress - WPL",
+			fg_warehouse = "Stores - WPL", company = erpnext.get_default_company(),
+			stock_uom = frappe.db.get_value('Item', bom.item, 'stock_uom'),
+			planned_start_date = frappe.flags.current_date)
+
+	# submit time logs
+	for timesheet in frappe.get_all("Timesheet", ["name"], {"docstatus": 0,
+		"production_order": ("!=", ""), "to_time": ("<", frappe.flags.current_date)}):
+		timesheet = frappe.get_doc("Timesheet", timesheet.name)
+		try:
+			timesheet.submit()
+			frappe.db.commit()
+		except OverlapError:
+			pass
+		except WorkstationHolidayError:
+			pass
+
+def make_stock_entry_from_pro(pro_id, purpose):
+	from erpnext.manufacturing.doctype.production_order.production_order import make_stock_entry
+	from erpnext.stock.stock_ledger import NegativeStockError
+	from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, \
+		DuplicateEntryForProductionOrderError, OperationsNotCompleteError
+
+	try:
+		st = frappe.get_doc(make_stock_entry(pro_id, purpose))
+		st.posting_date = frappe.flags.current_date
+		st.fiscal_year = str(frappe.flags.current_date.year)
+		for d in st.get("items"):
+			d.cost_center = "Main - " + frappe.db.get_value('Company', st.company, 'abbr')
+		st.insert()
+		frappe.db.commit()
+		st.submit()
+		frappe.db.commit()
+	except (NegativeStockError, IncorrectValuationRateError, DuplicateEntryForProductionOrderError,
+		OperationsNotCompleteError):
+		frappe.db.rollback()
diff --git a/erpnext/demo/user/projects.py b/erpnext/demo/user/projects.py
new file mode 100644
index 0000000..12fad29
--- /dev/null
+++ b/erpnext/demo/user/projects.py
@@ -0,0 +1,95 @@
+# 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.make_random import can_make
+from frappe.utils.make_random import how_many, get_random
+from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
+
+def run_projects(current_date):
+	frappe.set_user(frappe.db.get_global('demo_projects_user'))
+	if frappe.db.get_global('demo_projects_user'):
+		make_project(current_date)
+		make_timesheet_for_projects(current_date)
+		close_tasks(current_date)
+
+def make_timesheet_for_projects(current_date	):
+	for data in frappe.get_all("Task", ["name", "project"], {"status": "Open", "exp_end_date": ("<", current_date)}):
+		employee = get_random("Employee")
+		if frappe.db.get_value('Salary Structure', {'employee': employee}, 'salary_slip_based_on_timesheet'):
+			make_timesheet(employee, simulate = True, billable = 1, 
+				activity_type=get_random("Activity Type"), project=data.project, task =data.name)
+
+def close_tasks(current_date):
+	for task in frappe.get_all("Task", ["name"], {"status": "Open", "exp_end_date": ("<", current_date)}):
+		task = frappe.get_doc("Task", task.name)
+		task.status = "Closed"
+		task.save()
+
+def make_project(current_date):
+	if not frappe.db.exists('Project', 
+		"New Product Development " + current_date.strftime("%Y-%m-%d")):
+		project = frappe.get_doc({
+			"doctype": "Project",
+			"project_name": "New Product Development " + current_date.strftime("%Y-%m-%d"),
+		})
+		project.set("tasks", [
+				{
+					"title": "Review Requirements",
+					"start_date": frappe.utils.add_days(current_date, 10),
+					"end_date": frappe.utils.add_days(current_date, 11)
+				},
+				{
+					"title": "Design Options",
+					"start_date": frappe.utils.add_days(current_date, 11),
+					"end_date": frappe.utils.add_days(current_date, 20)
+				},
+				{
+					"title": "Make Prototypes",
+					"start_date": frappe.utils.add_days(current_date, 20),
+					"end_date": frappe.utils.add_days(current_date, 30)
+				},
+				{
+					"title": "Customer Feedback on Prototypes",
+					"start_date": frappe.utils.add_days(current_date, 30),
+					"end_date": frappe.utils.add_days(current_date, 40)
+				},
+				{
+					"title": "Freeze Feature Set",
+					"start_date": frappe.utils.add_days(current_date, 40),
+					"end_date": frappe.utils.add_days(current_date, 45)
+				},
+				{
+					"title": "Testing",
+					"start_date": frappe.utils.add_days(current_date, 45),
+					"end_date": frappe.utils.add_days(current_date, 60)
+				},
+				{
+					"title": "Product Engineering",
+					"start_date": frappe.utils.add_days(current_date, 45),
+					"end_date": frappe.utils.add_days(current_date, 55)
+				},
+				{
+					"title": "Supplier Contracts",
+					"start_date": frappe.utils.add_days(current_date, 55),
+					"end_date": frappe.utils.add_days(current_date, 70)
+				},
+				{
+					"title": "Design and Build Fixtures",
+					"start_date": frappe.utils.add_days(current_date, 45),
+					"end_date": frappe.utils.add_days(current_date, 65)
+				},
+				{
+					"title": "Test Run",
+					"start_date": frappe.utils.add_days(current_date, 70),
+					"end_date": frappe.utils.add_days(current_date, 80)
+				},
+				{
+					"title": "Launch",
+					"start_date": frappe.utils.add_days(current_date, 80),
+					"end_date": frappe.utils.add_days(current_date, 90)
+				},
+			])
+		project.insert()
diff --git a/erpnext/demo/user/purchase.py b/erpnext/demo/user/purchase.py
new file mode 100644
index 0000000..6f06f26
--- /dev/null
+++ b/erpnext/demo/user/purchase.py
@@ -0,0 +1,157 @@
+# 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, random
+from frappe.utils.make_random import how_many, get_random
+from frappe.desk import query_report
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.accounts.party import get_party_account_currency
+from erpnext.exceptions import InvalidCurrency
+from erpnext.stock.doctype.material_request.material_request import make_request_for_quotation
+from erpnext.buying.doctype.request_for_quotation.request_for_quotation import \
+			 make_supplier_quotation as make_quotation_from_rfq
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_purchase_user'))
+
+	if random.random() < 0.3:
+		report = "Items To Be Requested"
+		for row in query_report.run(report)["result"][:random.randint(1, 5)]:
+			item_code, qty = row[0], abs(row[-1])
+
+			mr = make_material_request(item_code, qty)
+
+	if random.random() < 0.3:
+		for mr in frappe.get_all('Material Request',
+			filters={'material_request_type': 'Purchase', 'status': 'Open'},
+			limit=random.randint(1,6)):
+			print mr.name
+			if not frappe.get_all('Request for Quotation',
+				filters={'material_request': mr.name}, limit=1):
+				rfq = make_request_for_quotation(mr.name)
+				rfq.transaction_date = frappe.flags.current_date
+				add_suppliers(rfq)
+				rfq.save()
+				rfq.submit()
+
+	# Make suppier quotation from RFQ against each supplier.
+	if random.random() < 0.3:
+		for rfq in frappe.get_all('Request for Quotation',
+			filters={'status': 'Open'}, limit=random.randint(1, 6)):
+			if not frappe.get_all('Supplier Quotation',
+				filters={'request_for_quotation': rfq.name}, limit=1):
+				rfq = frappe.get_doc('Request for Quotation', rfq.name)
+
+				for supplier in rfq.suppliers:
+					supplier_quotation = make_quotation_from_rfq(rfq.name, supplier.supplier)
+					supplier_quotation.save()
+					supplier_quotation.submit()
+
+	# get supplier details
+	supplier = get_random("Supplier")
+
+	company_currency = frappe.db.get_value("Company", "Wind Power LLC", "default_currency")
+	party_account_currency = get_party_account_currency("Supplier", supplier, "Wind Power LLC")
+	if company_currency == party_account_currency:
+		exchange_rate = 1
+	else:
+		exchange_rate = get_exchange_rate(party_account_currency, company_currency)
+
+	# make supplier quotations
+	if random.random() < 0.2:
+		from erpnext.stock.doctype.material_request.material_request import make_supplier_quotation
+
+		report = "Material Requests for which Supplier Quotations are not created"
+		for row in query_report.run(report)["result"][:random.randint(1, 3)]:
+			if row[0] != "'Total'":
+				sq = frappe.get_doc(make_supplier_quotation(row[0]))
+				sq.transaction_date = frappe.flags.current_date
+				sq.supplier = supplier
+				sq.currency = party_account_currency or company_currency
+				sq.conversion_rate = exchange_rate
+				sq.insert()
+				sq.submit()
+				frappe.db.commit()
+
+	# make purchase orders
+	if random.random() < 0.3:
+		from erpnext.stock.doctype.material_request.material_request import make_purchase_order
+		report = "Requested Items To Be Ordered"
+		for row in query_report.run(report)["result"][:how_many("Purchase Order")]:
+			if row[0] != "'Total'":
+				po = frappe.get_doc(make_purchase_order(row[0]))
+				po.supplier = supplier
+				po.currency = party_account_currency or company_currency
+				po.conversion_rate = exchange_rate
+				po.transaction_date = frappe.flags.current_date
+				po.insert()
+				po.submit()
+				frappe.db.commit()
+
+	if random.random() < 0.2:
+		make_subcontract()
+
+def make_material_request(item_code, qty):
+	mr = frappe.new_doc("Material Request")
+
+	variant_of = frappe.db.get_value('Item', item_code, 'variant_of') or item_code
+
+	if frappe.db.get_value('BOM', {'item': variant_of, 'is_default': 1, 'is_active': 1}):
+		mr.material_request_type = 'Manufacture'
+	else:
+		mr.material_request_type = "Purchase"
+
+	mr.transaction_date = frappe.flags.current_date
+
+	moq = frappe.db.get_value('Item', item_code, 'min_order_qty')
+
+	mr.append("items", {
+		"doctype": "Material Request Item",
+		"schedule_date": frappe.utils.add_days(mr.transaction_date, 7),
+		"item_code": item_code,
+		"qty": qty if qty > moq else moq
+	})
+	mr.insert()
+	mr.submit()
+	return mr
+
+def add_suppliers(rfq):
+	for i in xrange(2):
+		supplier = get_random("Supplier")
+		if supplier not in [d.supplier for d in rfq.get('suppliers')]:
+			rfq.append("suppliers", { "supplier": supplier })
+
+def make_subcontract():
+	from erpnext.buying.doctype.purchase_order.purchase_order import make_stock_entry
+
+	# make sub-contract PO
+	po = frappe.new_doc("Purchase Order")
+	po.is_subcontracted = "Yes"
+	po.supplier = get_random("Supplier")
+
+	item_code = get_random("Item", {"is_sub_contracted_item": 1})
+	moq = frappe.db.get_value('Item', item_code, 'min_order_qty')
+
+	po.append("items", {
+		"item_code": item_code,
+		"schedule_date": frappe.utils.add_days(frappe.flags.current_date, 7),
+		"qty": moq
+	})
+	po.set_missing_values()
+	try:
+		po.insert()
+	except InvalidCurrency:
+		return
+
+	po.submit()
+
+	# make material request for
+	make_material_request(po.items[0].item_code, po.items[0].qty)
+
+	# transfer material for sub-contract
+	stock_entry = frappe.get_doc(make_stock_entry(po.name, po.items[0].item_code))
+	stock_entry.from_warehouse = "Stores - WPL"
+	stock_entry.to_warehouse = "Supplier - WPL"
+	stock_entry.insert()
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
new file mode 100644
index 0000000..6b36b46
--- /dev/null
+++ b/erpnext/demo/user/sales.py
@@ -0,0 +1,109 @@
+# 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, random
+from frappe.utils.make_random import add_random_children, get_random
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.accounts.party import get_party_account_currency
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_sales_user_2'))
+	if random.random() < 0.5:
+		for i in xrange(random.randint(1,7)):
+			make_opportunity()
+
+	if random.random() < 0.5:
+		for i in xrange(random.randint(1,3)):
+			make_quotation()
+
+	# lost quotations / inquiries
+	if random.random() < 0.3:
+		for i in xrange(random.randint(1,3)):
+			quotation = get_random('Quotation', doc=True)
+			if quotation and quotation.status == 'Submitted':
+				quotation.declare_order_lost('Did not ask')
+
+		for i in xrange(random.randint(1,3)):
+			opportunity = get_random('Opportunity', doc=True)
+			if opportunity and opportunity.status in ('Open', 'Replied'):
+				opportunity.declare_enquiry_lost('Did not ask')
+
+	if random.random() < 0.3:
+		for i in xrange(random.randint(1,3)):
+			make_sales_order()
+
+def make_opportunity():
+	b = frappe.get_doc({
+		"doctype": "Opportunity",
+		"enquiry_from": "Customer",
+		"customer": get_random("Customer"),
+		"enquiry_type": "Sales",
+		"transaction_date": frappe.flags.current_date,
+	})
+
+	add_random_children(b, "items", rows=4, randomize = {
+		"qty": (1, 5),
+		"item_code": ("Item", {"has_variants": "0", "is_fixed_asset": 0})
+	}, unique="item_code")
+
+	b.insert()
+	frappe.db.commit()
+
+def make_quotation():
+	# get open opportunites
+	opportunity = get_random("Opportunity", {"status": "Open"})
+
+	if opportunity:
+		from erpnext.crm.doctype.opportunity.opportunity import make_quotation
+		qtn = frappe.get_doc(make_quotation(opportunity))
+		qtn.insert()
+		frappe.db.commit()
+		qtn.submit()
+		frappe.db.commit()
+	else:
+		# make new directly
+
+		# get customer, currency and exchange_rate
+		customer = get_random("Customer")
+
+		company_currency = frappe.db.get_value("Company", "Wind Power LLC", "default_currency")
+		party_account_currency = get_party_account_currency("Customer", customer, "Wind Power LLC")
+		if company_currency == party_account_currency:
+			exchange_rate = 1
+		else:
+			exchange_rate = get_exchange_rate(party_account_currency, company_currency)
+
+		qtn = frappe.get_doc({
+			"creation": frappe.flags.current_date,
+			"doctype": "Quotation",
+			"quotation_to": "Customer",
+			"customer": customer,
+			"currency": party_account_currency or company_currency,
+			"conversion_rate": exchange_rate,
+			"order_type": "Sales",
+			"transaction_date": frappe.flags.current_date,
+		})
+
+		add_random_children(qtn, "items", rows=3, randomize = {
+			"qty": (1, 5),
+			"item_code": ("Item", {"has_variants": "0", "is_fixed_asset": 0})
+		}, unique="item_code")
+
+		qtn.insert()
+		frappe.db.commit()
+		qtn.submit()
+		frappe.db.commit()
+
+def make_sales_order():
+	q = get_random("Quotation", {"status": "Submitted"})
+	if q:
+		from erpnext.selling.doctype.quotation.quotation import make_sales_order
+		so = frappe.get_doc(make_sales_order(q))
+		so.transaction_date = frappe.flags.current_date
+		so.delivery_date = frappe.utils.add_days(frappe.flags.current_date, 10)
+		so.insert()
+		frappe.db.commit()
+		so.submit()
+		frappe.db.commit()
diff --git a/erpnext/demo/user/stock.py b/erpnext/demo/user/stock.py
new file mode 100644
index 0000000..46657fd
--- /dev/null
+++ b/erpnext/demo/user/stock.py
@@ -0,0 +1,97 @@
+# 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, random
+from frappe.desk import query_report
+from erpnext.stock.stock_ledger import NegativeStockError
+from erpnext.stock.doctype.serial_no.serial_no import SerialNoRequiredError, SerialNoQtyError
+
+def work():
+	frappe.set_user(frappe.db.get_global('demo_manufacturing_user'))
+
+	make_purchase_receipt()
+	make_delivery_note()
+	make_stock_reconciliation()
+	submit_draft_stock_entries()
+
+def make_purchase_receipt():
+	if random.random() < 0.6:
+		from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
+		report = "Purchase Order Items To Be Received"
+		po_list =list(set([r[0] for r in query_report.run(report)["result"] if r[0]!="'Total'"]))[:random.randint(1, 10)]
+		for po in po_list:
+			pr = frappe.get_doc(make_purchase_receipt(po))
+
+			if pr.is_subcontracted=="Yes":
+				pr.supplier_warehouse = "Supplier - WPL"
+
+			pr.posting_date = frappe.flags.current_date
+			pr.insert()
+			try:
+				pr.submit()
+			except NegativeStockError:
+				pass
+			frappe.db.commit()
+
+def make_delivery_note():
+	# make purchase requests
+
+	# make delivery notes (if possible)
+	if random.random() < 0.3:
+		from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
+		report = "Ordered Items To Be Delivered"
+		for so in list(set([r[0] for r in query_report.run(report)["result"]
+			if r[0]!="'Total'"]))[:random.randint(1, 3)]:
+			dn = frappe.get_doc(make_delivery_note(so))
+			dn.posting_date = frappe.flags.current_date
+			for d in dn.get("items"):
+				if not d.expense_account:
+					d.expense_account = ("Cost of Goods Sold - {0}".format(
+						frappe.db.get_value('Company', dn.company, 'abbr')))
+			dn.insert()
+			try:
+				dn.submit()
+				frappe.db.commit()
+			except (NegativeStockError, SerialNoRequiredError, SerialNoQtyError):
+				frappe.db.rollback()
+
+def make_stock_reconciliation():
+	# random set some items as damaged
+	from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation \
+		import OpeningEntryAccountError, EmptyStockReconciliationItemsError
+
+	if random.random() < 0.1:
+		stock_reco = frappe.new_doc("Stock Reconciliation")
+		stock_reco.posting_date = frappe.flags.current_date
+		stock_reco.get_items_for("Stores - WP")
+		if stock_reco.items:
+			for item in stock_reco.items:
+				if item.qty:
+					item.qty = item.qty - round(random.randint(1, item.qty))
+			try:
+				stock_reco.insert()
+				stock_reco.submit()
+				frappe.db.commit()
+			except OpeningEntryAccountError:
+				frappe.db.rollback()
+			except EmptyStockReconciliationItemsError:
+				frappe.db.rollback()
+
+def submit_draft_stock_entries():
+	from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, \
+		DuplicateEntryForProductionOrderError, OperationsNotCompleteError
+
+	# try posting older drafts (if exists)
+	for st in frappe.db.get_values("Stock Entry", {"docstatus":0}, "name"):
+		try:
+			ste = frappe.get_doc("Stock Entry", st[0])
+			ste.posting_date = frappe.flags.current_date
+			ste.save()
+			ste.submit()
+			frappe.db.commit()
+		except (NegativeStockError, IncorrectValuationRateError, DuplicateEntryForProductionOrderError,
+			OperationsNotCompleteError):
+			frappe.db.rollback()
+
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/accounts/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/accounts/__init__.py
diff --git a/erpnext/docs/assets/img/accounts/asset-category.png b/erpnext/docs/assets/img/accounts/asset-category.png
new file mode 100644
index 0000000..87fc0c5
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-category.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-graph.png b/erpnext/docs/assets/img/accounts/asset-graph.png
new file mode 100644
index 0000000..5b300bb
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-graph.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-movement-using-button.png b/erpnext/docs/assets/img/accounts/asset-movement-using-button.png
new file mode 100644
index 0000000..b9ca68d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-movement-using-button.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-movement.png b/erpnext/docs/assets/img/accounts/asset-movement.png
new file mode 100644
index 0000000..39f7b34
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-movement.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-purchase-invoice.png b/erpnext/docs/assets/img/accounts/asset-purchase-invoice.png
new file mode 100644
index 0000000..a421bc9
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-purchase-invoice.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset-sales.png b/erpnext/docs/assets/img/accounts/asset-sales.png
new file mode 100644
index 0000000..329c0e2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset-sales.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/asset.png b/erpnext/docs/assets/img/accounts/asset.png
new file mode 100644
index 0000000..043c4d9
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/asset.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/budget-variance-report.png b/erpnext/docs/assets/img/accounts/budget-variance-report.png
new file mode 100644
index 0000000..c7c3677
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/budget-variance-report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/budget.png b/erpnext/docs/assets/img/accounts/budget.png
new file mode 100644
index 0000000..c488558
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/budget.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/depreciation-entry.png b/erpnext/docs/assets/img/accounts/depreciation-entry.png
new file mode 100644
index 0000000..e35180c
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/depreciation-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/depreciation-schedule.png b/erpnext/docs/assets/img/accounts/depreciation-schedule.png
new file mode 100644
index 0000000..400e4c8
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/depreciation-schedule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/monthly-distribution.png b/erpnext/docs/assets/img/accounts/monthly-distribution.png
new file mode 100644
index 0000000..0791c8b
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/monthly-distribution.png
Binary files differ
diff --git a/erpnext/projects/report/daily_time_log_summary/__init__.py b/erpnext/docs/assets/img/accounts/multi-currency/__init__.py
similarity index 100%
copy from erpnext/projects/report/daily_time_log_summary/__init__.py
copy to erpnext/docs/assets/img/accounts/multi-currency/__init__.py
diff --git a/erpnext/docs/assets/img/accounts/scrap-journal-entry.png b/erpnext/docs/assets/img/accounts/scrap-journal-entry.png
new file mode 100644
index 0000000..f4ba533
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/scrap-journal-entry.png
Binary files differ
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/articles/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/articles/__init__.py
diff --git a/erpnext/docs/assets/img/articles/attach_scanned_copy.png b/erpnext/docs/assets/img/articles/attach_scanned_copy.png
new file mode 100644
index 0000000..ab3f980
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/attach_scanned_copy.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/cheque_print.gif b/erpnext/docs/assets/img/articles/cheque_print.gif
new file mode 100644
index 0000000..1ebb586
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/cheque_print.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/create_print_format.png b/erpnext/docs/assets/img/articles/create_print_format.png
new file mode 100644
index 0000000..3919ef5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/create_print_format.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/cueque_print_preview.png b/erpnext/docs/assets/img/articles/cueque_print_preview.png
new file mode 100644
index 0000000..77261b0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/cueque_print_preview.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/cueque_print_template.png b/erpnext/docs/assets/img/articles/cueque_print_template.png
new file mode 100644
index 0000000..b4c5aa8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/cueque_print_template.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/journal_entry_cheque_print.png b/erpnext/docs/assets/img/articles/journal_entry_cheque_print.png
new file mode 100644
index 0000000..e8d0d46
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/journal_entry_cheque_print.png
Binary files differ
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/buying/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/buying/__init__.py
diff --git a/erpnext/docs/assets/img/buying/make-supplier-quotation-from-rfq.png b/erpnext/docs/assets/img/buying/make-supplier-quotation-from-rfq.png
new file mode 100644
index 0000000..5a189bf
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/make-supplier-quotation-from-rfq.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/request-for-quotation.gif b/erpnext/docs/assets/img/buying/request-for-quotation.gif
new file mode 100644
index 0000000..96c6917
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/request-for-quotation.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/request-for-quotation.png b/erpnext/docs/assets/img/buying/request-for-quotation.png
new file mode 100644
index 0000000..b8b1ec2
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/request-for-quotation.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/send-rfq-link.png b/erpnext/docs/assets/img/buying/send-rfq-link.png
new file mode 100644
index 0000000..835aca3
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/send-rfq-link.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/send-supplier-emails.png b/erpnext/docs/assets/img/buying/send-supplier-emails.png
new file mode 100644
index 0000000..e8cfadf
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/send-supplier-emails.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/set-email-id.png b/erpnext/docs/assets/img/buying/set-email-id.png
new file mode 100644
index 0000000..14974f2
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/set-email-id.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/supplier-password-update-link.png b/erpnext/docs/assets/img/buying/supplier-password-update-link.png
new file mode 100644
index 0000000..6fe13ca
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-password-update-link.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/supplier-portal-rfq.png b/erpnext/docs/assets/img/buying/supplier-portal-rfq.png
new file mode 100644
index 0000000..c271862
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-portal-rfq.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/supplier-quotation-from-rfq.png b/erpnext/docs/assets/img/buying/supplier-quotation-from-rfq.png
new file mode 100644
index 0000000..a57764e
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-quotation-from-rfq.png
Binary files differ
diff --git a/erpnext/docs/assets/img/buying/supplier-selection-from-rfq.png b/erpnext/docs/assets/img/buying/supplier-selection-from-rfq.png
new file mode 100644
index 0000000..e0c7819
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-selection-from-rfq.png
Binary files differ
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/crm/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/crm/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/customize/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/customize/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/human-resources/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/human-resources/__init__.py
diff --git a/erpnext/projects/doctype/time_log/__init__.py b/erpnext/docs/assets/img/manufacturing/__init__.py
similarity index 100%
copy from erpnext/projects/doctype/time_log/__init__.py
copy to erpnext/docs/assets/img/manufacturing/__init__.py
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/assets/img/multilingual_print_format/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/assets/img/multilingual_print_format/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/pos-setting/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/pos-setting/__init__.py
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/assets/img/price-list/__init__.py
similarity index 100%
rename from erpnext/crm/doctype/newsletter_list/__init__.py
rename to erpnext/docs/assets/img/price-list/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/project/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/project/__init__.py
diff --git a/erpnext/docs/assets/img/project/time_log_batch.gif b/erpnext/docs/assets/img/project/time_sheet.gif
similarity index 100%
rename from erpnext/docs/assets/img/project/time_log_batch.gif
rename to erpnext/docs/assets/img/project/time_sheet.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_sheet_make_invoice.png
similarity index 100%
rename from erpnext/docs/assets/img/project/time_log_batch_make_invoice.png
rename to erpnext/docs/assets/img/project/time_sheet_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_sheet_sales_invoice.png
similarity index 100%
rename from erpnext/docs/assets/img/project/time_log_batch_sales_invoice.png
rename to erpnext/docs/assets/img/project/time_sheet_sales_invoice.png
Binary files differ
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/selling/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/selling/__init__.py
diff --git a/erpnext/docs/assets/img/selling/margin-item-price-list.png b/erpnext/docs/assets/img/selling/margin-item-price-list.png
new file mode 100644
index 0000000..4961755
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/margin-item-price-list.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/margin-pricing-rule.png b/erpnext/docs/assets/img/selling/margin-pricing-rule.png
new file mode 100644
index 0000000..6dba884
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/margin-pricing-rule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/margin-quotation-item.png b/erpnext/docs/assets/img/selling/margin-quotation-item.png
new file mode 100644
index 0000000..d5ee8a3
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/margin-quotation-item.png
Binary files differ
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/setup-wizard/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/setup-wizard/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/setup/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/setup/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/setup/customize/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/setup/customize/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/setup/data-import/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/setup/data-import/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/setup/data/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/setup/data/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/setup/email/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/setup/email/__init__.py
diff --git a/erpnext/docs/assets/img/setup/email/email-alert-condition.png b/erpnext/docs/assets/img/setup/email/email-alert-condition.png
new file mode 100644
index 0000000..8ede011
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-alert-condition.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-alert-subject.png b/erpnext/docs/assets/img/setup/email/email-alert-subject.png
new file mode 100644
index 0000000..671de9b
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-alert-subject.png
Binary files differ
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/setup/print/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/setup/print/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/assets/img/setup/settings/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/assets/img/setup/settings/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/setup/users/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/setup/users/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/stock/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/stock/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/support/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/support/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/taxes/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/taxes/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/assets/img/users-and-permissions/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/assets/img/users-and-permissions/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/videos/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/videos/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/img/website/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/img/website/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/assets/old_images/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/assets/old_images/__init__.py
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/assets/old_images/erpnext/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/assets/old_images/erpnext/__init__.py
diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-1.png b/erpnext/docs/assets/old_images/erpnext/budgeting-1.png
deleted file mode 100644
index 29038a0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-1.png
+++ /dev/null
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
deleted file mode 100644
index 7cd431e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png
+++ /dev/null
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
deleted file mode 100644
index 29037c7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-3.png
+++ /dev/null
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
deleted file mode 100644
index 6348f1e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
index d1d8f6f..2d1e2a0 100644
--- a/erpnext/docs/current/models/stock/material_request_item.html
+++ b/erpnext/docs/current/models/stock/material_request_item.html
@@ -310,6 +310,27 @@
         
         <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>col_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -321,7 +342,7 @@
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>21</td>
             <td ><code>min_order_qty</code></td>
             <td >
                 Float</td>
@@ -333,7 +354,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>22</td>
             <td ><code>projected_qty</code></td>
             <td >
                 Float</td>
@@ -345,7 +366,7 @@
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>23</td>
             <td ><code>ordered_qty</code></td>
             <td >
                 Float</td>
@@ -357,7 +378,7 @@
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>24</td>
             <td ><code>page_break</code></td>
             <td >
                 Check</td>
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index b0310f6..6aa4e64 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -13,7 +13,7 @@
 
 <p>Version 3, 29 June 2007</p>
 
-<p>http://www.gnu.org/copyleft/gpl.html</p>
+<p><a href="http://www.gnu.org/copyleft/gpl.html" rel="nofollow">http://www.gnu.org/copyleft/gpl.html</a></p>
 
 <p>TERMS AND CONDITIONS
 0. Definitions.</p>
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/Beispiel/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/Beispiel/__init__.py
diff --git a/erpnext/docs/user/manual/de/Beispiel/Beispiel.md b/erpnext/docs/user/manual/de/Beispiel/index.md
similarity index 100%
rename from erpnext/docs/user/manual/de/Beispiel/Beispiel.md
rename to erpnext/docs/user/manual/de/Beispiel/index.md
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/CRM/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/CRM/__init__.py
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index e16504a..3ec4281 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -17,7 +17,7 @@
 
 Kontakte und Adressen werden in ERPNext getrennt gespeichert, damit Sie mehrere verschiedene Kontakte oder Adressen mit Kunden und Lieferanten verknüpfen können.
 
-Lesen Sie hierzu auch [Kontakt]({{docs_base_url}}/user/manual/en/crm/contact.html).
+Lesen Sie hierzu auch [Kontakt]({{docs_base_url}}/user/manual/de/CRM/contact.html).
 
 ### Einbindung in Konten
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/CRM/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/CRM/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/CRM/setup/campaign.md b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
index 9d070ff..c9b1ac8 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
@@ -5,7 +5,7 @@
 
 <img class="screenshot" alt="Kampagne" src="{{docs_base_url}}/assets/img/crm/campaign.png">
 
-Sie können in einer Kampagne [Leads]({{docs_base_url}}/user/manual/en/crm/lead.html), [Opportunities]({{docs_base_url}}/user/manual/en/crm/opportunity.html) und [Angebote]({{docs_base_url}}/user/manual/en/selling/quotation.html) nachverfolgen.
+Sie können in einer Kampagne [Leads]({{docs_base_url}}/user/manual/de/CRM/lead.html), [Opportunities]({{docs_base_url}}/user/manual/de/CRM/opportunity.html) und [Angebote]({{docs_base_url}}/user/manual/de/selling/quotation.html) nachverfolgen.
 
 ### Leads zu einer Kampagne nachverfolgen
 
diff --git a/erpnext/docs/user/manual/de/CRM/setup/index.md b/erpnext/docs/user/manual/de/CRM/setup/index.md
index 7a4110e..ebc9191 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/index.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/index.md
@@ -1,6 +1,6 @@
 # Einrichtung
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-Themen
+### Themen
 
 {index}
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/accounts/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/accounts/__init__.py
diff --git a/erpnext/docs/user/manual/de/accounts/index.md b/erpnext/docs/user/manual/de/accounts/index.md
index fedcd99..28c8a65 100644
--- a/erpnext/docs/user/manual/de/accounts/index.md
+++ b/erpnext/docs/user/manual/de/accounts/index.md
@@ -9,6 +9,6 @@
 * Eingangsrechnung: Rechnungen, die Sie von Ihren Lieferanten für deren Produkte oder Dienstleistungen erhalten.
 * Journalbuchungen / Buchungssätze: Für Buchungen wie Zahlung, Gutschrift und andere.
 
-#### Themen
+### Themen
 
 {index}
diff --git a/erpnext/docs/user/manual/de/accounts/making-payments.md b/erpnext/docs/user/manual/de/accounts/making-payments.md
index 550953d..0c2e041 100644
--- a/erpnext/docs/user/manual/de/accounts/making-payments.md
+++ b/erpnext/docs/user/manual/de/accounts/making-payments.md
@@ -3,13 +3,10 @@
 
 Zahlungen zu Ausgangs- oder Eingangsrechnungen können über die Schaltfläche "Zahlungsbuchung erstellen" zu übertragenen Rechnungen erfasst werden.
 
-1\. Aktualisieren Sie das Bankkonto (Sie können hier auch ein Standardkonto in den Unternehmensstammdaten einstellen).
-
-2\. Aktualiseren Sie das Veröffentlichungsdatum.
-
-3\. Geben Sie Schecknummer und Scheckdatum ein.
-
-4\. Speichern und Übertragen Sie.
+  1. Aktualisieren Sie das Bankkonto (Sie können hier auch ein Standardkonto in den Unternehmensstammdaten einstellen).
+  1. Aktualiseren Sie das Veröffentlichungsdatum.
+  1. Geben Sie Schecknummer und Scheckdatum ein.
+  1. Speichern und Übertragen Sie.
 
 <img class="screenshot" alt="Zahlungen durchführen" src="{{docs_base_url}}/assets/img/accounts/make-payment.png">
 
diff --git a/erpnext/docs/user/manual/de/accounts/opening-entry.md b/erpnext/docs/user/manual/de/accounts/opening-entry.md
index b3d7718..8195faf 100644
--- a/erpnext/docs/user/manual/de/accounts/opening-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/opening-entry.md
@@ -3,6 +3,6 @@
 
 Wenn Sie eine neue Firma erstellen, dann können Sie das ERPNext-Modul Rechnungswesen starten, indem Sie in den Kontenplan gehen.
 
-Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz]({{docs_base_url}}/user/manual/en/accounts/opening-accounts.html) nach.
+Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz]({{docs_base_url}}/user/manual/de/accounts/opening-accounts.html) nach.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md b/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
index 5cbc382..d64e272 100644
--- a/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
@@ -11,9 +11,8 @@
 
 In ERPNext können über den POS alle Verkaufs- und Einkaufstransaktionen, wie Ausgangsrechnung, Angebot, Kundenauftrag, Lieferantenauftrag, usw. bearbeitet werden. Über folgende zwei Schritte richten Sie den POS ein:
 
-1\. Aktivieren Sie die POS-Ansicht über Einstellungen > Anpassen > Funktionseinstellungen
-
-2\. Erstellen Sie einen Datensatz für die [POS-Einstellungen]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html)
+1. Aktivieren Sie die POS-Ansicht über Einstellungen > Anpassen > Funktionseinstellungen
+2. Erstellen Sie einen Datensatz für die [POS-Einstellungen]({{docs_base_url}}/user/manual/de/setting-up/pos-setting.html)
 
 #### Auf die POS-Ansicht umschalten
 
@@ -57,17 +56,15 @@
 
 Wenn alle Artikel mit Mengenangabe im Einkaufswagen hinzugefügt wurden, können Sie die Zahlung durchführen. Der Zahlungsprozess untergliedert sich in drei Schritte:
 
-1\. Klicken Sie auf "Zahlung durchführen" um das Zahlungsfenster zu öffnen.
-
-2\. Wählen Sie die Zahlungsart aus.
-
-3\. Klicken Sie auf die Schaltfläche "Zahlen" um das Dokument abzuspeichern.
+1. Klicken Sie auf "Zahlung durchführen" um das Zahlungsfenster zu öffnen.
+2. Wählen Sie die Zahlungsart aus.
+3. Klicken Sie auf die Schaltfläche "Zahlen" um das Dokument abzuspeichern.
 
 ![POS-Zahlung]({{docs_base_url}}/assets/old_images/erpnext/pos-make-payment.png)
 
 Übertragen Sie das Dokument um den Datensatz abzuschliessen. Nachdem das Dokument übertragen wurde, können Sie es entweder ausdrucken oder per E-Mail versenden.
 
-#### Buchungssätze (Hauptbuch) für einen POS:
+#### Buchungssätze (Hauptbuch) für einen POS
 
 Soll:
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/accounts/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/accounts/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/accounts/setup/index.txt b/erpnext/docs/user/manual/de/accounts/setup/index.txt
index 439c184..f59526c 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/index.txt
+++ b/erpnext/docs/user/manual/de/accounts/setup/index.txt
@@ -1,4 +1,3 @@
-
 fiscal-year
 cost-center
 accounts-settings
diff --git a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
index 0e1d00d..73d4907 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
@@ -1,7 +1,7 @@
 # Steuerregeln
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-Sie können festlegen, welche [Steuervorlage]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
+Sie können festlegen, welche [Steuervorlage]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
 
 <img class="screenshot" alt="Steuerregel" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/accounts/tools/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/accounts/tools/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/buying/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/buying/__init__.py
diff --git a/erpnext/docs/user/manual/de/buying/index.md b/erpnext/docs/user/manual/de/buying/index.md
index 4d18d59..c5bdd04 100644
--- a/erpnext/docs/user/manual/de/buying/index.md
+++ b/erpnext/docs/user/manual/de/buying/index.md
@@ -7,6 +7,6 @@
 
 ERPNext beinhaltet einen Satz an Transaktionen, die Ihren Einkaufprozess so effektiv und störungsfrei machen, wie nur möglich.
 
-### Topics
+### Themen
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/buying/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/buying/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
index 863e208..e6f0d97 100644
--- a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
@@ -17,7 +17,7 @@
 
 > Einstellungen > Einstellungen > Nummernkreis
 
-[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html)
+[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten]({{docs_base_url}}/user/manual/de/setting-up/settings/naming-series.html)
 
 ### 2. Standard-Lieferantentyp
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/customer-portal/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/customer-portal/__init__.py
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/user/manual/de/customize-erpnext/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/user/manual/de/customize-erpnext/__init__.py
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
index 1e33282..01bfaa7 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
@@ -11,15 +11,11 @@
 
 ### Einzelheiten zum DocType
 
-1\. Modul: Wählen Sie das Modul aus, in dem dieser DocType verwendet wird.
-
-2\. Dokumententyp: Geben Sie an, ob dieser DocType Hauptdaten befördern oder Transaktionen nachverfolgen soll. Der DocType für das Buch wird als Vorlage hinzugefügt.
-
-3\. Ist Untertabelle: Wenn dieser DocType als Tabelle in einen anderen DocType eingefügt wird, wie die Artikeltabelle in den DocType Kundenauftrag, dann sollten Sie auch "Ist Untertabelle" ankreuzen. Ansonsten nicht.
-
-4\. Ist einzeln: Wenn diese Option aktiviert ist, wird dieser DocType zu einem einzeln verwendeten Formular, wie die Vertriebseinstellungen, die nicht von Benutzern reproduziert werden können.
-
-5\. Benutzerdefiniert?: Dieses Feld ist standardmäßig aktiviert, wenn ein benutzerdefinierter DocType hinzugefügt wird.
+1. Modul: Wählen Sie das Modul aus, in dem dieser DocType verwendet wird.
+2. Dokumententyp: Geben Sie an, ob dieser DocType Hauptdaten befördern oder Transaktionen nachverfolgen soll. Der DocType für das Buch wird als Vorlage hinzugefügt.
+3. Ist Untertabelle: Wenn dieser DocType als Tabelle in einen anderen DocType eingefügt wird, wie die Artikeltabelle in den DocType Kundenauftrag, dann sollten Sie auch "Ist Untertabelle" ankreuzen. Ansonsten nicht.
+4. Ist einzeln: Wenn diese Option aktiviert ist, wird dieser DocType zu einem einzeln verwendeten Formular, wie die Vertriebseinstellungen, die nicht von Benutzern reproduziert werden können.
+5. Benutzerdefiniert?: Dieses Feld ist standardmäßig aktiviert, wenn ein benutzerdefinierter DocType hinzugefügt wird.
 
 ![Grundlagen zum Doctype]({{docs_base_url}}/assets/img/setup/customize/doctype-basics.png)
 
@@ -29,17 +25,12 @@
 
 Felder sind viel mehr als Datenbankspalten; sie können sein:
 
-1\. Spalten in der Datenbank
-
-2\. Wichtig für das Layout (Bereiche, Spaltentrennung)
-
-3\. Untertabellen (Feld vom Typ Tabelle)
-
-4\. HTML
-
-5\. Aktionen (Schaltflächen)
-
-6\. Anhänge oder Bilder
+1. Spalten in der Datenbank
+2. Wichtig für das Layout (Bereiche, Spaltentrennung)
+3. Untertabellen (Feld vom Typ Tabelle)
+4. HTML
+5. Aktionen (Schaltflächen)
+6. Anhänge oder Bilder
 
 ![Felder im DocType]({{docs_base_url}}/assets/img/setup/customize/Doctype-all-fields.png)
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index efd5980..c3bec3f 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -64,17 +64,12 @@
 
 Sie können weitere Eigenschaften auswählen wie:
 
-1\. Ist Pflichtfeld: Ist das Feld zwingend erforderlich oder nicht?
-
-2\. Beim Drucken verbergen: Soll dieses Feld beim Ausdruck sichtbar sein oder nicht?
-
-3\. Feldbeschreibung: Hier steht eine kurze Beschreibung des Feldes die gleich unter dem Feld erscheint.
-
-4\. Standardwert: Der Wert in diesem Feld wird automatisch aktualisiert.
-
-5\. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
-
-6\. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
+1. Ist Pflichtfeld: Ist das Feld zwingend erforderlich oder nicht?
+2. Beim Drucken verbergen: Soll dieses Feld beim Ausdruck sichtbar sein oder nicht?
+3. Feldbeschreibung: Hier steht eine kurze Beschreibung des Feldes die gleich unter dem Feld erscheint.
+4. Standardwert: Der Wert in diesem Feld wird automatisch aktualisiert.
+5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
+6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
 
 ![Eigenschaften von benutzerdefinierten Feldern]({{docs_base_url}}/assets/old_images/erpnext/custom-field-properties.png)
 
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/__init__.py
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
index 36f7894..c4e41ec 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
@@ -5,7 +5,7 @@
 
 > add_fetch(link_fieldname, source_fieldname, target_fieldname)
 
-### Beispiel:
+### Beispiel
 
 Sie erstellen ein benutzerdefiniertes Feld **VAT ID** (vat_id) unter **Kunde** und **Ausgangsrechnung** und Sie möchten sicher stellen, dass dieser Wert immer aktualisiert wird, wenn Sie einen Kunden oder eine Ausgangsrechnung aufrufen.
 
@@ -15,6 +15,6 @@
 
 * * *
 
-Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-scripts.html).
+Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt]({{docs_base_url}}/user/manual/de/customize-erpnext/custom-scripts/).
 
 {next}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/index.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/index.md
index 35cc4f7..43770ef 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/index.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/index.md
@@ -5,20 +5,17 @@
 
 Sie erstellen ein benutzerdefiniertes Skript wie folgt (Sie müssen dafür Systemadministrator sein!):
 
-1\. Gehen Sie zu: Einstellungen > Benutzerdefiniertes Skript > Neu
-
-2\. Wählen Sie den DocType, in dem Sie ein benutzerdefiniertes Skript hinzufügen möchten, aus.
+1. Gehen Sie zu: Einstellungen > Benutzerdefiniertes Skript > Neu
+2. Wählen Sie den DocType, in dem Sie ein benutzerdefiniertes Skript hinzufügen möchten, aus.
 
 * * *
 
-### Anmerkungen:
+### Anmerkungen
 
-1\. Auf benutzerdefinierte Skripte für Server kann nur der Administrator zugreifen.
+1. Auf benutzerdefinierte Skripte für Server kann nur der Administrator zugreifen.
+2. Benutzerdefinierte Skripte für Clients werden in Javascript geschrieben, die für Server in Python.
+3. Zum Testen gehen Sie auf Werkzeuge > Cache leeren und laden Sie die Seite neu, wenn Sie ein benutzerdefiniertes Skript aktualisieren.
 
-2\. Benutzerdefinierte Skripte für Clients werden in Javascript geschrieben, die für Server in Python.
-
-3\. Zum Testen gehen Sie auf Werkzeuge > Cache leeren und laden Sie die Seite neu, wenn Sie ein benutzerdefiniertes Skript aktualisieren.
-
-### Themen:
+### Themen
 
 {index}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
index a4ad75a..8e2e842 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
@@ -5,6 +5,8 @@
 
 > Einstellungen > Anpassen > Benutzerdefiniertes Skript
 
+<img alt="Custom Script" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-script-1.png">
+
 ### Themen
 
 {index}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
index 4ab5154..3b13208 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
@@ -13,11 +13,9 @@
 
 Um eine Standard-Bezeichnung einzufügen, gehen Sie zu:
 
-1\. Einstellungen > Anpassen > Formular anpassen
-
-2\. Wählen Sie Ihre Transaktion aus
-
-3\. Bearbeiten Sie das Feld "Standard" in Ihrem Formular
+1. Einstellungen > Anpassen > Formular anpassen
+2. Wählen Sie Ihre Transaktion aus
+3. Bearbeiten Sie das Feld "Standard" in Ihrem Formular
 
 ### Bezeichnungen definieren
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/index.txt b/erpnext/docs/user/manual/de/customize-erpnext/index.txt
index 1113395..bf6d52e 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/index.txt
+++ b/erpnext/docs/user/manual/de/customize-erpnext/index.txt
@@ -5,4 +5,4 @@
 document-title
 hiding-modules-and-features
 print-format
-articles
+custom-scripts
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
index ca6c771..9448201 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
@@ -14,7 +14,7 @@
 
 > Einstellungen > Druck > Druckformate
 
-![Druckformat]({{docs_base_url}}/assets/old_images/erpnext/customize/print-format.png)
+![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png)
 
 Wählen Sie den Typ des Druckformats, welches Sie bearbeiten wollen, und klicken Sie auf die Schaltfläche "Kopieren" in der rechten Spalte. Es öffnet sich ein neues Druckformat mit der Einstellung NEIN für "für "Ist Standard" und Sie kännen das Druckformat bearbeiten.
 
@@ -26,11 +26,10 @@
 
 > Anmerkung: Vorgedrucktes Briefpapier zu verwenden ist normalerweise keine gute Idee, weil Ihre Ausdrucke unfertig (inkonsistent) aussehen, wenn Sie per E-mail verschickt werden.
 
-### Referenzen:
+### Referenzen
 
-1\. [Programmiersprache Jinja Templating: Referenz](http://jinja.pocoo.org/docs/templates/)
-
-2\. [Bootstrap CSS Framework](http://getbootstrap.com/)
+1. [Programmiersprache Jinja Templating: Referenz](http://jinja.pocoo.org/docs/templates/)
+2. [Bootstrap CSS Framework](http://getbootstrap.com/)
 
 ### Druckeinstellungen
 
@@ -38,55 +37,54 @@
 
 > Einstellungen > Druck und Branding > Druckeinstellungen
 
-![Druckformat]({{docs_base_url}}/assets/old_images/erpnext/customize/print-settings.png)
+![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png)
 
-### Beispiel:
+### Beispiel
 
-<h3>{{ doc.select<em>print</em>heading or "Invoice" }}</h3>
-    <div class="row">
-        <div class="col-md-3 text-right">Customer Name</div>
-        <div class="col-md-9">{{ doc.customer<em>name }}</div>
-    </div>
-    <div class="row">
-        <div class="col-md-3 text-right">Date</div>
-        <div class="col-md-9">{{ doc.get</em>formatted("invoice<em>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</em>name }}
-                    {% if row.item<em>code != row.item</em>name -%}
-                    <br>Item Code: {{ row.item<em>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</em>uom }}</td>
-                <td style="width: 15%; text-align: right;">{{
-                    row.get<em>formatted("rate", doc) }}</td>
-                <td style="width: 15%; text-align: right;">{{
-                    row.get</em>formatted("amount", doc) }}</td>
-            </tr>
-            {%- endfor -%}
-        </tbody>
-    </table>
+ {% raw %}<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>{% endraw %}
 
 ### Anmerkungen
 
-1\. Um nach Datum und Währung formatiert Werte zu erhalten, verwenden Sie: `doc.get_formatted("fieldname")`
-
-2\. Für übersetzbare Zeichenfolgen verwenden Sie: `{{ _("This string is translated") }}`
+1. Um nach Datum und Währung formatiert Werte zu erhalten, verwenden Sie: `doc.get_formatted("fieldname")`
+1. Für übersetzbare Zeichenfolgen verwenden Sie: `{{ _("This string is translated") }}`
 
 ### Fußzeilen
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/human-resources/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/human-resources/__init__.py
diff --git a/erpnext/docs/user/manual/de/human-resources/attendance.md b/erpnext/docs/user/manual/de/human-resources/attendance.md
index a889cd8..9dd45ab 100644
--- a/erpnext/docs/user/manual/de/human-resources/attendance.md
+++ b/erpnext/docs/user/manual/de/human-resources/attendance.md
@@ -9,6 +9,6 @@
 
 Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen.
 
-Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html) hochladen.
+Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten]({{docs_base_url}}/user/manual/de/human-resources/tools/upload-attendance.html) hochladen.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/human-resources/job-applicant.md b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
index 92819e8..51b0359 100644
--- a/erpnext/docs/user/manual/de/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
@@ -1,7 +1,7 @@
 # Bewerber
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-Sie können eine Liste von Bewerbern auf [offene Stellen]({{docs_base_url}}/user/manual/en/human-resources/job-opening.html) verwalten.
+Sie können eine Liste von Bewerbern auf [offene Stellen]({{docs_base_url}}/user/manual/de/human-resources/job-opening.html) verwalten.
 
 Um einen neuen Bewerber anzulegen, gehen Sie zu:
 
diff --git a/erpnext/docs/user/manual/de/human-resources/leave-application.md b/erpnext/docs/user/manual/de/human-resources/leave-application.md
index 0f28e6f..fc16d83 100644
--- a/erpnext/docs/user/manual/de/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/de/human-resources/leave-application.md
@@ -14,8 +14,8 @@
 
 <img class="screenshot" alt="Urlaubsgenehmiger" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
 
-> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html).
+> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen]({{docs_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html).
 
-Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung]({{docs_base_url}}/user/manual/en/human-resources/setup/leave-allocation.html) an.
+Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung]({{docs_base_url}}/user/manual/de/human-resources/setup/leave-allocation.html) an.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
index 562b24c..5566071 100644
--- a/erpnext/docs/user/manual/de/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
@@ -9,7 +9,7 @@
 
 <img class="screenshot" alt="Angebotsschreiben" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
 
-> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber]({{docs_base_url}}/user/manual/en/human-resources/job-applicant.html) erstellt werden.
+> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber]({{docs_base_url}}/user/manual/de/human-resources/job-applicant.html) erstellt werden.
 
 Es gibt ein vordefiniertes Druckformat zum Angebotsschreiben.
 
diff --git a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
index 5d7eb61..a8eb33a 100644
--- a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
@@ -7,11 +7,9 @@
 
 Um in ERPNext eine Gehaltsabrechnung durchzuführen
 
-1\. Erstellen Sie Gehaltsstrukturen für alle Arbeitnehmer.
-
-2\. Erstellen Sie über den Prozess Gehaltsabrechnung Gehaltsabrechnungen.
-
-3\. Buchen Sie das Gehalt in Ihren Konten.
+1. Erstellen Sie Gehaltsstrukturen für alle Arbeitnehmer.
+2. Erstellen Sie über den Prozess Gehaltsabrechnung Gehaltsabrechnungen.
+3. Buchen Sie das Gehalt in Ihren Konten.
 
 ### Gehaltsstruktur
 
@@ -19,11 +17,9 @@
 
 Gehaltsstrukturen werden verwendet um Organisationen zu helfen
 
-1\. Gehaltslevel zu erhalten, die am Markt wettbewerbsfähig sind.
-
-2\. Ein ausgeglichenes Verhältnis zwischen den Entlohnungen intern anfallender Jobs zu erreichen.
-
-3\. Unterschiede in den Ebenen von Verwantwortung, Begabungen und Leistungen zu erkennen und entsprechend zu vergüten und Gehaltserhöhungen zu verwalten.
+1. Gehaltslevel zu erhalten, die am Markt wettbewerbsfähig sind.
+2. Ein ausgeglichenes Verhältnis zwischen den Entlohnungen intern anfallender Jobs zu erreichen.
+3. Unterschiede in den Ebenen von Verwantwortung, Begabungen und Leistungen zu erkennen und entsprechend zu vergüten und Gehaltserhöhungen zu verwalten.
 
 Eine Gehaltsstruktur kann folgende Komponenten enthalten:
 
@@ -83,15 +79,11 @@
 
 Beim Bearbeiten einer Gehaltsabrechnung
 
-1\. Wählen Sie die Firma, für die Sie Gehaltsabrechnungen erstellen wollen.
-
-2\. Wählen Sie den ensprechenden Monat und das Jahr.
-
-3\. Klicken Sie auf "Gehaltsabrechnung erstellen". Hierdurch werden für jeden aktiven Mitarbeiter für den gewählten Monat Datensätze für die Gehaltsabrechnung angelegt. Wenn die Gehaltsabrechnungen einmal angelegt sind, erstellt das System keine weiteren Gehaltsabrechnungen. Alle Aktualisierungen werden im Bereich "Aktivitätsprotokoll" angezeigt.
-
-4\. Wenn alle Gehaltsabrechnungen erstellt wurden, können Sie prüfen, ob Sie richtig sind, und sie bearbeiten, wenn Sie unbezahlten Urlaub abziehen wollen.
-
-5\. Wenn Sie das geprüft haben, können Sie sie alle gemeinsam "übertragen" indem Sie auf die Schaltfläche "Gehaltsabrechnung übertragen" klicken. Wenn Sie möchten, dass Sie automatisch per E-Mail an einen Mitarbeiter verschickt werden, stellen Sie sicher, dass Sie die Option "E-Mail absenden" angeklickt haben.
+1. Wählen Sie die Firma, für die Sie Gehaltsabrechnungen erstellen wollen.
+2. Wählen Sie den ensprechenden Monat und das Jahr.
+3. Klicken Sie auf "Gehaltsabrechnung erstellen". Hierdurch werden für jeden aktiven Mitarbeiter für den gewählten Monat Datensätze für die Gehaltsabrechnung angelegt. Wenn die Gehaltsabrechnungen einmal angelegt sind, erstellt das System keine weiteren Gehaltsabrechnungen. Alle Aktualisierungen werden im Bereich "Aktivitätsprotokoll" angezeigt.
+4. Wenn alle Gehaltsabrechnungen erstellt wurden, können Sie prüfen, ob Sie richtig sind, und sie bearbeiten, wenn Sie unbezahlten Urlaub abziehen wollen.
+5. Wenn Sie das geprüft haben, können Sie sie alle gemeinsam "übertragen" indem Sie auf die Schaltfläche "Gehaltsabrechnung übertragen" klicken. Wenn Sie möchten, dass Sie automatisch per E-Mail an einen Mitarbeiter verschickt werden, stellen Sie sicher, dass Sie die Option "E-Mail absenden" angeklickt haben.
 
 ### Gehälter in Konten buchen
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/human-resources/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/human-resources/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
index f9162ca..2e80ddf 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
@@ -5,6 +5,6 @@
 
 <img class="screenshot" alt="Urlaubszuordnung" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
 
-Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug]({{docs_base_url}}/user/manual/en/human-resources/tools/leave-allocation-tool.html).
+Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug]({{docs_base_url}}/user/manual/de/human-resources/tools/leave-allocation-tool.html).
 
 {next}
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/human-resources/tools/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/human-resources/tools/__init__.py
diff --git a/erpnext/docs/user/manual/de/index.md b/erpnext/docs/user/manual/de/index.md
index 5d2aeab..4dddaf5 100644
--- a/erpnext/docs/user/manual/de/index.md
+++ b/erpnext/docs/user/manual/de/index.md
@@ -1,6 +1,6 @@
 # Benutzerhandbuch (Deutsch)
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-### Inhalt:
+### Inhalt
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/introduction/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/introduction/__init__.py
diff --git a/erpnext/docs/user/manual/de/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/de/introduction/concepts-and-terms.md
index ab70d18..ad4d0c4 100644
--- a/erpnext/docs/user/manual/de/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/de/introduction/concepts-and-terms.md
@@ -151,7 +151,7 @@
 > Lagerbestand > Dokumente > Lager
 
 #### Lagerbuchung
-Materialübertrag von einem Lager, in ein Lager oder zwischen mehreren Lägern.
+Materialübertrag von einem Lager, in ein Lager oder zwischen mehreren Lagern.
 
 > Lagerbestand > Dokumente > Lagerbuchung
 
diff --git a/erpnext/docs/user/manual/de/introduction/implementation-strategy.md b/erpnext/docs/user/manual/de/introduction/implementation-strategy.md
index 3c41659..8218f8e 100644
--- a/erpnext/docs/user/manual/de/introduction/implementation-strategy.md
+++ b/erpnext/docs/user/manual/de/introduction/implementation-strategy.md
@@ -11,7 +11,7 @@
 * Lesen Sie das Handbuch.
 * Legen Sie ein kostenloses Konto auf [https://erpnext.com](https://erpnext.com) an. (Das ist der einfachste Weg um zu experimentieren.)
 * Legen Sie Ihre ersten Kunden, Lieferanten und Artikel an. Erstellen Sie weitere, um sich mit diesen Verfahren vertraut zu machen.
-* Legen Sie Kundengruppen, Artikelgruppen, Läger und Lieferantengruppen an, damit Sie Ihre Artikel klassifizieren können.
+* Legen Sie Kundengruppen, Artikelgruppen, Lager und Lieferantengruppen an, damit Sie Ihre Artikel klassifizieren können.
 * Durchlaufen Sie einen Standard-Vertriebszyklus: Lead -> Opportunity -> Angebot -> Kundenauftrag -> Lieferschein -> Ausgangsrechnung -> Zahlung (Journalbuchung/Buchungssatz)
 * Durchlaufen Sie einen Standard-Einkaufszyklus: Materialanfrage -> Lieferantenauftrag -> Eingangsrechnung -> Zahlung (Journalbuchung/Buchungssatz)
 * Durchlaufen Sie einen Fertigungszyklus (wenn anwendbar): Stückliste -> Planungswerkzeug zur Fertigung -> Fertigungsauftrag -> Materialausgabe
@@ -25,7 +25,7 @@
 * Säubern Sie Ihr Testkonto oder legen Sie besser noch eine frische Installation an.
 * Wenn Sie nur Ihre Transaktionen, nicht aber Ihre Stammdaten wie Artikel, Kunde, Lieferant, Stückliste, etc. löschen wollen, brauchen Sie nur auf die Firma klicken, für die Sie diese Transaktionen erstellt haben, und mit einer frischen Stückliste starten. Um eine Firma zu löschen, öffnen Sie den Datensatz zur Firma über Einstellungen > Vorlagen > Firma und löschen Sie die Firma indem Sie die **"Löschen"-Schaltfläche** am unteren Ende anklicken.
 * Sie können auch auf [https://erpnext.com](https://erpnext.com) ein neues Konto erstellen, und die Dreißig-Tage-Probezeit nutzen. [Finden Sie hier mehr zum Thema Einsatz von ERPNext heraus](/introduction/getting-started-with-erpnext).
-* Richten Sie Kundengruppen, Artikelgruppen, Läger und Stücklisten für alle Module ein.
+* Richten Sie Kundengruppen, Artikelgruppen, Lager und Stücklisten für alle Module ein.
 * Importieren Sie Kunden, Lieferanten, Artikel, Kontakte und Adressen mit Hilfe des Datenimportwerkzeuges.
 * Importieren Sie den Anfangsbestand des Lagers über das Werkzeug zum Lagerabgleich.
 * Erstellen Sie Eröffnungsbuchungen über Journalbuchungen/Buchungssätze und geben Sie offene Ausgangs- und Eingangsrechnungen ein.
diff --git a/erpnext/docs/user/manual/de/introduction/index.md b/erpnext/docs/user/manual/de/introduction/index.md
index f9e30f5..2b6a45a 100644
--- a/erpnext/docs/user/manual/de/introduction/index.md
+++ b/erpnext/docs/user/manual/de/introduction/index.md
@@ -31,6 +31,6 @@
 
 Und vieles vieles mehr.
 
-#### Themen:
+#### Themen
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/manufacturing/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/manufacturing/__init__.py
diff --git a/erpnext/docs/user/manual/de/manufacturing/production-order.md b/erpnext/docs/user/manual/de/manufacturing/production-order.md
index 3bbcce0..e6ddd7b 100644
--- a/erpnext/docs/user/manual/de/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/de/manufacturing/production-order.md
@@ -17,7 +17,7 @@
 * Geben Sie das geplante Startdatum an (ein geschätztes Datum zu dem die Produktion beginnen soll).
 * Wählen Sie das Lager aus. Das Fertigungslager ist der Ort zu dem die Artikel gelangen, wenn Sie mit der Herstellung beginnen, und das Eingangslager ist der Ort, wo fertige Erzeugnisse lagern, bevor sie versandt werden.
 
-> Anmerkung: Sie können einen Fertigungsauftrag abspeichern ohne ein Lager auszuwählen. Läger sind jedoch zwingend erforderlich um einen Fertigungsauftrag zu übertragen.
+> Anmerkung: Sie können einen Fertigungsauftrag abspeichern ohne ein Lager auszuwählen. Lager sind jedoch zwingend erforderlich um einen Fertigungsauftrag zu übertragen.
 
 ### Arbeitsplätze neu zuordnen/Dauer von Arbeitsgängen
 
@@ -84,11 +84,11 @@
 * Wenn Sie einen Fertigungsauftrag anhalten, wird sein Status auf "Angehalten" gesetzt, mit der Folge, dass alle Herstellungsprozesse für diesen Fertigungsauftrag eingestellt werden.
 * Um den Fertigungsauftrag anzuhalten klicken Sie auf die Schaltfläche "Anhalten".
 
-1\. Wenn Sie den Fertigungsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Fertigungsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Fertigungsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen.
-2\. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen".
-3\. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Fertigungsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt).
-4\. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
-5\. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
+1. Wenn Sie den Fertigungsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Fertigungsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Fertigungsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen.
+2. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen".
+3. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Fertigungsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt).
+4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
+5. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
 
 <img class="screenshot" alt="Fertigungsauftrag anhalten" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/manufacturing/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/manufacturing/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
index 901d242..28fa3cd 100644
--- a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
@@ -7,11 +7,9 @@
 
 ### Fremdvergabe einstellen
 
-1\. Erstellen Sie getrennte Artikel für unbearbeitete und bearbeitet Produkte. Beispiel: Wenn Sie Ihrem Lieferanten unlackierte Artikel X übergeben und Ihnen der Lieferant lackierte Produkte X zurückliefert, dann erstellen Sie zwei Artikel: "X unlackiert" und "X".
-
-2\. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
-
-3\. Stellen Sie für den bearbeiteten Artikel  und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
+1. Erstellen Sie getrennte Artikel für unbearbeitete und bearbeitet Produkte. Beispiel: Wenn Sie Ihrem Lieferanten unlackierte Artikel X übergeben und Ihnen der Lieferant lackierte Produkte X zurückliefert, dann erstellen Sie zwei Artikel: "X unlackiert" und "X".
+2. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
+3. Stellen Sie für den bearbeiteten Artikel  und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
 
 ![Fremdvergabe]({{docs_base_url}}/assets/old_images/erpnext/subcontract.png)
 
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/manufacturing/tools/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/manufacturing/tools/__init__.py
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
index e8dc3f4..922c32a 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
@@ -11,37 +11,26 @@
 
 Wenn eine Firma Computer herstellt, besteht die Stückliste des fertigen Erzeugnisses in etwa so aus:
 
-1\. Bildschirm
-
-2\. Tastatur
-
-3\. Maus
-
-4\. Zentraleinheit
+1. Bildschirm
+2. Tastatur
+3. Maus
+4. Zentraleinheit
 
 Von den oben aufgelisteten Artikeln wird die Zentraleinheit separat zusammengebaut. Somit wird eine eigenständige Stückliste für die Zentraleinheit ersellt. Im folgenden werden die Artikel der Stückliste der Zentraleinheit angegeben:
 
-1\. 250 GByte Festplatte
-
-2\. Hauptplatine
-
-3\. Prozessor
-
-4\. SMTP
-
-5\. DVD-Laufwerk
+1. 250 GByte Festplatte
+2. Hauptplatine
+3. Prozessor
+4. SMTP
+5. DVD-Laufwerk
 
 Wenn zur Stückliste der Zentraleinheit weitere Artikel hinzugefügt werden sollen, oder enthaltene Artikel bearbeitet werden sollen, sollte eine neue Stückliste erstellt werden.
 
-1\. _350 GByte Festplatte_
-
-2\. Hauptplatine
-
-3\. Prozessor
-
-4\. SMTP
-
-5\. DVD-Laufwerk
+1. _350 GByte Festplatte_
+2. Hauptplatine
+3. Prozessor
+4. SMTP
+5. DVD-Laufwerk
 
 Um die Stückliste, bei der die Zentraleinheit als Rohmaterial enthalten ist, in der Stückliste des fertigen Produktes zu aktualisieren, können Sie das Stücklisten-Austauschwerkzeug verwenden.
 
diff --git a/erpnext/docs/user/manual/de/manufacturing/workstation.md b/erpnext/docs/user/manual/de/manufacturing/workstation.md
index e9db7f2..2405382 100644
--- a/erpnext/docs/user/manual/de/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/de/manufacturing/workstation.md
@@ -13,6 +13,6 @@
 
 Geben Sie unter "Arbeitszeit" die Betriebszeiten des Arbeitsplatzes an. Sie können die Betriebszeiten auch mit Hilfe von Schichten angeben. Wenn Sie einen Fertigungauftrag einplanen, prüft das System die Verfügbarkeit des Arbeitsplatzes basierend auf den angegebenen Betrieszeiten.
 
-> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen]({{docs_base_url}}/user/manual/en/manufacturing/setup/manufacturing-settings.html) aktivieren.
+> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen]({{docs_base_url}}/user/manual/de/manufacturing/setup/manufacturing-settings.html) aktivieren.
 
 {next}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/projects/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/projects/__init__.py
diff --git a/erpnext/docs/user/manual/de/projects/project.md b/erpnext/docs/user/manual/de/projects/project.md
index 6a9db66..518443b 100644
--- a/erpnext/docs/user/manual/de/projects/project.md
+++ b/erpnext/docs/user/manual/de/projects/project.md
@@ -8,7 +8,7 @@
 ### Aufgaben verwalten
 
 Ein Projekt kann in mehrere verschiedene Aufgaben aufgeteilt werden. 
-Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe]({{docs_base_url}}/user/manual/en/projects/tasks.html).
+Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe]({{docs_base_url}}/user/manual/de/projects/tasks.html).
 
 <img class="screenshot" alt="Projekt" src="{{docs_base_url}}/assets/img/project/project_task.png">
 
@@ -24,7 +24,7 @@
 
 ### Zeitmanagement
 
-ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/en/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung  basierend auf dem Zeitprotokoll aktualisiert.
+ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung  basierend auf dem Zeitprotokoll aktualisiert.
 
 * Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle"
 
@@ -38,7 +38,7 @@
 
 ### Aufwände verwalten
 
-Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung.
+Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung.
 
 * Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung".
 
@@ -54,7 +54,7 @@
 
 ### Kostenstelle
 
-Sie können zu einem Projekt eine [Kostenstelle]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
+Sie können zu einem Projekt eine [Kostenstelle]({{docs_base_url}}/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
 
 <img class="screenshot" alt="Projekt - Kostenstelle" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
 
@@ -69,7 +69,7 @@
 
 ### Abrechnung
 
-Sie können einen [Kundenauftrag]({{docs_base_url}}/user/manual/en/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
+Sie können einen [Kundenauftrag]({{docs_base_url}}/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
 
 <img class="screenshot" alt="Projekt - Kundenauftrag" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
 
diff --git a/erpnext/docs/user/manual/de/projects/tasks.md b/erpnext/docs/user/manual/de/projects/tasks.md
index 73e19fe..163fb68 100644
--- a/erpnext/docs/user/manual/de/projects/tasks.md
+++ b/erpnext/docs/user/manual/de/projects/tasks.md
@@ -25,7 +25,7 @@
 
 ### Zeitmanagement
 
-ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/en/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden.
+ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden.
 
 * Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle".
 
@@ -39,7 +39,7 @@
 
 ### Ausgabenmanagement
 
-Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/en/human-resource-management/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung.
+Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung.
 
 * Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung".
 
diff --git a/erpnext/docs/user/manual/de/projects/time-log-batch.md b/erpnext/docs/user/manual/de/projects/time-log-batch.md
index bfc6fa8..6aa85cb 100644
--- a/erpnext/docs/user/manual/de/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/de/projects/time-log-batch.md
@@ -9,17 +9,17 @@
 
 Öffnen Sie einfach Ihre Übersicht der Zeitprotokolle und kreuzen Sie die Artikel an, die Sie dem Zeitprotokollstapel hinzufügen möchten. Klicken Sie dann auf die Schaltfläche "Zeitprotokollstapel erstellen" und diese Zeitprotokolle werden ausgewählt.
 
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_log_batch.gif">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
 
 ### Ausgangsrechnungen erstellen
 
 * Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen.
 
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_log_batch_make_invoice.png">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
 
 * Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel.
 
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_log_batch_sales_invoice.png">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet_sales_invoice.png">
 
 * Wenn Sie die Ausgangsrechnung "übertragen", wird die Nummer der Ausgangsrechnung in den Zeitprotokollen und im Zeitprotokollstapel aktualisiert und ihr Status wird auf "abgerechnet" geändert.
 
diff --git a/erpnext/docs/user/manual/de/projects/time-log.md b/erpnext/docs/user/manual/de/projects/time-log.md
index b65bf5e..d90e27a 100644
--- a/erpnext/docs/user/manual/de/projects/time-log.md
+++ b/erpnext/docs/user/manual/de/projects/time-log.md
@@ -37,12 +37,12 @@
 ### Abrechnung über Zeitprotokolle
 
 * Wenn Sie ein Zeitprotokoll abrechnen wollen, müssem Sie die Option "Abrechenbar" anklicken.
-* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten]({{docs_base_url}}/user/manual/en/projects/activity-cost.html)  basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart.
+* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten]({{docs_base_url}}/user/manual/de/projects/activity-cost.html)  basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart.
 * Das System kalkuliert dann den Rechnungsbetrag basierend auf den im Zeitprotokoll angegebenen Stunden.
 * Wenn "Abrechenbar" nicht markiert wurde, zeigt das System beim "Rechnungsbetrag" 0 an.
 
 <img class="screenshot" alt="Zeitprotokoll - Abrechnung" src="{{docs_base_url}}/assets/img/project/time_log_costing.png">
 
-* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel]({{docs_base_url}}/user/manual/en/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
+* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel]({{docs_base_url}}/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
 
 {next}
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/selling/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/selling/__init__.py
diff --git a/erpnext/docs/user/manual/de/selling/quotation.md b/erpnext/docs/user/manual/de/selling/quotation.md
index f7b6833..3434e26 100644
--- a/erpnext/docs/user/manual/de/selling/quotation.md
+++ b/erpnext/docs/user/manual/de/selling/quotation.md
@@ -34,12 +34,12 @@
 
 Die Preise, die sie abgeben, hängen von zwei Dingen ab:
 
-* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste]({{docs_base_url}}/user/manual/en/setting-up/price-lists.html) weiterlesen.
+* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste]({{docs_base_url}}/user/manual/de/setting-up/price-lists.html) weiterlesen.
 * Die Währung: Wenn Sie einem Kunden in einer anderen Währung anbieten, müssen Sie die Umrechnungsfaktoren aktualisieren um ERPNext in die Lage zu versetzen die Information in Ihrer Standardwährung zu speichern. Das hilft Ihnen dabei den Wert Ihres Angebots in der Standardwährung zu analysieren.
 
 ### Steuern
 
-Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html).
 
 Sie können Steuern auf die gleiche Art hinzufügen wie die Vorlage Verkaufssteuern und Gebühren.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/selling/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/selling/setup/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/setting-up/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
index 462c196..7b202f1 100644
--- a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
@@ -13,27 +13,27 @@
 
 Nehmen wir an dass ein Vertriebsmitarbeiter Kundenbestellungen nur dann genehmigen lassen muss, wenn der Gesamtwert 10.000 Euro übersteigt. Wenn die Kundenbestellung 10.000 Euro nicht übersteigt, dann kann auch ein Vertriebsmitarbeiter diese Transaktion übertragen. Das bedeutet, dass die Berechtigung des Vertriebsmitarbeiters zum Übertragen auf Kundenaufträge mit einer Maximalsumme von 10.000 Euro beschränkt wird.
 
-#### Schritt 1:
+#### Schritt 1
 
 Öffnen Sie eine neue Autorisierungsregel.
 
-#### Schritt 2: 
+#### Schritt 2
 
 Wählen Sie die Firma und die Transaktion aus, für die diese Autorisierungsregel angewendet werden soll. Diese Funktionalität ist nur für beschränkte Transaktionen verfügbar.
 
-#### Schritt 3: 
+#### Schritt 3
 
 Wählen Sie einen Wert für "Basiert auf" aus. Eine Autorisierungsregel wird auf Grundlage eines Wertes in diesem Feld angewendet.
 
-#### Schritt 4: 
+#### Schritt 4
 
 Wählen Sie eine Rolle, auf die die Autorisierungsregel angewendet werden soll. Für unser angenommenes Beispiel wird die Rolle "Nutzer Vertrieb" über "Anwenden auf (Rolle)" als Rolle ausgewählt. Um noch etwas genauer zu werden, können Sie auch über "Anwenden auf (Benutzer)" einen bestimmten Benutzer auswählen, wenn Sie eine Regel speziell auf einen Mitarbeiter anwenden wollen, und nicht auf alle Mitarbeiter aus dem Vertrieb. Es ist auch in Ordnung, keinen Benutzer aus dem Vertrieb anzugeben, weil es nicht zwingend erforderlich ist.
 
-#### Schritt 5: 
+#### Schritt 5
 
 Wählen Sie die Rolle des Genehmigers aus. Das könnte z. B. die Rolle des Vertriebsleiters sein, die Kundenaufträge über 10.000 Euro übertragen darf. Sie können auch hier einen bestimmten Vertriebsleiter auswählen, und dann die Regel so gestalten, dass Sie nur auf diesen Benutzer anwendbar ist. Einen genehmigenden Benutzer anzugeben ist nicht zwingend erfoderlich.
 
-#### Schritt 6: 
+#### Schritt 6
 
 Geben Sie "Autorisierter Wert" ein. Im Beispiel stellen wir das auf 10.000 Euro ein.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/setting-up/data/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/data/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
index 9e9f340..90dc38c 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
@@ -36,10 +36,10 @@
 
 <img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
 
-#### Anmerkungen:
+#### Anmerkungen
 
-1\. Stellen Sie sicher, dass Sie als Verschlüsselung UTF-8 verwenden, wenn Ihre Anwendung das zulässt.
-2\. Lassen Sie die Spalte ID für einen neuen Datensatz leer.
+1. Stellen Sie sicher, dass Sie als Verschlüsselung UTF-8 verwenden, wenn Ihre Anwendung das zulässt.
+2. Lassen Sie die Spalte ID für einen neuen Datensatz leer.
 
 ### 4. Hochladen aller Tabellen (übergeordnete und Untertabellen)
 
diff --git a/erpnext/docs/user/manual/de/setting-up/data/index.md b/erpnext/docs/user/manual/de/setting-up/data/index.md
index 3586885..68460b0 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/index.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/index.md
@@ -3,6 +3,6 @@
 
 Mithilfe des Werkzeuges zum Datenimport und -export können Sie Massenimporte und -exporte aus und nach Tabellenkalkulationsdateien (**.csv**) durchführen. Dieses Werkzeug ist sehr hilfreich zu Beginn des Einrichtungsprozesses um Daten aus anderen Systemen zu übernehmen.
 
-Themen
+### Themen
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool_detail/__init__.py b/erpnext/docs/user/manual/de/setting-up/email/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool_detail/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/email/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
index 732d648..58f6fe3 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
@@ -3,19 +3,13 @@
 
 Sie können verschiedene E-Mail-Benachrichtigungen in Ihrem System einstellen, um Sie an wichtige Aktivitäten zu erinnern, beispielsweise an:
 
-1\. das Enddatum einer Aufgabe.
-
-2\. einen vom Kunden erwarteten Liefertermin eines Kundenauftrages.
-
-3\. einen vom Lieferanten erwarteten Zahlungstermin.
-
-4\. eine Erinnerung zum Nachfassen.
-
-5\. Wenn der Wert einer Bestellung einen bestimmten Betrag überschreitet.
-
-6\. Wenn ein Vertrag ausläuft.
-
-7\. Wenn eine Aufgabe abgeschlossen ist oder Ihren Status ändert.
+1. das Enddatum einer Aufgabe.
+2. einen vom Kunden erwarteten Liefertermin eines Kundenauftrages.
+3. einen vom Lieferanten erwarteten Zahlungstermin.
+4. eine Erinnerung zum Nachfassen.
+5. Wenn der Wert einer Bestellung einen bestimmten Betrag überschreitet.
+6. Wenn ein Vertrag ausläuft.
+7. Wenn eine Aufgabe abgeschlossen ist oder Ihren Status ändert.
 
 Hierfür müssen Sie eine E-Mail-Erinnerung einstellen.
 
@@ -25,29 +19,20 @@
 
 Um eine E-Mail-Erinnerung einzustellen, gehen Sie wie folgt vor:
 
-1\. Wählen Sie das Dokument aus, welches Sie beobachten wollen.
-
-2\. Geben Sie an, welche Ereignisse Sie beobachten wollen. Ereignisse sind:
-
-2\.1 Neu: Wenn ein Dokument des gewählten Typs erstellt wird.
-
-2\.2 Speichern / Übertragen / Stornieren: Wenn ein Dokument des gewählten Typs gespeichert, übertragen oder storniert wird.
-
-2\.3 Änderung des Wertes: Wenn sich ein bestimmter Wert ändert.
-
-2\.4 Tage vor / Tage nach: Stellen Sie eine Benachrichtigung einige Tage vor oder nach einem **Referenzdatum** ein. Um die Anzahl der Tage einzugeben, geben Sie einen Wert in **Tage vor oder nach** ein. Das kann sehr nützlich sein, wenn es sich um Fälligkeitstermine handelt oder es um das Nachverfolgen von Leads oder Angeboten geht.
-
-3\. Stellen Sie, wenn Sie möchten, Zusatzbedingungen ein.
-
-4\. Geben Sie die Empfänger der Erinnerung an. Der Empfänger kann sowohl über ein Feld des Dokumentes als auch über eine feste Liste ausgewählt werden.
-
-5\. Verfassen Sie die Nachricht.
+1. Wählen Sie das Dokument aus, welches Sie beobachten wollen.
+2. Geben Sie an, welche Ereignisse Sie beobachten wollen. Ereignisse sind:
+    1. Neu: Wenn ein Dokument des gewählten Typs erstellt wird.
+    2. Speichern / Übertragen / Stornieren: Wenn ein Dokument des gewählten Typs gespeichert, übertragen oder storniert wird.
+    3. Änderung des Wertes: Wenn sich ein bestimmter Wert ändert.
+    4. Tage vor / Tage nach: Stellen Sie eine Benachrichtigung einige Tage vor oder nach einem **Referenzdatum** ein. Um die Anzahl der Tage einzugeben, geben Sie einen Wert in **Tage vor oder nach** ein. Das kann sehr nützlich sein, wenn es sich um Fälligkeitstermine handelt oder es um das Nachverfolgen von Leads oder Angeboten geht.
+3. Stellen Sie, wenn Sie möchten, Zusatzbedingungen ein.
+4. Geben Sie die Empfänger der Erinnerung an. Der Empfänger kann sowohl über ein Feld des Dokumentes als auch über eine feste Liste ausgewählt werden.
+5. Verfassen Sie die Nachricht.
 
 ---
 
 #### Beispiel
-1\. [Kriterien definieren](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">)
-
-2\. [Empfänger und Nachrichtentext eingeben](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">)
+1. [Kriterien definieren](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">)
+2. [Empfänger und Nachrichtentext eingeben](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">)
 
 {next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
index 730cae5..d2087ca 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
@@ -5,6 +5,6 @@
 
 <img class="screenshot" alt="Emails versenden" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
 
-**Anmerkung:** Es müssen Konten zum [E-Mail-Versand]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) eingerichtet sein.
+**Anmerkung:** Es müssen Konten zum [E-Mail-Versand]({{docs_base_url}}/user/manual/de/setting-up/email/email-account.html) eingerichtet sein.
 
 {next}
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/user/manual/de/setting-up/print/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/print/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/print/address-template.md b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
index fd9db98..b3f37f7 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
@@ -15,17 +15,15 @@
 
 Hier sehen Sie die Standardvorlage:
 
-
-
-{{ 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 -%}
+	{% raw %}{{ 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 -%}{% endraw %}
 
 
 ### Beispiel
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/setting-up/settings/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/settings/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
index ca41025..1a6f336 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
@@ -23,11 +23,9 @@
 
 In diesem Formular,
 
-1\. Wählen Sie die Transaktion aus, für die Sie den Nummernkreis einstellen wollen. Das System wird den aktuellen Nummernkreis in der Textbox aktualisieren.
-
-2\. Passen Sie den Nummernkreis nach Ihren Wünschen mit eindeutigen Präfixen an. Jedes Präfix muss in einer neuen Zeile stehen.
-
-3\. Das erste Präfix wird zum Standard-Präfix. Wenn Sie möchten, dass ein Benutzer explizit einen Nummernkreis statt der Standardeinstellung auswählt, markieren Sie die Option "Benutzer muss immer auswählen".
+1. Wählen Sie die Transaktion aus, für die Sie den Nummernkreis einstellen wollen. Das System wird den aktuellen Nummernkreis in der Textbox aktualisieren.
+2. Passen Sie den Nummernkreis nach Ihren Wünschen mit eindeutigen Präfixen an. Jedes Präfix muss in einer neuen Zeile stehen.
+3. Das erste Präfix wird zum Standard-Präfix. Wenn Sie möchten, dass ein Benutzer explizit einen Nummernkreis statt der Standardeinstellung auswählt, markieren Sie die Option "Benutzer muss immer auswählen".
 
 Sie können auch den Startpunkt eines Nummernkreises auswählen, indem Sie den Namen und den Startpunkt des Nummernkreises im Abschnitt "Seriennummer aktualisieren" angeben.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/setting-up/setup-wizard/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/setup-wizard/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
index eca0a67..f32815d 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
@@ -15,7 +15,7 @@
 
 Wenn Ihr Briefkopf noch nicht fertig ist, können Sie diesen Schritt auch überspringen.
 
-Um später einen Briefkopf über das Modul "Einstellungen" auszuwählen, lesen Sie im Bereich [Briefkopf]({{docs_base_url}}/user/manual/en/setting-up/print/letter-head.html) weiter.
+Um später einen Briefkopf über das Modul "Einstellungen" auszuwählen, lesen Sie im Bereich [Briefkopf]({{docs_base_url}}/user/manual/de/setting-up/print/letter-head.html) weiter.
 
 ### Anhang als Internetverknüpfung
 
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
index cedbe30..76f1538 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
@@ -18,6 +18,6 @@
 
 Das Anliegen der Mehrwertsteuer ist es, für den Staat ähnlich der Körperschaftssteuer und der Einkommensteuer Steuererträge zu generieren. Beispiel: Wenn Sie in einem Kaufhaus einkaufen schlägt Ihnen das Geschäft 19% als Mehrwertsteuer auf die Rechnung auf.
 
-Um im Einstellungsassistenten die Mehrwertsteuer einzustellen, geben Sie einfach den Prozentsatz der vom Staat erhoben wird, ein. Um die Mehrwertsteuer zu einem späteren Zeitpunkt einzustellen, lesen Sie bitte den Abschnitt [Einstellen von Steuern]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+Um im Einstellungsassistenten die Mehrwertsteuer einzustellen, geben Sie einfach den Prozentsatz der vom Staat erhoben wird, ein. Um die Mehrwertsteuer zu einem späteren Zeitpunkt einzustellen, lesen Sie bitte den Abschnitt [Einstellen von Steuern]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html).
 
 {next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
index 65c4c7a..69fed2b 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
@@ -18,6 +18,6 @@
 
 Kontaktname: Shiv Agarwal
 
-Um mehr über Kunden zu erfahren, lesen Sie im Abschnitt [Details zu Kunden]({{docs_base_url}}/user/manual/en/CRM/customer.html) nach.
+Um mehr über Kunden zu erfahren, lesen Sie im Abschnitt [Details zu Kunden]({{docs_base_url}}/user/manual/de/CRM/customer.html) nach.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
index b880cb4..7d398b5 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
@@ -8,6 +8,6 @@
 
 ---
 
-Um den Begriff "Lieferant" besser zu verstehen, lesen Sie unter [Lieferantenstammdaten]({{docs_base_url}}/user/manual/en/buying/supplier-master.html) nach.
+Um den Begriff "Lieferant" besser zu verstehen, lesen Sie unter [Lieferantenstammdaten]({{docs_base_url}}/user/manual/de/buying/supplier.html) nach.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md b/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
index 28ecce2..ba53f5e 100644
--- a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
+++ b/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
@@ -27,7 +27,7 @@
 
 ![Dropbox-Zugriff]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png)
 
-## Für OpenSource-Nutzer:
+## Für OpenSource-Nutzer
 
 Voreinstellungen:
 
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/setting-up/users-and-permissions/__init__.py
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
index 0dbcab4..6d101bc 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
@@ -31,7 +31,7 @@
 
 Um Benutzerberechtigungen zu setzen, gehen Sie zu:
 
-> Einstellungen > Berechtigungen > [Benutzerrechte-Manager]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
+> Einstellungen > Berechtigungen > [Benutzerrechte-Manager]({{docs_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html)
 
 
 
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
index de37271..a751693 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
@@ -12,7 +12,7 @@
 
 Abbildung: Übersicht aus dem Benutzerberechtigungs-Manager die aufzeigt, wie Benutzer nur auf bestimmte Firmen zugreifen können
 
-#### Beispiel:
+#### Beispiel
 
 Der Benutzer "aromn@example.com" hat die Rolle "Nutzer Vertrieb" und wir möchten die Zugriffsrechte des Benutzers so einschränken, dass er nur auf Datensätze einer bestimmten Firma, nämlich der Wind Power LLC, zugreifen kann.
 
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/stock/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/stock/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/__init__.py
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
index 1212013..1a17675 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
@@ -9,7 +9,7 @@
 
 Wenn Sie Artikel kaufen und erhalten, werden diese Artikel als Vermögen des Unternehmens gebucht (Warenbestand/Anlagevermögen). Wenn Sie diese Artikel wieder verkaufen und ausliefern, werden Kosten (Selbstkosten) in Höhe der Bezugskosten der Artikel verbucht. Nach jeder Lagertransaktion werden Buchungen im Hauptbuch erstellt. Dies hat zum Ergebnis, dass der Wert im Lagerbuch immer gleich dem Wert in der Bilanz bleibt. Das verbessert die Aussagekraft der Bilanz und der Gewinn- und Verlustrechnung.
 
-Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen.
+Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen.
 
 #### Vorteile
 
@@ -33,6 +33,6 @@
 
 Dieser Gesamtprozess wird als Stichtagsinventur bezeichnet.
 
-Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
 
 {next}
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index c233959..742d246 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -1,14 +1,14 @@
 # Zur Ständigen Inventur wechseln
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-Bestehende Benutzer müssen sich an folgende Schritte halten um das neue System der Ständigen Inventur zu aktivieren. Da die Ständige Inventur immer auf einer Synchronisation zwischen Lager und Kontostand aufbaut, ist es nicht möglich diese Option in einer bestehenden Lagereinstellung zu übernehmen. Sie müssen einen komplett neuen Satz von Lägern erstellen, jedes davon verbunden mit dem betreffenden Konto.
+Bestehende Benutzer müssen sich an folgende Schritte halten um das neue System der Ständigen Inventur zu aktivieren. Da die Ständige Inventur immer auf einer Synchronisation zwischen Lager und Kontostand aufbaut, ist es nicht möglich diese Option in einer bestehenden Lagereinstellung zu übernehmen. Sie müssen einen komplett neuen Satz von Lagern erstellen, jedes davon verbunden mit dem betreffenden Konto.
 
 Schritte:
 
 
   * Heben Sie die Salden der Konten, die Sie zur Pflege des verfügbaren Lagerwertes verwenden, (Warenbestände/Anlagevermögen) durch eine Journalbuchung auf.
 
-  * Da bereits angelegte Läger mit Lagertransaktionen verbunden sind, es aber keine verknüpften Buchungssätze gibt, können diese Läger nicht in einer ständigen Inventur genutzt werden. Sie müssen für zukünftige Lagertransaktionen neue Läger anlegen, die dann mit den zutreffenden Konten verknüpft sind. Wählen Sie bei der Erstellung neuer Läger eine Artikelgruppe unter der das Unterkonto für das Lager erstellt wird.
+  * Da bereits angelegte Lager mit Lagertransaktionen verbunden sind, es aber keine verknüpften Buchungssätze gibt, können diese Lager nicht in einer ständigen Inventur genutzt werden. Sie müssen für zukünftige Lagertransaktionen neue Lager anlegen, die dann mit den zutreffenden Konten verknüpft sind. Wählen Sie bei der Erstellung neuer Lager eine Artikelgruppe unter der das Unterkonto für das Lager erstellt wird.
 
   * Erstellen Sie folgende Standardkonten für jede Firma: 
 
@@ -25,6 +25,6 @@
 
 * Erstellen Sie Lagerbuchungen (Materialübertrag) um verfügbare Lagerbestände von einem existierenden Lager auf ein neues Lager zu übertragen. Sobald im neuen Lager der Lagerbestand verfügbar wird, sollten Sie für zukünftige Transaktionen nur noch das neue Lager verwenden.
 
-Das System wird für bereits existierende Lagertransaktionen keine Buchungssätze erstellen, wenn sie vor der Aktivierung der Ständigen Inventur übertragen wurden, da die alten Läger nicht mit Konten verknüpft werden. Wenn Sie eine neue Transaktion mit einem alten Lager erstellen oder eine existierende Transaktion ändern, gibt es keine korrespondierenden Buchungssätze. Sie müssen Lager und Kontostände manuell über das Journal synchronisieren.
+Das System wird für bereits existierende Lagertransaktionen keine Buchungssätze erstellen, wenn sie vor der Aktivierung der Ständigen Inventur übertragen wurden, da die alten Lager nicht mit Konten verknüpft werden. Wenn Sie eine neue Transaktion mit einem alten Lager erstellen oder eine existierende Transaktion ändern, gibt es keine korrespondierenden Buchungssätze. Sie müssen Lager und Kontostände manuell über das Journal synchronisieren.
 
 > Anmerkung: Wenn Sie bereits das alte System der Ständigen Inventur nutzen, wird dieses automatisch deaktiviert. Sie müssen den Schritten oben folgen um es wieder zu aktivieren.
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
index e41d0c5..9a7f431 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -7,22 +7,19 @@
 
 ### Aktivierung
 
-1\. Richten Sie die folgenden Standard-Konten für jede Firma ein:
-
-* Lagerwaren erhalten aber noch nicht abgerechnet
-* Lagerabgleichskonto
-* In der Bewertung enthaltene Kosten
-* Kostenstelle
-
-2\. In der Ständigen Inventur verwaltet das System für jedes Lager einen eigenen Kontostand unter einer eigenen Kontobezeichnung. Um diese Kontobezeichnung zu erstellen, gehen Sie zu "Konto erstellen unter" in den Lagerstammdaten.
-
-3\. Aktivieren Sie die Ständige Inventur.
+1. Richten Sie die folgenden Standard-Konten für jede Firma ein:
+    * Lagerwaren erhalten aber noch nicht abgerechnet
+    * Lagerabgleichskonto
+    * In der Bewertung enthaltene Kosten
+    * Kostenstelle
+2. In der Ständigen Inventur verwaltet das System für jedes Lager einen eigenen Kontostand unter einer eigenen Kontobezeichnung. Um diese Kontobezeichnung zu erstellen, gehen Sie zu "Konto erstellen unter" in den Lagerstammdaten.
+3. Aktivieren Sie die Ständige Inventur.
 
 > Einstellungen > Rechnungswesen > Kontoeinstellungen > Eine Buchung für jede Lagerbewegung erstellen
 
 ---
 
-### Beispiel:
+### Beispiel
 
 Wir nehmen folgenden Kontenplan und folgende Lagereinstellungen für Ihre Firma an:
 
@@ -60,7 +57,7 @@
       * Versandgebühren
       * Zoll
 
-#### Kontenkonfiguration des Lagers:
+#### Kontenkonfiguration des Lagers
 
 * In Verkaufsstellen
 * In der Fertigung
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/de/stock/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/de/stock/articles/__init__.py
diff --git a/erpnext/docs/user/manual/de/stock/articles/index.md b/erpnext/docs/user/manual/de/stock/articles/index.md
index 59fa9ae..2dbba4a 100644
--- a/erpnext/docs/user/manual/de/stock/articles/index.md
+++ b/erpnext/docs/user/manual/de/stock/articles/index.md
@@ -18,7 +18,7 @@
 
 ### Lagerbestand: Lager- und Bestandseinstellungen
 
-In ERPNext können Sie verschiedene Typen von Lägern einstellen um Ihre unterschiedlichen Artikel zu lagern. Die Auswahl kann aufgrund der Artikeltypen getroffen werden. Das kann ein Artikel des Anlagevermögens sein, ein Lagerartikel oder auch ein Fertigungsartikel.
+In ERPNext können Sie verschiedene Typen von Lagern einstellen um Ihre unterschiedlichen Artikel zu lagern. Die Auswahl kann aufgrund der Artikeltypen getroffen werden. Das kann ein Artikel des Anlagevermögens sein, ein Lagerartikel oder auch ein Fertigungsartikel.
 
 * **Lagerartikel:** Wenn Sie Lagerartikel dieses Typs in Ihrem Lagerbestand verwalten, erzeugt ERPNext für jede Transaktion dieses Artikels eine Buchung im Lagerhauptbuch.
 * **Standardlager:** Das ist das Lager, welches automatisch bei Ihren Transaktionen ausgewählt wird.
diff --git a/erpnext/docs/user/manual/de/stock/delivery-note.md b/erpnext/docs/user/manual/de/stock/delivery-note.md
index 98ae787..00e66ca 100644
--- a/erpnext/docs/user/manual/de/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/de/stock/delivery-note.md
@@ -19,7 +19,7 @@
 
 ### Pakete oder Artikel mit Produkt-Bundles versenden
 
-Wenn Sie Artikel, die ein [Produkt-Bundle]({{docs_base_url}}/user/manual/en/selling/setup/sales-bom.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels.
+Wenn Sie Artikel, die ein [Produkt-Bundle]({{docs_base_url}}/user/manual/de/selling/setup/product-bundle.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels.
 
 Wenn Ihre Artikel serialisiert sind, dann müssen Sie für Artikel vom Typ Produkt-Bundle die Seriennummer in der Tabelle "Packliste" aktualisieren.
 
diff --git a/erpnext/docs/user/manual/de/stock/index.md b/erpnext/docs/user/manual/de/stock/index.md
index 4241104..5a0c2dd 100644
--- a/erpnext/docs/user/manual/de/stock/index.md
+++ b/erpnext/docs/user/manual/de/stock/index.md
@@ -21,6 +21,6 @@
 
 Um dies umzusetzen, sammelt ERPNext alle Bestandstransaktionen in einer Tabelle, die als Lagerhauptbuch bezeichnet wird. Alle Kaufbelege, Lagerbuchungen und Lieferscheine aktualisieren diese Tabelle.
 
-### Themen:
+### Themen
 
 {index}
diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md
index ab5977b..0f55b1e 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/erpnext/docs/user/manual/de/stock/material-request.md
@@ -16,9 +16,9 @@
 Eine Materialanfrage kann auf folgende Arten erstellt werden:
 
 * Automatisch aus einem Kundenauftrag heraus.
-* Automatisch, wenn die projizierte Menge eines Artikels in den Lägern einen bestimmten Bestand erreicht.
+* Automatisch, wenn die projizierte Menge eines Artikels in den Lagern einen bestimmten Bestand erreicht.
 * Automatisch aus einer Stückliste heraus, wenn Sie das Modul "Produktionsplanung" benutzen, um Ihre Fertigungsaktivitäten zu planen.
-* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge]({{docs_base_url}}/user/manual/en/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten.
+* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge]({{docs_base_url}}/user/manual/de/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten.
 
 Es gibt folgende Typen von Materialanfragen:
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/stock/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/stock/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/stock/stock-entry.md b/erpnext/docs/user/manual/de/stock/stock-entry.md
index 699713a..4b9fe08 100644
--- a/erpnext/docs/user/manual/de/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/de/stock/stock-entry.md
@@ -21,7 +21,7 @@
 
 In einer Lagerbuchung müssen Sie die Artikelliste mit all Ihren Transaktionen aktualisieren. Für jede Zeile müssen Sie ein Ausgangslager oder ein Eingangslager oder beides eingeben (wenn Sie eine Bewegung erfassen).
 
-#### Zusätzliche Kosten:
+#### Zusätzliche Kosten
 
 Wenn die Lagerbuchung eine Eingangsbuchung ist, d. h. wenn ein beliebiger Artikel an einem Ziellager angenommen wird, können Sie zusätzliche Kosten erfassen (wie Versandgebühren, Zollgebühren, Betriebskosten, usw.), die mit dem Prozess verbunden sind. Die Zusatzkosten werden berücksichtigt, um den Wert des Artikels zu kalkulieren.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/stock/tools/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/stock/tools/__init__.py
diff --git a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
index 1a311e2..340e104 100644
--- a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
@@ -27,10 +27,8 @@
 
 ### Was passiert bei der Ausgabe?
 
-1\. Bei der Ausgabe des Einstandskostenbelegs werden die zutreffenden Einstandskosten in der Artikelliste des Kaufbelegs aktualisiert.
-
-2\. Die Bewertung der Artikel wird basierend auf den neuen Einstandskosten neu berechnet.
-
-3\. Wenn Sie die Ständige Inventur nutzen, verbucht das System Buchungen im Hauptbuch um den Lagerbestand zu korrigieren. Es belastet (erhöht) das Konto des zugehörigen Lagers und entlastet (erniedrigt) das Konto "Ausgaben in Bewertung eingerechnet". Wenn Artikel schon geliefert wurden, wurden die Selbstkosten zur alten Bewertung verbucht. Daher werden Hauptbuch-Buchungen erneut für alle zukünftigen ausgehenden Buchungen verbundener Artikel erstellt um den Selbstkosten-Betrag zu korrigieren.
+1. Bei der Ausgabe des Einstandskostenbelegs werden die zutreffenden Einstandskosten in der Artikelliste des Kaufbelegs aktualisiert.
+2. Die Bewertung der Artikel wird basierend auf den neuen Einstandskosten neu berechnet.
+3. Wenn Sie die Ständige Inventur nutzen, verbucht das System Buchungen im Hauptbuch um den Lagerbestand zu korrigieren. Es belastet (erhöht) das Konto des zugehörigen Lagers und entlastet (erniedrigt) das Konto "Ausgaben in Bewertung eingerechnet". Wenn Artikel schon geliefert wurden, wurden die Selbstkosten zur alten Bewertung verbucht. Daher werden Hauptbuch-Buchungen erneut für alle zukünftigen ausgehenden Buchungen verbundener Artikel erstellt um den Selbstkosten-Betrag zu korrigieren.
 
 {next}
diff --git a/erpnext/docs/user/manual/de/stock/warehouse.md b/erpnext/docs/user/manual/de/stock/warehouse.md
index 5025d16..a2e6c43 100644
--- a/erpnext/docs/user/manual/de/stock/warehouse.md
+++ b/erpnext/docs/user/manual/de/stock/warehouse.md
@@ -1,7 +1,7 @@
 # Lager
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
-Ein Lager ist ein geschäftlich genutztes Gebäude zum Lagern von Waren. Läger werden von Herstellern, Importeuren, Exporteuren, Großhändlern, Transporteuren, vom Zoll, usw. genutzt. Es handelt sich normalerweise um große, flache Gebäude in Industriegebieten von Städten und Ortschaften. Meistens verfügen sie über Ladestationen um Waren auf LKWs zu verladen und sie aus LKWs zu entladen.
+Ein Lager ist ein geschäftlich genutztes Gebäude zum Lagern von Waren. Lager werden von Herstellern, Importeuren, Exporteuren, Großhändlern, Transporteuren, vom Zoll, usw. genutzt. Es handelt sich normalerweise um große, flache Gebäude in Industriegebieten von Städten und Ortschaften. Meistens verfügen sie über Ladestationen um Waren auf LKWs zu verladen und sie aus LKWs zu entladen.
 
 Um zum Bereich "Lager" zu gelangen, klicken Sie auf "Lagerbestand" und gehen Sie unter "Dokumente" auf "Lager". Sie können auch über das Modul "Einstellungen" gehen und auf "Lagerbestand" und "Lager-Einstellungen" klicken.
 
@@ -9,13 +9,13 @@
 
 <img class="screenshot" alt="Lager" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
 
-In ERPNext muss jedes Lager einer festen Firma zugeordnet sein, um einen unternehmensbezogenen Lagerbestand zu erhalten. Die Läger werden mit den ihnen zugeordneten Firmenkürzeln abgespeichert. Dies erleichtert es auf einen Blick herauszufinden, welches Lager zu welcher Firma gehört.
+In ERPNext muss jedes Lager einer festen Firma zugeordnet sein, um einen unternehmensbezogenen Lagerbestand zu erhalten. Die Lager werden mit den ihnen zugeordneten Firmenkürzeln abgespeichert. Dies erleichtert es auf einen Blick herauszufinden, welches Lager zu welcher Firma gehört.
 
-Sie können für diese Läger Benutzereinschränkungen mit einstellen. Wenn Sie nicht möchten, dass ein bestimmter Benutzer mit einem bestimmten Lager arbeiten kann, können Sie diesen Benutzer vom Zugriff auf das Lager ausschliessen.
+Sie können für diese Lager Benutzereinschränkungen mit einstellen. Wenn Sie nicht möchten, dass ein bestimmter Benutzer mit einem bestimmten Lager arbeiten kann, können Sie diesen Benutzer vom Zugriff auf das Lager ausschliessen.
 
-### Läger verschmelzen
+### Lager verschmelzen
 
-Bei der täglichen Arbeit kommt es vor, dass fälschlicherweise doppelte Einträge erstellt werden, was zu doppelten Lägern führt. Doppelte Datensätze können zu einem einzigen Lagerort verschmolzen werden. Wählen Sie hierzu aus der Kopfmenüleiste des Systems das Menü "Datei" aus. Wählen Sie "Umbenennen" und geben Sie das richtige Lager ein, drücken Sie danach die Schaltfläche "Verschmelzen". Das System ersetzt in allen Transaktionen alle falschen Lagereinträge durch das richtige Lager. Weiterhin wird die verfügbare Menge (tatsächliche Menge, reservierte Menge, bestellte Menge, usw.) aller Artikel im doppelt vorhandenen Lager auf das richtige Lager übertragen. Löschen Sie nach dem Abschluß der Verschmelzung das doppelte Lager.
+Bei der täglichen Arbeit kommt es vor, dass fälschlicherweise doppelte Einträge erstellt werden, was zu doppelten Lagern führt. Doppelte Datensätze können zu einem einzigen Lagerort verschmolzen werden. Wählen Sie hierzu aus der Kopfmenüleiste des Systems das Menü "Datei" aus. Wählen Sie "Umbenennen" und geben Sie das richtige Lager ein, drücken Sie danach die Schaltfläche "Verschmelzen". Das System ersetzt in allen Transaktionen alle falschen Lagereinträge durch das richtige Lager. Weiterhin wird die verfügbare Menge (tatsächliche Menge, reservierte Menge, bestellte Menge, usw.) aller Artikel im doppelt vorhandenen Lager auf das richtige Lager übertragen. Löschen Sie nach dem Abschluß der Verschmelzung das doppelte Lager.
 
 > Hinweis: ERPNext berechnet den Lagerbestand für jede mögliche Kombination aus Artikel und Lager. Aus diesem Grund können Sie sich für jeden beliebigen Artikel den Lagerbestand in einem bestimmten Lager zu einem bestimmten Datum anzeigen lassen.
 
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/support/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/support/__init__.py
diff --git a/erpnext/docs/user/manual/de/support/index.md b/erpnext/docs/user/manual/de/support/index.md
index a4bb1f4..3b43a4d 100644
--- a/erpnext/docs/user/manual/de/support/index.md
+++ b/erpnext/docs/user/manual/de/support/index.md
@@ -5,6 +5,6 @@
 
 In diesem Modul können Sie eingehende Supportanfragen über Supporttickets abwickeln. Sie können somit auch Kundenanfragen zu bestimmten Seriennummern im Auge behalten und diese basierend auf der Garantie und anderen Informationen beantworten. Weiterhin können Sie Wartungspläne für Seriennummern erstellen und Wartungsbesuche bei Ihren Kunden aufzeichnen.
 
-Themen
+### Themen
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/using-erpnext/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/using-erpnext/__init__.py
diff --git a/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
index b84dac7..3107a2b 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
@@ -13,6 +13,6 @@
 
 ### Schlagworte
 
-Lesen Sie hier mehr über [Schlagworte]({{docs_base_url}}/user/manual/en/collaboration-tools/tags.html)
+Lesen Sie hier mehr über [Schlagworte]({{docs_base_url}}/user/manual/de/using-erpnext/tags.html)
 
 {next}
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/de/website/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/de/website/__init__.py
diff --git a/erpnext/docs/user/manual/de/website/index.md b/erpnext/docs/user/manual/de/website/index.md
index 2f8b4de..ca0310b 100644
--- a/erpnext/docs/user/manual/de/website/index.md
+++ b/erpnext/docs/user/manual/de/website/index.md
@@ -13,11 +13,9 @@
 
 Wir haben uns genau das gleiche gedacht und haben deshalb eine kleine aber feine App zur Webseitenentwicklung gebaut, direkt in ERPNext! Wenn Sie das Webseitenmodul von ERPNext nutzen, können Sie:
 
-1\. Webseiten erstellen
-
-2\. Einen Blog schreiben
-
-3\. Ihren Produktkatalog basierend auf den Artikelstammdaten erstellen 
+1. Webseiten erstellen
+2. Einen Blog schreiben
+3. Ihren Produktkatalog basierend auf den Artikelstammdaten erstellen 
 
 In Kürze werden wir einen Einkaufswagen mit bereit stellen, so dass Ihre Kunden Bestellung aufgeben können und online zahlen können.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/de/website/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/de/website/setup/__init__.py
diff --git a/erpnext/docs/user/manual/de/website/setup/social-login-keys.md b/erpnext/docs/user/manual/de/website/setup/social-login-keys.md
index 746a313..6a336f9 100644
--- a/erpnext/docs/user/manual/de/website/setup/social-login-keys.md
+++ b/erpnext/docs/user/manual/de/website/setup/social-login-keys.md
@@ -9,6 +9,6 @@
 
 * Für Facebook: https://www.youtube.com/watch?v=zC6Q6gIfiw8
 * Für Google: https://www.youtube.com/watch?v=w_EAttrE9sw
-* Für GutHub: https://www.youtube.com/watch?v=bG71DxxkVjQ
+* Für GitHub: https://www.youtube.com/watch?v=bG71DxxkVjQ
 
 {next}
diff --git a/erpnext/docs/user/manual/de/website/setup/website-settings.md b/erpnext/docs/user/manual/de/website/setup/website-settings.md
index efab665..45a4498 100644
--- a/erpnext/docs/user/manual/de/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/de/website/setup/website-settings.md
@@ -7,7 +7,7 @@
 
 ### Zielseite
 
-* Homepage: Sie können angeben, welche [Webseite]({{docs_base_url}}/user/manual/en/website/web-page.html) die Startseite der Homepage ist.
+* Homepage: Sie können angeben, welche [Webseite]({{docs_base_url}}/user/manual/de/website/web-page.html) die Startseite der Homepage ist.
 * Startseite ist "Products": Wenn diese Option markiert ist, ist die Standard-Artikelgruppe die Startseite der Webseite.
 * Titel-Präfix: Stellt den Browser-Titel ein.
 
diff --git a/erpnext/docs/user/manual/de/website/web-form.md b/erpnext/docs/user/manual/de/website/web-form.md
index ce660f6..473f2c7 100644
--- a/erpnext/docs/user/manual/de/website/web-form.md
+++ b/erpnext/docs/user/manual/de/website/web-form.md
@@ -13,13 +13,10 @@
 
 > Webseite > Web-Formular > Neu
 
-1\. Geben Sie die Bezeichnung und die URL des Web-Formulars an.
-
-2\. Wählen Sie den DocType aus, in dem der Benutzer Datensätze speichern soll.
-
-3\. Geben Sie an, ob sich der Benutzer einloggen muss, Daten ändern muss, mehrere verschiedene Datensätze verwalten soll, etc.
-
-4\. Fügen Sie die Felder, die Sie in den Datensätzen haben wollen, hinzu.
+1. Geben Sie die Bezeichnung und die URL des Web-Formulars an.
+2. Wählen Sie den DocType aus, in dem der Benutzer Datensätze speichern soll.
+3. Geben Sie an, ob sich der Benutzer einloggen muss, Daten ändern muss, mehrere verschiedene Datensätze verwalten soll, etc.
+4. Fügen Sie die Felder, die Sie in den Datensätzen haben wollen, hinzu.
 
 <img class="screenshot" alt="Webformular" src="{{docs_base_url}}/assets/img/website/web-form.png">
 
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/CRM/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/CRM/__init__.py
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
index 83757e0..f87f82c 100644
--- a/erpnext/docs/user/manual/en/CRM/contact.md
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -1,7 +1,6 @@
 # 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.
+Contacts do not need to be linked to another document, they can be stand alone.  You can even create a contact with only a first name, not linked to any other document or party (Customer/Supplier).
 
 The Contact_ID is automatically created:
 
@@ -36,7 +35,7 @@
 
 ### 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).
+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 and Address Type. (AddressTitle-AddressType).
 
 ### Address Linking
 
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 90a4228..88f9e66 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -21,9 +21,9 @@
 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.
+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)
+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
 
@@ -52,12 +52,12 @@
 “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)
+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.
+You can also mention [Sales Person]({{docs_base_url}}/user/manual/en/CRM/setup/sales-person.html) against a customer.
 
 ### Sales Partner
 
diff --git a/erpnext/docs/user/manual/en/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md
index 20639a9..e394333 100644
--- a/erpnext/docs/user/manual/en/CRM/index.md
+++ b/erpnext/docs/user/manual/en/CRM/index.md
@@ -1,4 +1,5 @@
 #CRM
+# CRM
 
 ERPNext helps you track business **Opportunities** from **Leads** and
 **Customers**, send them **Quotations** and make confirmed **Sales Orders**.
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/CRM/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/CRM/setup/__init__.py
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
index baf6ba4..9714350 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -4,7 +4,7 @@
 
 <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.
+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
 
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/accounts/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/accounts/__init__.py
diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
index 042e800..010d897 100644
--- a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -7,19 +7,17 @@
 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.
+Once Sales Order or Purchase Order is submitted, you will find option to create Advance Payment entry against it.
+
+To directly create Advance Payment Entry, Go to:
 
 > 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.  
+Select a Voucher Type based on a mode in which advance payment is made.
 
 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
+credit entry against the customer. To balance it with the debit entry [as per the Double
+accounting system] enter $5000 as debit against the company's cash account. In
 the row "Is Advance" click 'Yes'.
 
 #### Figure 1 : Journal Entry -Advance Entry  
@@ -43,7 +41,7 @@
 
 <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
+Save and submit the Journal Entry. 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
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/accounts/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/accounts/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md b/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md
new file mode 100644
index 0000000..811e948
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/cheque-print.md
@@ -0,0 +1,36 @@
+#Cheque Print
+
+** Whats is Cheque Print? **
+
+You can choose to print Cheques at the time of making payments to Creditors/ parties during Voucher Entry i.e., directly from the Payment Vouchers and Inter-bank payment or transfers through Contra Vouchers.
+
+###Setup Cheque Print
+
+To enable cheque printing,
+
+1. Create cheque settings under `Accounts > Cheque Print Template`.
+
+![Cheque Print Template]({{docs_base_url}}/assets/img/articles/cueque_print_template.png)
+
+You can see a preview of cheque print by attaching scanned copy of cheque to avoid miss printing.
+
+![Cheque scanned copy]({{docs_base_url}}/assets/img/articles/attach_scanned_copy.png)
+
+![Cheque Print Preview]({{docs_base_url}}/assets/img/articles/cueque_print_preview.png)
+
+2. After saving cheque print settings, you can Create / Update print format for settings.
+
+To create print format, click on `Create Print Format`.
+
+![Create Print Format]({{docs_base_url}}/assets/img/articles/create_print_format.png)
+
+If you have already created a Print Format, you can update it by clicking on `Update Print Format`.
+
+3. You will see newly created / updated print format under Journal Entry.
+
+![Print from Journal Entry]({{docs_base_url}}/assets/img/articles/journal_entry_cheque_print.png)
+
+
+###Cheque Print
+
+![Print from Journal Entry]({{docs_base_url}}/assets/img/articles/cheque_print.gif)
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index 76ace0b..d54f0cd 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -12,4 +12,5 @@
 post-dated-cheque-entry
 update-stock-option-in-sales-invoice
 what-is-the-differences-of-total-and-valuation-in-tax-and-charges
-withdrawing-salary-from-owners-equity-account
\ No newline at end of file
+withdrawing-salary-from-owners-equity-account
+cheque-print
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
index 356ad43..b8310ad 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
@@ -69,11 +69,11 @@
 
 #### 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.
+You can define budgets against the Cost Center associated with a Project. At any point of time, you can refer Budget Variance Report to analysis the expense vs budget against a cost center.
 
 To check Budget Variance report, go to:
 
-`Accounts > Standard Reports > Budget Variance Report`
+`Accounts > Budget and Cost Center > Budget Variance Report`
 
 [Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting.html).
 
diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
index a5f35d2..a9f92fb 100644
--- a/erpnext/docs/user/manual/en/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md
@@ -1,58 +1,29 @@
-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.
+In ERPNext, you can set and manage budgets against a Cost Center. 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.
+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.
+To allocate budget, go to:
 
-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.
+> Accounts > Budget and Cost Center > Budget
 
-#### Step 1: Click on Edit.
+In the Budget form, you can select a Cost Center and for that cost center you can define budgets against any Expense / Income accounts. Budgets can be defined against any Cost Center whether it is a Group / Leaf node in the Chart of Cost Centers.
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-1.png)  
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget.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
+If you have seasonal business, you can also define a Monthly Distribution record, to distribute the budget between months. If you don't set the monthly distribution, ERPNext will calculate the budget on yearly
 basis or in equal proportion for every month.
 
-#### Step 3:Add New Row and select budget account.  
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/monthly-distribution.png">
+
+While setting budget, you can also define the actions when expenses will exceed the allocated budget for a period. You can set separate action for monthly and annual budgets. There are 3 types of actions: Stop, Warn and Ignore. If Stop, system will not allow to book expenses more than allocated budget. In Case of Warn, it will just warn the user that expenses has been exceeded from the allocated budget. And Ignore will do nothing.
 
 
+At any point of time, user can check Budget Variance Report to analysis the expense vs budget against a cost center.
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-3.png)  
+To check Budget Variance report, go to:
 
+Accounts > Budget and Cost Center > Budget Variance Report
 
-
-### 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.
+<img class="screenshot" alt="Budget Variance Report" src="{{docs_base_url}}/assets/img/accounts/budget-variance-report.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
index 1a1d5d5..fcb7441 100644
--- a/erpnext/docs/user/manual/en/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -10,6 +10,7 @@
 opening-entry
 accounting-reports
 accounting-entries
+managing-fixed-assets
 budgeting
 opening-accounts
 item-wise-tax
diff --git a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
new file mode 100644
index 0000000..5fc8a0b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
@@ -0,0 +1,88 @@
+In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
+
+## Asset Category
+
+To start first you should create an Asset Category, depending on the type of assets. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here, you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
+
+<img class="screenshot" alt="Asset Category" src="{{docs_base_url}}/assets/img/accounts/asset-category.png">
+
+> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company.
+
+
+## Asset
+
+Next step will be creating the fixed asset record. Asset record is the heart of fixed asset management, all the activities like purchasing, depreciation, scrapping or sales are managed against it.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset.png">
+
+Explanation of the fields:
+
+1. Asset Category: The category of assets it belongs to.
+2. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
+3. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
+4. Warehouse: Set the location of the asset.
+5. Gross Purchase Amount: The purchase cost of the asset
+6. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
+7. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
+8. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the currect value of the asset. In case of new asset, mention the purchase amount or leave it blank.
+9. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
+	- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
+	- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
+10. Total Number of Depreciations: The total number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
+11. Number of Depreciations Booked: Enter the number of already booked depreciations for an existing asset.
+12. Frequency of Depreciation (Months): The number of months between two depreciations.
+13. Next Depreciation Date: Mention the next depreciation date, even if it is the first one. If the asset is an existing one and depreciation has already been completed, leave it blank.
+
+### Depreciations
+
+The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/depreciation-schedule.png">
+
+On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/depreciation-entry.png">
+
+In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
+
+For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-graph.png">
+
+
+## Purchase an Asset
+
+For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in teh Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice. 
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-purchase-invoice.png">
+
+On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no in the Asset record.
+
+
+## Sale an Asset
+
+To sale an asset, open the asset record and create a Sales Invoice using "Sale Asset" button. On submission of the Sales Invoice, following entries will take place:
+
+- "Receivable Account" (Debtors) will be debited by the sales amount.
+- "Fixed Asset Account" will be credited by the purchase amount of asset.
+- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
+- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-sales.png">
+
+
+## Scrap an Asset
+
+You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/scrap-journal-entry.png">
+
+## Asset Movement
+
+The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-movement.png">
+
+There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
+
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-movement-using-button.png">
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index c5887bb..92932b5 100644
--- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -58,7 +58,7 @@
 
 #### 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. 
+Suppose the default currency of the company is INR. You have a 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 of the credit account (Paypal) based on the average incoming exchange rate. This is to maintain Paypal balance properly in company currency. In case you modify the average exchange rate, you need to adjust the exchange rate manually in the future entries, so that balance in account currency and company currency are in sync.
diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 28ba0c2..fc86cdd 100644
--- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -1,4 +1,4 @@
-Now that you have completed most of the setup, its time to start moving in!
+	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.
@@ -29,11 +29,7 @@
 
 #### 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 **Temporary Opening** account is created under
-assets
+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 **Temporary Opening** account is created under assets
 
 #### The Opening Entry
 
@@ -54,7 +50,6 @@
 
 ![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.
@@ -68,26 +63,19 @@
   * 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:
-
+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.
+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.
+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.
+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 **Temporary Opening** account will have a balance of zero!
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/accounts/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/accounts/setup/__init__.py
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 8b9fcc1..16b5431 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -34,45 +34,4 @@
 
 ![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/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/accounts/tools/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/accounts/tools/__init__.py
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
index a5d6966..2b2ec36 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -11,14 +11,14 @@
 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">
+   <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">
+   <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">
+   <img class="screenshot" alt="Payment Tool" src="{{docs_base_url}}/assets/img/accounts/payment-tool-3.png">
 	
 {next}
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/buying/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/buying/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/buying/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/buying/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/buying/index.txt b/erpnext/docs/user/manual/en/buying/index.txt
index a12bb06..25c8797 100644
--- a/erpnext/docs/user/manual/en/buying/index.txt
+++ b/erpnext/docs/user/manual/en/buying/index.txt
@@ -1,4 +1,5 @@
 supplier
+request-for-quotation
 supplier-quotation
 purchase-order
 setup
diff --git a/erpnext/docs/user/manual/en/buying/request-for-quotation.md b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
new file mode 100644
index 0000000..c27895f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
@@ -0,0 +1,52 @@
+A Request for Quotation is a document that an organization submits to one or more suppliers eliciting quotation for items.
+
+In ERPNext, You can create request for quotation directly by going to:
+
+> Buying > Documents > Request for Quotation > New Request for Quotation
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.png)
+
+After creation of request for quotation, there are two ways to generate supplier quotation from request for quotation.
+
+#### For User
+
+__Step 1:__ Open request for quotation and click on make supplier quotation.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/make-supplier-quotation-from-rfq.png)
+
+__Step 2:__ Select supplier and click on make supplier quotation.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-selection-from-rfq.png)
+
+__Step 3:__ System will open the supplier quotation, user has to enter the rate and submit it.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-quotation-from-rfq.png)
+
+#### For Supplier
+
+__Step 1:__ User has to create contact or enter email id against the supplier on request for quotation.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/set-email-id.png)
+
+__Step 2:__ User has to click on send supplier emails button.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/send-supplier-emails.png)
+
+* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the request for quotation form.
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-password-update-link.png)
+
+* If supplier's user available: system will send request for quotation link to supplier, supplier has to login using his credentials to view request for quotation form on portal. 
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/send-rfq-link.png)
+
+__Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-portal-rfq.png)
+
+__Step 4:__ On submission, system will create supplier quotation(draft mode) against the supplier. User has to review the supplier quotation
+            and submit it.
+			
+More details:-
+
+![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.gif)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/buying/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/buying/setup/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/customer-portal/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/customer-portal/__init__.py
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/user/manual/en/customize-erpnext/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/user/manual/en/customize-erpnext/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/customize-erpnext/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/customize-erpnext/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
index a14f35c..62cc3f9 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
@@ -22,6 +22,6 @@
 
 <img alt="Uncheck Print Hide " class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-2.gif">
 
-#### Step 5: Update
+#### Step 4: Update
 
-Customize Customize Form to save changed. Reload your ERPNext account, and then check Print Format for confirmation.
\ No newline at end of file
+Update Customize Form to save changed. Reload your ERPNext account, and then check Print Format for confirmation.
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
index 46af27e..7bc965b 100644
--- 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
@@ -12,12 +12,12 @@
 
 Query Report is written in SQL which pull values from account's database and fetch in the report. Though SQL queries can be written from front end, like HTML, its restricted in hosted users. Because it will allow users with no access to specific report to query data directly from the database.
 
-Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
+Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
 
 ### 3. Script Report
 
 Script Reports are written in Python and stored on server side. These are complex reports which involves logic and calculation. Since these reports are written on server side, customizing it from hosted account is not possible. 
 
-Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
+Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
 
 <!-- markdown --> 
\ No newline at end of file
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/__init__.py
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
index b93d76e..f52cee1 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
@@ -1,5 +1,5 @@
 <!--markdown-->
-Before we venture to learn form customization tool, click [here](https://frappe.github.io/frappe/user/tutorial/doctypes.html) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently.
+Before we venture to learn form customization tool, click [here](https://frappe.github.io/frappe/user/en/tutorial/doctypes.html) 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 property of the standard fields, and insert [custom fields]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-field.html) as per the requirement. Let's assume we need to set Project Name field as a mandatory field in the Sales Order form. Following are the steps which shall be followed to achieve this.
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
index 34ef16d..123a613 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -1,5 +1,3 @@
-<!-- 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,
@@ -29,15 +27,15 @@
 
 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.
+For styling, the [Bootstrap 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/)
+1. [Jinja Templating Language: Reference](http://jinja.pocoo.org/docs/templates/)
+2. [Bootstrap CSS Framework](http://getbootstrap.com/)
 
 #### Print Settings
 
@@ -49,47 +47,45 @@
 
 #### 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 }}
+		{% raw %}<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>{% endraw %}
 
 #### Notes
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/human-resources/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/human-resources/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/human-resources/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/human-resources/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index 59c963f..824cd04 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -17,8 +17,8 @@
 
 > 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)
+settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-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)
+You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/manual/en/human-resources/leave.html)
 {next}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/human-resources/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/human-resources/setup/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/human-resources/tools/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/human-resources/tools/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/introduction/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/introduction/__init__.py
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
index 7761198..2be5a86 100644
--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -145,13 +145,19 @@
 A person who could be a future source of business. A Lead may generate
 Opportunities. (from: “may lead to a sale”).
 
-> Selling > Lead
+> CRM > Lead
 
 #### Opportunity
 
 A potential sale. (from: “opportunity for a business”).
 
-> Selling > Opportunity
+> CRM > Opportunity
+
+#### Quotation
+
+Customer's request to price an item or service.
+
+> Selling > Quotation
 
 #### Sales Order
 
diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
index 76e77b1..f1bcb49 100644
--- a/erpnext/docs/user/manual/en/introduction/index.md
+++ b/erpnext/docs/user/manual/en/introduction/index.md
@@ -4,43 +4,42 @@
 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.
+that it's hard to manage the dynamic nature of doing businesses. 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 goods and services, 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
+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.
+ERPNext is an end-to-end business solution that helps you to manage all your business information in one application 
+and use it to not only manage operations but also enables you to take informed decisions well in time to remain ahead of your competition. It forms a backbone of your business to add strength, transparency and control to your enterprise. 
 
 Among other things, ERPNext will help you to:
 
   * Track all Invoices and Payments.
   * Know what quantity of which product is available in stock.
+  * Identify and track your key performance indicators (KPI's).
   * 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.
+  * Tracking your budgets and spending
+  * Determine effective selling price based on the actual raw material, machinery and effort cost. 
   * Get reminders on maintenance schedules.
   * Publish your website.
 
 And a lot lot lot more.
 
+
 ### Topics
 
 {index}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/manufacturing/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/manufacturing/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/manufacturing/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/manufacturing/articles/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/manufacturing/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/manufacturing/setup/__init__.py
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index 9506d5c..1912a55 100644
--- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -28,7 +28,7 @@
 
 ####Over Production Allowance Percentage
 
-In Production Order, `Qty to Manufacture` is set. When creating Manufacture entry against Production Order, it validates `Qty to Manufature` entered in production order, and doesn't allow creating Manufacture Entry for more qty and Production Order qty. If you want to create Manufacture Qty than Production Order qty, mention Over Production Allowance Qty in the Manufacturing Settings. Based on Allowance Percentage mentioned, you will be able to create Manufacture Entry for more Qty than in Production Order.
+While making Production Orders against a Sales Order, the system will only allow production item quantity to be lesser than or equal to the quantity in the Sales Order. In case you wish to allow Production Orders to be raised with greater quantity, you can mention the Over Production Allowance Percentage here.
 
 ####Back-flush Raw Materials Based On
 
@@ -50,4 +50,4 @@
 
 ####Default Finished Goods Warehouse
 
-This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order.
\ No newline at end of file
+This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order.
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/manufacturing/tools/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/manufacturing/tools/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/projects/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/projects/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/projects/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/projects/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
index f04406f..ef59748 100644
--- a/erpnext/docs/user/manual/en/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -5,29 +5,29 @@
 
 ### Status of the Task
 
-A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled.
+A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or 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'.
+* By default each new Task created has the status set to 'Open'.
 
-* If a Time Log is made against a task, its status shall be set to 'Working'.
+* If a Time Log is made against a task, its status will be set to 'Working'.
 
 ### Dependent Task
 
-You can specify a list of dependent task under the 'Depends On' section.
+You can specify a list of dependent tasks 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.
+* You cannot close the parent task until all dependent tasks 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.
+* If the dependent tasks 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.
+The Actual Start and End Time along with the costing is updated based on the Time Log.
 
 * To view Time Log made against a Task click on 'Time Logs'
 
@@ -35,20 +35,20 @@
 
 <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.
+* You can also create a Time Log directly 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.
+You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/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.
+* You can also create a Expense Claims directly 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">
 
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
index d48633a..f4f76dc 100644
--- a/erpnext/docs/user/manual/en/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -1,23 +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 
+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 Sheet, go to 
 
-> Projects > Time Log Batch > New Time Log Batch
+> Projects > Time Sheet > New Time Sheet
 
 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.
+Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" 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">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
 
 ###Making Sales Invoice
 
-* After submitting the Time Log Batch, "Make Invoice" button shall appear.
+* After submitting the Time Sheet, "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">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
 
-* Click on that button to raise a Sales Invoice against the Time Log Batch.
+* Click on that button to raise a Sales Invoice against the Time Sheet.
 
-<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch_sales_invoice.png">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_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".
+* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed".
 
 {next}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/selling/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/selling/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/selling/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/selling/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
new file mode 100644
index 0000000..2a9ddfa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
@@ -0,0 +1,37 @@
+#Adding Margin
+
+User Can apply the margin on Quotation Item and Sales Order Item using following two options.
+1)Price Rule: With the help of this method user can apply the margin on Quotation and Sales Order based on condition. you can find the section margin on pricing rule where a user has to select the type of margin whether it is Percentage or Amount and rate or amount. The system will apply the margin on quotation item and sales order item if pricing rule is enabled.
+
+To setup Pricing Rule, go to:
+
+`Selling > Setup > Pricing Rule` or `Accounts > Setup > Pricing Rule`
+
+####Adding Margin in Pricing Rule
+
+<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-pricing-rule.png">
+
+Total Margin is calculated as follows:
+`Rate = Price List Rate + Margin Rate`
+
+So, In order to apply the Margin you need to add the Price List for the Item
+
+To add Price List, go to:
+
+`Selling > Setup > Item Price` or `Stock > Setup > Item Price`
+
+####Adding Item Price
+
+<img alt="Adding Margin in Pricing Rule" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-item-price-list.png">
+
+2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product.
+
+To add margin directly on Quotation or Sales Order, go to:
+
+`Selling > Document > Quotation`
+
+add item and scroll down to section where you can find the Margin Type
+
+####Adding Margin in Quotation
+
+<img alt="Adding Margin in Quotation" class="screenshot"  src="{{docs_base_url}}/assets/img/articles/margin-quotation-item.png">
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 027a515..6f5cc5e 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -7,7 +7,7 @@
 
 > Selling > Quotation > New Quotation
 
-###Creating Quotation from Oppurtunity
+###Creating Quotation from Opportunity
 
 You can also create a Quotation from an Opportunity.
 
@@ -35,7 +35,7 @@
 
 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 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.
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/selling/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/selling/setup/__init__.py
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
index 134a9b4..e32c97d 100644
--- 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
@@ -20,7 +20,7 @@
 
 ####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).
+If you wish to spread allocated target across months, then you should setup Monthly 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)
 
@@ -52,11 +52,11 @@
 
 ####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.
+Target Allocation 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.
+Using this Monthly Distribution document, you can divide target Qty or Amount across various months.
 
 ####2.4 Report - Territory Target Variance Item Groupwise
 
@@ -68,15 +68,15 @@
 
 ###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.
+Target Distribution document 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:
+To create new Monthly Distriibution, go to:
 
-`Accounts > Setup > Budget Distributon`
+`Accounts > Monthly 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.
+You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
 
 ###See Also
 
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/setting-up/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/setting-up/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/articles/__init__.py
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
index 2d2c179..3cbf159 100644
--- 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
@@ -2,6 +2,6 @@
 
 For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappe. Check following links to learn more about REST API of Frappe.
 
-[Frappe Rest API](https://frappe.github.io/frappe/user/guides/integration/rest_api.html)
+[Frappe Rest API](https://frappe.github.io/frappe/user/en/guides/integration/rest_api.html)
 
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/setting-up/data/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/data/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool_detail/__init__.py b/erpnext/docs/user/manual/en/setting-up/email/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool_detail/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/email/__init__.py
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
index f4cccd3..4caffbc 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -3,12 +3,12 @@
 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.
+2. Expected Delivery Date of a Sales Order.
+3. Expected Payment Date.
+4. Reminder of followup.
+5. If an Order greater than a particular value is received or sent.
+6. Expiry notification for a Contract.
+7. Completion / Status change of a Task.
 
 For this, you need to setup an Email Alert.
 
@@ -19,14 +19,48 @@
 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:
+2. 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
+3. Set additional conditions if you want.
+4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids.
+5. Compose the message
+
+
+### Setting a Subject
+You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject / message, you have to surround it with `{{ }}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example to get the name of a document, you use `{{ doc.name }}`. The below example sends an email on saving a Task with the Subject, "TASK##### has been created"
+
+<img class="screenshot" alt="Setting Subject" src="{{docs_base_url}}/assets/img/setup/email/email-alert-subject.png">
+
+### Setting Conditions
+
+Email alerts allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/email/email-alert-condition.png">
+
+The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on.
+
+### Setting a Message
+
+You can use both Jinja Tags (`{{ doc.[field_name] }}`) and HTML tags in the message textbox.
+
+	{% raw %}<h3>Order Overdue</h3>
+
+	<p>Transaction {{ doc.name }} has exceeded Due Date. Please take necessary action.</p>
+
+	<!-- show last comment -->
+	{% if comments %}
+	Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
+	{% endif %}
+
+	<h4>Details</h4>
+
+	<ul>
+	<li>Customer: {{ doc.customer }}
+	<li>Amount: {{ doc.total_amount }}
+	</ul>{% endraw %}
 
 ---
 
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/docs/user/manual/en/setting-up/print/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/print/__init__.py
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
index c2b9bb7..53dfef1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -14,7 +14,7 @@
 
 Here is the default template:
 
-	{{ address_line1 }}<br>
+	{% raw %}{{ address_line1 }}<br>
 	{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
 	{{ city }}<br>
 	{% if state %}{{ state }}<br>{% endif -%}
@@ -22,7 +22,7 @@
 	{{ country }}<br>
 	{% if phone %}Phone: {{ phone }}<br>{% endif -%}
 	{% if fax %}Fax: {{ fax }}<br>{% endif -%}
-	{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
+	{% if email_id %}Email: {{ email_id }}<br>{% endif -%}{% endraw %}
 
 ### Example
 
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/setting-up/settings/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/settings/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/setting-up/setup-wizard/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/setup-wizard/__init__.py
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
index 0e4b96a..762c984 100644
--- 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
@@ -7,6 +7,6 @@
 
 ---
 
-To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier-master.html)
+To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier.html)
 
 {next}
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/users-and-permissions/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/stock/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/stock/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/__init__.py
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
index fbe880f..80970bf 100644
--- 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
@@ -143,11 +143,11 @@
 <p><strong>Stock Ledger</strong>
 </p>
 
-![pr<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-2.png)
+<img alt="Stock" class="screenshot" src="{{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)
+<img alt="Leger" class="screenshot" src="{{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
@@ -162,7 +162,7 @@
 
 **General Ledger**
 
-![pi<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png)
+<img alt="General" class="screenshot" src="{{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.
@@ -220,11 +220,11 @@
 
 **Stock Ledger**
 
-![dn<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png)
+<img alt="Stock" class="screenshot" src="{{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)
+<img alt="General" class="screenshot" src="{{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
@@ -254,11 +254,11 @@
 
 **Stock Ledger**
 
-![si<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png)
+<img alt="Stock" class="screenshot" src="{{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)
+<img alt="General" class="screenshot" src="{{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.
@@ -292,11 +292,11 @@
 
 **Stock Ledger**
 
-![mr<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png)
+<img alt="Stock" class="screenshot" src="{{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)
+<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png">
 
 * * *
 
@@ -327,11 +327,11 @@
 
 **Stock Ledger**
 
-![mi<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png)
+<img alt="Stock" class="screenshot" src="{{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)
+<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png">
 
 * * *
 
@@ -364,8 +364,10 @@
 
 **Stock Ledger**
 
-![mtn<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png)
+<img alt="Stock" class="screenshot" src="{{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
+<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png">
+
+{ next }
\ No newline at end of file
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/stock/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/stock/articles/__init__.py
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index 6d20384..df779de 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -3,7 +3,6 @@
 depreciation-entry
 maintain-stock-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
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
deleted file mode 100644
index 0be7860..0000000
--- a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
+++ /dev/null
@@ -1,23 +0,0 @@
-#Managing Assets
-
-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, mainly stock items in a separate Warehouse.
-
-For the high value asset items, serialized inventory can be maintained. It will allow assigning unique Serial No. to each unit of an asset item.
-
-####Fixed Asset Master
-
-While creating Item Code for the fixed asset item, you should check "Is Fixed Asset" field.
-
-<img alt ="Fixed Asset Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/managing-assets-1.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]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) 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 should be done for fixed asset warehouse only.
-
-As per the perpetual inventory valuation system, accounting ledger is auto-created for a warehouse. You can move the accounting ledger of fixed asset asset from Stock Asset (default group) to Fixed Asset's group account.
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
index 7ae102b..ccf39c1 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -1,6 +1,6 @@
 #Managing Batch wise Inventory
 
-Set of items which has same properties and attributes can be group in a single Batch. For example, pharceuticals items are batch, so that it's manufacturing and expiry date can be tracked together. 
+Set of items which has same properties and attributes can be group in a single Batch. For example, pharmaceuticals  items are batch, so that it's manufacturing and expiry date can be tracked together. 
 
 To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master. 
 
diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
index 358f037..236e24b 100644
--- a/erpnext/docs/user/manual/en/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -22,7 +22,7 @@
 
 ### 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
+If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/manual/en/selling/setup/product-bundle.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
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/stock/item/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/stock/item/__init__.py
diff --git a/erpnext/docs/user/manual/en/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
index 4d2d727..e59fb42 100644
--- a/erpnext/docs/user/manual/en/stock/opening-stock.md
+++ b/erpnext/docs/user/manual/en/stock/opening-stock.md
@@ -10,6 +10,6 @@
 
 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)
+To understand Opening Stock for serialized Items visit [Stock Reconciliation]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
 
 {next}
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/stock/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/stock/setup/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/stock/tools/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/stock/tools/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/support/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/support/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/using-erpnext/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/using-erpnext/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/using-erpnext/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/using-erpnext/articles/__init__.py
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
index 8ce9b68..7418d73 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -14,6 +14,6 @@
 
 ### Tags
 
-[Read more about Tags]({{docs_base_url}}/user/manual/en/collaboration-tools/tags.html)  
+[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)  
 
 {next}
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/en/website/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/en/website/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/docs/user/manual/en/website/articles/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/docs/user/manual/en/website/articles/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/en/website/setup/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/en/website/setup/__init__.py
diff --git a/erpnext/docs/user/manual/en/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
index e14b2fd..212ccfb 100644
--- a/erpnext/docs/user/manual/en/website/setup/index.md
+++ b/erpnext/docs/user/manual/en/website/setup/index.md
@@ -1,5 +1,5 @@
 Settings for your website can be mentioned under setup.
 
-###Topics
+### Topics
 
 {index}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/manual/es/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/manual/es/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/docs/user/manual/es/accounts/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/docs/user/manual/es/accounts/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/videos/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/videos/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/docs/user/videos/learn/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/docs/user/videos/learn/__init__.py
diff --git a/erpnext/fixtures/web_form.json b/erpnext/fixtures/web_form.json
deleted file mode 100644
index a248886..0000000
--- a/erpnext/fixtures/web_form.json
+++ /dev/null
@@ -1,313 +0,0 @@
-[
- {
-  "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, 
-  "is_standard": 1, 
-  "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, 
-    "reqd": 1
-   }, 
-   {
-    "default": "Open", 
-    "description": null, 
-    "fieldname": "status", 
-    "fieldtype": "Select", 
-    "hidden": 0, 
-    "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, 
-    "reqd": 0
-   }, 
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "attachment", 
-    "fieldtype": "Attach", 
-    "hidden": 0, 
-    "label": "Attachment", 
-    "options": null, 
-    "read_only": 0, 
-    "reqd": 0
-   }
-  ], 
-  "web_page_link_text": null
- }, 
- {
-  "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, 
-    "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, 
-    "reqd": 1
-   }, 
-   {
-    "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, 
-    "reqd": 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, 
-    "reqd": 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": "Link", 
-    "hidden": 0, 
-    "label": "Country", 
-    "options": "Country", 
-    "read_only": 0, 
-    "reqd": 1
-   }, 
-   {
-    "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": "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, 
-    "reqd": 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
- }, 
- {
-  "allow_comments": 0, 
-  "allow_delete": 0, 
-  "allow_edit": 0, 
-  "allow_multiple": 0, 
-  "breadcrumbs": "[{\"title\":\"Jobs\", \"name\":\"jobs\"}]", 
-  "doc_type": "Job Applicant", 
-  "docstatus": 0, 
-  "doctype": "Web Form", 
-  "introduction_text": null, 
-  "is_standard": 0, 
-  "login_required": 0, 
-  "modified": "2016-02-19 16:46:57.448416", 
-  "name": "job_application", 
-  "page_name": "job_application", 
-  "published": 1, 
-  "success_message": "Thank you for applying.", 
-  "success_url": "/jobs", 
-  "title": "Job Application", 
-  "web_form_fields": [
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "job_title", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Job Title", 
-    "options": "", 
-    "read_only": 1, 
-    "reqd": 0
-   }, 
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "applicant_name", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Applicant Name", 
-    "options": null, 
-    "read_only": 0, 
-    "reqd": 1
-   }, 
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "email_id", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Email Id", 
-    "options": "Email", 
-    "read_only": 0, 
-    "reqd": 0
-   }, 
-   {
-    "default": "Cover Letter/Message", 
-    "description": null, 
-    "fieldname": "message", 
-    "fieldtype": "Text", 
-    "hidden": 0, 
-    "label": "Message", 
-    "options": null, 
-    "read_only": 0, 
-    "reqd": 1
-   }, 
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "upload_cv", 
-    "fieldtype": "Attach", 
-    "hidden": 0, 
-    "label": "Upload CV", 
-    "options": null, 
-    "read_only": 0, 
-    "reqd": 0
-   }
-  ], 
-  "web_page_link_text": null
- }
-]
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 184004c..fd188bc 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -32,13 +32,16 @@
 on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
 
+remember_selected = ['Company', 'Cost Center', 'Project']
+treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', "BOM"]
+
 # website
 update_website_context = "erpnext.shopping_cart.utils.update_website_context"
 my_account_context = "erpnext.shopping_cart.utils.update_my_account_context"
 
 email_append_to = ["Job Applicant", "Opportunity", "Issue"]
 
-calendars = ["Task", "Production Order", "Time Log", "Leave Application", "Sales Order", "Holiday List"]
+calendars = ["Task", "Production Order", "Leave Application", "Sales Order", "Holiday List"]
 
 fixtures = ["Web Form"]
 
@@ -71,15 +74,44 @@
 			"parents": [{"title": _("Shipments"), "name": "shipments"}]
 		}
 	},
+	{"from_route": "/rfq", "to_route": "Request for Quotation"},
+	{"from_route": "/rfq/<path:name>", "to_route": "rfq",
+		"defaults": {
+			"doctype": "Request for Quotation",
+			"parents": [{"title": _("Request for Quotation"), "name": "rfq"}]
+		}
+	},
+	{"from_route": "/addresses", "to_route": "Address"},
+	{"from_route": "/addresses/<path:name>", "to_route": "addresses",
+		"defaults": {
+			"doctype": "Address",
+			"parents": [{"title": _("Addresses"), "name": "addresses"}]
+		}
+	},
 	{"from_route": "/jobs", "to_route": "Job Opening"},
 ]
 
+portal_menu_items = [
+	{"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
+	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation"},
+	{"title": _("Orders"), "route": "/orders", "reference_doctype": "Sales Order"},
+	{"title": _("Invoices"), "route": "/invoices", "reference_doctype": "Sales Invoice"},
+	{"title": _("Shipments"), "route": "/shipments", "reference_doctype": "Delivery Note"},
+	{"title": _("Issues"), "route": "/issues", "reference_doctype": "Issue", "show_always": True},
+	{"title": _("Addresses"), "route": "/addresses", "reference_doctype": "Address"},
+	{"title": _("Announcements"), "route": "/announcement", "reference_doctype": "Announcement"},
+	{"title": _("Courses"), "route": "/course", "reference_doctype": "Course"},
+	{"title": _("Examination Schedule"), "route": "/examination", "reference_doctype": "Examination"},
+	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees"}
+]
+
 has_website_permission = {
 	"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",
-	"Address": "erpnext.utilities.doctype.address.address.has_website_permission"
+	"Address": "erpnext.utilities.doctype.address.address.has_website_permission",
+	"Discussion": "erpnext.schools.web_form.discussion.discussion.has_website_permission"
 }
 
 permission_query_conditions = {
@@ -107,16 +139,25 @@
 	},
 	"User": {
 		"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
-		"on_update": "erpnext.hr.doctype.employee.employee.update_user_permissions"
+		"on_update": "erpnext.hr.doctype.employee.employee.update_user_permissions",
+		"on_update": "erpnext.utilities.doctype.contact.contact.update_contact"
 	},
-	"Sales Taxes and Charges Template": {
-		"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
-	},
-	"Price List": {
+	("Sales Taxes and Charges Template", '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"
+	},
+
+	# bubble transaction notification on master
+	('Opportunity', 'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice',
+		'Supplier Quotation', 'Purchase Order', 'Purchase Receipt',
+		'Purchase Invoice', 'Project', 'Issue'): {
+			'on_change': 'erpnext.accounts.party_status.notify_status'
+		},
+
+	"Website Settings": {
+		"validate": "erpnext.portal.doctype.products_settings.products_settings.home_page_is_products"
 	}
 }
 
@@ -130,7 +171,8 @@
 		"erpnext.support.doctype.issue.issue.auto_close_tickets",
 		"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
 		"erpnext.hr.doctype.employee.employee.send_birthday_reminders",
-		"erpnext.projects.doctype.task.task.set_tasks_as_overdue"
+		"erpnext.projects.doctype.task.task.set_tasks_as_overdue",
+		"erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries"
 	]
 }
 
@@ -143,3 +185,9 @@
 get_translated_dict = {
 	("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"
 }
+
+bot_parsers = [
+	'erpnext.utilities.bot.FindItemBot',
+]
+
+get_site_info = 'erpnext.utilities.get_site_info'
diff --git a/erpnext/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js
index 4cfcd7e..728e5c2 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.js
+++ b/erpnext/hr/doctype/appraisal/appraisal.js
@@ -24,7 +24,7 @@
 }
 
 cur_frm.cscript.kra_template = function(doc, dt, dn) {
-	frappe.model.map_current_doc({
+	erpnext.utils.map_current_doc({
 		method: "erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template",
 		source_name: cur_frm.doc.kra_template,
 		frm: cur_frm
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index e353e34..3ca987b 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -38,7 +38,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Select template from which you want to get the Goals", 
+   "description": "", 
    "fieldname": "kra_template", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -67,7 +67,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "depends_on": "kra_template", 
-   "description": "Select the Employee for whom you are creating the Appraisal.", 
+   "description": "", 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -276,7 +276,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -497,7 +497,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-04 02:08:11.258389", 
+ "modified": "2016-04-13 01:49:09.748819", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
@@ -570,5 +570,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
- "title_field": "employee_name"
+ "title_field": "employee_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
index ef561da..49fe105 100644
--- a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
+++ b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:44", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Goal", 
@@ -26,6 +29,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "240px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -43,6 +47,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -50,6 +55,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Weightage (%)", 
@@ -74,6 +81,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -91,6 +99,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -98,6 +107,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -113,6 +123,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Score (0-5)", 
@@ -123,6 +134,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -140,6 +152,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -147,6 +160,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -162,6 +176,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Score Earned", 
@@ -171,6 +186,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -184,18 +200,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:41.929884", 
+ "modified": "2016-07-11 03:27:57.897071", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Goal", 
  "owner": "ashwini@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.js b/erpnext/hr/doctype/appraisal_template/appraisal_template.js
new file mode 100644
index 0000000..cc77292
--- /dev/null
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Appraisal Template', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 4903c58..4ecd838 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -17,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Appraisal Template Title", 
@@ -26,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -41,6 +43,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -50,6 +53,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -67,6 +71,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Goals", 
@@ -77,9 +82,10 @@
    "options": "Appraisal Template Goal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -95,7 +101,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:41.974626", 
+ "modified": "2016-04-13 01:49:21.815151", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Template", 
@@ -123,5 +129,7 @@
   }
  ], 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 ccce527..d11ec64 100644
--- a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
+++ b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:44", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "KRA", 
@@ -26,6 +29,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -43,6 +47,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Weightage (%)", 
@@ -52,6 +57,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -65,18 +71,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:42.006632", 
+ "modified": "2016-07-11 03:27:57.979215", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Template Goal", 
  "owner": "ashwini@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/designation/designation.js b/erpnext/hr/doctype/designation/designation.js
new file mode 100644
index 0000000..952c73f
--- /dev/null
+++ b/erpnext/hr/doctype/designation/designation.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Designation', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 1a1cc32..73f4446 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:designation_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:13", 
  "custom": 0, 
  "docstatus": 0, 
@@ -17,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
@@ -26,12 +28,38 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 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": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -44,7 +72,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.227540", 
+ "modified": "2016-06-01 12:52:03.787578", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Designation", 
@@ -71,6 +99,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 0fedfd6..bb9edf9 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -24,12 +24,6 @@
 	refresh: function() {
 		var me = this;
 		erpnext.toggle_naming_series();
-		if(!this.frm.doc.__islocal && this.frm.doc.__onload &&
-			!this.frm.doc.__onload.salary_structure_exists) {
-				cur_frm.add_custom_button(__('Salary Structure'), function() {
-					me.make_salary_structure(this); }, __("Make"));
-				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
-		}
 	},
 
 	date_of_birth: function() {
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 9e5a533..2677ac0 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -17,6 +17,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -41,6 +42,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
@@ -64,6 +66,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -90,6 +93,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salutation", 
@@ -116,6 +120,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Full Name", 
@@ -137,10 +142,62 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach Image", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "description": "System User (login) ID. If set, it will become default for all HR forms.", 
+   "fieldname": "user_id", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "User ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "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": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -165,6 +222,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -184,35 +242,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "System User (login) ID. If set, it will become default for all HR forms.", 
-   "fieldname": "user_id", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "User ID", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "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": "employee_number", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee Number", 
@@ -238,6 +272,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date of Joining", 
@@ -264,6 +299,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date of Birth", 
@@ -289,6 +325,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Gender", 
@@ -311,34 +348,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "employment_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employment Details", 
@@ -363,6 +377,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
@@ -389,6 +404,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employment Type", 
@@ -416,6 +432,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Holiday List", 
@@ -442,6 +459,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -464,6 +482,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Offer Date", 
@@ -489,6 +508,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Confirmation Date", 
@@ -514,6 +534,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contract End Date", 
@@ -539,6 +560,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date Of Retirement", 
@@ -564,6 +586,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Job Profile", 
@@ -587,6 +610,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Branch", 
@@ -613,6 +637,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Department", 
@@ -639,6 +664,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Designation", 
@@ -666,6 +692,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company Email", 
@@ -692,6 +719,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notice (days)", 
@@ -717,6 +745,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salary Information", 
@@ -742,6 +771,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salary Mode", 
@@ -769,6 +799,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Bank Name", 
@@ -795,6 +826,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bank A/C No.", 
@@ -820,6 +852,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Organization Profile", 
@@ -843,6 +876,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reports to", 
@@ -870,6 +904,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Approvers", 
@@ -894,6 +929,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
@@ -917,6 +953,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cell Number", 
@@ -940,6 +977,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Personal Email", 
@@ -964,6 +1002,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unsubscribed", 
@@ -987,6 +1026,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Emergency Contact", 
@@ -1010,6 +1050,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Relation", 
@@ -1033,6 +1074,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Emergency Phone", 
@@ -1056,6 +1098,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1079,6 +1122,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Permanent Address Is", 
@@ -1103,6 +1147,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Permanent Address", 
@@ -1126,6 +1171,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Address Is", 
@@ -1150,6 +1196,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Address", 
@@ -1173,6 +1220,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -1197,6 +1245,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bio", 
@@ -1220,6 +1269,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Personal Details", 
@@ -1243,6 +1293,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Passport Number", 
@@ -1266,6 +1317,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date of Issue", 
@@ -1289,6 +1341,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid Upto", 
@@ -1312,6 +1365,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Place of Issue", 
@@ -1335,6 +1389,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1358,6 +1413,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Marital Status", 
@@ -1382,6 +1438,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Blood Group", 
@@ -1407,6 +1464,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Family Background", 
@@ -1431,6 +1489,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Health Details", 
@@ -1454,6 +1513,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Educational Qualification", 
@@ -1477,6 +1537,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Education", 
@@ -1501,6 +1562,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Previous Work Experience", 
@@ -1525,6 +1587,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "External Work History", 
@@ -1549,6 +1612,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "History In Company", 
@@ -1573,6 +1637,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Internal Work History", 
@@ -1597,6 +1662,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exit", 
@@ -1621,6 +1687,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resignation Letter Date", 
@@ -1646,6 +1713,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Relieving Date", 
@@ -1671,6 +1739,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reason for Leaving", 
@@ -1696,6 +1765,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Encashed?", 
@@ -1722,6 +1792,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Encashment Date", 
@@ -1747,6 +1818,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exit Interview Details", 
@@ -1773,6 +1845,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Held On", 
@@ -1798,6 +1871,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reason for Resignation", 
@@ -1824,6 +1898,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "New Workplace", 
@@ -1849,6 +1924,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Feedback", 
@@ -1870,14 +1946,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-user", 
- "idx": 1, 
+ "idx": 24, 
+ "image_field": "image", 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-02-17 02:08:05.979565", 
+ "modified": "2016-04-04 06:44:59.778649", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
@@ -1950,5 +2027,6 @@
  "search_fields": "employee_name", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "employee_name"
+ "title_field": "employee_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 9e6afff..18b166b 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import getdate, validate_email_add, today
+from frappe.utils import getdate, validate_email_add, today, add_years
 from frappe.model.naming import make_autoname
 from frappe import throw, _
 import frappe.permissions
@@ -18,10 +18,6 @@
 
 
 class Employee(Document):
-	def onload(self):
-		self.get("__onload").salary_structure_exists = frappe.db.get_value("Salary Structure",
-				{"employee": self.name, "is_active": "Yes", "docstatus": ["!=", 2]})
-
 	def autoname(self):
 		naming_method = frappe.db.get_value("HR Settings", None, "emp_created_by")
 		if not naming_method:
@@ -133,11 +129,11 @@
 	def validate_for_enabled_user_id(self):
 		if not self.status == 'Active':
 			return
-		enabled = frappe.db.sql("""select name from `tabUser` where
-			name=%s and enabled=1""", self.user_id)
-		if not enabled:
-			throw(_("User {0} is disabled").format(
-				self.user_id), EmployeeUserDisabledError)
+		enabled = frappe.db.get_value("User", self.user_id, "enabled")
+		if enabled is None:
+			frappe.throw(_("User {0} does not exist").format(self.user_id))
+		if enabled == 0:
+			frappe.throw(_("User {0} is disabled").format(self.user_id), EmployeeUserDisabledError)
 
 	def validate_duplicate_user_id(self):
 		employee = frappe.db.sql_list("""select name from `tabEmployee` where
@@ -158,6 +154,13 @@
 	def on_trash(self):
 		delete_events(self.doctype, self.name)
 
+def get_timeline_data(doctype, name):
+	'''Return timeline for attendance'''
+	return dict(frappe.db.sql('''select unix_timestamp(att_date), count(*)
+		from `tabAttendance` where employee=%s
+			and att_date > date_sub(curdate(), interval 1 year)
+			and status in ('Present', 'Half Day')
+			group by att_date''', name))
 
 @frappe.whitelist()
 def get_retirement_date(date_of_birth=None):
@@ -165,7 +168,8 @@
 	ret = {}
 	if date_of_birth:
 		try:
-			dt = getdate(date_of_birth) + datetime.timedelta(21915)
+			retirement_age = int(frappe.db.get_single_value("HR Settings", "retirement_age") or 60)
+			dt = add_years(getdate(date_of_birth),retirement_age)
 			ret = {'date_of_retirement': dt.strftime('%Y-%m-%d')}
 		except ValueError:
 			# invalid date
@@ -218,8 +222,7 @@
 			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 or e.user_id,
-				bulk=True)
+				reply_to=e.company_email or e.personal_email or e.user_id)
 
 def get_employees_who_are_born_today():
 	"""Get Employee properties whose birthday is today."""
@@ -235,7 +238,7 @@
 		holiday_list = frappe.db.get_value("Company", company, "default_holiday_list")
 
 	if not holiday_list and raise_exception:
-		frappe.throw(_('Please set a default Holiday List for Employee {0} or Company {0}').format(employee, company))
+		frappe.throw(_('Please set a default Holiday List for Employee {0} or Company {1}').format(employee, company))
 
 	return holiday_list
 
diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py
new file mode 100644
index 0000000..420c1df
--- /dev/null
+++ b/erpnext/hr/doctype/employee/employee_dashboard.py
@@ -0,0 +1,25 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on the attendance of this Employee'),
+	'fieldname': 'employee',
+	'transactions': [
+		{
+			'label': _('Leave and Attendance'),
+			'items': ['Attendance', 'Leave Application', 'Leave Allocation']
+		},
+		{
+			'label': _('Payroll'),
+			'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
+		},
+		{
+			'label': _('Expense'),
+			'items': ['Expense Claim']
+		},
+		{
+			'label': _('Evaluation'),
+			'items': ['Appraisal']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/test_employee.py b/erpnext/hr/doctype/employee/test_employee.py
index dbd510b..a2fed53 100644
--- a/erpnext/hr/doctype/employee/test_employee.py
+++ b/erpnext/hr/doctype/employee/test_employee.py
@@ -20,7 +20,7 @@
 
 		self.assertTrue(employee.name in [e.name for e in get_employees_who_are_born_today()])
 
-		frappe.db.sql("delete from `tabBulk Email`")
+		frappe.db.sql("delete from `tabEmail Queue`")
 
 		hr_settings = frappe.get_doc("HR Settings", "HR Settings")
 		hr_settings.stop_birthday_reminders = 0
@@ -28,7 +28,7 @@
 
 		send_birthday_reminders()
 
-		bulk_mails = frappe.db.sql("""select * from `tabBulk Email`""", as_dict=True)
+		email_queue = frappe.db.sql("""select * from `tabEmail Queue`""", as_dict=True)
 		self.assertTrue("Subject: Birthday Reminder for {0}".format(employee.employee_name) \
-			in bulk_mails[0].message)
+			in email_queue[0].message)
 
diff --git a/erpnext/hr/doctype/employee_education/employee_education.json b/erpnext/hr/doctype/employee_education/employee_education.json
index 1049ce5..e41c6ca 100644
--- a/erpnext/hr/doctype/employee_education/employee_education.json
+++ b/erpnext/hr/doctype/employee_education/employee_education.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:45", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "School/University", 
@@ -24,6 +27,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qualification", 
@@ -48,6 +53,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Level", 
@@ -75,6 +82,7 @@
    "options": "Graduate\nPost Graduate\nUnder Graduate", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -90,6 +98,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year of Passing", 
@@ -99,6 +108,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -114,6 +124,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Class / Percentage", 
@@ -123,6 +134,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -138,6 +150,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Major/Optional Subjects", 
@@ -147,6 +160,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -158,18 +172,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.561817", 
+ "modified": "2016-07-11 03:27:59.995464", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Education", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 cbd1b54..fcabbbc 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:45", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -24,6 +27,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
@@ -48,6 +53,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,6 +69,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Salary", 
@@ -73,6 +80,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,6 +96,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Address", 
@@ -97,6 +106,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,6 +122,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contact", 
@@ -121,6 +132,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -136,6 +148,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Experience", 
@@ -145,6 +158,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -156,18 +170,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.610845", 
+ "modified": "2016-07-11 03:28:00.088980", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee External Work History", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 fb82e7f..3d277af 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:45", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Branch", 
@@ -25,6 +28,7 @@
    "options": "Branch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Department", 
@@ -50,6 +55,7 @@
    "options": "Department", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
@@ -75,6 +82,7 @@
    "options": "Designation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -90,6 +98,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
@@ -99,6 +108,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -114,6 +124,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Date", 
@@ -123,6 +134,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -134,20 +146,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.658225", 
+ "modified": "2016-07-11 03:28:00.195130", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Internal Work History", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 9c40cea..13c229b 100644
--- a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json
+++ b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-04-12 06:56:15", 
  "custom": 0, 
  "description": "Users who can approve a specific employee's leave applications", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Leave Approver", 
@@ -25,6 +28,7 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -37,20 +41,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.702691", 
+ "modified": "2016-07-11 03:28:00.270787", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Leave Approver", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 16e78a6..bcd8bc0 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -7,39 +7,30 @@
 	make_bank_entry: function() {
 		var me = this;
 		return frappe.call({
-			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
+			method: "erpnext.hr.doctype.expense_claim.expense_claim.make_bank_entry",
 			args: {
-				"company": cur_frm.doc.company,
-				"voucher_type": "Bank Entry"
+				"docname": cur_frm.doc.name,
 			},
 			callback: function(r) {
-				var jv = frappe.model.make_new_doc_and_get_name('Journal Entry');
-				jv = locals['Journal Entry'][jv];
-				jv.voucher_type = 'Bank Entry';
-				jv.company = cur_frm.doc.company;
-				jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name;
-				var expense = cur_frm.doc.expenses || [];
-				for(var i = 0; i < expense.length; i++){
-					var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts');
-					d1.account = expense[i].default_account;
-					d1.debit_in_account_currency = expense[i].sanctioned_amount;
-					d1.reference_type = cur_frm.doc.doctype;
-					d1.reference_name = cur_frm.doc.name;
-				}
+				var doc = frappe.model.sync(r.message);
+				frappe.set_route('Form', 'Journal Entry', r.message.name);
+			}
+		});
+	},
+	
+	expense_type: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
 
-				// credit to bank
-				var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts');
-				d1.credit_in_account_currency = cur_frm.doc.total_sanctioned_amount;
-				d1.reference_type = cur_frm.doc.doctype;
-				d1.reference_name = cur_frm.doc.name;
-				if(r.message) {
-					d1.account = r.message.account;
-					d1.balance = r.message.balance;
-					d1.account_currency = r.message.account_currency;
-					d1.account_type = r.message.account_type;
+		return frappe.call({
+			method: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account",
+			args: {
+				"expense_claim_type": d.expense_type,
+				"company": frm.company
+			},
+			callback: function(r) {
+				if (r.message) {
+					d.default_account = r.message.account;
 				}
-
-				loaddoc('Journal Entry', jv.name);
 			}
 		});
 	}
@@ -49,7 +40,6 @@
 
 cur_frm.add_fetch('employee', 'company', 'company');
 cur_frm.add_fetch('employee','employee_name','employee_name');
-cur_frm.add_fetch('expense_type', 'default_account', 'default_account');
 
 cur_frm.cscript.onload = function(doc,cdt,cdn) {
 	if(!doc.approval_status)
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index 2e3ad66..efdee97 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -20,6 +20,7 @@
 		self.validate_expense_approver()
 		self.calculate_total_amount()
 		set_employee_name(self)
+		self.set_expense_account()
 		if self.task and not self.project:
 			self.project = frappe.db.get_value("Task", self.task, "project")
 
@@ -59,7 +60,11 @@
 			if flt(d.sanctioned_amount) > flt(d.claim_amount):
 				frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
 
-
+	def set_expense_account(self):
+		for expense in self.expenses:
+			if not expense.default_account:
+				expense.default_account = get_expense_claim_account(expense.expense_type, self.company)["account"]
+		
 @frappe.whitelist()
 def get_expense_approver(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""
@@ -68,3 +73,48 @@
 		where u.name = r.parent and r.role = 'Expense Approver' 
 		and u.enabled = 1 and u.name like %s
 	""", ("%" + txt + "%"))
+
+@frappe.whitelist()
+def make_bank_entry(docname):
+	from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+
+	expense_claim = frappe.get_doc("Expense Claim", docname)
+	default_bank_cash_account = get_default_bank_cash_account(expense_claim.company, "Bank")
+
+	je = frappe.new_doc("Journal Entry")
+	je.voucher_type = 'Bank Entry'
+	je.company = expense_claim.company
+	je.remark = 'Payment against Expense Claim: ' + docname;
+
+	for expense in expense_claim.expenses:
+		je.append("accounts", {
+			"account": expense.default_account,
+			"debit_in_account_currency": expense.sanctioned_amount,
+			"reference_type": "Expense Claim",
+			"reference_name": expense_claim.name
+		})
+
+	je.append("accounts", {
+		"account": default_bank_cash_account.account,
+		"credit_in_account_currency": expense_claim.total_sanctioned_amount,
+		"reference_type": "Expense Claim",
+		"reference_name": expense_claim.name,
+		"balance": default_bank_cash_account.balance,
+		"account_currency": default_bank_cash_account.account_currency,
+		"account_type": default_bank_cash_account.account_type
+	})
+
+	return je.as_dict()
+
+@frappe.whitelist()
+def get_expense_claim_account(expense_claim_type, company):
+	account = frappe.db.get_value("Expense Claim Account",
+		{"parent": expense_claim_type, "company": company}, "default_account")
+	
+	if not account:
+		frappe.throw(_("Please set default account in Expense Claim Type {0}")
+			.format(expense_claim_type))
+	
+	return {
+		"account": account
+	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index b21f2a1..59d686e 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -30,7 +30,7 @@
 			 "project": "_Test Project 1",
 			 "task": task_name,
 			 "expenses":
-			 	[{ "expense_type": "Food", "claim_amount": 300, "sanctioned_amount": 200 }]
+			 	[{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 300, "sanctioned_amount": 200 }]
 		})
 		expense_claim.submit()
 
@@ -44,7 +44,7 @@
 			 "project": "_Test Project 1",
 			 "task": task_name,
 			 "expenses":
-			 	[{ "expense_type": "Food", "claim_amount": 600, "sanctioned_amount": 500 }]
+			 	[{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 600, "sanctioned_amount": 500 }]
 		})
 		expense_claim2.submit()
 
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/doctype/expense_claim_account/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/hr/doctype/expense_claim_account/__init__.py
diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json
new file mode 100644
index 0000000..a2bbe0b
--- /dev/null
+++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.json
@@ -0,0 +1,89 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-07-18 12:24:16.507860", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "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": "default_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Default Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-18 12:39:29.709848", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Expense Claim Account", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py
new file mode 100644
index 0000000..f34633c
--- /dev/null
+++ b/erpnext/hr/doctype/expense_claim_account/expense_claim_account.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ExpenseClaimAccount(Document):
+	pass
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 d4e53a0..bafee91 100644
--- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
+++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:46", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Expense Date", 
@@ -24,6 +27,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -41,6 +45,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -48,6 +53,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,6 +69,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Expense Claim Type", 
@@ -73,6 +80,7 @@
    "options": "Expense Claim Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -91,6 +99,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Account", 
@@ -100,6 +109,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -115,6 +125,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -122,6 +133,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +149,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -146,6 +159,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -163,6 +177,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -170,6 +185,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -185,6 +201,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Claim Amount", 
@@ -195,6 +212,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -212,6 +230,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -219,6 +238,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -234,6 +254,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sanctioned Amount", 
@@ -244,6 +265,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -257,20 +279,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.025506", 
+ "modified": "2016-07-11 03:28:00.406154", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Detail", 
  "owner": "harshada@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
new file mode 100644
index 0000000..fda6809
--- /dev/null
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
@@ -0,0 +1,17 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.ui.form.on("Expense Claim Type", {
+	refresh: function(frm){
+		frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(frm, cdt, cdn){
+			var d = locals[cdt][cdn];
+			return{
+				filters: {
+					"is_group": 0,
+					"root_type": "Expense",
+					'company': d.company
+				}
+			}
+		}
+	}
+})
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 460b3b8..3d2b251 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -3,11 +3,13 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:expense_type", 
+ "beta": 0, 
  "creation": "2012-03-27 14:35:55", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Claim Type", 
@@ -26,6 +29,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -37,34 +41,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "default_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "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": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -74,6 +55,7 @@
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -81,19 +63,46 @@
    "set_only_once": 0, 
    "unique": 0, 
    "width": "300px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "accounts", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Expense Claim Account", 
+   "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, 
  "hide_toolbar": 0, 
  "icon": "icon-flag", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.084611", 
+ "modified": "2016-07-18 12:36:10.096252", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Type", 
@@ -140,6 +149,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
index 91f3bcb..5e6a7a8 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
@@ -3,8 +3,25 @@
 
 from __future__ import unicode_literals
 import frappe
-
+from frappe import _
 from frappe.model.document import Document
 
 class ExpenseClaimType(Document):
-	pass
\ No newline at end of file
+	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"))
\ No newline at end of file
diff --git a/erpnext/hr/doctype/holiday/holiday.json b/erpnext/hr/doctype/holiday/holiday.json
index 131215c..cc65631 100644
--- a/erpnext/hr/doctype/holiday/holiday.json
+++ b/erpnext/hr/doctype/holiday/holiday.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:46", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -64,19 +66,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-03-11 06:39:10.913467", 
+ "modified": "2016-07-11 03:28:00.660849", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Holiday", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.py b/erpnext/hr/doctype/holiday_list/holiday_list.py
index 0412624..8935689 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.py
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.py
@@ -34,7 +34,7 @@
 			throw(_("To Date cannot be before From Date"))
 
 		for day in self.get("holidays"):
-			if not (self.from_date <= day.holiday_date <= self.to_date):
+			if not (getdate(self.from_date) <= getdate(day.holiday_date) <= getdate(self.to_date)):
 				frappe.throw(_("The holiday on {0} is not between From Date and To Date").format(formatdate(day.holiday_date)))
 
 	def get_weekly_off_date_list(self, start_date, end_date):
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.js b/erpnext/hr/doctype/hr_settings/hr_settings.js
new file mode 100644
index 0000000..6ab523e
--- /dev/null
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('HR Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index 99625fd..ba2c38b 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -2,6 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-08-02 13:45:23", 
  "custom": 0, 
  "docstatus": 0, 
@@ -16,12 +17,42 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "description": "Enter retirement age in years", 
+   "fieldname": "retirement_age", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Retirement Age", 
+   "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, 
@@ -39,13 +70,16 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee Records to be created by", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Naming Series\nEmployee Number", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,12 +96,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stop Birthday Reminders", 
+   "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,12 +120,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payroll 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, 
@@ -105,12 +145,42 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Include holidays in Total no. of Working 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "1", 
+   "description": "", 
+   "fieldname": "email_salary_slip_to_employee", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Email Salary Slip to Employee", 
+   "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, 
@@ -123,12 +193,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-02-05 05:11:39.153447", 
+ "max_attachments": 0, 
+ "modified": "2016-06-27 16:20:59.737869", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "HR Settings", 
@@ -155,6 +227,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index eac1a9a..6541a8c 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -20,11 +20,11 @@
 						"applicant_name": frm.doc.applicant_name,
 						"designation": frm.doc.job_opening,
 					};
-					new_doc("Offer Letter");
+					frappe.new_doc("Offer Letter");
 				}, __("Make"));
 				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 		}
-		
+
 	}
 });
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 6bb9ea7..4af03b6 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -3,16 +3,18 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "JA-.######", 
+ "beta": 0, 
  "creation": "2013-01-29 19:25:37", 
  "custom": 0, 
  "description": "Applicant for a Job", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "applicant_name", 
    "fieldtype": "Data", 
@@ -29,14 +31,14 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
@@ -54,7 +56,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -212,13 +214,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-user", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-02 02:22:31.941850", 
+ "modified": "2016-07-15 07:10:58.195489", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 
@@ -245,9 +248,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "applicant_name", 
  "sort_order": "ASC", 
- "title_field": "applicant_name"
+ "title_field": "applicant_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.py b/erpnext/hr/doctype/job_applicant/job_applicant.py
index 56c31cd..365386c 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.py
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.py
@@ -29,6 +29,10 @@
 		self.check_email_id_is_unique()
 		validate_email_add(self.email_id, True)
 
+		if not self.applicant_name and self.email_id:
+			guess = self.email_id.split('@')[0]
+			self.applicant_name = ' '.join([p.capitalize() for p in guess.split('.')])
+
 	def check_email_id_is_unique(self):
 		if self.email_id:
 			names = frappe.db.sql_list("""select name from `tabJob Applicant`
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index 3cf1431..4556ed3 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -3,6 +3,7 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "field:job_title", 
+ "beta": 0, 
  "creation": "2013-01-15 16:13:36", 
  "custom": 0, 
  "description": "Description of a Job Opening", 
@@ -63,6 +64,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "publish", 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Route", 
+   "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": 1
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -108,71 +135,20 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "publish", 
-   "fieldname": "page_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Page Name", 
-   "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, 
-   "default": "jobs", 
-   "fieldname": "parent_website_route", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Parent Website Route", 
-   "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, 
  "hide_toolbar": 0, 
  "icon": "icon-bookmark", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-02 01:44:28.280777", 
+ "modified": "2016-06-23 14:45:46.102129", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Opening", 
@@ -199,7 +175,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_opening/job_opening.py b/erpnext/hr/doctype/job_opening/job_opening.py
index 7c42a76..267e7a8 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.py
+++ b/erpnext/hr/doctype/job_opening/job_opening.py
@@ -7,6 +7,8 @@
 import frappe
 
 from frappe.website.website_generator import WebsiteGenerator
+from frappe.utils import quoted
+from frappe.utils.user import get_fullname_and_avatar
 from frappe import _
 
 class JobOpening(WebsiteGenerator):
@@ -16,6 +18,9 @@
 		page_title_field = "job_title",
 	)
 
+	def make_route(self):
+		return 'jobs/' + self.scrub(self.job_title)
+
 	def get_context(self, context):
 		context.parents = [{'name': 'jobs', 'title': _('All Jobs') }]
 
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 6882034..fee39aa 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -239,7 +239,7 @@
 
 	def notify(self, args):
 		args = frappe._dict(args)
-		from frappe.desk.page.messages.messages import post
+		from frappe.desk.page.chat.chat import post
 		post(**{"txt": args.message, "contact": args.message_to, "subject": args.subject,
 			"notify": cint(self.follow_via_email)})
 
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 7d5092d..fbc2991 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:47", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allow User", 
@@ -23,6 +26,7 @@
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -36,18 +40,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.599178", 
+ "modified": "2016-07-11 03:28:02.032277", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List Allow", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 119e200..1d0ac01 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
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:47", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Block Date", 
@@ -22,6 +25,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reason", 
@@ -46,6 +51,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -59,18 +65,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.626901", 
+ "modified": "2016-07-11 03:28:02.099296", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List Date", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 b34eabc..d063d39 100644
--- a/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json
+++ b/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-03-05 12:53:45.342292", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Offer Term", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -47,6 +52,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,6 +68,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Value / Description", 
@@ -70,6 +77,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -80,21 +88,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.811208", 
+ "modified": "2016-07-11 03:28:02.786855", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Letter Term", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
index 3da896c..1c60a5f 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -58,7 +58,8 @@
 	});
 }
 
-
-frappe.ui.form.on("Process Payroll", "refresh", function(frm) {
-	frm.disable_save();
-});
+frappe.ui.form.on("Process Payroll", {
+	refresh: function(frm) {
+		frm.disable_save();
+	}
+})
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
index 3bd298e..7285765 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -2,6 +2,7 @@
  "allow_copy": 1, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2012-03-27 14:35:59", 
  "custom": 0, 
  "docstatus": 0, 
@@ -16,12 +17,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Select Employees", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -37,11 +41,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -58,13 +65,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "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, 
@@ -80,35 +90,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Branch", 
    "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": "Check if you want to send salary slip in mail to each employee while submitting salary slip", 
-   "fieldname": "send_email", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Send Email", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -124,11 +115,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -145,13 +139,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Department", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -167,13 +164,65 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Designation", 
    "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": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "salary_slip_based_on_timesheet", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Slip Based on Timesheet", 
+   "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, 
@@ -189,13 +238,16 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Select Payroll Year and Month", 
+   "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, 
@@ -211,13 +263,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -233,12 +288,15 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -254,13 +312,16 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Month", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -276,13 +337,16 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Process Payroll", 
+   "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, 
@@ -298,11 +362,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -320,12 +387,15 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Create Salary Slip", 
+   "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,11 +411,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -363,12 +436,15 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Submit Salary Slip", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -384,11 +460,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -406,12 +485,15 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Make Bank Entry", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -427,11 +509,14 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -447,12 +532,15 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Activity Log", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -465,12 +553,14 @@
  "hide_toolbar": 1, 
  "icon": "icon-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-07-07 07:16:02.380839", 
+ "max_attachments": 0, 
+ "modified": "2016-06-22 18:14:02.418857", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Process Payroll", 
@@ -497,8 +587,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index 51e3740..c80c660 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -15,20 +15,18 @@
 			Returns list of active employees based on selected criteria
 			and for which salary structure exists
 		"""
-
 		cond = self.get_filter_condition()
 		cond += self.get_joining_releiving_condition()
 
 		emp_list = frappe.db.sql("""
 			select t1.name
 			from `tabEmployee` t1, `tabSalary Structure` t2
-			where t1.docstatus!=2 and t2.docstatus != 2
-			and t1.name = t2.employee
+			where t1.docstatus!=2 and t2.docstatus != 2 and 
+			ifnull(t2.salary_slip_based_on_timesheet,0) = 0 and t1.name = t2.employee
 		%s """% cond)
 
 		return emp_list
 
-
 	def get_filter_condition(self):
 		self.check_mandatory()
 
@@ -67,10 +65,10 @@
 					""", (emp[0], self.month, self.fiscal_year, self.company)):
 				ss = frappe.get_doc({
 					"doctype": "Salary Slip",
+					"salary_slip_based_on_timesheet": 0,
 					"fiscal_year": self.fiscal_year,
 					"employee": emp[0],
 					"month": self.month,
-					"email_check": self.send_email,
 					"company": self.company,
 				})
 				ss.insert()
@@ -109,7 +107,6 @@
 		for ss in ss_list:
 			ss_obj = frappe.get_doc("Salary Slip",ss[0])
 			try:
-				ss_obj.email_check = self.send_email
 				ss_obj.submit()
 			except Exception,e:
 				not_submitted_ss.append(ss[0])
@@ -128,11 +125,9 @@
 
 		submitted_ss = self.format_as_links(list(set(all_ss) - set(not_submitted_ss)))
 		if submitted_ss:
-			mail_sent_msg = self.send_email and " (Mail has been sent to the employee)" or ""
 			log = """
-			<b>Salary Slips Submitted %s:</b>\
-			<br><br> %s <br><br>
-			""" % (mail_sent_msg, '<br>'.join(submitted_ss))
+				<b>Salary Slips Submitted:</b> <br><br>%s
+				""" % ('<br>'.join(submitted_ss))
 
 		if not_submitted_ss:
 			log += """
diff --git a/erpnext/hr/doctype/salary_component/README.md b/erpnext/hr/doctype/salary_component/README.md
new file mode 100644
index 0000000..9644192
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/README.md
@@ -0,0 +1 @@
+Type of earning and deductions that is a part of the salary.
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/hr/doctype/salary_component/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/hr/doctype/salary_component/__init__.py
diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js
new file mode 100644
index 0000000..3ed566e
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/salary_component.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Salary Component', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
new file mode 100644
index 0000000..3cf83c1
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -0,0 +1,109 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:salary_component", 
+ "beta": 0, 
+ "creation": "2016-06-30 15:42:43.631931", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "salary_component", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-01 12:42:46.103131", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Component", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_component/salary_component.py b/erpnext/hr/doctype/salary_component/salary_component.py
new file mode 100644
index 0000000..5a37172
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/salary_component.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SalaryComponent(Document):
+	pass
diff --git a/erpnext/hr/doctype/salary_component/test_records.json b/erpnext/hr/doctype/salary_component/test_records.json
new file mode 100644
index 0000000..bd3a7d4
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/test_records.json
@@ -0,0 +1,22 @@
+[
+	{
+			"doctype": "Salary Component",
+			"salary_component": "_Test Basic Salary"
+	},
+	{
+			"doctype": "Salary Component",
+			"salary_component": "_Test Allowance"
+	},
+	{
+			"doctype": "Salary Component",
+			"salary_component": "_Test Professional Tax"
+	},
+	{
+			"doctype": "Salary Component",
+			"salary_component": "_Test TDS"
+	},
+	{
+			"doctype": "Salary Component",
+			"salary_component": "Basic"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_component/test_salary_component.py b/erpnext/hr/doctype/salary_component/test_salary_component.py
new file mode 100644
index 0000000..599bc6a
--- /dev/null
+++ b/erpnext/hr/doctype/salary_component/test_salary_component.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('Salary Component')
+
+class TestSalaryComponent(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool_detail/__init__.py b/erpnext/hr/doctype/salary_detail/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/payment_tool_detail/__init__.py
rename to erpnext/hr/doctype/salary_detail/__init__.py
diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json
new file mode 100644
index 0000000..eadfccf
--- /dev/null
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-30 15:32:36.385111", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "salary_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Salary Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "depends_on_lwp", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depends on Leave Without Pay", 
+   "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": "default_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Default Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:06.925361", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Detail", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.py b/erpnext/hr/doctype/salary_detail/salary_detail.py
new file mode 100644
index 0000000..0b18754
--- /dev/null
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SalaryDetail(Document):
+	pass
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index 905ec21..6cfba4b 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -2,7 +2,50 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.add_fetch('employee', 'company', 'company');
-cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');
+cur_frm.add_fetch('time_sheet', 'total_hours', 'working_hours');
+
+frappe.ui.form.on("Salary Slip", {
+	setup: function(frm) {
+		frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(){
+			return {
+				filters: {
+					employee: frm.doc.employee
+				}
+			}
+		}
+	},
+
+	company: function(frm) {
+		var company = locals[':Company'][frm.doc.company];
+		if(!frm.doc.letter_head && company.default_letter_head) {
+			frm.set_value('letter_head', company.default_letter_head);
+		}
+	},
+
+	refresh: function(frm) {
+		frm.trigger("toggle_fields")
+	},
+
+	salary_slip_based_on_timesheet: function(frm) {
+		frm.trigger("toggle_fields")
+	},
+
+	toggle_fields: function(frm) {
+		frm.toggle_display(['start_date', 'end_date', 'hourly_wages', 'timesheets'],
+			cint(frm.doc.salary_slip_based_on_timesheet)==1);
+		frm.toggle_display(['fiscal_year', 'month', 'total_days_in_month', 'leave_without_pay', 'payment_days'],
+			cint(frm.doc.salary_slip_based_on_timesheet)==0);
+	}
+})
+
+
+frappe.ui.form.on("Salary Slip Timesheet", {
+	time_sheet: function(frm, cdt, cdn) {
+		doc = frm.doc;
+		cur_frm.cscript.fiscal_year(doc, cdt, cdn)
+	}
+})
+
 
 // On load
 // -------------------------------------------------------------------
@@ -29,7 +72,13 @@
 		});
 }
 
-cur_frm.cscript.month = cur_frm.cscript.employee = cur_frm.cscript.fiscal_year;
+cur_frm.cscript.month = cur_frm.cscript.salary_slip_based_on_timesheet = cur_frm.cscript.fiscal_year;
+cur_frm.cscript.start_date = cur_frm.cscript.end_date = cur_frm.cscript.fiscal_year;
+
+cur_frm.cscript.employee = function(doc,dt,dn){
+	doc.salary_structure = ''
+	cur_frm.cscript.fiscal_year(doc, dt, dn)
+}
 
 cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
 	if (doc.employee && doc.fiscal_year && doc.month) {
@@ -47,23 +96,23 @@
 	calculate_net_pay(doc, dt, dn);
 }
 
-cur_frm.cscript.e_modified_amount = function(doc,dt,dn){
+cur_frm.cscript.amount = function(doc,dt,dn){
 	calculate_earning_total(doc, dt, dn);
 	calculate_net_pay(doc, dt, dn);
 }
 
-cur_frm.cscript.e_depends_on_lwp = function(doc,dt,dn){
+cur_frm.cscript.depends_on_lwp = function(doc,dt,dn){
 	calculate_earning_total(doc, dt, dn, true);
 	calculate_net_pay(doc, dt, dn);
 }
 // Trigger on earning modified amount and depends on lwp
 // ------------------------------------------------------------------------
-cur_frm.cscript.d_modified_amount = function(doc,dt,dn){
+cur_frm.cscript.amount = function(doc,dt,dn){
 	calculate_ded_total(doc, dt, dn);
 	calculate_net_pay(doc, dt, dn);
 }
 
-cur_frm.cscript.d_depends_on_lwp = function(doc, dt, dn) {
+cur_frm.cscript.depends_on_lwp = function(doc, dt, dn) {
 	calculate_ded_total(doc, dt, dn, true);
 	calculate_net_pay(doc, dt, dn);
 };
@@ -72,41 +121,40 @@
 // ------------------------------------------------------------------------
 var calculate_earning_total = function(doc, dt, dn, reset_amount) {
 	var tbl = doc.earnings || [];
-
 	var total_earn = 0;
 	for(var i = 0; i < tbl.length; i++){
-		if(cint(tbl[i].e_depends_on_lwp) == 1) {
-			tbl[i].e_modified_amount =  Math.round(tbl[i].e_amount)*(flt(doc.payment_days) / 
-				cint(doc.total_days_in_month)*100)/100;			
-			refresh_field('e_modified_amount', tbl[i].name, 'earnings');
+		if(cint(tbl[i].depends_on_lwp) == 1) {
+			tbl[i].amount =  Math.round(tbl[i].default_amount)*(flt(doc.payment_days) /
+				cint(doc.total_days_in_month)*100)/100;
+			refresh_field('amount', tbl[i].name, 'earnings');
 		} else if(reset_amount) {
-			tbl[i].e_modified_amount = tbl[i].e_amount;
-			refresh_field('e_modified_amount', tbl[i].name, 'earnings');
+			tbl[i].amount = tbl[i].default_amount;
+			refresh_field('amount', tbl[i].name, 'earnings');
 		}
-		total_earn += flt(tbl[i].e_modified_amount);
+		total_earn += flt(tbl[i].amount);
+		
 	}
 	doc.gross_pay = total_earn + flt(doc.arrear_amount) + flt(doc.leave_encashment_amount);
-	refresh_many(['e_modified_amount', 'gross_pay']);
+	refresh_many(['amount','gross_pay']);
 }
 
 // Calculate deduction total
 // ------------------------------------------------------------------------
 var calculate_ded_total = function(doc, dt, dn, reset_amount) {
 	var tbl = doc.deductions || [];
-
 	var total_ded = 0;
 	for(var i = 0; i < tbl.length; i++){
-		if(cint(tbl[i].d_depends_on_lwp) == 1) {
-			tbl[i].d_modified_amount = Math.round(tbl[i].d_amount)*(flt(doc.payment_days)/cint(doc.total_days_in_month)*100)/100;
-			refresh_field('d_modified_amount', tbl[i].name, 'deductions');
+		if(cint(tbl[i].depends_on_lwp) == 1) {
+			tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_days_in_month)*100)/100;
+			refresh_field('amount', tbl[i].name, 'deductions');
 		} else if(reset_amount) {
-			tbl[i].d_modified_amount = tbl[i].d_amount;
-			refresh_field('d_modified_amount', tbl[i].name, 'earnings');
+			tbl[i].amount = tbl[i].default_amount;
+			refresh_field('amount', tbl[i].name, 'deductions');
 		}
-		total_ded += flt(tbl[i].d_modified_amount);
+		total_ded += flt(tbl[i].amount);
 	}
 	doc.total_deduction = total_ded;
-	refresh_field('total_deduction');	
+	refresh_field('total_deduction');
 }
 
 // Calculate net payable amount
@@ -137,5 +185,5 @@
 cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
 	return{
 		query: "erpnext.controllers.queries.employee_query"
-	}		
+	}
 }
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index e83d442..75146d9 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -2,8 +2,10 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:15", 
  "custom": 0, 
+ "default_print_format": "", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
@@ -65,7 +67,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "employee_name", 
-   "fieldtype": "Data", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -76,10 +78,11 @@
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
+   "options": "employee.employee_name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -171,6 +174,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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, 
@@ -221,8 +249,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -230,8 +258,8 @@
    "in_list_view": 0, 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -239,41 +267,40 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "month", 
-   "fieldtype": "Select", 
+   "depends_on": "", 
+   "fieldname": "salary_slip_based_on_timesheet", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Month", 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Slip Based on Timesheet", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "month", 
-   "oldfieldtype": "Select", 
-   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
+   "options": "", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0, 
-   "width": "37%"
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -301,6 +328,139 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "month", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Month", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "month", 
+   "oldfieldtype": "Select", 
+   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "37%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Start Date", 
+   "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, 
+   "default": "Today", 
+   "depends_on": "", 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "End Date", 
+   "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": "column_break_15", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "salary_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "depends_on": "", 
    "fieldname": "total_days_in_month", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -327,6 +487,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "leave_without_pay", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -353,6 +514,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "payment_days", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -379,6 +541,159 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "hourly_wages", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "timesheets", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Slip Timesheet", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Slip Timesheet", 
+   "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": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_working_hours", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Working Hours", 
+   "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": "hour_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Hour Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "section_break_26", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "bank_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -431,23 +746,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "email_check", 
-   "fieldtype": "Check", 
+   "fieldname": "column_break_01", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Email", 
    "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "email_check", 
-   "oldfieldtype": "Check", 
+   "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
-   "report_hide": 1, 
+   "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
@@ -547,7 +860,7 @@
    "no_copy": 0, 
    "oldfieldname": "earning_details", 
    "oldfieldtype": "Table", 
-   "options": "Salary Slip Earning", 
+   "options": "Salary Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -600,7 +913,7 @@
    "no_copy": 0, 
    "oldfieldname": "deduction_details", 
    "oldfieldtype": "Table", 
-   "options": "Salary Slip Deduction", 
+   "options": "Salary Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -640,52 +953,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_25", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_26", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "arrear_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -767,6 +1034,29 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_25", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "total_deduction", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -820,7 +1110,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
@@ -874,14 +1164,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
- "idx": 1, 
+ "idx": 9, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-18 16:02:55.254165", 
+ "modified": "2016-07-07 12:49:01.596547", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -949,10 +1240,12 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
- "title_field": "employee_name"
+ "title_field": "employee_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 63147d5..1d657dc 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -20,14 +20,16 @@
 		self.name = make_autoname('Sal Slip/' +self.employee + '/.#####')
 
 	def validate(self):
+		self.validate_dates()
 		self.check_existing()
-
+		self.set_month_dates()
+		
 		if not (len(self.get("earnings")) or len(self.get("deductions"))):
 			self.get_emp_and_leave_details()
 		else:
 			self.get_leave_details(lwp = self.leave_without_pay)
 
-		if not self.net_pay:
+		if self.salary_slip_based_on_timesheet or not self.net_pay:
 			self.calculate_net_pay()
 
 		company_currency = get_company_currency(self.company)
@@ -35,38 +37,84 @@
 
 		set_employee_name(self)
 
+	def validate_dates(self):
+		if date_diff(self.end_date, self.start_date) < 0:
+			frappe.throw(_("To date cannot be before From date"))
+
 	def get_emp_and_leave_details(self):
 		if self.employee:
+			self.set("earnings", [])
+			self.set("deductions", [])
+
+			self.set_month_dates()
+			self.validate_dates()
 			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)
+				ss_doc = frappe.get_doc('Salary Structure', struct)
+				self.salary_slip_based_on_timesheet = ss_doc.salary_slip_based_on_timesheet or 0
+				self.set_time_sheet()
+				self.pull_sal_struct(ss_doc)
+
+	def set_time_sheet(self):
+		if self.salary_slip_based_on_timesheet and not self.get('timesheets'):
+			self.set("timesheets", [])
+
+			timesheets = frappe.db.sql(""" select * from `tabTimesheet` where employee = %(employee)s and (status = 'Submitted' or
+				status = 'Billed')""", {'employee': self.employee}, as_dict=1)
+
+			for data in timesheets:
+				self.append('timesheets', {
+					'time_sheet': data.name,
+					'working_hours': data.total_hours
+				})
+
+	def set_month_dates(self):
+		if self.month and not self.salary_slip_based_on_timesheet:
+			m = get_month_details(self.fiscal_year, self.month)
+			self.start_date = m['month_start_date']
+			self.end_date = m['month_end_date']
 
 	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'
 			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))
+			and (to_date is null or to_date >= %s or to_date >= %s) order by from_date desc limit 1""",
+			(self.employee, self.start_date, joining_date, self.end_date, relieving_date))
 
 		if not struct:
-			msgprint(_("No active Salary Structure found for employee {0} and the month")
-				.format(self.employee))
-			self.employee = None
+			self.salary_structure = None
+			frappe.throw(_("No active or default Salary Structure found for employee {0} for the given dates")
+				.format(self.employee), title=_('Salary Structure Missing'))
 
 		return struct and struct[0][0] or ''
 
-	def pull_sal_struct(self, struct):
+	def pull_sal_struct(self, ss_doc):
 		from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-		make_salary_slip(struct, self)
+		make_salary_slip(ss_doc.name, self)
+
+		if self.salary_slip_based_on_timesheet:
+			self.salary_structure = ss_doc.name
+			self.hour_rate = ss_doc.hour_rate
+			self.total_working_hours = sum([d.working_hours or 0.0 for d in self.timesheets]) or 0.0
+			self.add_earning_for_hourly_wages(ss_doc.salary_component)
+
+	def add_earning_for_hourly_wages(self, salary_component):
+		default_type = False
+		for data in self.earnings:
+			if data.salary_component == salary_component:
+				data.amount = self.hour_rate * self.total_working_hours
+				default_type = True
+				break
+
+		if not default_type:
+			earnings = self.append('earnings', {})
+			earnings.salary_component = salary_component
+			earnings.amount = self.hour_rate * self.total_working_hours
 
 	def pull_emp_details(self):
 		emp = frappe.db.get_value("Employee", self.employee, ["bank_name", "bank_ac_no"], as_dict=1)
@@ -81,40 +129,41 @@
 
 		if not self.month:
 			self.month = "%02d" % getdate(nowdate()).month
+			self.set_month_dates()
 
 		if not joining_date:
 			joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
 				["date_of_joining", "relieving_date"])
 
-		m = get_month_details(self.fiscal_year, self.month)
-		holidays = self.get_holidays_for_employee(m['month_start_date'], m['month_end_date'])
+		holidays = self.get_holidays_for_employee(self.start_date, self.end_date)
 
-		working_days = m["month_days"]
+		working_days = date_diff(self.end_date, self.start_date) + 1
 		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)
+			lwp = self.calculate_lwp(holidays, working_days)
 		self.total_days_in_month = working_days
 		self.leave_without_pay = lwp
-		payment_days = flt(self.get_payment_days(m, joining_date, relieving_date)) - flt(lwp)
+		payment_days = flt(self.get_payment_days(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']
+	def get_payment_days(self, joining_date, relieving_date):
+		start_date = getdate(self.start_date)
+
 		if joining_date:
-			if joining_date > month['month_start_date']:
+			if joining_date > getdate(self.start_date):
 				start_date = joining_date
-			elif joining_date > month['month_end_date']:
+			elif joining_date > getdate(self.end_date):
 				return
 
-		end_date = month['month_end_date']
+		end_date = getdate(self.end_date)
 		if relieving_date:
-			if relieving_date > start_date and relieving_date < month['month_end_date']:
+			if relieving_date > start_date and relieving_date < getdate(self.end_date):
 				end_date = relieving_date
-			elif relieving_date < month['month_start_date']:
+			elif relieving_date < getdate(self.start_date):
 				frappe.throw(_("Employee relieved on {0} must be set as 'Left'")
 					.format(relieving_date))
 
@@ -142,10 +191,10 @@
 
 		return holidays
 
-	def calculate_lwp(self, holidays, m):
+	def calculate_lwp(self, holidays, working_days):
 		lwp = 0
-		for d in range(m['month_days']):
-			dt = add_days(cstr(m['month_start_date']), d)
+		for d in range(working_days):
+			dt = add_days(cstr(self.start_date), d)
 			if dt not in holidays:
 				leave = frappe.db.sql("""
 					select t1.name, t1.half_day
@@ -161,38 +210,42 @@
 		return lwp
 
 	def check_existing(self):
-		ret_exist = frappe.db.sql("""select name from `tabSalary Slip`
-			where month = %s and fiscal_year = %s and docstatus != 2
-			and employee = %s and name != %s""",
-			(self.month, self.fiscal_year, self.employee, self.name))
-		if ret_exist:
-			self.employee = ''
-			frappe.throw(_("Salary Slip of employee {0} already created for this month").format(self.employee))
+		if not self.salary_slip_based_on_timesheet:
+			ret_exist = frappe.db.sql("""select name from `tabSalary Slip`
+						where month = %s and fiscal_year = %s and docstatus != 2
+						and employee = %s and name != %s""",
+						(self.month, self.fiscal_year, self.employee, self.name))
+			if ret_exist:
+				self.employee = ''
+				frappe.throw(_("Salary Slip of employee {0} already created for this period").format(self.employee))
+		else:
+			for data in self.timesheets:
+				if frappe.db.get_value('Timesheet', data.time_sheet, 'status') == 'Payrolled':
+					frappe.throw(_("Salary Slip of employee {0} already created for time sheet {1}").format(self.employee, data.time_sheet))
 
 	def calculate_earning_total(self):
 		self.gross_pay = flt(self.arrear_amount) + flt(self.leave_encashment_amount)
 		for d in self.get("earnings"):
-			if cint(d.e_depends_on_lwp) == 1:
-				d.e_modified_amount = rounded((flt(d.e_amount) * flt(self.payment_days)
-					/ cint(self.total_days_in_month)), self.precision("e_modified_amount", "earnings"))
-			elif not self.payment_days:
-				d.e_modified_amount = 0
-			elif not d.e_modified_amount:
-				d.e_modified_amount = d.e_amount
-			self.gross_pay += flt(d.e_modified_amount)
+			if cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet:
+				d.amount = rounded((flt(d.default_amount) * flt(self.payment_days)
+					/ cint(self.total_days_in_month)), self.precision("amount", "earnings"))
+			elif not self.payment_days and not self.salary_slip_based_on_timesheet:
+				d.amount = 0
+			elif not d.amount:
+				d.amount = d.default_amount
+			self.gross_pay += flt(d.amount)
 
 	def calculate_ded_total(self):
 		self.total_deduction = 0
 		for d in self.get('deductions'):
-			if cint(d.d_depends_on_lwp) == 1:
-				d.d_modified_amount = rounded((flt(d.d_amount) * flt(self.payment_days)
-					/ cint(self.total_days_in_month)), self.precision("d_modified_amount", "deductions"))
-			elif not self.payment_days:
-				d.d_modified_amount = 0
-			elif not d.d_modified_amount:
-				d.d_modified_amount = d.d_amount
-
-			self.total_deduction += flt(d.d_modified_amount)
+			if cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet:
+				d.amount = rounded((flt(d.amount) * flt(self.payment_days)
+					/ cint(self.total_days_in_month)), self.precision("amount", "deductions"))
+			elif not self.payment_days and not self.salary_slip_based_on_timesheet:
+				d.amount = 0
+			elif not d.amount:
+				d.amount = d.default_amount
+			self.total_deduction += flt(d.amount)
 
 	def calculate_net_pay(self):
 		disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
@@ -204,15 +257,28 @@
 			self.precision("net_pay") if disable_rounded_total else 0)
 
 	def on_submit(self):
-		if(self.email_check == 1):
-			self.send_mail_funct()
+		self.update_status(self.name)
+		if(frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")):
+			self.email_salary_slip()
 
+	def on_cancel(self):
+		self.update_status()
 
-	def send_mail_funct(self):
-		receiver = frappe.db.get_value("Employee", self.employee, "company_email")
+	def email_salary_slip(self):
+		receiver = frappe.db.get_value("Employee", self.employee, "company_email") or \
+			frappe.db.get_value("Employee", self.employee, "personal_email")
 		if receiver:
-			subj = 'Salary Slip - ' + cstr(self.month) +'/'+cstr(self.fiscal_year)
+			subj = 'Salary Slip - from {0} to {1}, fiscal year {2}'.format(self.start_date, self.end_date, self.fiscal_year)
 			frappe.sendmail([receiver], subject=subj, message = _("Please see attachment"),
-				attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)])
+				attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)], reference_doctype= self.doctype, reference_name= self.name)
 		else:
-			msgprint(_("Company Email ID not found, hence mail not sent"))
+			msgprint(_("{0}: Employee email not found, hence email not sent").format(self.employee_name))
+
+	def update_status(self, salary_slip=None):
+		for data in self.timesheets:
+			if data.time_sheet:
+				timesheet = frappe.get_doc('Timesheet', data.time_sheet)
+				timesheet.salary_slip = salary_slip
+				timesheet.flags.ignore_validate_update_after_submit = True
+				timesheet.set_status()
+				timesheet.save()
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/test_records.json b/erpnext/hr/doctype/salary_slip/test_records.json
index da8d95d..ba59dd1 100644
--- a/erpnext/hr/doctype/salary_slip/test_records.json
+++ b/erpnext/hr/doctype/salary_slip/test_records.json
@@ -1,36 +1,36 @@
 [
  {
   "company": "_Test Company", 
+  "doctype": "Salary Slip", 
   "deductions": [
    {
-    "d_amount": 100, 
-    "d_depends_on_lwp": 0, 
-    "d_type": "_Test Professional Tax", 
-    "doctype": "Salary Slip Deduction", 
+	"doctype": "Salary Detail",
+    "amount": 100, 
+    "depends_on_lwp": 0, 
+    "salary_component": "_Test Professional Tax", 
     "parentfield": "deductions"
    }, 
    {
-    "d_amount": 50, 
-    "d_depends_on_lwp": 1, 
-    "d_type": "_Test TDS", 
-    "doctype": "Salary Slip Deduction", 
+	"doctype": "Salary Detail",
+    "amount": 48.39, 
+    "depends_on_lwp": 0, 
+    "salary_component": "_Test TDS", 
     "parentfield": "deductions"
    }
-  ], 
-  "doctype": "Salary Slip", 
+  ],   
   "earnings": [
    {
-    "doctype": "Salary Slip Earning", 
-    "e_amount": 15000, 
-    "e_depends_on_lwp": 1, 
-    "e_type": "_Test Basic Salary", 
+    "doctype": "Salary Detail", 
+    "amount": 14516.13, 
+    "depends_on_lwp": 0, 
+    "salary_component": "_Test Basic Salary", 
     "parentfield": "earnings"
    }, 
    {
-    "doctype": "Salary Slip Earning", 
-    "e_amount": 500, 
-    "e_depends_on_lwp": 0, 
-    "e_type": "_Test Allowance", 
+    "doctype": "Salary Detail",
+    "amount": 500, 
+    "depends_on_lwp": 0, 
+    "salary_component": "_Test Allowance", 
     "parentfield": "earnings"
    }
   ], 
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 2383aff..d90d4b2 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -4,7 +4,7 @@
 
 import unittest
 import frappe
-from frappe.utils import today
+from frappe.utils import today, now_datetime, getdate, cstr
 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
@@ -35,10 +35,10 @@
 
 		self.assertEquals(ss.total_days_in_month, 31)
 		self.assertEquals(ss.payment_days, 30)
-		self.assertEquals(ss.earnings[0].e_modified_amount, 14516.13)
-		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.39)
+		self.assertEquals(ss.earnings[0].amount, 14516.13)
+		self.assertEquals(ss.earnings[1].amount, 500)
+		self.assertEquals(ss.deductions[0].amount, 100)
+		self.assertEquals(ss.deductions[1].amount, 48.39)
 		self.assertEquals(ss.gross_pay, 15016.13)
 		self.assertEquals(ss.net_pay, 14867.74)
 
@@ -49,12 +49,12 @@
 
 		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.28)
-		self.assertEquals(ss.gross_pay, 14982.76)
-		self.assertEquals(ss.net_pay, 14834.48)
+		self.assertEquals(ss.earnings[0].amount, 14516.13)
+		self.assertEquals(ss.earnings[1].amount, 500)
+		self.assertEquals(ss.deductions[0].amount, 100)
+		self.assertEquals(ss.deductions[1].amount, 48.39)
+		self.assertEquals(ss.gross_pay, 15016.13)
+		self.assertEquals(ss.net_pay, 14867.74)
 
 	def test_payment_days(self):
 		# Holidays not included in working days
@@ -97,6 +97,19 @@
 		frappe.set_user("test_employee@example.com")
 		self.assertTrue(salary_slip_test_employee.has_permission("read"))
 
+	def test_email_salary_slip(self):
+		frappe.db.sql("delete from `tabEmail Queue`")
+
+		hr_settings = frappe.get_doc("HR Settings", "HR Settings")
+		hr_settings.email_salary_slip_to_employee = 1
+		hr_settings.save()
+
+		self.make_employee("test_employee@example.com")
+		self.make_employee_salary_slip("test_employee@example.com")
+		email_queue = frappe.db.sql("""select name from `tabEmail Queue`""")
+		self.assertTrue(email_queue)
+
+
 	def make_employee(self, user):
 		if not frappe.db.get_value("User", user):
 			frappe.get_doc({
@@ -118,6 +131,7 @@
 				"date_of_joining": "2013-01-01",
 				"department": "_Test Department 1",
 				"gender": "Female",
+				"company_email": user,
 				"status": "Active"
 			}).insert()
 
@@ -139,6 +153,13 @@
 
 		return salary_slip
 
+	def make_activity_for_employee(self):
+		activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")
+		activity_type.billing_rate = 50
+		activity_type.costing_rate = 20
+		activity_type.wage_rate = 25
+		activity_type.save()
+
 test_dependencies = ["Leave Application", "Holiday List"]
 
 test_records = frappe.get_test_records('Salary Slip')
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 a0e722e..89a1f21 100644
--- a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
+++ b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
@@ -2,19 +2,23 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:48", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "d_type", 
+   "fieldname": "deduction_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
@@ -25,6 +29,7 @@
    "options": "Deduction Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +47,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Amount", 
@@ -52,6 +58,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -67,6 +74,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends on Leave Without Pay", 
@@ -74,6 +82,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -85,10 +94,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "d_modified_amount", 
+   "fieldname": "deduction_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -97,6 +107,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -108,18 +119,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.610195", 
+ "modified": "2016-07-11 03:28:07.000106", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip Deduction", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 6d897b0..076d009 100644
--- a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
+++ b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
@@ -2,19 +2,23 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:48", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "e_type", 
+   "fieldname": "earning_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
@@ -25,6 +29,7 @@
    "options": "Earning Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +47,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Amount", 
@@ -52,6 +58,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -67,6 +74,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends on Leave Without Pay", 
@@ -74,6 +82,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -85,10 +94,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "e_modified_amount", 
+   "fieldname": "earning_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -97,6 +107,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -108,18 +119,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.649418", 
+ "modified": "2016-07-11 03:28:07.074773", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip Earning", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/doctype/salary_slip_timesheet/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/hr/doctype/salary_slip_timesheet/__init__.py
diff --git a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json
new file mode 100644
index 0000000..52f829e
--- /dev/null
+++ b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.json
@@ -0,0 +1,88 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-14 19:22:29.811658", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "time_sheet", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Time Sheet", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Timesheet", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "working_hours", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Working Hours", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "3", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:07.152366", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Slip Timesheet", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.py b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.py
new file mode 100644
index 0000000..1bbfc53
--- /dev/null
+++ b/erpnext/hr/doctype/salary_slip_timesheet/salary_slip_timesheet.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SalarySlipTimesheet(Document):
+	pass
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index 77f516e..fab7ac4 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -4,6 +4,7 @@
 cur_frm.add_fetch('employee', 'company', 'company');
 cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');
 
+
 cur_frm.cscript.onload = function(doc, dt, dn){
 	e_tbl = doc.earnings || [];
 	d_tbl = doc.deductions || [];
@@ -12,13 +13,30 @@
 }
 
 cur_frm.cscript.refresh = function(doc, dt, dn){
-	if((!doc.__islocal) && (doc.is_active == 'Yes')){
+	if((!doc.__islocal) && (doc.is_active == 'Yes') && cint(doc.salary_slip_based_on_timesheet == 0)){
 		cur_frm.add_custom_button(__('Salary Slip'),
 			cur_frm.cscript['Make Salary Slip'], __("Make"));
 		cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 	}
 }
 
+frappe.ui.form.on('Salary Structure', {
+	refresh: function(frm) {
+		frm.trigger("toggle_fields")
+		frm.fields_dict['earnings'].grid.set_column_disp("default_amount", false);
+		frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
+	},
+
+	salary_slip_based_on_timesheet: function(frm) {
+		frm.trigger("toggle_fields")
+	},
+
+	toggle_fields: function(frm) {
+		frm.toggle_display(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
+		frm.toggle_reqd(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
+	}
+})
+
 cur_frm.cscript['Make Salary Slip'] = function() {
 	frappe.model.open_mapped_doc({
 		method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
@@ -31,36 +49,51 @@
 		return get_server_fields('get_employee_details','','',doc,dt,dn);
 }
 
-cur_frm.cscript.modified_value = function(doc, cdt, cdn){
+cur_frm.cscript.amount = function(doc, cdt, cdn){
 	calculate_totals(doc, cdt, cdn);
 }
 
-cur_frm.cscript.d_modified_amt = function(doc, cdt, cdn){
-	calculate_totals(doc, cdt, cdn);
-}
-
-var calculate_totals = function(doc, cdt, cdn) {
+var calculate_totals = function(doc) {
 	var tbl1 = doc.earnings || [];
 	var tbl2 = doc.deductions || [];
 
 	var total_earn = 0; var total_ded = 0;
 	for(var i = 0; i < tbl1.length; i++){
-		total_earn += flt(tbl1[i].modified_value);
+		total_earn += flt(tbl1[i].amount);
 	}
 	for(var j = 0; j < tbl2.length; j++){
-		total_ded += flt(tbl2[j].d_modified_amt);
+		total_ded += flt(tbl2[j].amount);
 	}
 	doc.total_earning = total_earn;
 	doc.total_deduction = total_ded;
-	doc.net_pay = flt(total_earn) - flt(total_ded);
+	doc.net_pay = 0.0
+	if(doc.salary_slip_based_on_timesheet == 0){
+		doc.net_pay = flt(total_earn) - flt(total_ded);
+	}
+
 	refresh_many(['total_earning', 'total_deduction', 'net_pay']);
 }
 
 cur_frm.cscript.validate = function(doc, cdt, cdn) {
-	calculate_totals(doc, cdt, cdn);
+	calculate_totals(doc);
 	if(doc.employee && doc.is_active == "Yes") frappe.model.clear_doc("Employee", doc.employee);
 }
 
 cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
 	return{ query: "erpnext.controllers.queries.employee_query" }
 }
+
+
+frappe.ui.form.on('Salary Detail', {
+	amount: function(frm) {
+		calculate_totals(frm.doc);
+	},
+	
+	earnings_remove: function(frm) {
+		calculate_totals(frm.doc);
+	}, 
+	
+	deductions_remove: function(frm) {
+		calculate_totals(frm.doc);
+	}
+})
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index e832697..4cdc67b 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-03-07 18:50:29", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -273,6 +275,33 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "No", 
+   "fieldname": "is_default", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Default", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Yes\nNo", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -325,6 +354,136 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "time_sheet_earning_detail", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "salary_slip_based_on_timesheet", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Slip Based on Timesheet", 
+   "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": "column_break_17", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "description": "Salary Component for timesheet based payroll.", 
+   "fieldname": "salary_component", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Component", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Component", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "hour_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Hour Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "depends_on": "", 
    "description": "Salary breakup based on Earning and Deduction.", 
    "fieldname": "earning_deduction", 
    "fieldtype": "Section Break", 
@@ -333,7 +492,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Monthly Earning & Deduction", 
+   "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "earning_deduction", 
@@ -379,6 +538,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "earnings", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -391,13 +551,13 @@
    "no_copy": 0, 
    "oldfieldname": "earning_details", 
    "oldfieldtype": "Table", 
-   "options": "Salary Structure Earning", 
+   "options": "Salary Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -445,7 +605,7 @@
    "no_copy": 0, 
    "oldfieldname": "deduction_details", 
    "oldfieldtype": "Table", 
-   "options": "Salary Structure Deduction", 
+   "options": "Salary Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -460,7 +620,8 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break0", 
+   "depends_on": "", 
+   "fieldname": "net_pay_detail", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -612,13 +773,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-18 16:10:30.031811", 
+ "modified": "2016-07-13 23:56:01.550518", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
@@ -649,7 +811,7 @@
    "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
-   "delete": 0, 
+   "delete": 1, 
    "email": 1, 
    "export": 0, 
    "if_owner": 0, 
@@ -665,10 +827,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
- "title_field": "employee_name"
+ "title_field": "employee_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index 69f341b..836e524 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -16,7 +16,7 @@
 		self.name = make_autoname(self.employee + '/.SST' + '/.#####')
 		
 	def validate(self):
-		self.check_existing()
+		self.check_overlap()
 		self.validate_amount()
 		self.validate_employee()
 		self.validate_joining_date()
@@ -48,43 +48,44 @@
 		for li in list1:
 			child = self.append(tab_fname, {})
 			if(tab_fname == 'earnings'):
-				child.e_type = cstr(li[0])
-				child.modified_value = 0
+				child.salary_component = cstr(li[0])
+				child.amount = 0
 			elif(tab_fname == 'deductions'):
-				child.d_type = cstr(li[0])
-				child.d_modified_amt = 0
+				child.salary_component = cstr(li[0])
+				child.amount = 0
 
 	def make_earn_ded_table(self):
-		self.make_table('Earning Type','earnings','Salary Structure Earning')
-		self.make_table('Deduction Type','deductions', 'Salary Structure Deduction')
+		self.make_table('Salary Component','earnings','Salary Detail')
+		self.make_table('Salary Component','deductions', 'Salary Detail')
 
-	def check_existing(self):
-		ret = self.get_other_active_salary_structure()
-
-		if ret and self.is_active=='Yes':
-			frappe.throw(_("Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.").format(ret, self.employee))
-
-	def get_other_active_salary_structure(self):
-		ret = frappe.db.sql("""select name from `tabSalary Structure` where is_active = 'Yes'
-			and employee = %s and name!=%s""", (self.employee,self.name))
-
-		return ret[0][0] if ret else None
-
-	def before_test_insert(self):
-		"""Make any existing salary structure for employee inactive."""
-		ret = self.get_other_active_salary_structure()
-		if ret:
-			frappe.db.set_value("Salary Structure", ret, "is_active", "No")
+	def check_overlap(self):
+		existing = frappe.db.sql("""select name from `tabSalary Structure`
+			where employee = %(employee)s and
+			(
+				(%(from_date)s > from_date and %(from_date)s < to_date) or
+				(%(to_date)s > from_date and %(to_date)s < to_date) or
+				(%(from_date)s <= from_date and %(to_date)s >= to_date))
+			and name!=%(name)s
+			and docstatus < 2""",
+			{
+				"employee": self.employee,
+				"from_date": self.from_date,
+				"to_date": self.to_date,
+				"name": self.name or "No Name"
+			}, as_dict=True)
+			
+		if existing:
+			frappe.throw(_("Salary structure {0} already exist, more than one salary structure for same period is not allowed").format(existing[0].name))
 
 	def validate_amount(self):
-		if flt(self.net_pay) < 0:
+		if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet:
 			frappe.throw(_("Net pay cannot be negative"))
 
 	def validate_employee(self):
 		old_employee = frappe.db.get_value("Salary Structure", self.name, "employee")
 		if old_employee and self.employee != old_employee:
 			frappe.throw(_("Employee can not be changed"))
-			
+
 	def validate_joining_date(self):
 		joining_date = getdate(frappe.db.get_value("Employee", self.employee, "date_of_joining"))
 		if getdate(self.from_date) < joining_date:
@@ -93,35 +94,29 @@
 @frappe.whitelist()
 def make_salary_slip(source_name, target_doc=None):
 	def postprocess(source, target):
+		# copy earnings and deductions table
+		for key in ('earnings', 'deductions'):
+			for d in source.get(key):
+				target.append(key, {
+					'amount': d.amount,
+					'default_amount': d.default_amount,
+					'depends_on_lwp' : d.depends_on_lwp,
+					'salary_component' : d.salary_component
+				})
+
 		target.run_method("pull_emp_details")
 		target.run_method("get_leave_details")
 		target.run_method("calculate_net_pay")
+			
 
 	doc = get_mapped_doc("Salary Structure", source_name, {
 		"Salary Structure": {
 			"doctype": "Salary Slip",
 			"field_map": {
-				"total_earning": "gross_pay"
+				"total_earning": "gross_pay",
+				"name": "salary_structure"
 			}
-		},
-		"Salary Structure Deduction": {
-			"doctype": "Salary Slip Deduction",
-			"field_map": [
-				["depend_on_lwp", "d_depends_on_lwp"],
-				["d_modified_amt", "d_amount"],
-				["d_modified_amt", "d_modified_amount"]
-			],
-			"add_if_empty": True
-		},
-		"Salary Structure Earning": {
-			"doctype": "Salary Slip Earning",
-			"field_map": [
-				["depend_on_lwp", "e_depends_on_lwp"],
-				["modified_value", "e_modified_amount"],
-				["modified_value", "e_amount"]
-			],
-			"add_if_empty": True
 		}
-	}, target_doc, postprocess)
+	}, target_doc, postprocess, ignore_child_tables=True)
 
 	return doc
diff --git a/erpnext/hr/doctype/salary_structure/test_records.json b/erpnext/hr/doctype/salary_structure/test_records.json
index 3af83f1..08841d1 100644
--- a/erpnext/hr/doctype/salary_structure/test_records.json
+++ b/erpnext/hr/doctype/salary_structure/test_records.json
@@ -6,10 +6,18 @@
 		"from_date": "2014-02-01",
 		"earnings": [
 			{
-				"e_type": "_Test Basic Salary"
+				"salary_component": "_Test Basic Salary"
 			},
 			{
-				"e_type": "_Test Allowance"
+				"salary_component": "_Test Allowance"
+			}
+		],
+		"deductions": [
+			{
+				"salary_component": "_Test Professional Tax"
+			},
+			{
+				"salary_component": "_Test TDS"
 			}
 		]
 	}
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 3a718aa..c361163 100644
--- a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json
+++ b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json
@@ -2,19 +2,23 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:48", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "d_type", 
+   "fieldname": "deduction_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
@@ -25,6 +29,7 @@
    "options": "Deduction Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +47,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -52,6 +58,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -67,6 +74,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reduce Deduction for Leave Without Pay (LWP)", 
@@ -76,6 +84,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -87,18 +96,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.793274", 
+ "modified": "2016-07-11 03:28:07.217367", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Deduction", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 8dfcb0a..e7e4cf4 100644
--- a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json
+++ b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json
@@ -2,19 +2,22 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:48", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "e_type", 
+   "fieldname": "earning_type", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
@@ -25,6 +28,7 @@
    "options": "Earning Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +46,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -52,6 +57,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -67,6 +73,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reduce Earning for Leave Without Pay (LWP)", 
@@ -76,6 +83,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -87,18 +95,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.830492", 
+ "modified": "2016-07-11 03:28:07.283082", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Earning", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.js b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
index 47ffec0..c49720c 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.js
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 
-frappe.require("assets/erpnext/js/utils.js");
+
 frappe.provide("erpnext.hr");
 
 erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/print_format/salary_slip_based_on_timesheet/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/hr/print_format/salary_slip_based_on_timesheet/__init__.py
diff --git a/erpnext/hr/print_format/salary_slip_based_on_timesheet/salary_slip_based_on_timesheet.json b/erpnext/hr/print_format/salary_slip_based_on_timesheet/salary_slip_based_on_timesheet.json
new file mode 100644
index 0000000..c5154d7
--- /dev/null
+++ b/erpnext/hr/print_format/salary_slip_based_on_timesheet/salary_slip_based_on_timesheet.json
@@ -0,0 +1,18 @@
+{
+ "creation": "2016-07-07 12:38:32.447281", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Salary Slip", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \" <h3 style=\\\"text-align: right;\\\">{{doc.name}}</h3><div><hr></div> \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_hours\"}, {\"print_hide\": 0, \"fieldname\": \"hour_rate\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"time_sheet\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"working_hours\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"timesheets\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"default_amount\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"default_amount\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]", 
+ "idx": 0, 
+ "modified": "2016-07-07 13:09:43.734752", 
+ "modified_by": "Administrator", 
+ "name": "Salary Slip based on Timesheet", 
+ "owner": "Administrator", 
+ "print_format_builder": 1, 
+ "print_format_type": "Server", 
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/print_format/salary_slip_standard/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/hr/print_format/salary_slip_standard/__init__.py
diff --git a/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
new file mode 100644
index 0000000..f8bd328
--- /dev/null
+++ b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
@@ -0,0 +1,18 @@
+{
+ "creation": "2016-07-07 11:45:14.872204", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Salary Slip", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"  <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n    <hr style=\\\"text-align: center;\\\">\\n</div>  \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_days_in_month\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"default_amount\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"default_amount\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"arrear_amount\"}, {\"print_hide\": 0, \"fieldname\": \"leave_encashment_amount\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]", 
+ "idx": 0, 
+ "modified": "2016-07-07 13:04:55.804431", 
+ "modified_by": "Administrator", 
+ "name": "Salary Slip Standard", 
+ "owner": "Administrator", 
+ "print_format_builder": 1, 
+ "print_format_type": "Server", 
+ "standard": "Yes"
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js b/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js
deleted file mode 100644
index d9d4c8c..0000000
--- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.query_reports["Employee Holiday Attendance"] = {
-	"filters": [
-		{
-			"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()
-		}
-	]
-}
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json b/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json
deleted file mode 100644
index f538d30..0000000
--- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2016-01-27 11:12:14.972452", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 0, 
- "is_standard": "Yes", 
- "modified": "2016-01-27 11:12:14.972452", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Employee Holiday Attendance", 
- "owner": "Administrator", 
- "ref_doctype": "Attendance", 
- "report_name": "Employee Holiday Attendance", 
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py b/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py
deleted file mode 100644
index f25fa03..0000000
--- a/erpnext/hr/report/employee_holiday_attendance/employee_holiday_attendance.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-
-def execute(filters=None):
-	if not filters:
-		filters = {}
-
-	columns = get_columns()
-	data = get_employees(filters)
-	return columns, data
-
-
-def get_columns():
-	return [
-		_("Employee") + ":Link/Employee:120",
-		_("Name") + ":Data:200",
-		_("Date") + ":Date:100",
-		_("Status") + ":Data:70",
-		_("Holiday") + ":Data:200"
-	]
-
-
-def get_employees(filters):
-	holidays = frappe.get_all("Holiday", fields=["holiday_date", "description"],
-				filters=[["holiday_date", ">=",
-				filters.from_date],
-				["holiday_date", "<=", filters.to_date]])
-	holiday_names = {}
-	holidays_list = []
-
-	for holiday in holidays:
-		holidays_list.append(holiday.holiday_date)
-		holiday_names[holiday.holiday_date] = holiday.description
-	if(holidays_list):
-		employee_list = frappe.db.sql("""select
-				employee, employee_name, att_date, status
-			from tabAttendance
-			where
-				att_date in ({0})""".format(', '.join(["%s"] * len(holidays_list))),
-				holidays_list, as_list=True)
-
-		for employee_data in employee_list:
-			employee_data.append(holiday_names[employee_data[2]])
-
-		return employee_list
-	else:
-		return []
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/hr/report/employees_working_on_a_holiday/__init__.py
similarity index 100%
rename from erpnext/hr/report/employee_holiday_attendance/__init__.py
rename to erpnext/hr/report/employees_working_on_a_holiday/__init__.py
diff --git a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
new file mode 100644
index 0000000..97108e8
--- /dev/null
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.js
@@ -0,0 +1,27 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Employees working on a holiday"] = {
+	"filters": [
+		{
+			"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()
+		},
+		{
+			"fieldname":"holiday_list",
+			"label": __("Holiday List"),
+			"fieldtype": "Link",
+			"options": "Holiday List"
+		}
+	]
+}
diff --git a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
new file mode 100644
index 0000000..a379fd2
--- /dev/null
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-07-14 12:03:56.967739", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-07-14 12:03:56.967739", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Employees working on a holiday", 
+ "owner": "Administrator", 
+ "ref_doctype": "Attendance", 
+ "report_name": "Employees working on a holiday", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
new file mode 100644
index 0000000..a0b78a6
--- /dev/null
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
@@ -0,0 +1,61 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+
+def execute(filters=None):
+	if not filters:
+		filters = {}
+
+	columns = get_columns()
+	data = get_employees(filters)
+	return columns, data
+
+
+def get_columns():
+	return [
+		_("Employee") + ":Link/Employee:120",
+		_("Name") + ":Data:200",
+		_("Date") + ":Date:100",
+		_("Status") + ":Data:70",
+		_("Holiday") + ":Data:200"
+	]
+
+def get_employees(filters):
+	holiday_filter = {"holiday_date": (">=", filters.from_date),
+				"holiday_date": ("<=", filters.to_date)}
+	if filters.holiday_list:
+		holiday_filter["parent"] = filters.holiday_list
+		
+	holidays = frappe.get_all("Holiday", fields=["holiday_date", "description"],
+				filters=holiday_filter)
+
+	holiday_names = {}
+	holidays_list = []
+
+	for holiday in holidays:
+		holidays_list.append(holiday.holiday_date)
+		holiday_names[holiday.holiday_date] = holiday.description
+
+	if(holidays_list):
+		cond = " att_date in %(holidays_list)s"
+
+		if filters.holiday_list:
+			cond += """ and (employee in (select employee from tabEmployee where holiday_list = %(holidays)s))"""
+
+		employee_list = frappe.db.sql("""select
+				employee, employee_name, att_date, status
+			from tabAttendance
+			where %s"""% cond.format(', '.join(["%s"] * len(holidays_list))),
+				{'holidays_list':holidays_list,
+				 'holidays':filters.holiday_list}, as_list=True)
+
+		for employee_data in employee_list:
+			employee_data.append(holiday_names[employee_data[2]])
+
+		return employee_list
+	else:
+		return []
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 8b02348..f384917 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
+++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
@@ -42,12 +42,12 @@
 		_("Payment Days") + ":Float:120"
 	]
 	
-	earning_types = frappe.db.sql_list("""select distinct e_type from `tabSalary Slip Earning`
-		where e_modified_amount != 0 and parent in (%s)""" % 
+	earning_types = frappe.db.sql_list("""select distinct salary_component from `tabSalary Detail`
+		where 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 d_modified_amount != 0 and parent in (%s)""" % 
+	ded_types = frappe.db.sql_list("""select distinct salary_component from `tabSalary Detail`
+		where 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] + \
@@ -83,25 +83,25 @@
 	return conditions, filters
 	
 def get_ss_earning_map(salary_slips):
-	ss_earnings = frappe.db.sql("""select parent, e_type, e_modified_amount 
-		from `tabSalary Slip Earning` where parent in (%s)""" %
+	ss_earnings = frappe.db.sql("""select parent, salary_component, amount 
+		from `tabSalary Detail` where parent in (%s)""" %
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=1)
 	
 	ss_earning_map = {}
 	for d in ss_earnings:
-		ss_earning_map.setdefault(d.parent, frappe._dict()).setdefault(d.e_type, [])
-		ss_earning_map[d.parent][d.e_type] = flt(d.e_modified_amount)
+		ss_earning_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, [])
+		ss_earning_map[d.parent][d.salary_component] = flt(d.amount)
 	
 	return ss_earning_map
 
 def get_ss_ded_map(salary_slips):
-	ss_deductions = frappe.db.sql("""select parent, d_type, d_modified_amount 
-		from `tabSalary Slip Deduction` where parent in (%s)""" %
+	ss_deductions = frappe.db.sql("""select parent, salary_component, amount 
+		from `tabSalary Detail` where parent in (%s)""" %
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=1)
 	
 	ss_ded_map = {}
 	for d in ss_deductions:
-		ss_ded_map.setdefault(d.parent, frappe._dict()).setdefault(d.d_type, [])
-		ss_ded_map[d.parent][d.d_type] = flt(d.d_modified_amount)
+		ss_ded_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, [])
+		ss_ded_map[d.parent][d.salary_component] = flt(d.amount)
 	
 	return ss_ded_map
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.py b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
index 8522650..35f1f67 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.py
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
@@ -24,7 +24,7 @@
 	def publish_selling_items(self):
 		"""Set `publish_in_hub`=1 for all Sales Items"""
 		for item in frappe.get_all("Item", fields=["name"],
-			filters={"is_sales_item": 1, "publish_in_hub": "0"}):
+			filters={ "publish_in_hub": "0"}):
 			frappe.db.set_value("Item", item.name, "publish_in_hub", 1)
 
 	def register(self):
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/maintenance/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/maintenance/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/maintenance/doctype/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/maintenance/doctype/__init__.py
diff --git a/erpnext/support/doctype/maintenance_schedule/README.md b/erpnext/maintenance/doctype/maintenance_schedule/README.md
similarity index 100%
rename from erpnext/support/doctype/maintenance_schedule/README.md
rename to erpnext/maintenance/doctype/maintenance_schedule/README.md
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/maintenance/doctype/maintenance_schedule/__init__.py
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
new file mode 100644
index 0000000..bcf1ae6
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -0,0 +1,122 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.provide("erpnext.maintenance");
+
+frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) {
+	erpnext.utils.get_party_details(frm) });
+frappe.ui.form.on_change("Maintenance Schedule", "customer_address", function(){
+	erpnext.utils.get_address_display(cur_frm, 'customer_address', 'address_display');
+});
+frappe.ui.form.on_change("Maintenance Schedule", "contact_person", function(){
+  erpnext.utils.get_contact_details(cur_frm);	
+});
+
+// TODO commonify this code
+erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
+	refresh: function() {
+		var me = this;
+
+		if (this.frm.doc.docstatus === 0) {
+			this.frm.add_custom_button(__('Sales Order'),
+				function() {
+					erpnext.utils.map_current_doc({
+						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
+						source_doctype: "Sales Order",
+						get_query_filters: {
+							docstatus: 1,
+							order_type: me.frm.doc.order_type,
+							customer: me.frm.doc.customer || undefined,
+							company: me.frm.doc.company
+						}
+					});
+				}, __("Get items from"));
+		} else if (this.frm.doc.docstatus === 1) {
+			this.frm.add_custom_button(__("Make Maintenance Visit"), function() {
+				frappe.model.open_mapped_doc({
+					method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+					source_name: me.frm.doc.name,
+					frm: me.frm
+				})
+			}, __("Make"));
+		}
+	},
+
+	start_date: function(doc, cdt, cdn) {
+		this.set_no_of_visits(doc, cdt, cdn);
+	},
+
+	end_date: function(doc, cdt, cdn) {
+		this.set_no_of_visits(doc, cdt, cdn);
+	},
+
+	periodicity: function(doc, cdt, cdn) {
+		this.set_no_of_visits(doc, cdt, cdn);
+	},
+
+	set_no_of_visits: function(doc, cdt, cdn) {
+		var item = frappe.get_doc(cdt, cdn);
+
+		if (item.start_date && item.end_date && item.periodicity) {
+			if(item.start_date > item.end_date) {
+				msgprint(__("Row {0}:Start Date must be before End Date", [item.idx]));
+				return;
+			}
+
+			var date_diff = frappe.datetime.get_diff(item.end_date, item.start_date) + 1;
+
+			var days_in_period = {
+				"Weekly": 7,
+				"Monthly": 30,
+				"Quarterly": 91,
+				"Half Yearly": 182,
+				"Yearly": 365
+			}
+
+			var no_of_visits = cint(date_diff / days_in_period[item.periodicity]);
+			frappe.model.set_value(item.doctype, item.name, "no_of_visits", no_of_visits);
+		}
+	},
+});
+
+$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm}));
+
+cur_frm.cscript.onload = function(doc, dt, dn) {
+	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
+
+	if(doc.__islocal){
+		set_multiple(dt,dn,{transaction_date:get_today()});
+	}
+
+	// set add fetch for item_code's item_name and description
+	cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+	cur_frm.add_fetch('item_code', 'description', 'description');
+
+}
+
+cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
+	return {
+		filters:{ 'customer': doc.customer }
+	}
+}
+
+cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
+	return {
+		filters:{ 'customer': doc.customer }
+	}
+}
+
+cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
+	if (!doc.__islocal) {
+		return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
+			function(r, rt) {
+				refresh_field('schedules');
+			});
+	} else {
+		msgprint(__("Please save the document before generating maintenance schedule"));
+	}
+}
+
+cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
+	return { query: "erpnext.controllers.queries.customer_query" }
+}
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
new file mode 100644
index 0000000..77ded22
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -0,0 +1,653 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "MS.#####", 
+ "beta": 0, 
+ "creation": "2013-01-10 16:34:30", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "status", 
+   "oldfieldtype": "Select", 
+   "options": "\nDraft\nSubmitted\nCancelled", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "transaction_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Transaction 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "items_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "items", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_maintenance_detail", 
+   "oldfieldtype": "Table", 
+   "options": "Maintenance Schedule Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "schedule", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-time", 
+   "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": "generate_schedule", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Generate Schedule", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "schedules", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Schedules", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "schedules", 
+   "oldfieldtype": "Table", 
+   "options": "Maintenance Schedule Detail", 
+   "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": "contact_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Info", 
+   "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": 1, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Customer Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer_name", 
+   "oldfieldtype": "Data", 
+   "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, 
+   "depends_on": "customer", 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_17", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "territory", 
+   "oldfieldtype": "Link", 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "customer", 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Maintenance Schedule", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-calendar", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-06-29 12:56:00.801674", 
+ "modified_by": "Administrator", 
+ "module": "Maintenance", 
+ "name": "Maintenance Schedule", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "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": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "status,customer,customer_name", 
+ "sort_order": "DESC", 
+ "timeline_field": "customer", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
new file mode 100644
index 0000000..9821246
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -0,0 +1,269 @@
+# 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 add_days, getdate, cint, cstr
+
+from frappe import throw, _
+from erpnext.utilities.transaction_base import TransactionBase, delete_events
+from erpnext.stock.utils import get_valid_serial_nos
+from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
+
+class MaintenanceSchedule(TransactionBase):
+	def generate_schedule(self):
+		self.set('schedules', [])
+		frappe.db.sql("""delete from `tabMaintenance Schedule Detail`
+			where parent=%s""", (self.name))
+		count = 1
+		for d in self.get('items'):
+			self.validate_maintenance_detail()
+			s_list = []
+			s_list = self.create_schedule_list(d.start_date, d.end_date, d.no_of_visits, d.sales_person)
+			for i in range(d.no_of_visits):
+				child = self.append('schedules')
+				child.item_code = d.item_code
+				child.item_name = d.item_name
+				child.scheduled_date = s_list[i].strftime('%Y-%m-%d')
+				if d.serial_no:
+					child.serial_no = d.serial_no
+				child.idx = count
+				count = count + 1
+				child.sales_person = d.sales_person
+
+		self.save()
+
+	def on_submit(self):
+		if not self.get('schedules'):
+			throw(_("Please click on 'Generate Schedule' to get schedule"))
+		self.check_serial_no_added()
+		self.validate_schedule()
+
+		email_map = {}
+		for d in self.get('items'):
+			if d.serial_no:
+				serial_nos = get_valid_serial_nos(d.serial_no)
+				self.validate_serial_no(serial_nos, d.start_date)
+				self.update_amc_date(serial_nos, d.end_date)
+
+			no_email_sp = []
+			if d.sales_person not in email_map:
+				sp = frappe.get_doc("Sales Person", d.sales_person)
+				try:
+					email_map[d.sales_person] = sp.get_email_id()
+				except frappe.ValidationError:
+					no_email_sp.append(d.sales_person)
+					
+			if no_email_sp:
+				frappe.msgprint(
+					frappe._("Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}").format(
+						doc.owner, "<br>"+no_email_sp.join("<br>")
+				))
+
+			scheduled_date = frappe.db.sql("""select scheduled_date from
+				`tabMaintenance Schedule Detail` where sales_person=%s and item_code=%s and
+				parent=%s""", (d.sales_person, d.item_code, self.name), as_dict=1)
+
+			for key in scheduled_date:
+				description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
+					(self.name, d.item_code, self.customer)
+				frappe.get_doc({
+					"doctype": "Event",
+					"owner": email_map.get(d.sales_person, self.owner),
+					"subject": description,
+					"description": description,
+					"starts_on": cstr(key["scheduled_date"]) + " 10:00:00",
+					"event_type": "Private",
+					"ref_type": self.doctype,
+					"ref_name": self.name
+				}).insert(ignore_permissions=1)
+
+		frappe.db.set(self, 'status', 'Submitted')
+
+	def create_schedule_list(self, start_date, end_date, no_of_visit, sales_person):
+		schedule_list = []
+		start_date_copy = start_date
+		date_diff = (getdate(end_date) - getdate(start_date)).days
+		add_by = date_diff / no_of_visit
+
+		for visit in range(cint(no_of_visit)):
+			if (getdate(start_date_copy) < getdate(end_date)):
+				start_date_copy = add_days(start_date_copy, add_by)
+				if len(schedule_list) < no_of_visit:
+					schedule_date = self.validate_schedule_date_for_holiday_list(getdate(start_date_copy),
+						sales_person)
+					if schedule_date > getdate(end_date):
+						schedule_date = getdate(end_date)
+					schedule_list.append(schedule_date)
+
+		return schedule_list
+
+	def validate_schedule_date_for_holiday_list(self, schedule_date, sales_person):
+		validated = False
+
+		employee = frappe.db.get_value("Sales Person", sales_person, "employee")
+		if employee:
+			holiday_list = get_holiday_list_for_employee(employee)
+		else:
+			holiday_list = frappe.db.get_value("Company", self.company, "default_holiday_list")
+
+		holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
+
+		if not validated and holidays:
+
+			# max iterations = len(holidays)
+			for i in xrange(len(holidays)):
+				if schedule_date in holidays:
+					schedule_date = add_days(schedule_date, -1)
+				else:
+					validated = True
+					break
+
+		return schedule_date
+
+	def validate_dates_with_periodicity(self):
+		for d in self.get("items"):
+			if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random":
+				date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1
+				days_in_period = {
+					"Weekly": 7,
+					"Monthly": 30,
+					"Quarterly": 90,
+					"Half Yearly": 180,
+					"Yearly": 365
+				}
+
+				if date_diff < days_in_period[d.periodicity]:
+					throw(_("Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}")
+						.format(d.idx, d.periodicity, days_in_period[d.periodicity]))
+
+	def validate_maintenance_detail(self):
+		if not self.get('items'):
+			throw(_("Please enter Maintaince Details first"))
+
+		for d in self.get('items'):
+			if not d.item_code:
+				throw(_("Please select item code"))
+			elif not d.start_date or not d.end_date:
+				throw(_("Please select Start Date and End Date for Item {0}".format(d.item_code)))
+			elif not d.no_of_visits:
+				throw(_("Please mention no of visits required"))
+			elif not d.sales_person:
+				throw(_("Please select Incharge Person's name"))
+
+			if getdate(d.start_date) > getdate(d.end_date):
+				throw(_("Start date should be less than end date for Item {0}").format(d.item_code))
+
+	def validate_sales_order(self):
+		for d in self.get('items'):
+			if d.sales_order:
+				chk = frappe.db.sql("""select ms.name from `tabMaintenance Schedule` ms,
+					`tabMaintenance Schedule Item` msi where msi.parent=ms.name and
+					msi.sales_order=%s and ms.docstatus=1""", d.sales_order)
+				if chk:
+					throw(_("Maintenance Schedule {0} exists against {0}").format(chk[0][0], d.sales_order))
+
+	def validate(self):
+		self.validate_maintenance_detail()
+		self.validate_dates_with_periodicity()
+		self.validate_sales_order()
+
+	def on_update(self):
+		frappe.db.set(self, 'status', 'Draft')
+
+	def update_amc_date(self, serial_nos, amc_expiry_date=None):
+		for serial_no in serial_nos:
+			serial_no_doc = frappe.get_doc("Serial No", serial_no)
+			serial_no_doc.amc_expiry_date = amc_expiry_date
+			serial_no_doc.save()
+
+	def validate_serial_no(self, serial_nos, amc_start_date):
+		for serial_no in serial_nos:
+			sr_details = frappe.db.get_value("Serial No", serial_no,
+				["warranty_expiry_date", "amc_expiry_date", "warehouse", "delivery_date"], as_dict=1)
+
+			if not sr_details:
+				frappe.throw(_("Serial No {0} not found").format(serial_no))
+
+			if sr_details.warranty_expiry_date and sr_details.warranty_expiry_date>=amc_start_date:
+				throw(_("Serial No {0} is under warranty upto {1}").format(serial_no, sr_details.warranty_expiry_date))
+
+			if sr_details.amc_expiry_date and sr_details.amc_expiry_date >= amc_start_date:
+				throw(_("Serial No {0} is under maintenance contract upto {1}").format(serial_no, sr_details.amc_start_date))
+
+			if not sr_details.warehouse and sr_details.delivery_date and \
+				sr_details.delivery_date >= amc_start_date:
+					throw(_("Maintenance start date can not be before delivery date for Serial No {0}")
+						.format(serial_no))
+
+	def validate_schedule(self):
+		item_lst1 =[]
+		item_lst2 =[]
+		for d in self.get('items'):
+			if d.item_code not in item_lst1:
+				item_lst1.append(d.item_code)
+
+		for m in self.get('schedules'):
+			if m.item_code not in item_lst2:
+				item_lst2.append(m.item_code)
+
+		if len(item_lst1) != len(item_lst2):
+			throw(_("Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule'"))
+		else:
+			for x in item_lst1:
+				if x not in item_lst2:
+					throw(_("Please click on 'Generate Schedule'"))
+
+	def check_serial_no_added(self):
+		serial_present =[]
+		for d in self.get('items'):
+			if d.serial_no:
+				serial_present.append(d.item_code)
+
+		for m in self.get('schedules'):
+			if serial_present:
+				if m.item_code in serial_present and not m.serial_no:
+					throw(_("Please click on 'Generate Schedule' to fetch Serial No added for Item {0}").format(m.item_code))
+
+	def on_cancel(self):
+		for d in self.get('items'):
+			if d.serial_no:
+				serial_nos = get_valid_serial_nos(d.serial_no)
+				self.update_amc_date(serial_nos)
+		frappe.db.set(self, 'status', 'Cancelled')
+		delete_events(self.doctype, self.name)
+
+	def on_trash(self):
+		delete_events(self.doctype, self.name)
+
+@frappe.whitelist()
+def make_maintenance_visit(source_name, target_doc=None):
+	from frappe.model.mapper import get_mapped_doc
+
+	def update_status(source, target, parent):
+		target.maintenance_type = "Scheduled"
+
+	doclist = get_mapped_doc("Maintenance Schedule", source_name, {
+		"Maintenance Schedule": {
+			"doctype": "Maintenance Visit",
+			"field_map": {
+				"name": "maintenance_schedule"
+			},
+			"validation": {
+				"docstatus": ["=", 1]
+			},
+			"postprocess": update_status
+		},
+		"Maintenance Schedule Item": {
+			"doctype": "Maintenance Visit Purpose",
+			"field_map": {
+				"parent": "prevdoc_docname",
+				"parenttype": "prevdoc_doctype",
+				"sales_person": "service_person"
+			}
+		}
+	}, target_doc)
+
+	return doclist
diff --git a/erpnext/support/doctype/maintenance_schedule/test_maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
similarity index 100%
rename from erpnext/support/doctype/maintenance_schedule/test_maintenance_schedule.py
rename to erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/README.md b/erpnext/maintenance/doctype/maintenance_schedule_detail/README.md
similarity index 100%
rename from erpnext/support/doctype/maintenance_schedule_detail/README.md
rename to erpnext/maintenance/doctype/maintenance_schedule_detail/README.md
diff --git a/erpnext/accounts/doctype/payment_tool_detail/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule_detail/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool_detail/__init__.py
copy to erpnext/maintenance/doctype/maintenance_schedule_detail/__init__.py
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
new file mode 100644
index 0000000..93c706a
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
@@ -0,0 +1,195 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-02-22 01:28:05", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 0, 
+   "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": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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": 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": "scheduled_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Scheduled Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "scheduled_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "actual_date", 
+   "fieldtype": "Date", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Actual Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "actual_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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": "sales_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Sales Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "incharge_name", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Person", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "160px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "160px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:02.171375", 
+ "modified_by": "Administrator", 
+ "module": "Maintenance", 
+ "name": "Maintenance Schedule Detail", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
new file mode 100644
index 0000000..e69b4fb
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class MaintenanceScheduleDetail(Document):
+	pass
diff --git a/erpnext/support/doctype/maintenance_schedule_item/README.md b/erpnext/maintenance/doctype/maintenance_schedule_item/README.md
similarity index 100%
rename from erpnext/support/doctype/maintenance_schedule_item/README.md
rename to erpnext/maintenance/doctype/maintenance_schedule_item/README.md
diff --git a/erpnext/manufacturing/page/bom_browser/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule_item/__init__.py
similarity index 100%
copy from erpnext/manufacturing/page/bom_browser/__init__.py
copy to erpnext/maintenance/doctype/maintenance_schedule_item/__init__.py
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
new file mode 100644
index 0000000..e9192f7
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -0,0 +1,351 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-02-22 01:28:05", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 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": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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": 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": "description", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "schedule_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "start_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "end_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "periodicity", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Periodicity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "periodicity", 
+   "oldfieldtype": "Select", 
+   "options": "\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom", 
+   "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": "no_of_visits", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "No of Visits", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "no_of_visits", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "sales_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Sales Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "incharge_name", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Person", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "sales_order", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Sales Order", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_docname", 
+   "oldfieldtype": "Data", 
+   "options": "Sales Order", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "150px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:02.260189", 
+ "modified_by": "Administrator", 
+ "module": "Maintenance", 
+ "name": "Maintenance Schedule Item", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py
new file mode 100644
index 0000000..1dd47fe
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class MaintenanceScheduleItem(Document):
+	pass
diff --git a/erpnext/support/doctype/maintenance_visit/README.md b/erpnext/maintenance/doctype/maintenance_visit/README.md
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit/README.md
rename to erpnext/maintenance/doctype/maintenance_visit/README.md
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/maintenance/doctype/maintenance_visit/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/maintenance/doctype/maintenance_visit/__init__.py
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
new file mode 100644
index 0000000..38c20da
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@@ -0,0 +1,86 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.provide("erpnext.maintenance");
+
+
+frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) {
+	erpnext.utils.get_party_details(frm) });
+frappe.ui.form.on_change("Maintenance Visit", "customer_address", function(frm){
+	erpnext.utils.get_address_display(frm, 'customer_address', 'address_display')
+});
+frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){
+	erpnext.utils.get_contact_details(frm)
+});
+
+// TODO commonify this code
+erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({
+	refresh: function() {
+		if (this.frm.doc.docstatus===0) {
+			cur_frm.add_custom_button(__('Maintenance Schedule'),
+				function() {
+					erpnext.utils.map_current_doc({
+						method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+						source_doctype: "Maintenance Schedule",
+						get_query_filters: {
+							docstatus: 1,
+							customer: cur_frm.doc.customer || undefined,
+							company: cur_frm.doc.company
+						}
+					})
+				}, __("Get items from"));
+			cur_frm.add_custom_button(__('Warranty Claim'),
+				function() {
+					erpnext.utils.map_current_doc({
+						method: "erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit",
+						source_doctype: "Warranty Claim",
+						get_query_filters: {
+							status: ["in", "Open, Work in Progress"],
+							customer: cur_frm.doc.customer || undefined,
+							company: cur_frm.doc.company
+						}
+					})
+				}, __("Get items from"));
+			cur_frm.add_custom_button(__('Sales Order'),
+				function() {
+					erpnext.utils.map_current_doc({
+						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
+						source_doctype: "Sales Order",
+						get_query_filters: {
+							docstatus: 1,
+							order_type: cur_frm.doc.order_type,
+							customer: cur_frm.doc.customer || undefined,
+							company: cur_frm.doc.company
+						}
+					})
+				}, __("Get items from"));
+		}
+	},
+});
+
+$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({frm: cur_frm}));
+
+cur_frm.cscript.onload = function(doc, dt, dn) {
+	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
+	if(doc.__islocal) set_multiple(dt,dn,{mntc_date:get_today()});
+
+	// set add fetch for item_code's item_name and description
+	cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+	cur_frm.add_fetch('item_code', 'description', 'description');
+}
+
+cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
+	return{
+    	filters:{'customer': doc.customer}
+  	}
+}
+
+cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
+  	return{
+    	filters:{'customer': doc.customer}
+  	}
+}
+
+cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
+	return {query: "erpnext.controllers.queries.customer_query" }
+}
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
new file mode 100644
index 0000000..07ff450
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -0,0 +1,800 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "MV.#####", 
+ "beta": 0, 
+ "creation": "2013-01-10 16:34:31", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "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": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Today", 
+   "fieldname": "mntc_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Maintenance Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "mntc_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "mntc_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Maintenance Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "mntc_time", 
+   "oldfieldtype": "Time", 
+   "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": "maintenance_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-wrench", 
+   "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": "completion_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Completion Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "completion_status", 
+   "oldfieldtype": "Select", 
+   "options": "\nPartially Completed\nFully Completed", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_14", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Unscheduled", 
+   "fieldname": "maintenance_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Maintenance Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "maintenance_type", 
+   "oldfieldtype": "Select", 
+   "options": "\nScheduled\nUnscheduled\nBreakdown", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break0", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "options": "icon-wrench", 
+   "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": "purposes", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purposes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "maintenance_visit_details", 
+   "oldfieldtype": "Table", 
+   "options": "Maintenance Visit Purpose", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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": "customer_feedback", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Feedback", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer_feedback", 
+   "oldfieldtype": "Small Text", 
+   "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": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "status", 
+   "oldfieldtype": "Data", 
+   "options": "\nDraft\nCancelled\nSubmitted", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "amended_from", 
+   "oldfieldtype": "Data", 
+   "options": "Maintenance Visit", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "150px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Select", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "customer", 
+   "fieldname": "contact_info_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Info", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 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, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 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, 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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, 
+ "hide_toolbar": 0, 
+ "icon": "icon-file-text", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-06-29 12:55:51.677519", 
+ "modified_by": "Administrator", 
+ "module": "Maintenance", 
+ "name": "Maintenance Visit", 
+ "owner": "ashwini@webnotestech.com", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "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": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "timeline_field": "customer", 
+ "title_field": "customer_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit/maintenance_visit.py
rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit_list.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit/maintenance_visit_list.js
rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js
diff --git a/erpnext/support/doctype/maintenance_visit/test_maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/test_maintenance_visit.py
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit/test_maintenance_visit.py
rename to erpnext/maintenance/doctype/maintenance_visit/test_maintenance_visit.py
diff --git a/erpnext/support/doctype/maintenance_visit/test_records.json b/erpnext/maintenance/doctype/maintenance_visit/test_records.json
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit/test_records.json
rename to erpnext/maintenance/doctype/maintenance_visit/test_records.json
diff --git a/erpnext/support/doctype/maintenance_visit_purpose/README.md b/erpnext/maintenance/doctype/maintenance_visit_purpose/README.md
similarity index 100%
rename from erpnext/support/doctype/maintenance_visit_purpose/README.md
rename to erpnext/maintenance/doctype/maintenance_visit_purpose/README.md
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/maintenance/doctype/maintenance_visit_purpose/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/maintenance/doctype/maintenance_visit_purpose/__init__.py
diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
new file mode 100644
index 0000000..c59c469
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
@@ -0,0 +1,305 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-02-22 01:28:06", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "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_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": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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": 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": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "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": "work_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "service_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Sales Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "service_person", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Person", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "work_done", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Work Done", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "work_done", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Document Type", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_doctype", 
+   "oldfieldtype": "Data", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "150px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_docname", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Against Document No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_docname", 
+   "oldfieldtype": "Data", 
+   "options": "prevdoc_doctype", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "160px", 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "160px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_detail_docname", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Against Document Detail No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_detail_docname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "160px", 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "160px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:02.369271", 
+ "modified_by": "Administrator", 
+ "module": "Maintenance", 
+ "name": "Maintenance Visit Purpose", 
+ "owner": "ashwini@webnotestech.com", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
new file mode 100644
index 0000000..a7f0f5b
--- /dev/null
+++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class MaintenanceVisitPurpose(Document):
+	pass
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/maintenance/report/maintenance_schedules/__init__.py
similarity index 100%
rename from erpnext/support/report/maintenance_schedules/__init__.py
rename to erpnext/maintenance/report/maintenance_schedules/__init__.py
diff --git a/erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json b/erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json
new file mode 100644
index 0000000..6076f6e
--- /dev/null
+++ b/erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json
@@ -0,0 +1,17 @@
+{
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-06 14:25:21", 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 1, 
+ "is_standard": "Yes", 
+ "modified": "2014-06-29 08:18:17.144598", 
+ "modified_by": "Administrator", 
+ "module": "Support", 
+ "name": "Maintenance Schedules", 
+ "owner": "Administrator", 
+ "query": "SELECT\n    ms_sch.scheduled_date as \"Schedule Date:Date:120\",\n\tms_sch.item_code as \"Item Code:Link/Item:120\",\n\tms_sch.item_name as \"Item Name::120\",\n\tms_sch.serial_no as \"Serial No::120\",\n\tms_sch.sales_person as \"Sales Person::120\",\n\tms.customer_name as \"Customer:Link/Customer:120\",\n\tms.address_display as \"Customer Address::120\",\n\tms_item.sales_order as \"Sales Order:Link/Sales Order:120\",\n\tms.company as \"Company:Link/Company:120\"\n\t\nFROM\n\t`tabMaintenance Schedule` ms, \n    `tabMaintenance Schedule Detail` ms_sch, \n    `tabMaintenance Schedule Item` ms_item\nWHERE\n\tms.name = ms_sch.parent and ms.name = ms_item.parent and ms.docstatus = 1\nORDER BY\n\tms_sch.scheduled_date asc, ms_sch.item_code asc", 
+ "ref_doctype": "Maintenance Schedule", 
+ "report_name": "Maintenance Schedules", 
+ "report_type": "Query Report"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index aeacf11..2fbdbcb 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -4,6 +4,14 @@
 frappe.provide("erpnext.bom");
 
 frappe.ui.form.on("BOM", {
+	setup: function(frm) {
+		frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 3},
+			{fieldname: 'item_name', columns: 3},
+			{fieldname: 'qty', columns: 2},
+			{fieldname: 'rate', columns: 2}
+		];
+	},
 	onload_post_render: function(frm) {
 		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
 	},
@@ -16,7 +24,10 @@
 				frm.events.update_cost(frm);
 			});
 			frm.add_custom_button(__("Browse BOM"), function() {
-				frappe.set_route("bom-browser", frm.doc.name);
+				frappe.route_options = {
+					"bom": frm.doc.name
+				};
+				frappe.set_route("Tree", "BOM");
 			});
 		}
 
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index bd379e2..5eeb69f 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -2,6 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-01-22 15:11:38", 
  "custom": 0, 
  "docstatus": 0, 
@@ -65,49 +66,26 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "rm_cost_as_per", 
-   "fieldtype": "Select", 
+   "default": "1", 
+   "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", 
+   "fieldname": "quantity", 
+   "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Rate Of Materials Based On", 
+   "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Valuation Rate\nLast Purchase Rate\nPrice List", 
+   "oldfieldname": "quantity", 
+   "oldfieldtype": "Currency", 
    "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, 
-   "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", 
-   "fieldname": "buying_price_list", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -218,6 +196,57 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "rm_cost_as_per", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", 
+   "fieldname": "buying_price_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Price List", 
+   "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, 
    "depends_on": "", 
    "description": "Specify the operations, operating cost and give a unique Operation no to your operations.", 
    "fieldname": "operations_section", 
@@ -315,34 +344,6 @@
    "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, 
-   "default": "1", 
-   "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", 
-   "fieldname": "quantity", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quantity", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "quantity", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
@@ -807,7 +808,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:09:50.749754", 
+ "modified": "2016-05-13 18:28:53.557967", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
@@ -854,9 +855,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item", 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 52dae15..580d1ba 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -30,7 +30,7 @@
 		else:
 			idx = 1
 
-		self.name = 'BOM/' + self.item + ('/%.3i' % idx)
+		self.name = 'BOM-' + self.item + ('-%.3i' % idx)
 
 	def validate(self):
 		self.clear_operations()
@@ -41,8 +41,8 @@
 
 		self.validate_materials()
 		self.set_bom_material_details()
-		self.calculate_cost()
 		self.validate_operations()
+		self.calculate_cost()
 
 	def on_update(self):
 		self.check_recursion()
@@ -64,9 +64,8 @@
 		self.manage_default_bom()
 
 	def get_item_det(self, item_code):
-		item = frappe.db.sql("""select name, item_name, is_asset_item, is_purchase_item,
-			docstatus, description, image, is_sub_contracted_item, stock_uom, default_bom,
-			last_purchase_rate
+		item = frappe.db.sql("""select name, item_name, docstatus, description, image,
+			is_sub_contracted_item, stock_uom, default_bom, last_purchase_rate
 			from `tabItem` where name=%s""", item_code, as_dict = 1)
 
 		if not item:
@@ -118,7 +117,7 @@
 		rate = 0
 		if arg['bom_no']:
 			rate = self.get_bom_unitcost(arg['bom_no'])
-		elif arg and (arg['is_purchase_item'] == 1 or arg['is_sub_contracted_item'] == 1):
+		elif arg:
 			if self.rm_cost_as_per == 'Valuation Rate':
 				rate = self.get_valuation_rate(arg)
 			elif self.rm_cost_as_per == 'Last Purchase Rate':
@@ -186,13 +185,13 @@
 			item = frappe.get_doc("Item", self.item)
 			if item.default_bom != self.name:
 				item.default_bom = self.name
-				item.save()
+				item.save(ignore_permissions = True)
 		else:
 			frappe.db.set(self, "is_default", 0)
 			item = frappe.get_doc("Item", self.item)
 			if item.default_bom == self.name:
 				item.default_bom = None
-				item.save()
+				item.save(ignore_permissions = True)
 
 	def clear_operations(self):
 		if not self.with_operations:
@@ -371,7 +370,12 @@
 
 	def validate_operations(self):
 		if self.with_operations and not self.get('operations'):
-			frappe.throw(_("Operations cannot be left blank."))
+			frappe.throw(_("Operations cannot be left blank"))
+
+		if self.with_operations:
+			for d in self.operations:
+				if not d.description:
+					d.description = frappe.db.get_value('Operation', d.operation, 'description')
 
 def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1):
 	item_dict = {}
@@ -439,3 +443,14 @@
 	if item and not (bom.item.lower() == item.lower() or \
 		bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()):
 		frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item))
+
+@frappe.whitelist()
+def get_children(parent=None):
+	if parent:
+		return frappe.db.sql("""select item_code,
+			bom_no as value, qty,
+			if(ifnull(bom_no, "")!="", 1, 0) as expandable
+			from `tabBOM Item`
+			where parent=%s
+			order by idx
+			""", parent, as_dict=True)
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
new file mode 100644
index 0000000..f6a205f
--- /dev/null
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -0,0 +1,44 @@
+frappe.treeview_settings["BOM"] = {
+	get_tree_nodes: 'erpnext.manufacturing.doctype.bom.bom.get_children',
+	filters: [
+		{
+			fieldname: "bom",
+			fieldtype:"Link",
+			options: "BOM",
+			label: __("BOM")
+		}
+	],
+	title: "BOM",
+	breadcrumb: "Manufacturing",
+	disable_add_node: true,
+	root_label: "bom", //fieldname from filters
+	get_label: function(node) {
+		if(node.data.qty) {
+			return node.data.qty + " x " + node.data.item_code;
+		} else {
+			return node.data.item_code || node.data.value;
+		}
+	},
+	toolbar: [
+		{toggle_btn: true},
+		{
+			label:__("Edit"),
+			condition: function(node) {
+				return node.expandable;
+			},
+			click: function(node) {
+				
+				frappe.set_route("Form", "BOM", node.data.value);
+			}
+		}
+	],
+	menu_items: [
+		{
+			label: __("New BOM"),
+			action: function() {
+				frappe.new_doc("BOM", true)
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1'
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index ecd14ab..30be2a7 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/erpnext/manufacturing/doctype/bom/test_records.json
@@ -77,7 +77,7 @@
    },
    {
     "amount": 2000.0,
-    "bom_no": "BOM/_Test Item Home Desktop Manufactured/001",
+    "bom_no": "BOM-_Test Item Home Desktop Manufactured-001",
     "doctype": "BOM Item",
     "item_code": "_Test Item Home Desktop Manufactured",
     "parentfield": "items",
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 95fe205..eca19b4 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-03-07 11:42:57", 
  "custom": 0, 
  "default_print_format": "Standard", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -27,6 +30,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -42,6 +46,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -49,6 +54,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -64,6 +70,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -72,6 +79,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -87,6 +95,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -94,6 +103,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -109,6 +119,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -118,6 +129,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -135,6 +147,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -142,6 +155,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -157,6 +171,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -165,6 +180,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -180,6 +196,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -189,6 +206,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -204,6 +222,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -211,6 +230,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -226,6 +246,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -235,6 +256,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -250,6 +272,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
@@ -260,6 +283,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -275,6 +299,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty Consumed Per Unit", 
@@ -282,6 +307,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -297,6 +323,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -304,6 +331,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -319,6 +347,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
@@ -329,6 +358,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -344,6 +374,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -354,6 +385,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -365,18 +397,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:42.765051", 
+ "modified": "2016-07-11 03:27:58.370415", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Explosion Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index f87b381..a9f9229 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:49", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -25,6 +28,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -48,6 +53,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,6 +69,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -70,6 +77,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -85,6 +93,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "BOM No", 
@@ -95,6 +104,7 @@
    "options": "BOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -112,6 +122,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -119,6 +130,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -134,6 +146,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Description", 
@@ -143,6 +156,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "250px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -160,12 +174,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -181,6 +197,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -189,6 +206,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -204,6 +222,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -213,6 +232,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -228,6 +248,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
@@ -235,6 +256,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -250,6 +272,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -259,6 +282,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -275,6 +299,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
@@ -283,6 +308,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -298,12 +324,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -319,6 +347,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
@@ -329,6 +358,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -344,6 +374,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -354,6 +385,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -371,6 +403,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Scrap %", 
@@ -380,6 +413,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -395,6 +429,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty Consumed Per Unit", 
@@ -404,6 +439,7 @@
    "oldfieldtype": "Float", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -415,20 +451,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:42.842612", 
+ "modified": "2016-07-11 03:27:58.497370", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 0171c41..8b6406e 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -2,10 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:49", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation", 
@@ -25,6 +29,7 @@
    "options": "Operation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +45,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Workstation", 
@@ -50,6 +56,7 @@
    "options": "Workstation", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,18 +72,20 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Operation Description", 
+   "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "opn_description", 
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -89,12 +98,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -110,6 +121,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Hour Rate", 
@@ -119,6 +131,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,6 +148,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Time ", 
@@ -145,6 +159,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -160,6 +175,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operating Cost", 
@@ -169,6 +185,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -180,18 +197,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:42.924201", 
+ "modified": "2016-07-11 03:27:58.625909", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Operation", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/operation/operation.js b/erpnext/manufacturing/doctype/operation/operation.js
new file mode 100644
index 0000000..5c2aba6
--- /dev/null
+++ b/erpnext/manufacturing/doctype/operation/operation.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Operation', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 66d0bb6..bf7f519 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -3,11 +3,13 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "Prompt", 
+ "beta": 0, 
  "creation": "2014-11-07 16:20:30.683186", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Workstation", 
@@ -26,6 +29,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,6 +45,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -48,6 +53,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,14 +69,16 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Operation Description", 
+   "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, 
@@ -82,13 +90,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-wrench", 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.879598", 
+ "modified": "2016-07-08 08:42:35.126397", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Operation", 
@@ -136,8 +146,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/.py b/erpnext/manufacturing/doctype/production_order/.py
new file mode 100644
index 0000000..4476b16
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_order/.py
@@ -0,0 +1,8 @@
+import frappe
+
+def set_required_items(production_order):
+	pass
+
+def reserve_for_production(production_order):
+	'''Reserve pending raw materials for production'''
+	pass
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 8e6b7e6..d42f735 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -1,60 +1,109 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on("Production Order", "onload", function(frm) {
-	if (!frm.doc.status)
-		frm.doc.status = 'Draft';
+frappe.ui.form.on("Production Order", {
+	onload: function(frm) {
+		if (!frm.doc.status)
+			frm.doc.status = 'Draft';
 
-	frm.add_fetch("sales_order", "delivery_date", "expected_delivery_date");
+		frm.add_fetch("sales_order", "delivery_date", "expected_delivery_date");
+		frm.add_fetch("sales_order", "project", "project");
 
-	if(frm.doc.__islocal) {
-		frm.set_value({
-			"actual_start_date": "",
-			"actual_end_date": ""
+		if(frm.doc.__islocal) {
+			frm.set_value({
+				"actual_start_date": "",
+				"actual_end_date": ""
+			});
+			erpnext.production_order.set_default_warehouse(frm);
+		}
+		
+		// formatter for production order operation
+		frm.set_indicator_formatter('operation',
+			function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" })
+
+		erpnext.production_order.set_custom_buttons(frm);
+		erpnext.production_order.setup_company_filter(frm);
+		erpnext.production_order.setup_bom_filter(frm);
+	},
+	refresh: function(frm) {
+		erpnext.toggle_naming_series();
+		frm.set_intro("");
+		erpnext.production_order.set_custom_buttons(frm);
+
+		if (frm.doc.docstatus === 0 && !frm.doc.__islocal) {
+			frm.set_intro(__("Submit this Production Order for further processing."));
+		}
+
+		if (frm.doc.docstatus===1) {
+			frm.trigger('show_progress');
+		}
+		
+		if(frm.doc.docstatus == 1){
+			frm.add_custom_button(__('Make Timesheet'), function(){
+				frappe.model.open_mapped_doc({
+					method: "erpnext.manufacturing.doctype.production_order.production_order.make_new_timesheet",
+					frm: cur_frm
+				})
+			})
+		}
+	},
+	show_progress: function(frm) {
+		var bars = [];
+		var message = '';
+		var added_min = false;
+
+		// produced qty
+		var title = __('{0} items produced', [frm.doc.produced_qty]);
+		bars.push({
+			'title': title,
+			'width': (frm.doc.produced_qty / frm.doc.qty * 100) + '%',
+			'progress_class': 'progress-bar-success'
 		});
-		erpnext.production_order.set_default_warehouse(frm);
-	}
+		if(bars[0].width=='0%') {
+			 bars[0].width = '0.5%';
+			 added_min = 0.5;
+		 }
+		message = title;
 
-	erpnext.production_order.set_custom_buttons(frm);
-	erpnext.production_order.setup_company_filter(frm);
-	erpnext.production_order.setup_bom_filter(frm);
-});
-
-frappe.ui.form.on("Production Order", "refresh", function(frm) {
-	erpnext.toggle_naming_series();
-	frm.set_intro("");
-	erpnext.production_order.set_custom_buttons(frm);
-
-	if (frm.doc.docstatus === 0 && !frm.doc.__islocal) {
-		frm.set_intro(__("Submit this Production Order for further processing."));
+		// pending qty
+		var pending_complete = frm.doc.material_transferred_for_manufacturing - frm.doc.produced_qty;
+		if(pending_complete) {
+			var title = __('{0} items in progress', [pending_complete]);
+			bars.push({
+				'title': title,
+				'width': ((pending_complete / frm.doc.qty * 100) - added_min)  + '%',
+				'progress_class': 'progress-bar-warning'
+			})
+			message = message + '. ' + title;
+		}
+		frm.dashboard.add_progress(__('Status'), bars, message);
 	}
 });
 
-frappe.ui.form.on("Production Order", "additional_operating_cost", function(frm) {
-	erpnext.production_order.calculate_total_cost(frm);
-});
 
-frappe.ui.form.on("Production Order Operation", "workstation", function(frm, cdt, cdn) {
-	var d = locals[cdt][cdn];
-	if (d.workstation) {
-		frappe.call({
-			"method": "frappe.client.get",
-			args: {
-				doctype: "Workstation",
-				name: d.workstation
-			},
-			callback: function (data) {
-				frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
-				erpnext.production_order.calculate_cost(frm.doc);
-				erpnext.production_order.calculate_total_cost(frm);
-			}
-		})
-	}
-});
 
-frappe.ui.form.on("Production Order Operation", "time_in_mins", function(frm, cdt, cdn) {
-	erpnext.production_order.calculate_cost(frm.doc);
-	erpnext.production_order.calculate_total_cost(frm)
+frappe.ui.form.on("Production Order Operation", {
+	workstation: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if (d.workstation) {
+			frappe.call({
+				"method": "frappe.client.get",
+				args: {
+					doctype: "Workstation",
+					name: d.workstation
+				},
+				callback: function (data) {
+					frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
+					erpnext.production_order.calculate_cost(frm.doc);
+					erpnext.production_order.calculate_total_cost(frm);
+				}
+			})
+		}
+	},
+	time_in_mins: function(frm, cdt, cdn) {
+		erpnext.production_order.calculate_cost(frm.doc);
+		erpnext.production_order.calculate_total_cost(frm);
+	},
 });
 
 erpnext.production_order = {
@@ -76,20 +125,27 @@
 
 			// opertions
 			if ((doc.operations || []).length) {
-				frm.add_custom_button(__('Time Logs'), function() {
+				frm.add_custom_button(__('Timesheet'), function() {
 					frappe.route_options = {"production_order": frm.doc.name};
-					frappe.set_route("List", "Time Log");
+					frappe.set_route("List", "Timesheet");
 				}, __("View"));
 			}
 
 			if (flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) {
-				frm.add_custom_button(__('Transfer Materials for Manufacture'),
-					cur_frm.cscript['Transfer Raw Materials'], __("Stock Entry"));
+				var btn = frm.add_custom_button(__('Start'),
+					cur_frm.cscript['Transfer Raw Materials']);
+				btn.addClass('btn-primary');
 			}
 
 			if (flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) {
-				frm.add_custom_button(__('Update Finished Goods'),
-					cur_frm.cscript['Update Finished Goods'], __("Stock Entry"));
+				var btn = frm.add_custom_button(__('Finish'),
+					cur_frm.cscript['Update Finished Goods']);
+
+				if(doc.material_transferred_for_manufacturing==doc.qty) {
+					// all materials transferred for manufacturing,
+					// make this primary
+					btn.addClass('btn-primary');
+				}
 			}
 		}
 
@@ -123,6 +179,7 @@
 			}
 		}
 
+		frm.fields_dict.source_warehouse.get_query = company_filter;
 		frm.fields_dict.fg_warehouse.get_query = company_filter;
 		frm.fields_dict.wip_warehouse.get_query = company_filter;
 	},
@@ -178,7 +235,7 @@
 			flt(this.frm.doc.qty) - flt(this.frm.doc.material_transferred_for_manufacturing);
 
 		frappe.prompt({fieldtype:"Float", label: __("Qty for {0}", [purpose]), fieldname:"qty",
-			description: __("Max: {0}", [max]) },
+			description: __("Max: {0}", [max]), 'default': max },
 			function(data) {
 				if(data.qty > max) {
 					frappe.msgprint(__("Quantity must not be more than {0}", [max]));
@@ -209,32 +266,6 @@
 	qty: function() {
 		frappe.ui.form.trigger("Production Order", 'bom_no')
 	},
-	show_time_logs: function(doc, cdt, cdn) {
-		var child = locals[cdt][cdn]
-		frappe.route_options = {"operation_id": child.name};
-		frappe.set_route("List", "Time Log");
-	},
-
-	make_time_log: function(doc, cdt, cdn){
-		var child = locals[cdt][cdn]
-		frappe.call({
-			method:"erpnext.manufacturing.doctype.production_order.production_order.make_time_log",
-			args: {
-				"name": doc.name,
-				"operation": child.operation,
-				"from_time": child.planned_start_time,
-				"to_time": child.planned_end_time,
-				"project": doc.project,
-				"workstation": child.workstation,
-				"qty": flt(doc.qty) - flt(child.completed_qty),
-				"operation_id": child.name
-			},
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		});
-	}
 });
 
 cur_frm.cscript['Stop Production Order'] = function() {
@@ -257,7 +288,7 @@
 	return {
 		query: "erpnext.controllers.queries.item_query",
 		filters:{
-			'is_pro_applicable': 1,
+			'is_stock_item': 1,
 		}
 	}
 }
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 02467ef..d1dc0c2 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -3,11 +3,13 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:16", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -51,7 +53,7 @@
    "no_copy": 0, 
    "options": "PRO-", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -78,7 +80,7 @@
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled", 
+   "options": "\nDraft\nSubmitted\nNot Started\nStopped\nIn Process\nCompleted\nCancelled", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -162,7 +164,7 @@
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -200,6 +202,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "description": "", 
+   "fieldname": "sales_order", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Order", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Order", 
+   "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, 
    "depends_on": "", 
    "fieldname": "qty", 
    "fieldtype": "Float", 
@@ -309,6 +337,33 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "description": "Warehouse for reserving items", 
+   "fieldname": "source_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Source 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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "wip_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -924,32 +979,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Manufacture against Sales Order", 
-   "fieldname": "sales_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Order", 
-   "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, 
    "description": "Manufacture against Material Request", 
    "fieldname": "material_request", 
    "fieldtype": "Link", 
@@ -1024,19 +1053,46 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "required_items", 
+   "fieldtype": "Table", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Required Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Production Order Item", 
+   "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, 
  "hide_toolbar": 0, 
  "icon": "icon-cogs", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:10:07.951138", 
+ "modified": "2016-07-08 07:09:06.847763", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
@@ -1083,8 +1139,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "ASC", 
- "title_field": "production_item"
+ "title_field": "production_item", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 5614f37..cd24f9b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -4,22 +4,26 @@
 from __future__ import unicode_literals
 import frappe
 
+import json
 from frappe.utils import flt, get_datetime, getdate, date_diff, cint, nowdate
 from frappe import _
+from frappe.utils import time_diff_in_seconds
 from frappe.model.document import Document
+from frappe.model.mapper import get_mapped_doc
 from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
 from dateutil.relativedelta import relativedelta
 from erpnext.stock.doctype.item.item import validate_end_of_life
 from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError, NotInWorkingHoursError
-from erpnext.projects.doctype.time_log.time_log import OverlapError
+from erpnext.projects.doctype.timesheet.timesheet import OverlapError
 from erpnext.stock.doctype.stock_entry.stock_entry import get_additional_costs
 from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
 from erpnext.stock.stock_balance import get_planned_qty, update_bin_qty
+from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
+from erpnext.stock.utils import get_bin
 
 class OverProductionError(frappe.ValidationError): pass
 class StockOverProductionError(frappe.ValidationError): pass
 class OperationTooLongError(frappe.ValidationError): pass
-class ProductionNotApplicableError(frappe.ValidationError): pass
 class ItemHasVariantError(frappe.ValidationError): pass
 
 form_grid_templates = {
@@ -28,13 +32,6 @@
 
 class ProductionOrder(Document):
 	def validate(self):
-		if self.docstatus == 0:
-			self.status = "Draft"
-
-		from erpnext.controllers.status_updater import validate_status
-		validate_status(self.status, ["Draft", "Submitted", "Stopped",
-			"In Process", "Completed", "Cancelled"])
-
 		self.validate_production_item()
 		if self.bom_no:
 			validate_bom_no(self.production_item, self.bom_no)
@@ -42,22 +39,24 @@
 		self.validate_sales_order()
 		self.validate_warehouse()
 		self.calculate_operating_cost()
-		self.validate_delivery_date()
 		self.validate_qty()
 		self.validate_operation_time()
+		self.status = self.get_status()
 
 		from erpnext.utilities.transaction_base import validate_uom_is_integer
 		validate_uom_is_integer(self, "stock_uom", ["qty", "produced_qty"])
 
 	def validate_sales_order(self):
 		if self.sales_order:
-			so = frappe.db.sql("""select name, delivery_date from `tabSales Order`
+			so = frappe.db.sql("""select name, delivery_date, project from `tabSales Order`
 				where name=%s and docstatus = 1""", self.sales_order, as_dict=1)
 
 			if len(so):
 				if not self.expected_delivery_date:
 					self.expected_delivery_date = so[0].delivery_date
 
+				self.project = so[0].project
+
 				self.validate_production_order_against_so()
 			else:
 				frappe.throw(_("Sales Order {0} is not valid").format(self.sales_order))
@@ -65,7 +64,7 @@
 	def validate_warehouse(self):
 		from erpnext.stock.utils import validate_warehouse_company
 
-		for w in [self.fg_warehouse, self.wip_warehouse]:
+		for w in [self.source_warehouse, self.fg_warehouse, self.wip_warehouse]:
 			validate_warehouse_company(w, self.company)
 
 	def calculate_operating_cost(self):
@@ -113,23 +112,36 @@
 
 
 	def update_status(self, status=None):
+		'''Update status of production order'''
+		status = self.get_status()
+		if status != self.status:
+			self.db_set("status", status)
+
+		self.update_required_items()
+
+	def get_status(self, status=None):
+		'''Return the status based on stock entries against this production order'''
 		if not status:
 			status = self.status
 
-		if status != 'Stopped':
-			stock_entries = frappe._dict(frappe.db.sql("""select purpose, sum(fg_completed_qty)
-				from `tabStock Entry` where production_order=%s and docstatus=1
-				group by purpose""", self.name))
+		if self.docstatus==0:
+			status = 'Draft'
+		elif self.docstatus==1:
+			if status != 'Stopped':
+				stock_entries = frappe._dict(frappe.db.sql("""select purpose, sum(fg_completed_qty)
+					from `tabStock Entry` where production_order=%s and docstatus=1
+					group by purpose""", self.name))
 
-			status = "Submitted"
-			if stock_entries:
-				status = "In Process"
-				produced_qty = stock_entries.get("Manufacture")
-				if flt(produced_qty) == flt(self.qty):
-					status = "Completed"
+				status = "Not Started"
+				if stock_entries:
+					status = "In Process"
+					produced_qty = stock_entries.get("Manufacture")
+					if flt(produced_qty) == flt(self.qty):
+						status = "Completed"
+		else:
+			status = 'Cancelled'
 
-		if status != self.status:
-			self.db_set("status", status)
+		return status
 
 	def update_production_order_qty(self):
 		"""Update **Manufactured Qty** and **Material Transferred for Qty** in Production Order
@@ -147,14 +159,17 @@
 
 			self.db_set(fieldname, qty)
 
+	def before_submit(self):
+		self.set_required_items()
+		self.make_time_logs()
+
 	def on_submit(self):
 		if not self.wip_warehouse:
 			frappe.throw(_("Work-in-Progress Warehouse is required before Submit"))
 		if not self.fg_warehouse:
 			frappe.throw(_("For Warehouse is required before Submit"))
-			
-		frappe.db.set(self,'status', 'Submitted')
-		self.make_time_logs()
+
+		self.update_reserved_qty_for_production()
 		self.update_completed_qty_in_material_request()
 		self.update_planned_qty()
 
@@ -162,7 +177,8 @@
 		self.validate_cancel()
 
 		frappe.db.set(self,'status', 'Cancelled')
-		self.delete_time_logs()
+		self.clear_required_items()
+		self.delete_timesheet()
 		self.update_completed_qty_in_material_request()
 		self.update_planned_qty()
 
@@ -180,11 +196,11 @@
 		update_bin_qty(self.production_item, self.fg_warehouse, {
 			"planned_qty": get_planned_qty(self.production_item, self.fg_warehouse)
 		})
-		
+
 		if self.material_request:
 			mr_obj = frappe.get_doc("Material Request", self.material_request)
 			mr_obj.update_requested_qty([self.material_request_item])
-			
+
 	def update_completed_qty_in_material_request(self):
 		if self.material_request:
 			frappe.get_doc("Material Request", self.material_request).update_completed_qty([self.material_request_item])
@@ -220,8 +236,8 @@
 			holidays[holiday_list] = holiday_list_days
 
 		return holidays[holiday_list]
-
-	def make_time_logs(self):
+		
+	def make_time_logs(self, open_new=False):
 		"""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."""
@@ -229,72 +245,87 @@
 		if not self.operations:
 			return
 
-		time_logs = []
+		timesheets = []
 		plan_days = frappe.db.get_single_value("Manufacturing Settings", "capacity_planning_for_days") or 30
 
+		timesheet = make_timesheet(self.name)
+		workstation_list = []
+		last_workstation_idx = {}
+		timesheet.set('time_logs', [])
+
 		for i, d in enumerate(self.operations):
-			self.set_operation_start_end_time(i, d)
+			if d.workstation and d.status != 'Completed':
+				last_workstation_idx[d.workstation] = i # set last row index of workstation
+				self.set_start_end_time_for_workstation(d, workstation_list, last_workstation_idx.get(d.workstation))
+				
+				args = self.get_operations_data(d)
+				add_timesheet_detail(timesheet, args)
+				original_start_time = d.planned_start_time
 
-			time_log = make_time_log(self.name, d.operation, d.planned_start_time, d.planned_end_time,
-				flt(self.qty) - flt(d.completed_qty), self.project, d.workstation, operation_id=d.name)
-
-			if d.workstation:
 				# validate operating hours if workstation [not mandatory] is specified
-				self.check_operation_fits_in_working_hours(d)
-
-			original_start_time = time_log.from_time
-			while True:
-				_from_time = time_log.from_time
-
 				try:
-					time_log.save()
-					break
-				except WorkstationHolidayError:
-					time_log.move_to_next_day()
-				except NotInWorkingHoursError:
-					time_log.move_to_next_working_slot()
+					timesheet.validate_time_logs()
 				except OverlapError:
-					time_log.move_to_next_non_overlapping_slot()
+					if frappe.message_log: frappe.message_log.pop()
+					timesheet.schedule_for_production_order(d.idx)
+				except WorkstationHolidayError:
+					if frappe.message_log: frappe.message_log.pop()
+					timesheet.schedule_for_production_order(d.idx)
 
-				# reset end time
-				time_log.to_time = get_datetime(time_log.from_time) + relativedelta(minutes=d.time_in_mins)
+				from_time, to_time = self.get_start_end_time(timesheet, d.name)
 
-				if date_diff(time_log.from_time, original_start_time) > plan_days:
-					frappe.msgprint(_("Unable to find Time Slot in the next {0} days for Operation {1}").format(plan_days, d.operation))
+				if date_diff(from_time, original_start_time) > plan_days:
+					frappe.throw(_("Unable to find Time Slot in the next {0} days for Operation {1}").format(plan_days, d.operation))
 					break
 
-				# if time log needs to be moved, make sure that the from time is not the same
-				if _from_time == time_log.from_time:
-					frappe.throw("Capacity Planning Error")
+				d.planned_start_time = from_time
+				d.planned_end_time = to_time
+				d.db_update()
 
-			d.planned_start_time = time_log.from_time
-			d.planned_end_time = time_log.to_time
-			d.db_update()
+		if timesheet and open_new:
+			return timesheet
 
-			if time_log.name:
-				time_logs.append(time_log.name)
+		if timesheet:
+			timesheet.save()
+			timesheets.append(timesheet.name)
 
 		self.planned_end_date = self.operations[-1].planned_end_time
-
-		if time_logs:
+		if timesheets:
 			frappe.local.message_log = []
-			frappe.msgprint(_("Time Logs created:") + "\n" + "\n".join(time_logs))
+			frappe.msgprint(_("Timesheet created:") + "\n" + "\n".join(timesheets))
 
-	def set_operation_start_end_time(self, i, d):
+	def get_operations_data(self, data):
+		return {
+			'from_time': data.planned_start_time,
+			'hours': data.time_in_mins / 60.0,
+			'to_time': data.planned_end_time,
+			'project': self.project,
+			'operation': data.operation,
+			'operation_id': data.name,
+			'workstation': data.workstation,
+			'completed_qty': flt(self.qty) - flt(data.completed_qty)
+		}
+
+	def set_start_end_time_for_workstation(self, data, workstation_list, index):
 		"""Set start and end time for given operation. If first operation, set start as
 		`planned_start_date`, else add time diff to end time of earlier operation."""
-		if self.planned_start_date:
-			if i==0:
-				# first operation at planned_start date
-				d.planned_start_time = self.planned_start_date
-			else:
-				d.planned_start_time = get_datetime(self.operations[i-1].planned_end_time)\
-					+ get_mins_between_operations()
 
-			d.planned_end_time = get_datetime(d.planned_start_time) + relativedelta(minutes = d.time_in_mins)
+		if data.workstation not in workstation_list:
+			data.planned_start_time = self.planned_start_date
+			workstation_list.append(data.workstation)
+		else:
+			data.planned_start_time = get_datetime(self.operations[index-1].planned_end_time)\
+								+ get_mins_between_operations()
 
-			if d.planned_start_time == d.planned_end_time:
-				frappe.throw(_("Capacity Planning Error"))
+		data.planned_end_time = get_datetime(data.planned_start_time) + relativedelta(minutes = data.time_in_mins)
+
+		if data.planned_start_time == data.planned_end_time:
+			frappe.throw(_("Capacity Planning Error"))
+
+	def get_start_end_time(self, timesheet, operation_id):
+		for data in timesheet.time_logs:
+			if data.operation_id == operation_id:
+				return data.from_time, data.to_time
 
 	def check_operation_fits_in_working_hours(self, d):
 		"""Raises expection if operation is longer than working hours in the given workstation."""
@@ -323,19 +354,11 @@
 			self.actual_start_date = None
 			self.actual_end_date = None
 
-	def validate_delivery_date(self):
-		if self.planned_start_date and self.expected_delivery_date \
-			and getdate(self.expected_delivery_date) < getdate(self.planned_start_date):
-				frappe.msgprint(_("Expected Delivery Date is lesser than Planned Start Date."))
-
-	def delete_time_logs(self):
-		for time_log in frappe.get_all("Time Log", ["name"], {"production_order": self.name}):
-			frappe.delete_doc("Time Log", time_log.name)
+	def delete_timesheet(self):
+		for timesheet in frappe.get_all("Timesheet", ["name"], {"production_order": self.name}):
+			frappe.delete_doc("Timesheet", timesheet.name)
 
 	def validate_production_item(self):
-		if not frappe.db.get_value("Item", self.production_item, "is_pro_applicable"):
-			frappe.throw(_("Item is not allowed to have Production Order."), ProductionNotApplicableError)
-
 		if frappe.db.get_value("Item", self.production_item, "has_variants"):
 			frappe.throw(_("Production Order cannot be raised against a Item Template"), ItemHasVariantError)
 
@@ -350,6 +373,74 @@
 			if not d.time_in_mins > 0:
 				frappe.throw(_("Operation Time must be greater than 0 for Operation {0}".format(d.operation)))
 
+	def update_required_items(self):
+		'''
+		update bin reserved_qty_for_production
+		called from Stock Entry for production, after submit, cancel
+		'''
+		if self.docstatus==1 and self.source_warehouse:
+			if self.material_transferred_for_manufacturing == self.produced_qty:
+				# clear required items table and save document
+				self.clear_required_items()
+			else:
+				# calculate transferred qty based on submitted
+				# stock entries
+				self.update_transaferred_qty_for_required_items()
+
+				# update in bin
+				self.update_reserved_qty_for_production()
+
+	def clear_required_items(self):
+		'''Remove the required_items table and update the bins'''
+		items = [d.item_code for d in self.required_items]
+		self.required_items = []
+
+		self.update_child_table('required_items')
+
+		# completed, update reserved qty in bin
+		self.update_reserved_qty_for_production(items)
+
+	def update_reserved_qty_for_production(self, items=None):
+		'''update reserved_qty_for_production in bins'''
+		if not self.source_warehouse:
+			return
+
+		if not items:
+			items = [d.item_code for d in self.required_items]
+
+		for item in items:
+			stock_bin = get_bin(item, self.source_warehouse)
+			stock_bin.update_reserved_qty_for_production()
+
+	def set_required_items(self):
+		'''set required_items for production to keep track of reserved qty'''
+		if self.source_warehouse:
+			item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=self.qty,
+				fetch_exploded = self.use_multi_level_bom)
+
+			for item in item_dict.values():
+				self.append('required_items', {'item_code': item.item_code,
+					'required_qty': item.qty})
+
+			#print frappe.as_json(self.required_items)
+
+	def update_transaferred_qty_for_required_items(self):
+		'''update transferred qty from submitted stock entries for that item against
+			the production order'''
+
+		for d in self.required_items:
+			transferred_qty = frappe.db.sql('''select count(qty)
+				from `tabStock Entry` entry, `tabStock Entry Detail` detail
+				where
+					entry.production_order = %s
+					entry.purpose = "Material Transfer for Manufacture"
+					and entry.docstatus = 1
+					and detail.parent = entry.name
+					and detail.item_code = %s''', (self.name, d.item_code))[0][0]
+
+			d.db_set('transferred_qty', transferred_qty, update_modified = False)
+
+
 @frappe.whitelist()
 def get_item_details(item):
 	res = frappe.db.sql("""select stock_uom, description
@@ -380,6 +471,8 @@
 	stock_entry.fg_completed_qty = qty or (flt(production_order.qty) - flt(production_order.produced_qty))
 
 	if purpose=="Material Transfer for Manufacture":
+		if production_order.source_warehouse:
+			stock_entry.from_warehouse = production_order.source_warehouse
 		stock_entry.to_warehouse = production_order.wip_warehouse
 	else:
 		stock_entry.from_warehouse = production_order.wip_warehouse
@@ -415,22 +508,22 @@
 	return data
 
 @frappe.whitelist()
-def make_time_log(name, operation, from_time=None, to_time=None, qty=None,  project=None, workstation=None, operation_id=None):
-	time_log =  frappe.new_doc("Time Log")
-	time_log.for_manufacturing = 1
-	time_log.from_time = from_time
-	time_log.to_time = to_time
-	time_log.production_order = name
-	time_log.project = project
-	time_log.operation_id = operation_id
-	time_log.operation = operation
-	time_log.workstation= workstation
-	time_log.activity_type= "Manufacturing"
-	time_log.completed_qty = flt(qty)
+def make_timesheet(production_order):
+	timesheet = frappe.new_doc("Timesheet")
+	timesheet.employee = ""
+	timesheet.production_order = production_order
+	return timesheet
 
-	if from_time and to_time :
-		time_log.calculate_total_hours()
-	return time_log
+@frappe.whitelist()	
+def add_timesheet_detail(timesheet, args):
+	if isinstance(timesheet, unicode):
+		timesheet = frappe.get_doc('Timesheet', timesheet)
+
+	if isinstance(args, unicode):
+		args = json.loads(args)
+
+	timesheet.append('time_logs', args)
+	return timesheet
 
 @frappe.whitelist()
 def get_default_warehouse():
@@ -439,3 +532,13 @@
 	fg_warehouse = frappe.db.get_single_value("Manufacturing Settings",
 		"default_fg_warehouse")
 	return {"wip_warehouse": wip_warehouse, "fg_warehouse": fg_warehouse}
+
+@frappe.whitelist()
+def make_new_timesheet(source_name, target_doc=None):
+	po = frappe.get_doc('Production Order', source_name)
+	ts = po.make_time_logs(open_new=True)
+
+	if not ts.get('time_logs'):
+		frappe.throw(_("Already completed"))
+
+	return ts
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_list.js b/erpnext/manufacturing/doctype/production_order/production_order_list.js
index f08158c..cce56cf 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order_list.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order_list.js
@@ -9,6 +9,7 @@
 			return [__(doc.status), {
 				"Draft": "red",
 				"Stopped": "red",
+				"Not Started": "red",
 				"In Process": "orange",
 				"Completed": "green",
 				"Cancelled": "darkgrey"
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index cfea4e5..d29544b 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -5,14 +5,18 @@
 from __future__ import unicode_literals
 import unittest
 import frappe
-from frappe.utils import flt, time_diff_in_hours, now, add_days
+from frappe.utils import flt, time_diff_in_hours, now, add_days, cint
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 from erpnext.manufacturing.doctype.production_order.production_order \
-	import make_stock_entry, ProductionNotApplicableError,ItemHasVariantError
+	import make_stock_entry, ItemHasVariantError
 from erpnext.stock.doctype.stock_entry import test_stock_entry
-from erpnext.projects.doctype.time_log.time_log import OverProductionLoggedError
+from erpnext.stock.utils import get_bin
 
 class TestProductionOrder(unittest.TestCase):
+	def setUp(self):
+		self.warehouse = '_Test Warehouse 2 - _TC'
+		self.item = '_Test Item'
+
 	def check_planned_qty(self):
 		set_perpetual_inventory(0)
 
@@ -67,25 +71,25 @@
 
 		self.assertRaises(StockOverProductionError, s.submit)
 
-	def test_make_time_log(self):
-		from erpnext.projects.doctype.time_log.test_time_log import make_time_log_test_record
+	def test_make_time_sheet(self):
+		from erpnext.manufacturing.doctype.production_order.production_order import make_timesheet
 		prod_order = make_prod_order_test_record(item="_Test FG Item 2",
 			planned_start_date=now(), qty=1, do_not_save=True)
 
 		prod_order.set_production_order_operations()
 		prod_order.insert()
 		prod_order.submit()
-
+		
 		d = prod_order.operations[0]
-
 		d.completed_qty = flt(d.completed_qty)
 
-		time_log = make_time_log_test_record(hours=1, production_order= prod_order.name, operation= d.operation,
-			completed_qty= prod_order.qty - d.completed_qty, operation_id=d.name, for_manufacturing=1, simulate=True)
+		name = frappe.db.get_value('Timesheet', {'production_order': prod_order.name}, 'name')
+		time_sheet_doc = frappe.get_doc('Timesheet', name)
+		time_sheet_doc.submit()
+		
 
-		self.assertEqual(prod_order.name, time_log.production_order)
-		self.assertEqual((prod_order.qty - d.completed_qty), time_log.completed_qty)
-		self.assertEqual(time_diff_in_hours(d.planned_end_time, d.planned_start_time),time_log.hours)
+		self.assertEqual(prod_order.name, time_sheet_doc.production_order)
+		self.assertEqual((prod_order.qty - d.completed_qty), sum([d.completed_qty for d in time_sheet_doc.time_logs]))
 
 		manufacturing_settings = frappe.get_doc({
 			"doctype": "Manufacturing Settings",
@@ -100,8 +104,11 @@
 
 		self.assertEqual(prod_order.operations[0].actual_operation_time, 60)
 		self.assertEqual(prod_order.operations[0].actual_operating_cost, 100)
+		
+		time_sheet_doc1 = make_timesheet(prod_order.name)
+		self.assertEqual(len(time_sheet_doc1.get('time_logs')), 0)
 
-		time_log.cancel()
+		time_sheet_doc.cancel()
 
 		prod_order.load_from_db()
 		self.assertEqual(prod_order.operations[0].status, "Pending")
@@ -110,11 +117,6 @@
 		self.assertEqual(flt(prod_order.operations[0].actual_operation_time), 0)
 		self.assertEqual(flt(prod_order.operations[0].actual_operating_cost), 0)
 
-		time_log2 = make_time_log_test_record(from_time= add_days(time_log.to_time, 1) ,production_order= prod_order.name, operation= d.operation,
-			completed_qty= 5, operation_id=d.name, for_manufacturing=1, do_not_save=True)
-
-		self.assertRaises(OverProductionLoggedError, time_log2.save)
-
 	def test_planned_operating_cost(self):
 		prod_order = make_prod_order_test_record(item="_Test FG Item 2",
 			planned_start_date=now(), qty=1, do_not_save=True)
@@ -125,12 +127,7 @@
 		self.assertEqual(prod_order.planned_operating_cost, cost*2)
 
 	def test_production_item(self):
-		frappe.db.set_value("Item", "_Test FG Item", "is_pro_applicable", 0)
-
 		prod_order = make_prod_order_test_record(item="_Test FG Item", qty=1, do_not_save=True)
-		self.assertRaises(ProductionNotApplicableError, prod_order.save)
-
-		frappe.db.set_value("Item", "_Test FG Item", "is_pro_applicable", 1)
 		frappe.db.set_value("Item", "_Test FG Item", "end_of_life", "2000-1-1")
 
 		self.assertRaises(frappe.ValidationError, prod_order.save)
@@ -145,6 +142,73 @@
 		prod_order = make_prod_order_test_record(item="_Test Variant Item", qty=1, do_not_save=True)
 		self.assertRaises(ItemHasVariantError, prod_order.save)
 
+	def test_reserved_qty_for_production_submit(self):
+		self.bin1_at_start = get_bin(self.item, self.warehouse)
+
+		# reset to correct value
+		self.bin1_at_start.update_reserved_qty_for_production()
+
+		self.pro_order = make_prod_order_test_record(item="_Test FG Item", qty=2,
+			source_warehouse=self.warehouse)
+
+		self.bin1_on_submit = get_bin(self.item, self.warehouse)
+
+		# reserved qty for production is updated
+		self.assertEqual(cint(self.bin1_at_start.reserved_qty_for_production) + 2,
+			cint(self.bin1_on_submit.reserved_qty_for_production))
+		self.assertEqual(cint(self.bin1_at_start.projected_qty),
+			cint(self.bin1_on_submit.projected_qty) + 2)
+
+	def test_reserved_qty_for_production_cancel(self):
+		self.test_reserved_qty_for_production_submit()
+
+		self.pro_order.cancel()
+
+		bin1_on_cancel = get_bin(self.item, self.warehouse)
+
+		# reserved_qty_for_producion updated
+		self.assertEqual(cint(self.bin1_at_start.reserved_qty_for_production),
+			cint(bin1_on_cancel.reserved_qty_for_production))
+		self.assertEqual(self.bin1_at_start.projected_qty,
+			cint(bin1_on_cancel.projected_qty))
+
+	def test_reserved_qty_for_production_on_stock_entry(self):
+		test_stock_entry.make_stock_entry(item_code="_Test Item",
+			target= self.warehouse, qty=100, basic_rate=100)
+		test_stock_entry.make_stock_entry(item_code="_Test Item Home Desktop 100",
+			target= self.warehouse, qty=100, basic_rate=100)
+
+		self.test_reserved_qty_for_production_submit()
+
+		s = frappe.get_doc(make_stock_entry(self.pro_order.name,
+			"Material Transfer for Manufacture", 2))
+
+		s.submit()
+
+		bin1_on_start_production = get_bin(self.item, self.warehouse)
+
+		# reserved_qty_for_producion updated
+		self.assertEqual(cint(self.bin1_at_start.reserved_qty_for_production),
+			cint(bin1_on_start_production.reserved_qty_for_production))
+
+		# projected qty will now be 2 less (becuase of item movement)
+		self.assertEqual(cint(self.bin1_at_start.projected_qty),
+			cint(bin1_on_start_production.projected_qty) + 2)
+
+		s = frappe.get_doc(make_stock_entry(self.pro_order.name, "Manufacture", 2))
+
+		bin1_on_end_production = get_bin(self.item, self.warehouse)
+
+		# no change in reserved / projected
+		self.assertEqual(cint(bin1_on_end_production.reserved_qty_for_production),
+			cint(bin1_on_start_production.reserved_qty_for_production))
+		self.assertEqual(cint(bin1_on_end_production.projected_qty),
+			cint(bin1_on_end_production.projected_qty))
+
+		# required_items removed
+		self.pro_order.reload()
+		self.assertEqual(len(self.pro_order.required_items), 0)
+
 def make_prod_order_test_record(**args):
 	args = frappe._dict(args)
 
@@ -156,7 +220,12 @@
 	pro_order.wip_warehouse = args.wip_warehouse or "_Test Warehouse - _TC"
 	pro_order.fg_warehouse = args.fg_warehouse or "_Test Warehouse 1 - _TC"
 	pro_order.company = args.company or "_Test Company"
-	pro_order.stock_uom = "_Test UOM"
+	pro_order.stock_uom = args.stock_uom or "_Test UOM"
+	pro_order.set_production_order_operations()
+
+	if args.source_warehouse:
+		pro_order.source_warehouse = args.source_warehouse
+
 	if args.planned_start_date:
 		pro_order.planned_start_date = args.planned_start_date
 
diff --git a/erpnext/manufacturing/doctype/production_order/test_records.json b/erpnext/manufacturing/doctype/production_order/test_records.json
index e744e3b..8114103 100644
--- a/erpnext/manufacturing/doctype/production_order/test_records.json
+++ b/erpnext/manufacturing/doctype/production_order/test_records.json
@@ -1,6 +1,6 @@
 [
  {
-  "bom_no": "BOM/_Test FG Item/001", 
+  "bom_no": "BOM-_Test FG Item-001", 
   "company": "_Test Company", 
   "doctype": "Production Order", 
   "fg_warehouse": "_Test Warehouse 1 - _TC", 
@@ -9,4 +9,4 @@
   "stock_uom": "_Test UOM", 
   "wip_warehouse": "_Test Warehouse - _TC"
  }
-]
\ No newline at end of file
+]
diff --git a/erpnext/manufacturing/page/bom_browser/__init__.py b/erpnext/manufacturing/doctype/production_order_item/__init__.py
similarity index 100%
rename from erpnext/manufacturing/page/bom_browser/__init__.py
rename to erpnext/manufacturing/doctype/production_order_item/__init__.py
diff --git a/erpnext/manufacturing/doctype/production_order_item/production_order_item.json b/erpnext/manufacturing/doctype/production_order_item/production_order_item.json
new file mode 100644
index 0000000..bac7a67
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_order_item/production_order_item.json
@@ -0,0 +1,113 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-04-18 07:38:26.314642", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "required_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Required Qty", 
+   "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": "transferred_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Transferred Qty", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:04.136342", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "Production Order Item", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order_item/production_order_item.py b/erpnext/manufacturing/doctype/production_order_item/production_order_item.py
new file mode 100644
index 0000000..c18338c
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_order_item/production_order_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProductionOrderItem(Document):
+	pass
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 923e534..3493ccf 100644
--- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
+++ b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-10-16 14:35:41.950175", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -24,6 +27,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation", 
@@ -50,6 +55,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Description", 
@@ -75,6 +82,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -90,6 +98,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -97,6 +106,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -113,6 +123,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Completed Qty", 
@@ -121,6 +132,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +149,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
@@ -146,6 +159,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -161,6 +175,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Workstation", 
@@ -172,30 +187,7 @@
    "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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:(doc.docstatus==1)", 
-   "fieldname": "show_time_logs", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Show Time Logs", 
-   "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, 
@@ -211,6 +203,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Estimated Time and Cost", 
@@ -219,6 +212,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -234,6 +228,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Start Time", 
@@ -242,6 +237,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -257,6 +253,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned End Time", 
@@ -265,6 +262,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -280,6 +278,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -287,6 +286,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,6 +303,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation Time", 
@@ -313,6 +314,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -328,6 +330,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Hour Rate", 
@@ -338,6 +341,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -353,6 +357,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Operating Cost", 
@@ -362,6 +367,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -377,6 +383,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Time and Cost", 
@@ -385,6 +392,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -400,6 +408,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Start Time", 
@@ -408,6 +417,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -424,6 +434,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual End Time", 
@@ -432,6 +443,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -447,6 +459,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -454,6 +467,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -470,6 +484,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Operation Time", 
@@ -478,6 +493,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -494,6 +510,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Operating Cost", 
@@ -503,55 +520,36 @@
    "permlevel": 0, 
    "precision": "", 
    "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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:(doc.docstatus==1 && doc.status!=\"Completed\")", 
-   "fieldname": "make_time_log", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Make Time Log", 
-   "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
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:52.476364", 
+ "modified": "2016-07-11 03:28:04.235889", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order Operation", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 6138435..354afbd 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:49", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -44,6 +47,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM No", 
@@ -72,6 +76,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Planned Qty", 
@@ -100,6 +105,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Start Date", 
@@ -124,6 +130,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -148,6 +155,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse", 
@@ -172,6 +180,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order", 
@@ -198,6 +207,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Request", 
@@ -223,6 +233,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Pending Qty", 
@@ -250,6 +261,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -278,6 +290,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -305,6 +318,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "material_request_item", 
@@ -325,19 +339,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-11 05:08:19.492712", 
+ "modified": "2016-07-11 03:28:04.410743", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
index 739c97f..c4fdc9a 100644
--- a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
+++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2016-02-10 05:09:11.983251", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Material Request", 
@@ -46,6 +49,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -69,6 +73,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Material Request Date", 
@@ -94,21 +99,24 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-23 02:06:15.169120", 
+ "modified": "2016-07-11 03:28:04.519523", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Material Request", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 5eaa274..2225496 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
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:49", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Order", 
@@ -44,6 +47,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Salse Order Date", 
@@ -72,6 +76,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -95,6 +100,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer", 
@@ -122,6 +128,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
@@ -144,19 +151,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-23 02:13:07.340323", 
+ "modified": "2016-07-11 03:28:04.587544", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Sales Order", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
index 6824013..a0e9ce7 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/utils.js");
+
 
 cur_frm.cscript.onload = function(doc) {
 	cur_frm.set_value("company", frappe.defaults.get_user_default("Company"))
@@ -18,6 +18,10 @@
 cur_frm.add_fetch("sales_order", "base_grand_total", "grand_total");
 
 frappe.ui.form.on("Production Planning Tool", {
+	onload_post_render: function(frm) {
+	 		frm.get_field("items").grid.set_multiple_add("item_code", "planned_qty");
+	 },	
+	 
 	get_sales_orders: function(frm) {
 		frappe.call({
 			doc: frm.doc,
@@ -97,7 +101,7 @@
 
 cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc) {
  	return erpnext.queries.item({
-		'is_pro_applicable': 1
+		'is_stock_item': 1
 	});
 }
 
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index 4fc3e87..26ba5b7 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -2,17 +2,19 @@
  "allow_copy": 1, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-01-21 12:03:47", 
  "custom": 0, 
  "default_print_format": "Standard", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "Sales Order", 
+   "default": "", 
    "fieldname": "get_items_from", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -242,6 +244,33 @@
    "bold": 0, 
    "collapsible": 0, 
    "depends_on": "eval: doc.get_items_from == \"Sales Order\"", 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval: doc.get_items_from == \"Sales Order\"", 
    "fieldname": "section_break1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -606,7 +635,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Create Material Requests for All Required Qty", 
+   "label": "Create for full quantity, ignoring quantity already on order", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -624,7 +653,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Items to be requested which are \"Out of Stock\" considering all warehouses based on projected qty and minimum order qty, if \"Create Material Requests for All Required Qty\" is unchecked.", 
+   "description": "", 
    "fieldname": "create_material_requests", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -682,7 +711,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-10 12:55:45.647372", 
+ "modified": "2016-06-02 17:59:48.976304", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Planning Tool", 
@@ -709,7 +738,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 1, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 25e3776..4770781 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -32,9 +32,11 @@
 			so_filter += " and so.transaction_date <= %(to_date)s"
 		if self.customer:
 			so_filter += " and so.customer = %(customer)s"
+		if self.project:
+			so_filter += " and so.project = %(project)s"
 
 		if self.fg_item:
-			item_filter += " and item.name = %(item)s"
+			item_filter += " and so_item.item_code = %(item)s"
 
 		open_so = frappe.db.sql("""
 			select distinct so.name, so.transaction_date, so.customer, so.base_grand_total
@@ -42,17 +44,18 @@
 			where so_item.parent = so.name
 				and so.docstatus = 1 and so.status != "Stopped"
 				and so.company = %(company)s
-				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}))
+				and so_item.qty > so_item.delivered_qty {0} {1}
+				and (exists (select name from `tabBOM` bom where bom.item=so_item.item_code
+						and bom.is_active = 1)
 					or exists (select name from `tabPacked Item` pi
 						where pi.parent = so.name and pi.parent_item = so_item.item_code
-							and exists (select name from `tabItem` item where item.name=pi.item_code
-								and (item.is_pro_applicable = 1 or item.is_sub_contracted_item = 1) {2})))
-			""".format(so_filter, item_filter, item_filter), {
+							and exists (select name from `tabBOM` bom where bom.item=pi.item_code
+								and bom.is_active = 1)))
+			""".format(so_filter, item_filter), {
 				"from_date": self.from_date,
 				"to_date": self.to_date,
 				"customer": self.customer,
+				"project": self.project,
 				"item": self.fg_item,
 				"company": self.company
 			}, as_dict=1)
@@ -83,7 +86,7 @@
 			mr_filter += " and mr_item.warehouse = %(warehouse)s"
 
 		if self.fg_item:
-			item_filter += " and item.name = %(item)s"
+			item_filter += " and mr_item.item_code = %(item)s"
 
 		pending_mr = frappe.db.sql("""
 			select distinct mr.name, mr.transaction_date
@@ -91,9 +94,9 @@
 			where mr_item.parent = mr.name
 				and mr.material_request_type = "Manufacture"
 				and mr.docstatus = 1
-				and mr_item.qty > mr_item.ordered_qty {0}
-				and (exists (select name from `tabItem` item where item.name=mr_item.item_code
-					and (item.is_pro_applicable = 1 or item.is_sub_contracted_item = 1 {1})))
+				and mr_item.qty > ifnull(mr_item.ordered_qty,0) {0} {1}
+				and (exists (select name from `tabBOM` bom where bom.item=mr_item.item_code
+					and bom.is_active = 1))
 			""".format(mr_filter, item_filter), {
 				"from_date": self.from_date,
 				"to_date": self.to_date,
@@ -134,8 +137,8 @@
 			(qty - delivered_qty) as pending_qty
 			from `tabSales Order Item` so_item
 			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) %s""" % \
+			and exists (select name from `tabBOM` bom where bom.item=so_item.item_code
+					and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
 
 		if self.fg_item:
@@ -148,8 +151,8 @@
 			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 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) %s""" % \
+			and exists (select name from `tabBOM` bom where bom.item=pi.item_code
+					and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
 
 		self.add_items(items + packed_items)
@@ -168,8 +171,8 @@
 			(qty - ordered_qty) as pending_qty
 			from `tabMaterial Request Item` mr_item
 			where parent in (%s) and docstatus = 1 and qty > ordered_qty
-			and exists (select * from `tabItem` item where item.name=mr_item.item_code
-				and item.is_pro_applicable = 1) %s""" % \
+			and exists (select name from `tabBOM` bom where bom.item=mr_item.item_code
+				and bom.is_active = 1) %s""" % \
 			(", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1)
 
 		self.add_items(items)
@@ -321,7 +324,6 @@
 					fb.description, fb.stock_uom, item.min_order_qty
 					from `tabBOM Explosion Item` fb, `tabBOM` bom, `tabItem` item
 					where bom.name = fb.parent and item.name = fb.item_code
-					and (item.is_pro_applicable = 0 or ifnull(item.default_bom, "")="")
 					and (item.is_sub_contracted_item = 0 or ifnull(item.default_bom, "")="")
 					and item.is_stock_item = 1
 					and fb.docstatus<2 and bom.name=%s
@@ -447,9 +449,12 @@
 					"transaction_date": nowdate(),
 					"status": "Draft",
 					"company": self.company,
-					"requested_by": frappe.session.user,
-					"material_request_type": "Purchase"
+					"requested_by": frappe.session.user
 				})
+				if item_wrapper.default_bom:
+					material_request.update({"material_request_type": "Manufacture"}) 
+				else:
+					material_request.update({"material_request_type": "Purchase"})
 				for sales_order, requested_qty in items_to_be_requested[item].items():
 					material_request.append("items", {
 						"doctype": "Material Request Item",
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 1a4c9ea..b9cd174 100644
--- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-12-24 14:46:40.678236", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Start Time", 
@@ -24,6 +27,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -39,6 +43,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -46,6 +51,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -61,6 +67,7 @@
    "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "End Time", 
@@ -69,6 +76,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -84,6 +92,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -91,6 +100,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -107,6 +117,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Enabled", 
@@ -115,6 +126,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -125,21 +137,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:30:01.107577", 
+ "modified": "2016-07-11 03:28:10.225704", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Workstation Working Hour", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.js b/erpnext/manufacturing/page/bom_browser/bom_browser.js
deleted file mode 100644
index 3c13905..0000000
--- a/erpnext/manufacturing/page/bom_browser/bom_browser.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.pages['bom-browser'].on_page_load = function(wrapper) {
-	var page = frappe.ui.make_app_page({
-		parent: wrapper,
-		title: 'BOM Browser',
-		single_column: true
-	});
-
-	page.main.css({
-		"min-height": "300px",
-		"padding-bottom": "25px"
-	});
-
-	page.tree_area = $('<div class="padding"><p class="text-muted">'+
-		__("Select BOM to start")
-		+'</p></div>').appendTo(page.main);
-
-	frappe.breadcrumbs.add(frappe.breadcrumbs.last_module || "Manufacturing");
-
-	var make_tree = function() {
-		erpnext.bom_tree = new erpnext.BOMTree(page.$bom_select.val(), page, page.tree_area);
-	}
-
-	page.$bom_select = wrapper.page.add_field({fieldname: "bom",
-		fieldtype:"Link", options: "BOM", label: __("BOM")}).$input
-		.change(function() {
-			make_tree();
-		});
-
-	page.set_secondary_action(__('Refresh'), function() {
-		make_tree();
-	});
-}
-
-
-frappe.pages['bom-browser'].on_page_show = function(wrapper){
-	// set from route
-	var bom = null;
-	if(frappe.get_route()[1]) {
-		var bom = frappe.get_route().splice(1).join("/");
-	}
-	if(frappe.route_options && frappe.route_options.bom) {
-		var bom = frappe.route_options.bom;
-	}
-	if(bom) {
-		wrapper.page.$bom_select.val(bom).trigger("change");
-	}
-};
-
-erpnext.BOMTree = Class.extend({
-	init: function(root, page, parent) {
-		$(parent).empty();
-		var me = this;
-		me.page = page;
-		me.bom = page.$bom_select.val();
-		me.can_read = frappe.model.can_read("BOM");
-		me.can_create = frappe.boot.user.can_create.indexOf("BOM") !== -1 ||
-					frappe.boot.user.in_create.indexOf("BOM") !== -1;
-		me.can_write = frappe.model.can_write("BOM");
-		me.can_delete = frappe.model.can_delete("BOM");
-		this.tree = new frappe.ui.Tree({
-			parent: $(parent),
-			label: me.bom,
-			args: {parent: me.bom},
-			method: 'erpnext.manufacturing.page.bom_browser.bom_browser.get_children',
-			toolbar: [
-				{toggle_btn: true},
-				{
-					label:__("Edit"),
-					condition: function(node) {
-						return node.expandable;
-					},
-					click: function(node) {
-						frappe.set_route("Form", "BOM", node.data.value);
-					}
-				}
-			],
-			get_label: function(node) {
-				if(node.data.qty) {
-					return node.data.qty + " x " + node.data.item_code;
-				} else {
-					return node.data.item_code || node.data.value;
-				}
-			}
-		});
-	}
-});
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.json b/erpnext/manufacturing/page/bom_browser/bom_browser.json
deleted file mode 100644
index 5b75463..0000000
--- a/erpnext/manufacturing/page/bom_browser/bom_browser.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "content": null, 
- "creation": "2015-05-25 02:57:33.472044", 
- "docstatus": 0, 
- "doctype": "Page", 
- "modified": "2015-05-25 02:57:33.472044", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "bom-browser", 
- "owner": "Administrator", 
- "page_name": "bom-browser", 
- "roles": [
-  {
-   "role": "Manufacturing User"
-  }
- ], 
- "script": null, 
- "standard": "Yes", 
- "style": null, 
- "title": "BOM Browser"
-}
\ No newline at end of file
diff --git a/erpnext/manufacturing/page/bom_browser/bom_browser.py b/erpnext/manufacturing/page/bom_browser/bom_browser.py
deleted file mode 100644
index 8099389..0000000
--- a/erpnext/manufacturing/page/bom_browser/bom_browser.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
-
-@frappe.whitelist()
-def get_children(parent):
-	return frappe.db.sql("""select item_code,
-		bom_no as value, qty,
-		if(ifnull(bom_no, "")!="", 1, 0) as expandable
-		from `tabBOM Item`
-		where parent=%s
-		order by idx
-		""", parent, as_dict=True)
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index dfca2f2..609a3fe 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -11,3 +11,6 @@
 Utilities
 Shopping Cart
 Hub Node
+Portal
+Maintenance
+Schools
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index e9af184..d211ca9 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -8,6 +8,7 @@
 erpnext.patches.v4_0.move_warehouse_user_to_restrictions
 erpnext.patches.v4_0.global_defaults_to_system_settings
 erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
+execute:frappe.reload_doc('stock', 'doctype', 'warehouse')
 execute:frappe.reload_doc('accounts', 'doctype', 'sales_invoice') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'quotation') # 2014-01-29
@@ -20,6 +21,7 @@
 execute:frappe.reload_doc('accounts', 'doctype', 'pos_setting') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'customer') # 2014-01-29
 execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
+execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
 execute:frappe.reload_doctype('Item')
 erpnext.patches.v4_0.map_charge_to_taxes_and_charges
 execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
@@ -139,6 +141,9 @@
 erpnext.patches.v5_0.update_sms_sender
 erpnext.patches.v5_0.set_appraisal_remarks
 erpnext.patches.v5_0.update_time_log_title
+erpnext.patches.v7_0.create_warehouse_nestedset
+erpnext.patches.v7_0.merge_account_type_stock_and_warehouse_to_stock
+erpnext.patches.v7_0.set_is_group_for_warehouse
 erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse
 erpnext.patches.v5_0.newsletter
 execute:frappe.delete_doc("DocType", "Chart of Accounts")
@@ -196,7 +201,7 @@
 erpnext.patches.v5_7.item_template_attributes
 execute:frappe.delete_doc_if_exists("DocType", "Manage Variants")
 execute:frappe.delete_doc_if_exists("DocType", "Manage Variants Item")
-erpnext.patches.v4_2.repost_reserved_qty #2015-08-20
+erpnext.patches.v4_2.repost_reserved_qty #2016-04-15
 erpnext.patches.v5_4.update_purchase_cost_against_project
 erpnext.patches.v5_8.update_order_reference_in_return_entries
 erpnext.patches.v5_8.add_credit_note_print_heading
@@ -258,5 +263,40 @@
 erpnext.patches.v6_20x.remove_fiscal_year_from_holiday_list
 erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po
 erpnext.patches.v6_27.fix_recurring_order_status
+erpnext.patches.v6_20x.remove_customer_supplier_roles
 erpnext.patches.v6_20x.update_product_bundle_description
-erpnext.patches.v6_20x.repost_valuation_rate_for_negative_inventory
\ No newline at end of file
+erpnext.patches.v7_0.update_party_status
+erpnext.patches.v7_0.update_item_projected
+erpnext.patches.v7_0.fix_duplicate_icons
+erpnext.patches.v7_0.remove_features_setup
+erpnext.patches.v7_0.update_home_page
+erpnext.patches.v7_0.create_budget_record
+execute:frappe.delete_doc_if_exists("Page", "financial-analytics")
+erpnext.patches.v7_0.update_project_in_gl_entry
+execute:frappe.db.sql('update tabQuotation set status="Cancelled" where docstatus=2')
+execute:frappe.rename_doc("DocType", "Payments", "Sales Invoice Payment", force=True)
+erpnext.patches.v7_0.update_mins_to_first_response
+erpnext.patches.v6_20x.repost_valuation_rate_for_negative_inventory
+erpnext.patches.v7_0.re_route #2016-06-27
+erpnext.patches.v7_0.system_settings_setup_complete
+erpnext.patches.v7_0.set_naming_series_for_timesheet
+execute:frappe.reload_doc('projects', 'doctype', 'project')
+execute:frappe.reload_doc('projects', 'doctype', 'project_user')
+erpnext.patches.v7_0.convert_timelogbatch_to_timesheet
+erpnext.patches.v7_0.convert_timelog_to_timesheet
+erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet
+erpnext.patches.v7_0.remove_doctypes_and_reports
+erpnext.patches.v7_0.update_maintenance_module_in_doctype
+erpnext.patches.v7_0.update_prevdoc_values_for_supplier_quotation_item
+erpnext.patches.v7_0.rename_advance_table_fields
+erpnext.patches.v7_0.rename_salary_components
+erpnext.patches.v7_0.rename_prevdoc_fields
+erpnext.patches.v7_0.rename_time_sheet_doctype
+execute:frappe.delete_doc_if_exists("Report", "Customers Not Buying Since Long Time")
+erpnext.patches.v7_0.make_is_group_fieldtype_as_check
+execute:frappe.reload_doc('projects', 'doctype', 'timesheet', force=True)
+execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance")
+execute:frappe.delete_doc_if_exists("DocType", "Payment Tool")
+execute:frappe.delete_doc_if_exists("DocType", "Payment Tool Detail")
+erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists
+erpnext.patches.v7_0.migrate_schools_to_erpnext
diff --git a/erpnext/patches/v4_2/default_website_style.py b/erpnext/patches/v4_2/default_website_style.py
index e9f2cb9..cdf0a7a 100644
--- a/erpnext/patches/v4_2/default_website_style.py
+++ b/erpnext/patches/v4_2/default_website_style.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 import frappe
-from frappe.templates.pages.style_settings import default_properties
+from frappe.www.style_settings import default_properties
 
 def execute():
 	frappe.reload_doc('website', 'doctype', 'style_settings')
diff --git a/erpnext/patches/v4_2/repost_reserved_qty.py b/erpnext/patches/v4_2/repost_reserved_qty.py
index 4570570..36117aa 100644
--- a/erpnext/patches/v4_2/repost_reserved_qty.py
+++ b/erpnext/patches/v4_2/repost_reserved_qty.py
@@ -6,7 +6,8 @@
 from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
 
 def execute():
-	frappe.reload_doctype("Sales Order Item")
+	for doctype in ("Sales Order Item", "Bin"):
+		frappe.reload_doctype(doctype)
 
 	repost_for = frappe.db.sql("""
 		select
diff --git a/erpnext/patches/v5_0/newsletter.py b/erpnext/patches/v5_0/newsletter.py
index bd95937..c03664b 100644
--- a/erpnext/patches/v5_0/newsletter.py
+++ b/erpnext/patches/v5_0/newsletter.py
@@ -10,9 +10,9 @@
 	frappe.reload_doctype("Lead")
 	frappe.reload_doctype("Contact")
 
-	frappe.reload_doc('crm', 'doctype', 'newsletter_list')
-	frappe.reload_doc('crm', 'doctype', 'newsletter_list_subscriber')
-	frappe.reload_doc('crm', 'doctype', 'newsletter')
+	frappe.reload_doc('email', 'doctype', 'email_group')
+	frappe.reload_doc('email', 'doctype', 'email_group_member')
+	frappe.reload_doc('email', 'doctype', 'newsletter')
 
 	frappe.permissions.reset_perms("Newsletter")
 
@@ -30,7 +30,7 @@
 			user.save()
 
 	# create default lists
-	general = frappe.new_doc("Newsletter List")
+	general = frappe.new_doc("Email Group")
 	general.title = "General"
 	general.insert()
 	general.import_from("Lead")
diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py
index 05d5c91..d9af7b8 100644
--- a/erpnext/patches/v5_0/rename_table_fieldnames.py
+++ b/erpnext/patches/v5_0/rename_table_fieldnames.py
@@ -86,9 +86,6 @@
 	"Bank Reconciliation": [
 		["entries", "journal_entries"]
 	],
-	"Cost Center": [
-		["budget_details", "budgets"]
-	],
 	"C-Form": [
 		["invoice_details", "invoices"]
 	],
@@ -185,8 +182,8 @@
 	"Territory": [
 		["target_details", "targets"]
 	],
-	"Time Log Batch": [
-		["time_log_batch_details", "time_logs"]
+	"Time Sheet": [
+		["time_sheet_details", "time_logs"]
 	],
 	"Workstation": [
 		["workstation_operation_hours", "working_hours"]
diff --git a/erpnext/patches/v5_2/change_item_selects_to_checks.py b/erpnext/patches/v5_2/change_item_selects_to_checks.py
index 2665f4c..dde0b56 100644
--- a/erpnext/patches/v5_2/change_item_selects_to_checks.py
+++ b/erpnext/patches/v5_2/change_item_selects_to_checks.py
@@ -4,8 +4,7 @@
 
 def execute():
 	fields = ("is_stock_item", "is_asset_item", "has_batch_no", "has_serial_no",
-		"is_purchase_item", "is_sales_item", "inspection_required",
-		"is_pro_applicable", "is_sub_contracted_item")
+		"inspection_required", "is_sub_contracted_item")
 
 
 	# convert to 1 or 0
diff --git a/erpnext/patches/v6_2/remove_newsletter_duplicates.py b/erpnext/patches/v6_2/remove_newsletter_duplicates.py
index 4f25c95..dc5b778 100644
--- a/erpnext/patches/v6_2/remove_newsletter_duplicates.py
+++ b/erpnext/patches/v6_2/remove_newsletter_duplicates.py
@@ -1,12 +1,12 @@
 import frappe
 
 def execute():
-	duplicates = frappe.db.sql("""select newsletter_list, email, count(name)
-		from `tabNewsletter List Subscriber`
-		group by newsletter_list, email
+	duplicates = frappe.db.sql("""select email_group, email, count(name)
+		from `tabEmail Group Member`
+		group by email_group, email
 		having count(name) > 1""")
 
 	# delete all duplicates except 1
-	for newsletter_list, email, count in duplicates:
-		frappe.db.sql("""delete from `tabNewsletter List Subscriber`
-			where newsletter_list=%s and email=%s limit %s""", (newsletter_list, email, count-1))
+	for email_group, email, count in duplicates:
+		frappe.db.sql("""delete from `tabEmail Group Member`
+			where email_group=%s and email=%s limit %s""", (email_group, email, count-1))
diff --git a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
new file mode 100644
index 0000000..e5e3d3f
--- /dev/null
+++ b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
@@ -0,0 +1,18 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	for role in ('Customer', 'Supplier'):
+		frappe.db.sql('''delete from `tabUserRole`
+			where role=%s and parent in ("Administrator", "Guest")''', role)
+
+		if not frappe.db.sql('select name from `tabUserRole` where role=%s', role):
+
+			# delete DocPerm
+			for doctype in frappe.db.sql('select parent from tabDocPerm where role=%s', role):
+				d = frappe.get_doc("DocType", doctype[0])
+				d.permissions = [p for p in d.permissions if p.role != role]
+				d.save()
+
+			# delete Role
+			frappe.delete_doc_if_exists('Role', role)
diff --git a/erpnext/patches/v6_20x/set_compact_print.py b/erpnext/patches/v6_20x/set_compact_print.py
index 4ba1aea..495407f 100644
--- a/erpnext/patches/v6_20x/set_compact_print.py
+++ b/erpnext/patches/v6_20x/set_compact_print.py
@@ -1,5 +1,8 @@
 from __future__ import unicode_literals
 import frappe
 
+from erpnext.setup.install import create_compact_item_print_custom_field
+
 def execute():
-	frappe.db.set_value("Features Setup", None, "compact_item_print", 1)
+	create_compact_item_print_custom_field()
+	frappe.db.set_value("Print Settings", None, "compact_item_print", 1)
diff --git a/erpnext/patches/v6_21/fix_reorder_level.py b/erpnext/patches/v6_21/fix_reorder_level.py
index 602978b..82a35eb 100644
--- a/erpnext/patches/v6_21/fix_reorder_level.py
+++ b/erpnext/patches/v6_21/fix_reorder_level.py
@@ -15,7 +15,7 @@
 				"warehouse": item.default_warehouse,
 				"warehouse_reorder_level": item.re_order_level,
 				"warehouse_reorder_qty": item.re_order_qty,
-				"material_request_type": "Purchase" if item_doc.is_purchase_item else "Transfer"
+				"material_request_type": "Purchase"
 			})
 
 			try:
diff --git a/erpnext/patches/v6_27/fix_recurring_order_status.py b/erpnext/patches/v6_27/fix_recurring_order_status.py
index c67973a..5843c9f 100644
--- a/erpnext/patches/v6_27/fix_recurring_order_status.py
+++ b/erpnext/patches/v6_27/fix_recurring_order_status.py
@@ -11,41 +11,44 @@
 			"stock_doctype": "Delivery Note",
 			"invoice_doctype": "Sales Invoice",
 			"stock_doctype_ref_field": "against_sales_order",
-			"invoice_ref_field": "sales_order"
+			"invoice_ref_field": "sales_order",
+			"qty_field": "delivered_qty"
 		},
 		{
 			"doctype": "Purchase Order",
 			"stock_doctype": "Purchase Receipt",
 			"invoice_doctype": "Purchase Invoice",
 			"stock_doctype_ref_field": "prevdoc_docname",
-			"invoice_ref_field": "purchase_order"
+			"invoice_ref_field": "purchase_order",
+			"qty_field": "received_qty"
 		}):
-		
-		order_list = frappe.db.sql("""select name from `tab{0}` 
-			where docstatus=1 and is_recurring=1 
+
+		order_list = frappe.db.sql("""select name from `tab{0}`
+			where docstatus=1 and is_recurring=1
 			and ifnull(recurring_id, '') != name and creation >= '2016-01-25'"""
 			.format(doc["doctype"]), as_dict=1)
-	
+
 		for order in order_list:
-			frappe.db.sql("""update `tab{0} Item` 
-				set delivered_qty=0, billed_amt=0 where parent=%s""".format(doc["doctype"]), order.name)
-		
+			frappe.db.sql("""update `tab{0} Item`
+				set {1}=0, billed_amt=0 where parent=%s""".format(doc["doctype"],
+					doc["qty_field"]), order.name)
+
 			# Check against Delivery Note and Purchase Receipt
-			stock_doc_list = frappe.db.sql("""select distinct parent from `tab{0} Item` 
+			stock_doc_list = frappe.db.sql("""select distinct parent from `tab{0} Item`
 				where docstatus=1 and ifnull({1}, '')=%s"""
 				.format(doc["stock_doctype"], doc["stock_doctype_ref_field"]), order.name)
-			
+
 			if stock_doc_list:
 				for dn in stock_doc_list:
 					frappe.get_doc(doc["stock_doctype"], dn[0]).update_qty(update_modified=False)
-		
+
 			# Check against Invoice
-			invoice_list = frappe.db.sql("""select distinct parent from `tab{0} Item` 
+			invoice_list = frappe.db.sql("""select distinct parent from `tab{0} Item`
 				where docstatus=1 and ifnull({1}, '')=%s"""
 				.format(doc["invoice_doctype"], doc["invoice_ref_field"]), order.name)
-			
+
 			if invoice_list:
 				for dn in invoice_list:
 					frappe.get_doc(doc["invoice_doctype"], dn[0]).update_qty(update_modified=False)
-		
+
 			frappe.get_doc(doc["doctype"], order.name).set_status(update=True, update_modified=False)
\ No newline at end of file
diff --git a/erpnext/patches/v6_4/fix_journal_entries_due_to_reconciliation.py b/erpnext/patches/v6_4/fix_journal_entries_due_to_reconciliation.py
index 37b6c63..b1464d5 100644
--- a/erpnext/patches/v6_4/fix_journal_entries_due_to_reconciliation.py
+++ b/erpnext/patches/v6_4/fix_journal_entries_due_to_reconciliation.py
@@ -5,6 +5,9 @@
 import frappe
 
 def execute():
+	frappe.reload_doctype("Sales Invoice Advance")
+	frappe.reload_doctype("Purchase Invoice Advance")
+	
 	je_rows = frappe.db.sql("""
 		select name, parent, reference_type, reference_name, debit, credit
 		from `tabJournal Entry Account`
@@ -23,7 +26,7 @@
 		is_advance_entry=None
 		if d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name:
 			is_advance_entry = frappe.db.sql("""select name from `tab{0}` 
-				where journal_entry=%s and jv_detail_no=%s 
+				where reference_name=%s and reference_row=%s 
 					and ifnull(allocated_amount, 0) > 0 and docstatus=1"""
 				.format(d.reference_type + " Advance"), (d.parent, d.name))
 				
diff --git a/erpnext/patches/v6_5/show_in_website_for_template_item.py b/erpnext/patches/v6_5/show_in_website_for_template_item.py
index 48040ee..af6e830 100644
--- a/erpnext/patches/v6_5/show_in_website_for_template_item.py
+++ b/erpnext/patches/v6_5/show_in_website_for_template_item.py
@@ -9,7 +9,7 @@
 		item = frappe.get_doc("Item", item_code)
 		item.db_set("show_in_website", 1, update_modified=False)
 
-		item.get_route()
-		item.db_set("page_name", item.page_name, update_modified=False)
+		item.make_route()
+		item.db_set("route", item.route, update_modified=False)
 
 	frappe.website.render.clear_cache()
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/patches/v7_0/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/patches/v7_0/__init__.py
diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
new file mode 100644
index 0000000..cb16466
--- /dev/null
+++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py
@@ -0,0 +1,35 @@
+import frappe
+
+from erpnext.manufacturing.doctype.production_order.production_order import make_timesheet, add_timesheet_detail
+
+def execute():
+	frappe.reload_doc('projects', 'doctype', 'timesheet')
+
+	for data in frappe.get_all('Time Log', fields=["*"],
+		filters = [["docstatus", "<", "2"]]):
+		time_sheet = make_timesheet(data.production_order)
+		args = get_timelog_data(data)
+		add_timesheet_detail(time_sheet, args)
+		time_sheet.docstatus = data.docstatus
+		time_sheet.note = data.note
+		time_sheet.company = frappe.db.get_single_value('Global Defaults', 'default_company')
+		time_sheet.save(ignore_permissions=True)
+
+def get_timelog_data(data):
+	return {
+		'billable': data.billable,
+		'from_time': data.from_time,
+		'hours': data.hours,
+		'to_time': data.to_time,
+		'project': data.project,
+		'task': data.task,
+		'activity_type': data.activity_type,
+		'operation': data.operation,
+		'operation_id': data.operation_id,
+		'workstation': data.workstation,
+		'completed_qty': data.completed_qty,
+		'billing_rate': data.billing_rate,
+		'billing_amount': data.billing_amount,
+		'costing_rate': data.costing_rate,
+		'costing_amount': data.costing_amount
+	}
diff --git a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
new file mode 100644
index 0000000..0eff8d4
--- /dev/null
+++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py
@@ -0,0 +1,26 @@
+import frappe
+from frappe.utils import cint
+from erpnext.manufacturing.doctype.production_order.production_order import add_timesheet_detail
+from erpnext.patches.v7_0.convert_timelog_to_timesheet import get_timelog_data
+
+def execute():
+	for tlb in frappe.get_all('Time Log Batch', fields=["*"], 
+		filters = [["docstatus", "<", "2"]]):
+		time_sheet = frappe.new_doc('Timesheet')
+		time_sheet.employee= ""
+		time_sheet.company = frappe.db.get_single_value('Global Defaults', 'default_company')
+		time_sheet.sales_invoice = tlb.sales_invoice
+
+		for data in frappe.get_all('Time Log Batch Detail', fields=["*"],
+			filters = {'parent': tlb.name}):
+			args = get_timesheet_data(data)
+			add_timesheet_detail(time_sheet, args)
+
+		time_sheet.docstatus = tlb.docstatus
+		time_sheet.save(ignore_permissions=True)
+
+def get_timesheet_data(data):
+	time_log = frappe.get_all('Time Log', fields=["*"],
+		filters = {'name': data.time_log})[0]
+
+	return get_timelog_data(time_log)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/create_budget_record.py b/erpnext/patches/v7_0/create_budget_record.py
new file mode 100644
index 0000000..607ef690
--- /dev/null
+++ b/erpnext/patches/v7_0/create_budget_record.py
@@ -0,0 +1,56 @@
+import frappe
+
+from erpnext.accounts.doctype.budget.budget import DuplicateBudgetError
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "budget")
+	frappe.reload_doc("accounts", "doctype", "budget_account")
+
+	existing_budgets = frappe.db.sql("""
+		select
+			cc.name, cc.company, cc.distribution_id,
+			budget.account, budget.budget_allocated, budget.fiscal_year
+		from
+			`tabCost Center` cc, `tabBudget Detail` budget
+		where
+			cc.name=budget.parent
+	""", as_dict=1)
+
+	actions = {}
+	for d in frappe.db.sql("select name, yearly_bgt_flag, monthly_bgt_flag from tabCompany", as_dict=1):
+		actions.setdefault(d.name, d)
+
+	budget_records = []
+	for d in existing_budgets:
+		budget = frappe.db.get_value("Budget",
+			{"cost_center": d.name, "fiscal_year": d.fiscal_year, "company": d.company})
+
+		if not budget:
+			budget = frappe.new_doc("Budget")
+			budget.cost_center = d.name
+			budget.fiscal_year = d.fiscal_year
+			budget.monthly_distribution = d.distribution_id
+			budget.company = d.company
+			if actions[d.company]["yearly_bgt_flag"]:
+				budget.action_if_annual_budget_exceeded = actions[d.company]["yearly_bgt_flag"]
+			if actions[d.company]["monthly_bgt_flag"]:
+				budget.action_if_accumulated_monthly_budget_exceeded = actions[d.company]["monthly_bgt_flag"]
+		else:
+			budget = frappe.get_doc("Budget", budget)
+
+		budget.append("accounts", {
+			"account": d.account,
+			"budget_amount": d.budget_allocated
+		})
+
+		try:
+			budget.insert()
+			budget_records.append(budget)
+		except DuplicateBudgetError:
+			pass
+
+	for budget in budget_records:
+		budget.submit()
+
+	if frappe.db.get_value("DocType", "Budget Detail"):
+		frappe.delete_doc("DocType", "Budget Detail")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/create_warehouse_nestedset.py b/erpnext/patches/v7_0/create_warehouse_nestedset.py
new file mode 100644
index 0000000..af39cc8
--- /dev/null
+++ b/erpnext/patches/v7_0/create_warehouse_nestedset.py
@@ -0,0 +1,125 @@
+import frappe
+from frappe import _
+from frappe.utils import cint
+from frappe.utils.nestedset import rebuild_tree
+
+def execute():
+	"""
+	Patch Reference:
+		1. check whether warehouse is associated to company or not
+		2. if warehouse is associated with company
+			a. create warehouse group for company
+			b. set warehouse group as parent to other warehouses and set is_group as 0
+		3. if warehouses is not associated with company
+			a. get distinct companies from stock ledger entries
+			b. if sle have only company,
+				i. set default company to all warehouse
+				ii. repeat 2.a and 2.b
+			c. if have multiple companies,
+				i. create group warehouse without company
+				ii. repeat 2.b
+	"""
+	
+	frappe.reload_doc("stock", "doctype", "warehouse")
+
+	if check_is_warehouse_associated_with_company():
+		for company in frappe.get_all("Company", fields=["name", "abbr"]):
+			make_warehouse_nestedset(company)
+	else:
+		sle_against_companies = frappe.db.sql_list("""select distinct company from `tabStock Ledger Entry`""")
+		company = frappe.defaults.get_defaults().company
+
+		if len(sle_against_companies) == 1:
+			set_company_to_warehouse(company)
+			make_warehouse_nestedset(company)
+
+		elif len(sle_against_companies) > 1:
+			make_warehouse_nestedset()
+
+def check_is_warehouse_associated_with_company():
+	warehouse_associcated_with_company = False
+
+	for warehouse in frappe.get_all("Warehouse", fields=["name", "company"]):
+		if warehouse.company:
+			warehouse_associcated_with_company = True
+
+	return warehouse_associcated_with_company
+
+def make_warehouse_nestedset(company=None):
+	validate_parent_account_for_warehouse(company)
+	stock_account_group = get_stock_account_group(company.name)
+	if not stock_account_group and cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
+		return
+
+	if company:
+		warehouse_group = "{0} - {1}".format(_("All Warehouses"), company.abbr)
+		ignore_mandatory = False
+	else:
+		warehouse_group = _("All Warehouses")
+		ignore_mandatory = True
+
+	if not frappe.db.get_value("Warehouse", warehouse_group):
+		create_default_warehouse_group(company, stock_account_group, ignore_mandatory)
+
+	set_parent_to_warehouse(warehouse_group, company)
+	if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
+		set_parent_to_warehouse_account(company)
+
+def validate_parent_account_for_warehouse(company=None):
+	if not company:
+		return
+
+	if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
+		parent_account = frappe.db.sql("""select name from tabAccount
+			where account_type='Stock' and company=%s and is_group=1
+			and (warehouse is null or warehouse = '')""", company.name)
+
+		if not parent_account:
+			current_parent_accounts_for_warehouse = frappe.db.sql("""select parent_account from tabAccount
+				where account_type='Warehouse' and (warehouse is not null or warehouse != '') """)
+
+			if current_parent_accounts_for_warehouse:
+				frappe.db.set_value("Account", current_parent_accounts_for_warehouse[0][0], "account_type", "Stock")
+
+def create_default_warehouse_group(company=None, stock_account_group=None, ignore_mandatory=False):
+	wh = frappe.get_doc({
+		"doctype": "Warehouse",
+		"warehouse_name": _("All Warehouses"),
+		"is_group": 1,
+		"company": company.name if company else "",
+		"parent_warehouse": "",
+		"create_account_under": stock_account_group
+	})
+
+	if ignore_mandatory:
+		wh.flags.ignore_mandatory = ignore_mandatory
+
+	wh.insert(ignore_permissions=True)
+
+def set_parent_to_warehouse(warehouse_group, company=None):
+	frappe.db.sql(""" update tabWarehouse set parent_warehouse = %s, is_group = 0
+		where (is_group = 0 or is_group is null or is_group = '') and ifnull(company, '') = %s
+		""",(warehouse_group, company.name if company else ""))
+
+	rebuild_tree("Warehouse", "parent_warehouse")
+
+def set_parent_to_warehouse_account(company):
+	frappe.db.sql(""" update tabAccount set parent_account = %s
+		where is_group = 0 and account_type = "Warehouse"
+		and (warehouse is not null or warehouse != '') and company = %s
+		""",("{0} - {1}".format(_("All Warehouses"), company.abbr), company.name))
+
+	rebuild_tree("Account", "parent_account")
+
+def set_company_to_warehouse(company):
+	frappe.db.sql("update tabWahouse set company=%s", company)
+
+def get_stock_account_group(company):
+	stock_account_group = frappe.db.get_all('Account', filters = {'company': company, 'is_group': 1,
+		'account_type': 'Stock', 'root_type': 'Asset'}, limit=1)
+			
+	if not stock_account_group:
+		stock_account_group = frappe.db.get_all('Account', filters = {'company': company, 'is_group': 1,
+				'parent_account': '', 'root_type': 'Asset'}, limit=1)
+
+	return stock_account_group[0].name if stock_account_group else None
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/fix_duplicate_icons.py b/erpnext/patches/v7_0/fix_duplicate_icons.py
new file mode 100644
index 0000000..3e762f7
--- /dev/null
+++ b/erpnext/patches/v7_0/fix_duplicate_icons.py
@@ -0,0 +1,24 @@
+import frappe
+
+from frappe.desk.doctype.desktop_icon.desktop_icon import (sync_desktop_icons,
+	get_desktop_icons, set_hidden)
+from erpnext.patches.v7_0.migrate_schools_to_erpnext import reload_doctypes_for_schools_icons
+
+def execute():
+	'''hide new style icons if old ones are set'''
+	reload_doctypes_for_schools_icons()
+
+	sync_desktop_icons()
+
+	for user in frappe.get_all('User', filters={'user_type': 'System User'}):
+		desktop_icons = get_desktop_icons(user.name)
+		icons_dict = {}
+		for d in desktop_icons:
+			if not d.hidden:
+				icons_dict[d.module_name] = d
+
+		for key in (('Selling', 'Customer'), ('Stock', 'Item'), ('Buying', 'Supplier'),
+			('HR', 'Employee'), ('CRM', 'Lead'), ('Support', 'Issue'), ('Projects', 'Project')):
+			if key[0] in icons_dict and key[1] in icons_dict:
+				set_hidden(key[1], user.name, 1)
+
diff --git a/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py b/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py
new file mode 100644
index 0000000..ba82e86
--- /dev/null
+++ b/erpnext/patches/v7_0/make_is_group_fieldtype_as_check.py
@@ -0,0 +1,18 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	for doctype in ["Sales Person", "Customer Group", "Item Group", "Territory"]:
+		
+		# convert to 1 or 0
+		frappe.db.sql("update `tab{doctype}` set is_group = if(is_group='Yes',1,0) "
+			.format(doctype=doctype))
+
+		frappe.db.commit()
+
+		# alter fields to int
+				
+		frappe.db.sql("alter table `tab{doctype}` change is_group is_group int(1) default '0'"
+			.format(doctype=doctype))
+
+		frappe.reload_doctype(doctype)
diff --git a/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py b/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py
new file mode 100644
index 0000000..6141792
--- /dev/null
+++ b/erpnext/patches/v7_0/merge_account_type_stock_and_warehouse_to_stock.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "account")
+	
+	frappe.db.sql(""" update tabAccount set account_type = "Stock"
+		where account_type = "Warehouse" """)
+	
+	frappe.db.commit()
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
new file mode 100644
index 0000000..9933743
--- /dev/null
+++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py
@@ -0,0 +1,32 @@
+from __future__ import unicode_literals
+import frappe
+from erpnext.setup.setup_wizard import domainify
+
+def execute():
+	reload_doctypes_for_schools_icons()
+
+	frappe.reload_doc('website', 'doctype', 'portal_settings')
+	frappe.reload_doc('website', 'doctype', 'portal_menu_item')
+	frappe.reload_doc('buying', 'doctype', 'request_for_quotation')
+
+	if 'schools' in frappe.get_installed_apps():
+		frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
+		frappe.db.sql("""delete from `tabDesktop Icon`""")
+		if not frappe.db.exists('Module Def', 'Schools'):
+			frappe.get_doc({
+				'doctype': 'Module Def',
+				'module_name': 'Schools',
+				'app_name': 'erpnext'
+			}).insert()
+		frappe.db.sql("""update `tabDocType` set module='Schools' where module='Academics'""")
+		from frappe.installer import remove_from_installed_apps
+		remove_from_installed_apps("schools")
+		domainify.setup_domain('Education')
+	else:
+		frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
+		domainify.setup_sidebar_items(domainify.get_domain('Manufacturing'))
+
+def reload_doctypes_for_schools_icons():
+	for name in ('student', 'student_group', 'course_schedule', 'student_attendance',
+		'course', 'program', 'student_applicant', 'examination', 'fees', 'instructor', 'announcement'):
+		frappe.reload_doc('schools', 'doctype', name)
diff --git a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
new file mode 100644
index 0000000..695c552
--- /dev/null
+++ b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py
@@ -0,0 +1,14 @@
+import frappe
+
+def execute():
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment')
+	for time_sheet in frappe.db.sql(""" select sales_invoice, name, total_billing_amount from `tabTimesheet`
+		where sales_invoice is not null and docstatus < 2""", as_dict=True):
+		si_doc = frappe.get_doc('Sales Invoice', time_sheet.sales_invoice)
+		ts = si_doc.append('timesheets',{})
+		ts.time_sheet = time_sheet.name
+		ts.billing_amount = time_sheet.total_billing_amount
+		si_doc.update_time_sheet(time_sheet.sales_invoice)
+		si_doc.flags.ignore_validate_update_after_submit = True
+		si_doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/re_route.py b/erpnext/patches/v7_0/re_route.py
new file mode 100644
index 0000000..1db4920
--- /dev/null
+++ b/erpnext/patches/v7_0/re_route.py
@@ -0,0 +1,4 @@
+from frappe.patches.v7_0.re_route import update_routes
+
+def execute():
+	update_routes(['Item', 'Item Group', 'Sales Partner', 'Job Opening'])
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/remove_doctypes_and_reports.py b/erpnext/patches/v7_0/remove_doctypes_and_reports.py
new file mode 100644
index 0000000..978c363
--- /dev/null
+++ b/erpnext/patches/v7_0/remove_doctypes_and_reports.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+	for doctype in ['Time Log Batch', 'Time Log Batch Detail', 'Time Log']:
+		frappe.delete_doc('DocType', doctype)
+		
+	report = "Daily Time Log Summary"
+	if frappe.db.exists("Report", report):
+		frappe.delete_doc('Report', report)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/remove_features_setup.py b/erpnext/patches/v7_0/remove_features_setup.py
new file mode 100644
index 0000000..60d1926
--- /dev/null
+++ b/erpnext/patches/v7_0/remove_features_setup.py
@@ -0,0 +1,26 @@
+import frappe
+
+from erpnext.setup.install import create_compact_item_print_custom_field
+from frappe.utils import cint
+
+def execute():
+	frappe.reload_doctype('Stock Settings')
+	stock_settings = frappe.get_doc('Stock Settings', 'Stock Settings')
+	stock_settings.show_barcode_field = cint(frappe.db.get_value("Features Setup", None, "fs_item_barcode"))
+	stock_settings.save()
+
+	create_compact_item_print_custom_field()
+
+	compact_item_print = frappe.db.get_value("Features Setup", None, "compact_item_print")
+	frappe.db.set_value("Print Settings", None, "compact_item_print", compact_item_print)
+
+	# remove defaults
+	frappe.db.sql("""delete from tabDefaultValue where defkey in ('fs_item_serial_nos',
+		'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
+		'fs_item_advanced', 'fs_packing_details', 'fs_item_group_in_details',
+		'fs_exports', 'fs_imports', 'fs_discounts', 'fs_purchase_discounts',
+		'fs_after_sales_installations', 'fs_projects', 'fs_sales_extras',
+		'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality',
+		'fs_page_break', 'fs_more_info', 'fs_pos_view', 'compact_item_print')""")
+
+	frappe.delete_doc('DocType', 'Features Setup')
diff --git a/erpnext/patches/v7_0/rename_advance_table_fields.py b/erpnext/patches/v7_0/rename_advance_table_fields.py
new file mode 100644
index 0000000..ba8b2da
--- /dev/null
+++ b/erpnext/patches/v7_0/rename_advance_table_fields.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	for dt in ("Sales Invoice Advance", "Purchase Invoice Advance"):
+		frappe.reload_doctype(dt)
+		
+		frappe.db.sql("update `tab{0}` set reference_type = 'Journal Entry'".format(dt))
+		
+		rename_field(dt, "journal_entry", "reference_name")
+		rename_field(dt, "jv_detail_no", "reference_row")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/rename_prevdoc_fields.py b/erpnext/patches/v7_0/rename_prevdoc_fields.py
new file mode 100644
index 0000000..d189056
--- /dev/null
+++ b/erpnext/patches/v7_0/rename_prevdoc_fields.py
@@ -0,0 +1,75 @@
+import frappe
+import json
+from frappe.model.utils.rename_field import update_reports, rename_field, update_property_setters
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
+
+def execute():
+	frappe.reload_doctype('Purchase Order Item')
+	frappe.reload_doctype('Purchase Receipt Item')
+	update_po_fields()
+	update_prop_setters_reports_print_format_for_po()
+	set_sales_order_field()
+	rename_pr_fields()
+
+def update_po_fields():
+	for data in frappe.db.sql(""" select prevdoc_docname, prevdoc_detail_docname, name, prevdoc_doctype
+		from `tabPurchase Order Item` where prevdoc_doctype is not null""", as_dict=True):
+		if data.prevdoc_doctype == 'Material Request':
+			frappe.db.set_value("Purchase Order Item", data.name, "material_request", data.prevdoc_docname, update_modified=False)
+			frappe.db.set_value("Purchase Order Item", data.name, "material_request_item", data.prevdoc_detail_docname, update_modified=False)
+		elif data.prevdoc_doctype == 'Sales Order':
+			frappe.db.set_value("Purchase Order Item", data.name, "sales_order", data.prevdoc_docname, update_modified=False)
+			frappe.db.set_value("Purchase Order Item", data.name, "sales_order_item", data.prevdoc_detail_docname, update_modified=False)
+
+def get_columns():
+	return {
+		'prevdoc_docname': 'material_request',
+		'prevdoc_detail_docname': 'material_request_item'
+	}
+
+def update_prop_setters_reports_print_format_for_po():
+	for key, val in get_columns().items():
+		update_property_setters('Purchase Order Item', key, val)
+		update_reports('Purchase Order Item', key, val)
+		update_print_format_for_po(key, val, 'Purchase Order')
+
+def update_print_format_for_po(old_fieldname, new_fieldname, doc_type):
+	column_mapper = get_columns()
+
+	for data in frappe.db.sql(""" select name, format_data from `tabPrint Format` where
+		format_data like %(old_fieldname)s and doc_type = %(doc_type)s""", 
+		{'old_fieldname': '%%%s%%'%(old_fieldname), 'doc_type': doc_type}, as_dict=True):
+
+		update_print_format_fields(old_fieldname, new_fieldname, data)
+
+def update_print_format_fields(old_fieldname, new_fieldname, args):
+	report_dict = json.loads(args.format_data)
+	update = False
+
+	for col in report_dict:
+		if col.get('fieldname') and col.get('fieldname') == old_fieldname:
+			col['fieldname'] = new_fieldname
+			update = True
+
+		if col.get('visible_columns'):
+			for key in col.get('visible_columns'):
+				if key.get('fieldname') == old_fieldname:
+					key['fieldname'] = new_fieldname
+					update = True
+
+	if update:
+		val = json.dumps(report_dict)
+		frappe.db.sql("""update `tabPrint Format` set `format_data`=%s where name=%s""", (val, args.name))
+		
+def set_sales_order_field():
+	for data in frappe.db.sql("""select doc_type, field_name, property, value, property_type 
+		from `tabProperty Setter` where doc_type = 'Purchase Order Item' 
+		and field_name in('material_request', 'material_request_item')""", as_dict=True):
+		if data.field_name == 'material_request':
+			make_property_setter(data.doc_type, 'sales_order', data.property, data.value, data.property_type)
+		else:
+			make_property_setter(data.doc_type, 'sales_order_item', data.property, data.value, data.property_type)
+
+def rename_pr_fields():
+	rename_field("Purchase Receipt Item", "prevdoc_docname", "purchase_order")
+	rename_field("Purchase Receipt Item", "prevdoc_detail_docname", "purchase_order_item")
diff --git a/erpnext/patches/v7_0/rename_salary_components.py b/erpnext/patches/v7_0/rename_salary_components.py
new file mode 100644
index 0000000..ecf2faf
--- /dev/null
+++ b/erpnext/patches/v7_0/rename_salary_components.py
@@ -0,0 +1,145 @@
+import frappe
+from frappe.model.utils.rename_field import update_property_setters
+
+def execute():
+	if not frappe.db.exists("DocType", "Salary Structure Earning"):
+		return
+	
+	frappe.reload_doc("hr", "doctype", "salary_detail")
+	frappe.reload_doc("hr", "doctype", "salary_component")
+	
+	standard_cols = ["name", "creation", "modified", "owner", "modified_by", "parent", "parenttype", "parentfield", "idx"]
+	
+	dt_cols = {
+		"Salary Structure Deduction": ["d_type", "d_modified_amt", "depend_on_lwp"],
+		"Salary Structure Earning": ["e_type", "modified_value", "depend_on_lwp"],
+		"Salary Slip Earning": ["e_type", "e_modified_amount", "e_depends_on_lwp", "e_amount"],
+		"Salary Slip Deduction": ["d_type", "d_modified_amount", "d_depends_on_lwp", "d_amount"],
+	}
+	
+	earning_type_exists = True if "earning_type" in frappe.db.get_table_columns("Salary Slip Earning") else False
+	e_type_exists = True if "e_type" in frappe.db.get_table_columns("Salary Slip Earning") else False
+	
+	
+	if e_type_exists and earning_type_exists:
+		frappe.db.sql("""update `tabSalary Slip Earning` 
+			set e_type = earning_type, e_modified_amount = earning_amount
+			where e_type is null and earning_type is not null""")
+
+		frappe.db.sql("""update `tabSalary Structure Earning` set e_type = earning_type 
+			where e_type is null and earning_type is not null""")
+
+		frappe.db.sql("""update `tabSalary Slip Deduction` set 
+			d_type = deduction_type, d_modified_amount = deduction_amount
+			where d_type is null and deduction_type is not null""")
+
+		frappe.db.sql("""update `tabSalary Structure Deduction` set d_type = deduction_type 
+			where d_type is null and deduction_type is not null""")
+			
+	if earning_type_exists and not e_type_exists:
+		for val in dt_cols.values():
+			if val[0] == "e_type":
+				val[0] = "earning_type"
+			
+			if val[0] == "d_type":
+				val[0] = "deduction_type"
+				
+			if val[1] == "e_modified_amount":
+				val[1]  ="earning_amount"
+				
+			if val[1] == "d_modified_amount":
+				val[1]  ="deduction_amount"
+			
+
+	
+	target_cols = standard_cols + ["salary_component", "amount", "depends_on_lwp", "default_amount"]
+	target_cols = "`" + "`, `".join(target_cols) + "`"		
+	
+	for doctype, cols in dt_cols.items():		
+		source_cols = "`" + "`, `".join(standard_cols + cols) + "`"
+		if len(cols) == 3:
+			source_cols += ", 0"
+		
+		
+		frappe.db.sql("""INSERT INTO `tabSalary Detail` ({0}) SELECT {1} FROM `tab{2}`"""
+			.format(target_cols, source_cols, doctype))
+			
+	
+	dt_cols_de = {
+		"Deduction Type": ["deduction_name", "description"],
+		"Earning Type": ["earning_name", "description"],
+	}
+	
+	standard_cols_de = standard_cols
+	
+
+	target_cols = standard_cols_de + ["salary_component", "description"]
+	target_cols = "`" + "`, `".join(target_cols) + "`"		
+	
+	for doctype, cols in dt_cols_de.items():		
+		source_cols = "`" + "`, `".join(standard_cols_de + cols) + "`"
+		
+		frappe.db.sql("""INSERT INTO `tabSalary Component` ({0}) SELECT {1} FROM `tab{2}`"""
+			.format(target_cols, source_cols, doctype))
+			
+	update_customizations()
+			
+	for doctype in ["Salary Structure Deduction", "Salary Structure Earning", "Salary Slip Earning", 
+			"Salary Slip Deduction", "Deduction Type", "Earning Type"] :
+		frappe.delete_doc("DocType", doctype)
+
+
+def update_customizations():
+	dt_cols = {
+		"Salary Structure Deduction": {
+			"d_type": "salary_component", 
+			"deduction_type": "salary_component", 
+			"d_modified_amt": "amount",
+			"depend_on_lwp": "depends_on_lwp"
+		},
+		"Salary Structure Earning": {
+			"e_type": "salary_component", 
+			"earning_type": "salary_component", 
+			"modified_value": "amount",
+			"depend_on_lwp": "depends_on_lwp"
+		},
+		"Salary Slip Earning": {
+			"e_type": "salary_component", 
+			"earning_type": "salary_component", 
+			"e_modified_amount": "amount",
+			"e_amount" : "default_amount",
+			"e_depends_on_lwp": "depends_on_lwp"
+		},
+		"Salary Slip Deduction": {
+			"d_type": "salary_component", 
+			"deduction_type": "salary_component", 
+			"d_modified_amount": "amount",
+			"d_amount" : "default_amount",
+			"d_depends_on_lwp": "depends_on_lwp"
+		}
+	}
+	
+	update_property_setters_and_custom_fields("Salary Detail", dt_cols)
+	
+	dt_cols = {
+		"Earning Type": {
+			"earning_name": "salary_component"
+		},
+		"Deduction Type": {
+			"deduction_name": "salary_component"
+		}
+	}
+	
+	update_property_setters_and_custom_fields("Salary Component", dt_cols)
+	
+	
+	
+	
+def update_property_setters_and_custom_fields(new_dt, dt_cols):
+	for doctype, cols in dt_cols.items():
+		frappe.db.sql("update `tabProperty Setter` set doc_type = %s where doc_type=%s", (new_dt, doctype))
+		frappe.db.sql("update `tabCustom Field` set dt = %s where dt=%s", (new_dt, doctype))
+		
+		
+		for old_fieldname, new_fieldname in cols.items():
+			update_property_setters(new_dt, old_fieldname, new_fieldname)
diff --git a/erpnext/patches/v7_0/rename_time_sheet_doctype.py b/erpnext/patches/v7_0/rename_time_sheet_doctype.py
new file mode 100644
index 0000000..a008045
--- /dev/null
+++ b/erpnext/patches/v7_0/rename_time_sheet_doctype.py
@@ -0,0 +1,13 @@
+import frappe
+
+def execute():
+	if frappe.db.table_exists("Time Sheet") and not frappe.db.table_exists("Timesheet"):
+		frappe.rename_doc("DocType", "Time Sheet", "Timesheet")
+		frappe.rename_doc("DocType", "Time Sheet Detail", "Timesheet Detail")
+		
+		for doctype in ['Time Sheet', 'Time Sheet Detail']:
+			frappe.delete_doc('DocType', doctype)
+		
+		report = "Daily Time Sheet Summary"
+		if frappe.db.exists("Report", report):
+			frappe.delete_doc('Report', report)
diff --git a/erpnext/patches/v7_0/set_is_group_for_warehouse.py b/erpnext/patches/v7_0/set_is_group_for_warehouse.py
new file mode 100644
index 0000000..d3aca21
--- /dev/null
+++ b/erpnext/patches/v7_0/set_is_group_for_warehouse.py
@@ -0,0 +1,6 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("stock", "doctype", "warehouse")
+	frappe.db.sql("""update tabWarehouse
+		set is_group = if ((ifnull(is_group, "No") = "Yes" or ifnull(is_group, 0) = 1), 1, 0)""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/set_naming_series_for_timesheet.py b/erpnext/patches/v7_0/set_naming_series_for_timesheet.py
new file mode 100644
index 0000000..d4d1a69
--- /dev/null
+++ b/erpnext/patches/v7_0/set_naming_series_for_timesheet.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 frappe.custom.doctype.property_setter.property_setter import make_property_setter
+
+def execute():
+	frappe.reload_doc('projects', 'doctype', 'timesheet')
+	frappe.reload_doc('projects', 'doctype', 'timesheet_detail')
+	frappe.reload_doc('accounts', 'doctype', 'sales_invoice_timesheet')
+	
+	make_property_setter('Timesheet', "naming_series", "options", 'TS-', "Text")
+	make_property_setter('Timesheet', "naming_series", "default", 'TS-', "Text")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
new file mode 100644
index 0000000..2c07e30
--- /dev/null
+++ b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py
@@ -0,0 +1,15 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc("hr", "doctype", "expense_claim_type")
+	frappe.reload_doc("hr", "doctype", "expense_claim_account")
+	
+	for expense_claim_type in frappe.get_all("Expense Claim Type", fields=["name", "default_account"]):
+		if expense_claim_type.default_account:
+			doc = frappe.get_doc("Expense Claim Type", expense_claim_type.name)
+			doc.append("accounts", {
+				"company": frappe.db.get_value("Account", expense_claim_type.default_account, "company"),
+				"default_account": expense_claim_type.default_account,
+			})
+			doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/system_settings_setup_complete.py b/erpnext/patches/v7_0/system_settings_setup_complete.py
new file mode 100644
index 0000000..0feeee9
--- /dev/null
+++ b/erpnext/patches/v7_0/system_settings_setup_complete.py
@@ -0,0 +1,16 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype('System Settings')
+	companies = frappe.db.sql("""select name, country
+		from tabCompany order by creation asc""", as_dict=True)
+	if companies:
+		frappe.db.set_value('System Settings', 'System Settings', 'setup_complete', 1)
+
+	for company in companies:
+		if company.country:
+			frappe.db.set_value('System Settings', 'System Settings', 'country', company.country)
+			break
+
+
diff --git a/erpnext/patches/v7_0/update_home_page.py b/erpnext/patches/v7_0/update_home_page.py
new file mode 100644
index 0000000..604d7d4
--- /dev/null
+++ b/erpnext/patches/v7_0/update_home_page.py
@@ -0,0 +1,24 @@
+import frappe
+import erpnext
+
+def execute():
+	frappe.reload_doc('portal', 'doctype', 'homepage_featured_product')
+	frappe.reload_doc('portal', 'doctype', 'homepage')
+	frappe.reload_doc('portal', 'doctype', 'products_settings')
+
+	website_settings = frappe.get_doc('Website Settings', 'Website Settings')
+	if frappe.db.exists('Web Page', website_settings.home_page):
+		header = frappe.db.get_value('Web Page', website_settings.home_page, 'header')
+		if header and header.startswith("<div class='hero text-center'>"):
+			homepage = frappe.get_doc('Homepage', 'Homepage')
+			homepage.company = erpnext.get_default_company()
+			if '<h1>' in header:
+				homepage.tag_line = header.split('<h1>')[1].split('</h1>')[0] or 'Default Website'
+			else:
+				homepage.tag_line = 'Default Website'
+			homepage.setup_items()
+			homepage.save()
+
+			website_settings.home_page = 'home'
+			website_settings.save()
+
diff --git a/erpnext/patches/v7_0/update_item_projected.py b/erpnext/patches/v7_0/update_item_projected.py
new file mode 100644
index 0000000..71b54af
--- /dev/null
+++ b/erpnext/patches/v7_0/update_item_projected.py
@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Item")
+	from erpnext.stock.doctype.bin.bin import update_item_projected_qty
+	for item in frappe.get_all("Item", filters={"is_stock_item": 1}):
+		update_item_projected_qty(item.name)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py b/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py
new file mode 100644
index 0000000..4c0c6a9
--- /dev/null
+++ b/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.set_value("DocType", "Maintenance Schedule", "module", "Maintenance")
+	frappe.db.set_value("DocType", "Maintenance Schedule Detail", "module", "Maintenance")
+	frappe.db.set_value("DocType", "Maintenance Schedule Item", "module", "Maintenance")
+	frappe.db.set_value("DocType", "Maintenance Visit", "module", "Maintenance")
+	frappe.db.set_value("DocType", "Maintenance Visit Purpose", "module", "Maintenance")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_mins_to_first_response.py b/erpnext/patches/v7_0/update_mins_to_first_response.py
new file mode 100644
index 0000000..a89a9c8
--- /dev/null
+++ b/erpnext/patches/v7_0/update_mins_to_first_response.py
@@ -0,0 +1,23 @@
+import frappe
+
+from frappe.core.doctype.communication.email import update_mins_to_first_communication
+
+def execute():
+	frappe.reload_doctype('Issue')
+	frappe.reload_doctype('Opportunity')
+
+	for doctype in ('Issue', 'Opportunity'):
+		frappe.db.sql('update tab{0} set mins_to_first_response=0'.format(doctype))
+		for parent in frappe.get_all(doctype, order_by='creation desc', limit=500):
+			parent_doc = frappe.get_doc(doctype, parent.name)
+			for communication in frappe.get_all('Communication',
+				filters={'reference_doctype': doctype, 'reference_name': parent.name,
+				'communication_medium': 'Email'},
+				order_by = 'creation asc', limit=2):
+
+				communication_doc = frappe.get_doc('Communication', communication.name)
+
+				update_mins_to_first_communication(parent_doc, communication_doc)
+
+				if parent_doc.mins_to_first_response:
+					continue
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_party_status.py b/erpnext/patches/v7_0/update_party_status.py
new file mode 100644
index 0000000..208b476
--- /dev/null
+++ b/erpnext/patches/v7_0/update_party_status.py
@@ -0,0 +1,21 @@
+import frappe
+from erpnext.accounts.party_status import status_depends_on, default_status
+from frappe.desk.notifications import get_filters_for
+
+def execute():
+	for party_type in ('Customer', 'Supplier'):
+		frappe.reload_doctype(party_type)
+
+		# set all as default status
+		frappe.db.sql('update `tab{0}` set status=%s'.format(party_type), default_status[party_type])
+
+		for doctype in status_depends_on[party_type]:
+			filters = get_filters_for(doctype)
+			parties = frappe.get_all(doctype, fields="{0} as party".format(party_type.lower()),
+				filters=filters, limit_page_length=1)
+
+			parties = filter(None, [p.party for p in parties])
+
+			if parties:
+				frappe.db.sql('update `tab{0}` set status="Open" where name in ({1})'.format(party_type,
+					', '.join(len(parties) * ['%s'])), parties)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py b/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py
new file mode 100644
index 0000000..1c41ec8
--- /dev/null
+++ b/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py
@@ -0,0 +1,8 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Supplier Quotation Item')
+	for data in frappe.db.sql(""" select prevdoc_docname, prevdoc_detail_docname, name
+		from `tabSupplier Quotation Item` where prevdoc_docname is not null""", as_dict=True):
+		frappe.db.set_value("Supplier Quotation Item", data.name, "material_request", data.prevdoc_docname)
+		frappe.db.set_value("Supplier Quotation Item", data.name, "material_request_item", data.prevdoc_detail_docname)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_project_in_gl_entry.py b/erpnext/patches/v7_0/update_project_in_gl_entry.py
new file mode 100644
index 0000000..7f9923b
--- /dev/null
+++ b/erpnext/patches/v7_0/update_project_in_gl_entry.py
@@ -0,0 +1,20 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("GL Entry")
+	
+	for doctype in ("Delivery Note", "Sales Invoice", "Stock Entry"):
+		frappe.db.sql("""
+			update `tabGL Entry` gle, `tab{0}` dt
+			set gle.project = dt.project
+			where gle.voucher_type=%s and gle.voucher_no = dt.name
+				and ifnull(gle.cost_center, '') != '' and ifnull(dt.project, '') != ''
+		""".format(doctype), doctype)
+		
+	for doctype in ("Purchase Receipt", "Purchase Invoice"):
+		frappe.db.sql("""
+			update `tabGL Entry` gle, `tab{0} Item` dt
+			set gle.project = dt.project
+			where gle.voucher_type=%s and gle.voucher_no = dt.parent and gle.cost_center=dt.cost_center 
+				and ifnull(gle.cost_center, '') != '' and ifnull(dt.project, '') != ''
+		""".format(doctype), doctype)
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/portal/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/portal/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/portal/doctype/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/portal/doctype/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/portal/doctype/homepage/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/portal/doctype/homepage/__init__.py
diff --git a/erpnext/portal/doctype/homepage/homepage.js b/erpnext/portal/doctype/homepage/homepage.js
new file mode 100644
index 0000000..df7f5ce
--- /dev/null
+++ b/erpnext/portal/doctype/homepage/homepage.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Homepage', {
+	refresh: function(frm) {
+
+	},
+});
+
+frappe.ui.form.on('Homepage Featured Product', {
+	item_code: function(frm, cdt, cdn) {
+		var featured_product = frappe.model.get_doc(cdt, cdn);
+		if (featured_product.item_code) {
+			frappe.call({
+				method: 'frappe.client.get_value',
+				args: {
+					'doctype': 'Item',
+					'filters': featured_product.item_code,
+					'fieldname': [
+						'item_name',
+						'web_long_description',
+						'description',
+						'image',
+						'thumbnail'
+					]
+				},
+				callback: function(r) {
+					if (!r.exc) {
+						$.extend(featured_product, r.message);
+						if (r.message.web_long_description) {
+							featured_product.description = r.message.web_long_description;
+						}
+						frm.refresh_field('products');
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/portal/doctype/homepage/homepage.json b/erpnext/portal/doctype/homepage/homepage.json
new file mode 100644
index 0000000..cbe58c7
--- /dev/null
+++ b/erpnext/portal/doctype/homepage/homepage.json
@@ -0,0 +1,209 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "", 
+ "beta": 1, 
+ "creation": "2016-04-22 05:27:52.109319", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Company Tagline for website homepage", 
+   "fieldname": "tag_line", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Tag Line", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "description": "Company Description for website homepage", 
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "products_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Products", 
+   "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, 
+   "description": "Products to be shown on website homepage", 
+   "fieldname": "products", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Products", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Homepage Featured Product", 
+   "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, 
+   "width": "40px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-05-12 14:19:41.689519", 
+ "modified_by": "Administrator", 
+ "module": "Portal", 
+ "name": "Homepage", 
+ "name_case": "", 
+ "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": 0, 
+   "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": 0, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "company", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/portal/doctype/homepage/homepage.py b/erpnext/portal/doctype/homepage/homepage.py
new file mode 100644
index 0000000..20ce767
--- /dev/null
+++ b/erpnext/portal/doctype/homepage/homepage.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Homepage(Document):
+	def validate(self):
+		if not self.products:
+			self.setup_items()
+		if not self.description:
+			self.description = frappe._("This is an example website auto-generated from ERPNext")
+
+	def setup_items(self):
+		for d in frappe.get_all('Item', fields=['name', 'item_name', 'description', 'image'],
+			filters={'show_in_website': 1}, limit=3):
+
+			doc = frappe.get_doc('Item', d.name)
+			if not doc.route:
+				# set missing route
+				doc.save()
+			self.append('products', dict(item_code=d.name,
+				item_name=d.item_name, description=d.description, image=d.image))
+
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/portal/doctype/homepage_featured_product/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/portal/doctype/homepage_featured_product/__init__.py
diff --git a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
new file mode 100644
index 0000000..f3f9ce9
--- /dev/null
+++ b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
@@ -0,0 +1,276 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2016-04-22 05:57:06.261401", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "150", 
+   "read_only": 1, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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": "thumbnail", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "route", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "route", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:00.729983", 
+ "modified_by": "Administrator", 
+ "module": "Portal", 
+ "name": "Homepage Featured Product", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.py b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.py
new file mode 100644
index 0000000..936e07d
--- /dev/null
+++ b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class HomepageFeaturedProduct(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/portal/doctype/products_settings/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/portal/doctype/products_settings/__init__.py
diff --git a/erpnext/portal/doctype/products_settings/products_settings.js b/erpnext/portal/doctype/products_settings/products_settings.js
new file mode 100644
index 0000000..7a57aba
--- /dev/null
+++ b/erpnext/portal/doctype/products_settings/products_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Products Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/portal/doctype/products_settings/products_settings.json b/erpnext/portal/doctype/products_settings/products_settings.json
new file mode 100644
index 0000000..90de96c
--- /dev/null
+++ b/erpnext/portal/doctype/products_settings/products_settings.json
@@ -0,0 +1,106 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2016-04-22 09:11:55.272398", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "If checked, the Home page will be the default Item Group for the website", 
+   "fieldname": "home_page_is_products", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Home Page is Products", 
+   "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": "products_as_list", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Show Products as a List", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-04-22 09:11:59.537639", 
+ "modified_by": "Administrator", 
+ "module": "Portal", 
+ "name": "Products Settings", 
+ "name_case": "", 
+ "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": 0, 
+   "role": "Website Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/portal/doctype/products_settings/products_settings.py b/erpnext/portal/doctype/products_settings/products_settings.py
new file mode 100644
index 0000000..f17ae9f
--- /dev/null
+++ b/erpnext/portal/doctype/products_settings/products_settings.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cint
+from frappe.model.document import Document
+
+class ProductsSettings(Document):
+	def validate(self):
+		if self.home_page_is_products:
+			website_settings = frappe.get_doc('Website Settings')
+			website_settings.home_page = 'products'
+			website_settings.save()
+
+def home_page_is_products(doc, method):
+	'''Called on saving Website Settings'''
+	home_page_is_products = cint(frappe.db.get_single_value('Products Settings', 'home_page_is_products'))
+	if home_page_is_products:
+		doc.home_page = 'products'
+
diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json
index 6b660ca..26179cc 100644
--- a/erpnext/projects/doctype/dependent_task/dependent_task.json
+++ b/erpnext/projects/doctype/dependent_task/dependent_task.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-04-29 04:52:48.868079", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Task", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -35,21 +39,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.201217", 
+ "modified": "2016-07-11 03:27:59.535486", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Dependent Task", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index d190f34..1b3b05d 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -2,6 +2,15 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Project", {
+	setup: function(frm) {
+		frm.get_field('tasks').grid.editable_fields = [
+			{fieldname: 'title', columns: 3},
+			{fieldname: 'status', columns: 3},
+			{fieldname: 'start_date', columns: 2},
+			{fieldname: 'end_date', columns: 2}
+		];
+
+	},
 	onload: function(frm) {
 		var so = frappe.meta.get_docfield("Project", "sales_order");
 		so.get_route_options_for_new_doc = function(field) {
@@ -11,63 +20,84 @@
 				"project_name": frm.doc.name
 			}
 		}
+
+		frm.set_query('customer', 'erpnext.controllers.queries.customer_query');
+
+		// sales order
+		frm.set_query('sales_order', function() {
+			var filters = {
+				'project': ["in", frm.doc.__islocal ? [""] : [frm.doc.name, ""]]
+			};
+
+			if (frm.doc.customer) {
+				filters["customer"] = frm.doc.customer;
+			}
+
+			return {
+				filters: filters
+			}
+		});
+	},
+	refresh: function(frm) {
+		if(frm.doc.__islocal) {
+			frm.web_link && frm.web_link.remove();
+		} else {
+			frm.add_web_link("/projects?project=" + encodeURIComponent(frm.doc.name));
+
+			if(frappe.model.can_read("Task")) {
+				frm.add_custom_button(__("Gantt Chart"), function() {
+					frappe.route_options = {"project": frm.doc.name,
+						"start": frm.doc.expected_start_date, "end": frm.doc.expected_end_date};
+					frappe.set_route("Gantt", "Task");
+				});
+			}
+
+			frm.trigger('show_dashboard');
+		}
+	},
+	tasks_refresh: function(frm) {
+		var grid = frm.get_field('tasks').grid;
+		grid.wrapper.find('select[data-fieldname="status"]').each(function() {
+			if($(this).val()==='Open') {
+				$(this).addClass('input-indicator-open');
+			} else {
+				$(this).removeClass('input-indicator-open');
+			}
+		});
+	},
+	show_dashboard: function(frm) {
+		if(frm.doc.__onload.activity_summary.length) {
+			var hours = $.map(frm.doc.__onload.activity_summary, function(d) { return d.total_hours });
+			var max_count = Math.max.apply(null, hours);
+			var sum = hours.reduce(function(a, b) { return a + b; }, 0);
+			var section = frm.dashboard.add_section(
+				frappe.render_template('project_dashboard',
+					{
+						data: frm.doc.__onload.activity_summary,
+						max_count: max_count,
+						sum: sum
+					}));
+
+			section.on('click', '.time-sheet-link', function() {
+				var activity_type = $(this).attr('data-activity_type');
+				frappe.set_route('List', 'Timesheet',
+					{'activity_type': activity_type, 'project': frm.doc.name});
+			});
+		}
 	}
 });
 
-frappe.ui.form.on("Project Task", "edit_task", function(frm, doctype, name) {
-	var doc = frappe.get_doc(doctype, name);
-	if(doc.task_id) {
-		frappe.set_route("Form", "Task", doc.task_id);
-	} else {
-		msgprint(__("Save the document first."));
-	}
-})
-
-// show tasks
-cur_frm.cscript.refresh = function(doc) {
-	if(!doc.__islocal) {
-		if(frappe.model.can_read("Task")) {
-			cur_frm.add_custom_button(__("Gantt Chart"), function() {
-				frappe.route_options = {"project": doc.name, "start": doc.expected_start_date, "end": doc.expected_end_date};
-				frappe.set_route("Gantt", "Task");
-			}, __("View"), true);
-			cur_frm.add_custom_button(__("Tasks"), function() {
-				frappe.route_options = {"project": doc.name}
-				frappe.set_route("List", "Task");
-			}, __("View"), true);
+frappe.ui.form.on("Project Task", {
+	edit_task: function(frm, doctype, name) {
+		var doc = frappe.get_doc(doctype, name);
+		if(doc.task_id) {
+			frappe.set_route("Form", "Task", doc.task_id);
+		} else {
+			msgprint(__("Save the document first."));
 		}
-		if(frappe.model.can_read("Time Log")) {
-			cur_frm.add_custom_button(__("Time Logs"), function() {
-				frappe.route_options = {"project": doc.name}
-				frappe.set_route("List", "Time Log");
-			}, __("View"), true);
-		}
+	},
+	status: function(frm, doctype, name) {
+		frm.trigger('tasks_refresh');
+	},
+});
 
-		if(frappe.model.can_read("Expense Claim")) {
-			cur_frm.add_custom_button(__("Expense Claims"), function() {
-				frappe.route_options = {"project": doc.name}
-				frappe.set_route("List", "Expense Claim");
-			}, __("View"), true);
-		}
-	}
-}
-
-cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
-	return{
-		query: "erpnext.controllers.queries.customer_query"
-	}
-}
-
-cur_frm.fields_dict['sales_order'].get_query = function(doc) {
-	var filters = {
-		'project': ["in", doc.__islocal ? [""] : [doc.name, ""]]
-	};
-
-	if (doc.customer) {
-		filters["customer"] = doc.customer;
-	}
-
-	return {
-		filters: filters
-	}
-}
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 1f1943c..f094428 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -196,7 +196,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "expected_end_date", 
    "fieldtype": "Date", 
@@ -326,6 +326,58 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "users_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Users", 
+   "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, 
+   "description": "Project will be accessible on the website to these users", 
+   "fieldname": "users", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Users", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project User", 
+   "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": "sb_milestones", 
    "fieldtype": "Section Break", 
@@ -377,7 +429,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "percent_complete", 
    "fieldtype": "Percent", 
@@ -914,14 +966,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-puzzle-piece", 
- "idx": 1, 
+ "idx": 29, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2016-03-10 05:10:21.779365", 
+ "modified": "2016-04-22 03:15:39.635420", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
@@ -968,9 +1020,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "customer, status, priority, is_active", 
  "sort_order": "DESC", 
- "timeline_field": "customer"
+ "timeline_field": "customer", 
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index ec4f523..7405f2c 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import flt, getdate
+from frappe.utils import flt, getdate, get_url
 from frappe import _
 
 from frappe.model.document import Document
@@ -15,20 +15,28 @@
 
 	def onload(self):
 		"""Load project tasks for quick view"""
-		if not self.get("tasks"):
-			for task in self.get_tasks():
-				self.append("tasks", {
-					"title": task.subject,
-					"status": task.status,
-					"start_date": task.exp_start_date,
-					"end_date": task.exp_end_date,
-					"description": task.description,
-					"task_id": task.name
-				})
+		if not self.get('__unsaved') and not self.get("tasks"):
+			self.load_tasks()
+
+		self.set_onload('activity_summary', frappe.db.sql('''select activity_type, sum(hours) as total_hours
+			from `tabTimesheet Detail` where project=%s group by activity_type order by total_hours desc''', self.name, as_dict=True))
 
 	def __setup__(self):
 		self.onload()
 
+	def load_tasks(self):
+		"""Load `tasks` from the database"""
+		self.tasks = []
+		for task in self.get_tasks():
+			self.append("tasks", {
+				"title": task.subject,
+				"status": task.status,
+				"start_date": task.exp_start_date,
+				"end_date": task.exp_end_date,
+				"description": task.description,
+				"task_id": task.name
+			})
+
 	def get_tasks(self):
 		return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
 
@@ -36,6 +44,7 @@
 		self.validate_dates()
 		self.sync_tasks()
 		self.tasks = []
+		self.send_welcome_email()
 
 	def validate_dates(self):
 		if self.expected_start_date and self.expected_end_date:
@@ -79,7 +88,7 @@
 		self.update_percent_complete()
 		self.update_costing()
 		self.flags.dont_sync_tasks = True
-		self.save()
+		self.save(ignore_permissions = True)
 
 	def update_percent_complete(self):
 		total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0]
@@ -90,13 +99,13 @@
 			self.percent_complete = flt(flt(completed) / total * 100, 2)
 
 	def update_costing(self):
-		from_time_log = frappe.db.sql("""select
+		from_time_sheet = frappe.db.sql("""select
 			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 `tabTimesheet Detail` where project = %s and docstatus = 1""", self.name, as_dict=1)[0]
 
 		from_expense_claim = frappe.db.sql("""select
 			sum(total_sanctioned_amount) as total_sanctioned_amount
@@ -104,12 +113,12 @@
 			and docstatus = 1""",
 			self.name, as_dict=1)[0]
 
-		self.actual_start_date = from_time_log.start_date
-		self.actual_end_date = from_time_log.end_date
+		self.actual_start_date = from_time_sheet.start_date
+		self.actual_end_date = from_time_sheet.end_date
 
-		self.total_costing_amount = from_time_log.costing_amount
-		self.total_billing_amount = from_time_log.billing_amount
-		self.actual_time = from_time_log.time
+		self.total_costing_amount = from_time_sheet.costing_amount
+		self.total_billing_amount = from_time_sheet.billing_amount
+		self.actual_time = from_time_sheet.time
 
 		self.total_expense_claim = from_expense_claim.total_sanctioned_amount
 
@@ -124,6 +133,61 @@
 
 		self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0
 
+	def send_welcome_email(self):
+		url = get_url("/project/?name={0}".format(self.name))
+		messages = (
+		_("You have been invited to collaborate on the project: {0}".format(self.name)),
+		url,
+		_("Join")
+		)
+
+		content = """
+		<p>{0}.</p>
+		<p><a href="{1}">{2}</a></p>
+		"""
+
+		for user in self.users:
+			if user.welcome_email_sent==0:
+				frappe.sendmail(user.user, subject=_("Project Collaboration Invitation"), content=content.format(*messages))
+				user.welcome_email_sent=1
+
+	def on_update(self):
+		self.load_tasks()
+		self.sync_tasks()
+
+def get_timeline_data(doctype, name):
+	'''Return timeline for attendance'''
+	return dict(frappe.db.sql('''select unix_timestamp(from_time), count(*)
+		from `tabTimesheet Detail` where project=%s
+			and from_time > date_sub(curdate(), interval 1 year)
+			and docstatus < 2
+			group by date(from_time)''', name))
+
+def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	return frappe.db.sql('''select distinct project.*
+		from tabProject project, `tabProject User` project_user
+		where
+			(project_user.user = %(user)s
+			and project_user.parent = project.name)
+			or project.owner = %(user)s
+			order by project.modified desc
+			limit {0}, {1}
+		'''.format(limit_start, limit_page_length),
+			{'user':frappe.session.user},
+			as_dict=True,
+			update={'doctype':'Project'})
+
+def get_list_context(context=None):
+	return {
+		"show_sidebar": True,
+		"show_search": True,
+		'no_breadcrumbs': True,
+		"title": _("Projects"),
+		"get_list": get_project_list,
+		"row_template": "templates/includes/projects/project_row.html"
+	}
+
+
 @frappe.whitelist()
 def get_cost_center_name(project):
 	return frappe.db.get_value("Project", project, "cost_center")
diff --git a/erpnext/projects/doctype/project/project_dashboard.html b/erpnext/projects/doctype/project/project_dashboard.html
new file mode 100644
index 0000000..f5bfbb7
--- /dev/null
+++ b/erpnext/projects/doctype/project/project_dashboard.html
@@ -0,0 +1,26 @@
+<h5 style="margin-top: 0px;">Activity Summary</h5>
+<h6 style="margin-bottom: 25px;">{{ __("Total hours: {0}", [flt(sum, 2) ]) }}</h6>
+{% for d in data %}
+<div class="row">
+	<div class="col-xs-4">
+		<a class="small time-sheet-link" data-activity_type="{{ d.activity_type || "" }}">
+			{{ d.activity_type || __("Unknown") }}</a>
+	</div>
+	<div class="col-xs-8">
+		<span class="inline-graph">
+			<span class="inline-graph-half">
+			</span>
+			<span class="inline-graph-half" title="{{ __("hours") }}">
+				<span class="inline-graph-count">
+					{{ __("{0} hours", [flt(d.total_hours, 2)]) }}
+				</span>
+				<span class="inline-graph-bar">
+					<span class="inline-graph-bar-inner dark"
+						style="width: {{ cint(d.total_hours/max_count * 100) }}%">
+					</span>
+				</span>
+			</span>
+		</span>
+	</div>
+</div>
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project_dashboard.py b/erpnext/projects/doctype/project/project_dashboard.py
new file mode 100644
index 0000000..b36df88
--- /dev/null
+++ b/erpnext/projects/doctype/project/project_dashboard.py
@@ -0,0 +1,25 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on the Time Sheets created against this project'),
+	'fieldname': 'project',
+	'transactions': [
+		{
+			'label': _('Project'),
+			'items': ['Task', 'Timesheet', 'Expense Claim', 'Issue']
+		},
+		{
+			'label': _('Material'),
+			'items': ['Material Request', 'BOM', 'Stock Entry']
+		},
+		{
+			'label': _('Sales'),
+			'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
+		},
+		{
+			'label': _('Purchase'),
+			'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
+		},
+	]
+}
diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json
index 51a4662..c21a3ad 100644
--- a/erpnext/projects/doctype/project_task/project_task.json
+++ b/erpnext/projects/doctype/project_task/project_task.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-02-22 11:15:28.201059", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Title", 
@@ -24,6 +27,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
@@ -49,6 +54,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -65,6 +71,7 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "View Task", 
@@ -73,6 +80,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,6 +96,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -95,6 +104,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -110,6 +120,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Start Date", 
@@ -118,6 +129,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -134,6 +146,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
@@ -142,6 +155,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -157,6 +171,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -164,6 +179,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -179,6 +195,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -187,6 +204,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -202,6 +220,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Task ID", 
@@ -211,6 +230,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -221,21 +241,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:52.824820", 
+ "modified": "2016-07-11 03:28:04.669838", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project Task", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/__init__.py b/erpnext/projects/doctype/project_user/__init__.py
similarity index 100%
copy from erpnext/projects/doctype/time_log/__init__.py
copy to erpnext/projects/doctype/project_user/__init__.py
diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json
new file mode 100644
index 0000000..ea57589
--- /dev/null
+++ b/erpnext/projects/doctype/project_user/project_user.json
@@ -0,0 +1,88 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-03-25 02:52:19.283003", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "welcome_email_sent", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Welcome email sent", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-11 03:28:04.756894", 
+ "modified_by": "Administrator", 
+ "module": "Projects", 
+ "name": "Project User", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_user/project_user.py b/erpnext/projects/doctype/project_user/project_user.py
new file mode 100644
index 0000000..3198f3b
--- /dev/null
+++ b/erpnext/projects/doctype/project_user/project_user.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProjectUser(Document):
+	pass
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index a0bbe26..c6b6664 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -16,10 +16,10 @@
 
 
 		if(!doc.__islocal) {
-			if(frappe.model.can_read("Time Log")) {
-				frm.add_custom_button(__("Time Logs"), function() {
+			if(frappe.model.can_read("Timesheet")) {
+				frm.add_custom_button(__("Timesheet"), function() {
 					frappe.route_options = {"project": doc.project, "task": doc.name}
-					frappe.set_route("List", "Time Log");
+					frappe.set_route("List", "Timesheet");
 				}, __("View"), true);
 			}
 			if(frappe.model.can_read("Expense Claim")) {
@@ -34,12 +34,12 @@
 					frm.add_custom_button(__("Close"), function() {
 						frm.set_value("status", "Closed");
 						frm.save();
-					}, __("Status"));
+					});
 				} else {
 					frm.add_custom_button(__("Reopen"), function() {
 						frm.set_value("status", "Open");
 						frm.save();
-					}, __("Status"));
+					});
 				}
 			}
 		}
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 9816df8..94ec8a1 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "TASK.#####", 
+ "beta": 0, 
  "creation": "2013-01-29 19:25:50", 
  "custom": 0, 
  "docstatus": 0, 
@@ -17,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Subject", 
@@ -36,12 +38,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Project", 
@@ -68,6 +71,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -93,6 +97,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
@@ -119,6 +124,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Priority", 
@@ -145,6 +151,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -168,6 +175,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected Start Date", 
@@ -195,6 +203,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected Time (in hours)", 
@@ -220,6 +229,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -243,6 +253,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Expected End Date", 
@@ -268,6 +279,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -292,6 +304,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Details", 
@@ -319,6 +332,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends On", 
@@ -343,6 +357,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "depends_on", 
@@ -369,6 +384,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -395,9 +411,10 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Actual Start Date (via Time Logs)", 
+   "label": "Actual Start Date (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "act_start_date", 
@@ -422,6 +439,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Time (in hours)", 
@@ -447,6 +465,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -470,9 +489,10 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Actual End Date (via Time Logs)", 
+   "label": "Actual End Date (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "act_end_date", 
@@ -495,6 +515,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -518,9 +539,10 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Total Costing Amount (via Time Logs)", 
+   "label": "Total Costing Amount (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "actual_budget", 
@@ -544,6 +566,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Expense Claim (via Expense Claim)", 
@@ -569,6 +592,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -592,9 +616,10 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Total Billing Amount (via Time Logs)", 
+   "label": "Total Billing Amount (via Time Sheet)", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -616,6 +641,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -640,6 +666,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Review Date", 
@@ -666,6 +693,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Closing Date", 
@@ -691,6 +719,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -713,6 +742,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -734,6 +764,7 @@
  "hide_toolbar": 0, 
  "icon": "icon-check", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -741,7 +772,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2016-02-03 01:11:46.043538", 
+ "modified": "2016-06-20 17:31:00.798534", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
@@ -768,10 +799,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "subject", 
  "sort_order": "DESC", 
  "timeline_field": "project", 
- "title_field": "subject"
+ "title_field": "subject", 
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 15c98f4..b918e3a 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -58,7 +58,7 @@
 	def update_time_and_costing(self):
 		tl = frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date,
 			sum(billing_amount) as total_billing_amount, sum(costing_amount) as total_costing_amount,
-			sum(hours) as time from `tabTime Log` where task = %s and docstatus=1"""
+			sum(hours) as time from `tabTimesheet Detail` where task = %s and docstatus=1"""
 			,self.name, as_dict=1)[0]
 		if self.status == "Open":
 			self.status = "Working"
@@ -101,6 +101,11 @@
 					task.exp_end_date = add_days(task.exp_start_date, task_duration)
 					task.flags.ignore_recursion_check = True
 					task.save()
+					
+	def has_webform_permission(doc):
+		project_user = frappe.db.get_value("Project User", {"parent": doc.project, "user":frappe.session.user} , "user")
+		if project_user:
+			return True				
 
 @frappe.whitelist()
 def get_events(start, end, filters=None):
@@ -134,7 +139,7 @@
 			order by name
 			limit %(start)s, %(page_len)s """ % {'key': searchfield,
 			'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype),
-			'start': start, 'page_len': page_len})
+			'start': start, 'page_len': page_len})			
 
 
 @frappe.whitelist()
@@ -150,3 +155,6 @@
 		where exp_end_date is not null
 		and exp_end_date < CURDATE()
 		and `status` not in ('Closed', 'Cancelled')""")
+		
+
+		
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index 48a4655..212aec0 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -1,5 +1,6 @@
 frappe.listview_settings['Task'] = {
 	add_fields: ["project", "status", "priority", "exp_end_date"],
+	filters: [["status", "=", "Open"]],
 	onload: function(listview) {
 		var method = "erpnext.projects.doctype.task.task.set_multiple_status";
 
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 7007269..45bcd82 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -124,29 +124,6 @@
 		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
 		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
 
-		time_log = frappe.new_doc('Time Log')
-		time_log.update({
-			"from_time": "2015-1-1",
-			"to_time": "2015-1-20",
-			"task": task1.name
-		})
-		time_log.submit()
-
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
-
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
-		time_log.cancel()
-
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_start_date"), getdate('2015-1-21'))
-		self.assertEqual(frappe.db.get_value("Task", task2.name, "exp_end_date"), getdate('2015-1-25'))
-
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_start_date"), getdate('2015-1-26'))
-		self.assertEqual(frappe.db.get_value("Task", task3.name, "exp_end_date"), getdate('2015-1-28'))
-
-
 	def test_close_assignment(self):
 		task = frappe.new_doc("Task")
 		task.subject = "Test Close Assignment"
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 12782ea..ad6869b 100644
--- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json
+++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-04-29 04:52:48.868079", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Task", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -47,6 +52,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,6 +68,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Subject", 
@@ -71,6 +78,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -81,21 +89,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.161882", 
+ "modified": "2016-07-11 03:28:09.329158", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task Depends On", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/README.md b/erpnext/projects/doctype/time_log/README.md
deleted file mode 100644
index bab52e7..0000000
--- a/erpnext/projects/doctype/time_log/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Log of activity done by a user in a particular period.
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/test_records.json b/erpnext/projects/doctype/time_log/test_records.json
deleted file mode 100644
index 0637a08..0000000
--- a/erpnext/projects/doctype/time_log/test_records.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py
deleted file mode 100644
index 591316b..0000000
--- a/erpnext/projects/doctype/time_log/test_time_log.py
+++ /dev/null
@@ -1,182 +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
-import unittest
-
-import datetime
-from frappe.utils import now_datetime, now
-from erpnext.projects.doctype.time_log.time_log import OverlapError, NotSubmittedError, NegativeHoursError
-from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError, NotInWorkingHoursError
-from erpnext.manufacturing.doctype.production_order.test_production_order import make_prod_order_test_record
-
-
-class TestTimeLog(unittest.TestCase):
-	def test_duplication(self):
-		tl1 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002", simulate= True)
-
-		tl2 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
-			from_time= tl1.from_time, to_time= tl1.to_time, do_not_save= 1)
-
-		self.assertRaises(OverlapError, tl2.insert)
-		
-		tl3 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
-			from_time= tl1.from_time - datetime.timedelta(hours=1), 
-			to_time= tl1.to_time + datetime.timedelta(hours=1), do_not_save= 1)
-
-		self.assertRaises(OverlapError, tl3.insert)
-		
-		tl4 = make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
-			from_time= tl1.from_time + datetime.timedelta(minutes=20), 
-			to_time= tl1.to_time + datetime.timedelta(minutes=30), do_not_save= 1)
-
-		self.assertRaises(OverlapError, tl4.insert)
-		
-		make_time_log_test_record(user= "test@example.com", employee= "_T-Employee-0002",
-			from_time= tl1.to_time, 
-			to_time= tl1.to_time + datetime.timedelta(hours=1))
-
-	def test_production_order_status(self):
-		prod_order = make_prod_order_test_record(item= "_Test FG Item 2", qty= 1, do_not_submit= True)
-		prod_order.set_production_order_operations()
-		prod_order.save()
-
-		time_log = make_time_log_test_record(for_manufacturing= 1, production_order= prod_order.name, qty= 1,
-			employee= "_T-Employee-0003", do_not_save= True, simulate=1)
-
-		self.assertRaises(NotSubmittedError, time_log.save)
-
-	def test_time_log_on_holiday(self):
-		prod_order = make_prod_order_test_record(item= "_Test FG Item 2", qty= 1,
-			planned_start_date= now(), do_not_save= True)
-		prod_order.set_production_order_operations()
-		prod_order.save()
-		prod_order.submit()
-
-		time_log = make_time_log_test_record(from_time= "2013-02-01 10:00:00", to_time= "2013-02-01 20:00:00",
-			for_manufacturing= 1, production_order= prod_order.name, qty= 1,
-			operation= prod_order.operations[0].operation, operation_id= prod_order.operations[0].name,
-			workstation= "_Test Workstation 1", do_not_save= True)
-
-		self.assertRaises(WorkstationHolidayError , time_log.save)
-
-		time_log.update({
-			"from_time": "2013-02-02 09:00:00",
-			"to_time": "2013-02-02 20:00:00"
-		})
-		self.assertRaises(NotInWorkingHoursError , time_log.save)
-
-		time_log.from_time= "2013-02-02 10:30:00"
-		time_log.save()
-		time_log.submit()
-		time_log.cancel()
-
-	def test_negative_hours(self):
-		time_log = make_time_log_test_record(to_time= now_datetime() + datetime.timedelta(minutes=-1),
-			employee="_T-Employee-0006",do_not_save= True)
-		self.assertRaises(NegativeHoursError, time_log.save)
-
-	def test_default_activity_cost(self):
-		activity_type = frappe.get_doc("Activity Type", "_Test Activity Type")
-		activity_type.billing_rate = 20
-		activity_type.costing_rate = 15
-		activity_type.save()
-
-		project = "_Test Project for Activity Type"
-
-		frappe.db.sql("delete from `tabTime Log` where project=%s or employee='_T-Employee-0002'", project)
-		frappe.delete_doc("Project", project)
-		project = frappe.get_doc({"doctype": "Project", "project_name": project}).insert()
-
-		make_time_log_test_record(employee="_T-Employee-0002", hours=2,
-			activity_type = "_Test Activity Type", project = project.name)
-
-		project = frappe.get_doc("Project", project.name)
-		self.assertTrue(project.total_costing_amount, 30)
-		self.assertTrue(project.total_billing_amount, 40)
-
-	def test_total_activity_cost_for_project(self):
-		frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
-		frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
-		frappe.db.sql("""delete from `tabTime Log` where name = "_Test Project 1" """)
-
-		if not frappe.db.exists('Activity Cost', {"activity_type": "_Test Activity Type"}):
-			activity_cost = frappe.get_doc({
-				"doctype": "Activity Cost",
-				"employee": "_T-Employee-0002",
-				"activity_type": "_Test Activity Type",
-				"billing_rate": 100,
-				"costing_rate": 50
-			})
-			activity_cost.insert()
-
-		frappe.get_doc({
-			"project_name": "_Test Project 1",
-			"doctype": "Project",
-			"tasks" :
-				[{ "title": "_Test Project Task 1", "status": "Open" }]
-		}).save()
-
-		task_name = frappe.db.get_value("Task",{"project": "_Test Project 1"})
-
-		time_log = make_time_log_test_record(employee="_T-Employee-0002", hours=2,
-			task=task_name, simulate=1)
-		self.assertEqual(time_log.costing_rate, 50)
-		self.assertEqual(time_log.costing_amount, 100)
-		self.assertEqual(time_log.billing_rate, 100)
-		self.assertEqual(time_log.billing_amount, 200)
-
-		self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200)
-		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
-
-		time_log2 = make_time_log_test_record(employee="_T-Employee-0002",
-			hours=2, task= task_name, from_time = now_datetime() + datetime.timedelta(hours= 3), simulate=1)
-		self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 400)
-		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 400)
-
-		time_log2.cancel()
-
-		self.assertEqual(frappe.db.get_value("Task", task_name, "total_billing_amount"), 200)
-		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_billing_amount"), 200)
-		time_log.cancel()
-
-test_ignore = ["Time Log Batch", "Sales Invoice"]
-
-def make_time_log_test_record(**args):
-	args = frappe._dict(args)
-
-	time_log = frappe.new_doc("Time Log")
-
-	time_log.from_time = args.from_time or now_datetime()
-	time_log.hours = args.hours or 1
-	time_log.to_time = args.to_time or time_log.from_time + datetime.timedelta(hours= time_log.hours)
-
-	time_log.project = args.project
-	time_log.task = args.task
-	time_log.for_manufacturing = args.for_manufacturing
-	time_log.production_order = args.production_order
-	time_log.operation = args.operation
-	time_log.operation_id = args.operation_id
-	time_log.workstation = args.workstation
-	time_log.completed_qty = args.completed_qty
-	time_log.activity_type = args.activity_type or "_Test Activity Type"
-	time_log.billable = args.billable or 1
-	time_log.employee = args.employee
-	time_log.user = args.user
-
-	if not args.do_not_save:
-		if args.simulate:
-			while True:
-				try:
-					time_log.save()
-					break
-				except OverlapError:
-					time_log.from_time = time_log.from_time + datetime.timedelta(minutes=10)
-					time_log.to_time = time_log.from_time + datetime.timedelta(hours= time_log.hours)
-		else:
-			time_log.save()
-		if not args.do_not_submit:
-			time_log.submit()
-
-	return time_log
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
deleted file mode 100644
index 7648a53..0000000
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.provide("erpnext.projects");
-
-frappe.ui.form.on("Time Log", "onload", function(frm) {
-	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");
-		}
-	}
-});
-
-frappe.ui.form.on("Time Log", "refresh", function(frm) {
-	// set default user if created
-	if (frm.doc.__islocal && !frm.doc.user) {
-		frm.set_value("user", user);
-	}
-
-	frm.toggle_reqd("activity_type", !frm.doc.for_manufacturing);
-});
-
-
-// set to time if hours is updated
-frappe.ui.form.on("Time Log", "hours", function(frm) {
-	if(!frm.doc.from_time) {
-		frm.set_value("from_time", frappe.datetime.now_datetime());
-	}
-	var d = moment(frm.doc.from_time);
-	d.add(frm.doc.hours, "hours");
-	frm._setting_hours = true;
-	frm.set_value("to_time", d.format(moment.defaultDatetimeFormat));
-	frm._setting_hours = false;
-});
-
-// clear production order if making time log
-frappe.ui.form.on("Time Log", "before_save", function(frm) {
-	frm.doc.production_order && frappe.model.remove_from_locals("Production Order",
-		frm.doc.production_order);
-});
-
-// set hours if to_time is updated
-frappe.ui.form.on("Time Log", "to_time", function(frm) {
-	if(frm._setting_hours) return;
-	frm.set_value("hours", moment(cur_frm.doc.to_time).diff(moment(cur_frm.doc.from_time),
-		"seconds") / 3600);
-
-});
-
-var calculate_cost = function(frm) {
-	frm.set_value("costing_amount", frm.doc.costing_rate * frm.doc.hours);
-	if (frm.doc.billable==1){
-		frm.set_value("billing_amount", (frm.doc.billing_rate * frm.doc.hours) + frm.doc.additional_cost);
-	}
-}
-
-var get_activity_cost = function(frm) {
-	if (frm.doc.activity_type){
-		return frappe.call({
-			method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost",
-			args: {
-				"employee": frm.doc.employee,
-				"activity_type": frm.doc.activity_type
-			},
-			callback: function(r) {
-				if(!r.exc && r.message) {
-					frm.set_value("costing_rate", r.message.costing_rate);
-					frm.set_value("billing_rate", r.message.billing_rate);
-					calculate_cost(frm);
-				}
-			}
-		});
-	}
-}
-
-frappe.ui.form.on("Time Log", "hours", function(frm) {
-	calculate_cost(frm);
-});
-
-frappe.ui.form.on("Time Log", "additional_cost", function(frm) {
-	calculate_cost(frm);
-});
-
-frappe.ui.form.on("Time Log", "activity_type", function(frm) {
-	get_activity_cost(frm);
-});
-
-frappe.ui.form.on("Time Log", "employee", function(frm) {
-	get_activity_cost(frm);
-});
-
-frappe.ui.form.on("Time Log", "billable", function(frm) {
-	if (frm.doc.billable==1) {
-		calculate_cost(frm);
-	}
-	else {
-		frm.set_value("billing_amount", 0);
-		frm.set_value("additional_cost", 0);
-	}
-});
-
-cur_frm.fields_dict['task'].get_query = function(doc) {
-	return {
-		filters:{
-			'project': doc.project
-		}
-	}
-}
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
deleted file mode 100644
index fb1a710..0000000
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ /dev/null
@@ -1,951 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "creation": "2013-04-03 16:38:41", 
- "custom": 0, 
- "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "depends_on": "eval:!doc.for_manufacturing", 
-   "fieldname": "activity_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Activity Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Activity Type", 
-   "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": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "TL-", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "", 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "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, 
-   "depends_on": "", 
-   "fieldname": "task", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Task", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Task", 
-   "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": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled", 
-   "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": "column_break_2", 
-   "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, 
-   "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": "from_time", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "default": "0", 
-   "fieldname": "hours", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Hours", 
-   "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": "to_time", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "billable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billable", 
-   "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": "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, 
-   "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": "note", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Note", 
-   "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": "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, 
-   "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": "user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "User", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "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": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "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": "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, 
-   "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": "for_manufacturing", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "For Manufacturing", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.for_manufacturing", 
-   "fieldname": "section_break_11", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "production_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Production Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Production Order", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "depends_on": "", 
-   "fieldname": "operation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Operation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Operation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "depends_on": "", 
-   "fieldname": "operation_id", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Operation ID", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "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": "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, 
-   "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, 
-   "depends_on": "", 
-   "fieldname": "workstation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Workstation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Workstation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "depends_on": "", 
-   "description": "Operation completed for how many finished goods?", 
-   "fieldname": "completed_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Completed Qty", 
-   "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, 
-   "depends_on": "", 
-   "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, 
-   "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, 
-   "default": "0", 
-   "description": "", 
-   "fieldname": "costing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Costing Rate based on Activity Type (per hour)", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0", 
-   "fieldname": "costing_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Costing 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_25", 
-   "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, 
-   "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, 
-   "default": "0", 
-   "description": "", 
-   "fieldname": "billing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billing Rate based on Activity Type (per hour)", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.billable", 
-   "fieldname": "additional_cost", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Cost", 
-   "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, 
-   "default": "0", 
-   "description": "Will be updated only if Time Log is 'Billable'", 
-   "fieldname": "billing_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billing 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, 
-   "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, 
-   "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, 
-   "description": "Will be updated when batched.", 
-   "fieldname": "time_log_batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Time Log Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Time Log Batch", 
-   "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, 
-   "description": "Will be updated when billed.", 
-   "fieldname": "sales_invoice", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Invoice", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Invoice", 
-   "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": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Time Log", 
-   "permlevel": 1, 
-   "print_hide": 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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-time", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-01-29 04:05:43.489154", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Time Log", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC", 
- "title_field": "title"
-}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
deleted file mode 100644
index b2a855d..0000000
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ /dev/null
@@ -1,288 +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 flt, get_datetime, get_time, getdate
-from dateutil.relativedelta import relativedelta
-from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
-
-class OverlapError(frappe.ValidationError): pass
-class OverProductionLoggedError(frappe.ValidationError): pass
-class NotSubmittedError(frappe.ValidationError): pass
-class NegativeHoursError(frappe.ValidationError): pass
-
-from frappe.model.document import Document
-
-class TimeLog(Document):
-	def validate(self):
-		self.set_status()
-		self.set_title()
-		self.validate_overlap()
-		self.validate_timings()
-		self.calculate_total_hours()
-		self.validate_time_log_for()
-		self.check_workstation_timings()
-		self.validate_production_order()
-		self.validate_manufacturing()
-		self.set_project_if_missing()
-		self.update_cost()
-
-	def on_submit(self):
-		self.update_production_order()
-		self.update_task_and_project()
-
-	def on_cancel(self):
-		self.update_production_order()
-		self.update_task_and_project()
-
-	def before_update_after_submit(self):
-		self.set_status()
-
-	def before_cancel(self):
-		self.set_status()
-
-	def set_status(self):
-		self.status = {
-			0: "Draft",
-			1: "Submitted",
-			2: "Cancelled"
-		}[self.docstatus or 0]
-
-		if self.time_log_batch:
-			self.status="Batched for Billing"
-
-		if self.sales_invoice:
-			self.status="Billed"
-
-	def set_title(self):
-		"""Set default title for the Time Log"""
-		if self.title:
-			return
-
-		from frappe.utils import get_fullname
-		if self.production_order:
-			self.title = _("{0} for {1}").format(self.operation, self.production_order)
-		elif self.activity_type and (self.task or self.project):
-			self.title = _("{0} for {1}").format(self.activity_type, self.task or self.project)
-		else:
-			self.title = self.task or self.project or get_fullname(frappe.session.user)
-
-	def validate_overlap(self):
-		"""Checks if 'Time Log' entries overlap for a user, workstation. """
-		self.validate_overlap_for("user")
-		self.validate_overlap_for("employee")
-		self.validate_overlap_for("workstation")
-
-	def validate_overlap_for(self, fieldname):
-		existing = self.get_overlap_for(fieldname)
-		if existing:
-			frappe.throw(_("This Time Log conflicts with {0} for {1} {2}").format(existing.name,
-				self.meta.get_label(fieldname), self.get(fieldname)), OverlapError)
-
-	def get_overlap_for(self, fieldname):
-		if not self.get(fieldname):
-			return
-
-		existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
-			where `{0}`=%(val)s and
-			(
-				(%(from_time)s > from_time and %(from_time)s < to_time) or 
-				(%(to_time)s > from_time and %(to_time)s < to_time) or 
-				(%(from_time)s <= from_time and %(to_time)s >= to_time))
-			and name!=%(name)s
-			and docstatus < 2""".format(fieldname),
-			{
-				"val": self.get(fieldname),
-				"from_time": self.from_time,
-				"to_time": self.to_time,
-				"name": self.name or "No Name"
-			}, as_dict=True)
-
-		return existing[0] if existing else None
-
-	def validate_timings(self):
-		if self.to_time and self.from_time and get_datetime(self.to_time) <= get_datetime(self.from_time):
-			frappe.throw(_("To Time must be greater than From Time"), NegativeHoursError)
-
-	def calculate_total_hours(self):
-		if self.to_time and self.from_time:
-			from frappe.utils import time_diff_in_seconds
-			self.hours = flt(time_diff_in_seconds(self.to_time, self.from_time)) / 3600
-
-	def set_project_if_missing(self):
-		"""Set project if task is set"""
-		if self.task and not self.project:
-			self.project = frappe.db.get_value("Task", self.task, "project")
-
-	def validate_time_log_for(self):
-		if not self.for_manufacturing:
-			for fld in ["production_order", "operation", "workstation", "completed_qty"]:
-				self.set(fld, None)
-		else:
-			self.activity_type=None
-
-	def check_workstation_timings(self):
-		"""Checks if **Time Log** is between operating hours of the **Workstation**."""
-		if self.workstation and self.from_time and self.to_time:
-			from erpnext.manufacturing.doctype.workstation.workstation import check_if_within_operating_hours
-			check_if_within_operating_hours(self.workstation, self.operation, self.from_time, self.to_time)
-
-	def validate_production_order(self):
-		"""Throws 'NotSubmittedError' if **production order** is not submitted. """
-		if self.production_order:
-			if frappe.db.get_value("Production Order", self.production_order, "docstatus") != 1 :
-				frappe.throw(_("You can make a time log only against a submitted production order"), NotSubmittedError)
-
-	def update_production_order(self):
-		"""Updates `start_date`, `end_date`, `status` for operation in Production Order."""
-
-		if self.production_order and self.for_manufacturing:
-			if not self.operation_id:
-				frappe.throw(_("Operation ID not set"))
-
-			dates = self.get_operation_start_end_time()
-			summary = self.get_time_log_summary()
-
-			pro = frappe.get_doc("Production Order", self.production_order)
-			for o in pro.operations:
-				if o.name == self.operation_id:
-					o.actual_start_time = dates.start_date
-					o.actual_end_time = dates.end_date
-					o.completed_qty = summary.completed_qty
-					o.actual_operation_time = summary.mins
-					break
-
-
-			pro.flags.ignore_validate_update_after_submit = True
-			pro.update_operation_status()
-			pro.calculate_operating_cost()
-			pro.set_actual_dates()
-			pro.save()
-
-	def get_operation_start_end_time(self):
-		"""Returns Min From and Max To Dates of Time Logs against a specific Operation. """
-		return frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date from `tabTime Log`
-				where production_order = %s and operation = %s and docstatus=1""",
-				(self.production_order, self.operation), as_dict=1)[0]
-
-	def move_to_next_day(self):
-		"""Move start and end time one day forward"""
-		self.from_time = get_datetime(self.from_time) + relativedelta(day=1)
-
-	def move_to_next_working_slot(self):
-		"""Move to next working slot from workstation"""
-		workstation = frappe.get_doc("Workstation", self.workstation)
-		slot_found = False
-		for working_hour in workstation.working_hours:
-			if get_datetime(self.from_time).time() < get_time(working_hour.start_time):
-				self.from_time = getdate(self.from_time).strftime("%Y-%m-%d") + " " + working_hour.start_time
-				slot_found = True
-				break
-
-		if not slot_found:
-			# later than last time
-			self.from_time = getdate(self.from_time).strftime("%Y-%m-%d") + " " + workstation.working_hours[0].start_time
-			self.move_to_next_day()
-
-	def move_to_next_non_overlapping_slot(self):
-		"""If in overlap, set start as the end point of the overlapping time log"""
-		overlapping = self.get_overlap_for("workstation") \
-			or self.get_overlap_for("employee") \
-			or self.get_overlap_for("user")
-
-		if not overlapping:
-			frappe.throw("Logical error: Must find overlapping")
-
-		self.from_time = get_datetime(overlapping.to_time) + get_mins_between_operations()
-
-	def get_time_log_summary(self):
-		"""Returns 'Actual Operating Time'. """
-		return frappe.db.sql("""select
-			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]
-
-	def validate_manufacturing(self):
-		if self.for_manufacturing:
-			if not self.production_order:
-				frappe.throw(_("Production Order is Mandatory"))
-			if not self.completed_qty:
-				self.completed_qty = 0
-
-			production_order = frappe.get_doc("Production Order", self.production_order)
-			pending_qty = flt(production_order.qty) - flt(production_order.produced_qty)
-			if flt(self.completed_qty) > pending_qty:
-				frappe.throw(_("Completed Qty cannot be more than {0} for operation {1}").format(pending_qty, self.operation),
-					OverProductionLoggedError)
-
-		else:
-			self.production_order = None
-			self.operation = None
-			self.quantity = None
-
-	def update_cost(self):
-		rate = get_activity_cost(self.employee, self.activity_type)
-		if rate:
-			self.costing_rate = flt(rate.get('costing_rate'))
-			self.billing_rate = flt(rate.get('billing_rate'))
-			self.costing_amount = self.costing_rate * self.hours
-			if self.billable:
-				self.billing_amount = self.billing_rate * self.hours
-			else:
-				self.billing_amount = 0
-		
-		if self.additional_cost and self.billable:
-			self.billing_amount += self.additional_cost
-
-	def update_task_and_project(self):
-		"""Update costing rate in Task or Project if either is set"""
-
-		if self.task:
-			task = frappe.get_doc("Task", self.task)
-			task.update_time_and_costing()
-			task.save()
-
-		elif self.project:
-			frappe.get_doc("Project", self.project).update_project()
-
-
-@frappe.whitelist()
-def get_events(start, end, filters=None):
-	"""Returns events for Gantt / Calendar view rendering.
-
-	:param start: Start date-time.
-	:param end: End date-time.
-	:param filters: Filters like workstation, project etc.
-	"""
-	from frappe.desk.calendar import get_event_conditions
-	conditions = get_event_conditions("Time Log", filters)
-
-	data = frappe.db.sql("""select name, from_time, to_time,
-		activity_type, task, project, production_order, workstation from `tabTime Log`
-		where docstatus < 2 and ( from_time between %(start)s and %(end)s or to_time between %(start)s and %(end)s )
-		{conditions}""".format(conditions=conditions), {
-			"start": start,
-			"end": end
-			}, as_dict=True, update={"allDay": 0})
-
-	for d in data:
-		d.title = d.name + ": " + (d.activity_type or d.production_order or "")
-		if d.task:
-			d.title += " for Task: " + d.task
-		if d.project:
-			d.title += " for Project: " + d.project
-
-	return data
-
-@frappe.whitelist()
-def get_activity_cost(employee=None, activity_type=None):
-	rate = frappe.db.get_values("Activity Cost", {"employee": employee,
-		"activity_type": activity_type}, ["costing_rate", "billing_rate"], as_dict=True)
-	if not rate:
-		rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
-			["costing_rate", "billing_rate"], as_dict=True)
-
-	return rate[0] if rate else {}
diff --git a/erpnext/projects/doctype/time_log/time_log_calendar.js b/erpnext/projects/doctype/time_log/time_log_calendar.js
deleted file mode 100644
index 132355f..0000000
--- a/erpnext/projects/doctype/time_log/time_log_calendar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.views.calendar["Time Log"] = {
-	field_map: {
-		"start": "from_time",
-		"end": "to_time",
-		"id": "name",
-		"title": "title",
-		"allDay": "allDay"
-	},
-	gantt: true,
-	gantt_scale: "hours",
-	filters: [
-		{
-			"fieldtype": "Link",
-			"fieldname": "workstation",
-			"options": "Workstation",
-			"label": __("Workstation")
-		},
-		{
-			"fieldtype": "Link",
-			"fieldname": "employee",
-			"options": "Employee",
-			"label": __("Employee")
-		},
-	],
-	get_events_method: "erpnext.projects.doctype.time_log.time_log.get_events"
-}
diff --git a/erpnext/projects/doctype/time_log/time_log_list.js b/erpnext/projects/doctype/time_log/time_log_list.js
deleted file mode 100644
index 5396928..0000000
--- a/erpnext/projects/doctype/time_log/time_log_list.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-// render
-frappe.listview_settings['Time Log'] = {
-	add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "for_manufacturing", "billing_amount"],
-	
-	get_indicator: function(doc) {
-		if (doc.status== "Batched for Billing") {
-			return [__("Batched for Billing"), "darkgrey", "status,=,Batched for Billing"]
-		} else if (doc.status== "Billed") {
-			return [__("Billed"), "green", "status,=,Billed"]
-		} else if (doc.status== "Submitted" && doc.billable) {
-			return [__("Billable"), "orange", "billable,=,1"]
-		}
-	},
-	
-	selectable: true,
-	onload: function(me) {
-		me.page.add_menu_item(__("Make Time Log Batch"), function() {
-			var selected = me.get_checked_items() || [];
-
-			if(!selected.length) {
-				msgprint(__("Please select Time Logs."));
-				return;
-			}
-
-			// select only billable time logs
-			for(var i in selected) {
-				var d = selected[i];
-				if(!d.billable) {
-					msgprint(__("Time Log is not billable") + ": " + d.name + " - " + d.title);
-					return;
-				}
-				if(d.status=="Batched for Billing") {
-					msgprint(__("Time Log has been Batched for Billing") + ": " + d.name + " - " + d.title);
-					return;
-				}
-				if(d.status=="Billed") {
-					msgprint(__("Time Log has been Billed") + ": " + d.name + " - " + d.title);
-					return;
-				}
-				if(d.status!="Submitted") {
-					msgprint(__("Time Log Status must be Submitted.") + ": " + d.name + " - " + d.title);
-					return;
-				}
-			}
-
-			// make batch
-			frappe.model.with_doctype("Time Log Batch", function() {
-				var tlb = frappe.model.get_new_doc("Time Log Batch");
-				$.each(selected, function(i, d) {
-					var detail = frappe.model.get_new_doc("Time Log Batch Detail", tlb,
-						"time_logs");
-
-					$.extend(detail, {
-						"time_log": d.name,
-						"activity_type": d.activity_type,
-						"billing_amount": d.billing_amount,
-						"hours": d.hours
-					});
-				})
-				frappe.set_route("Form", "Time Log Batch", tlb.name);
-			})
-
-		}, "icon-file-alt");
-	}
-};
diff --git a/erpnext/projects/doctype/time_log_batch/README.md b/erpnext/projects/doctype/time_log_batch/README.md
deleted file mode 100644
index c27521a..0000000
--- a/erpnext/projects/doctype/time_log_batch/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Group of Time Logs that can be batched for billing.
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch/__init__.py b/erpnext/projects/doctype/time_log_batch/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/projects/doctype/time_log_batch/__init__.py
+++ /dev/null
diff --git a/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py b/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
deleted file mode 100644
index 9f3591d..0000000
--- a/erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
+++ /dev/null
@@ -1,37 +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, unittest
-from erpnext.projects.doctype.time_log.test_time_log import make_time_log_test_record
-
-class TimeLogBatchTest(unittest.TestCase):
-	def test_time_log_status(self):
-		time_log = make_time_log_test_record(simulate=True)
-
-		self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Submitted")
-
-		tlb = create_time_log_batch(time_log.name)
-
-		self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Batched for Billing")
-		tlb.cancel()
-		self.assertEquals(frappe.db.get_value("Time Log", time_log.name, "status"), "Submitted")
-
-def create_time_log_batch(time_log):
-	tlb = frappe.get_doc({
-		"doctype": "Time Log Batch",
-		"time_logs": [
-			{
-			"doctype": "Time Log Batch Detail",
-			"parentfield": "time_logs",
-			"parenttype": "Time Log Batch",
-			"time_log": time_log
-			}
-		]
-	})
-
-	tlb.insert()
-	tlb.submit()
-	return tlb
-
-test_ignore = ["Sales Invoice"]
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
deleted file mode 100644
index b1c431c..0000000
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.add_fetch("time_log", "activity_type", "activity_type");
-cur_frm.add_fetch("time_log", "billing_amount", "billing_amount");
-cur_frm.add_fetch("time_log", "hours", "hours");
-
-cur_frm.set_query("time_log", "time_logs", function(doc) {
-	return {
-		query: "erpnext.projects.utils.get_time_log_list",
-		filters: {
-			"billable": 1,
-			"status": "Submitted"
-		}
-	}
-});
-
-$.extend(cur_frm.cscript, {
-	refresh: function(doc) {
-		cur_frm.set_intro({
-			"Draft": __("Select Time Logs and Submit to create a new Sales Invoice."),
-			"Submitted": __("Click on 'Make Sales Invoice' button to create a new Sales Invoice."),
-			"Billed": __("This Time Log Batch has been billed."),
-			"Cancelled": __("This Time Log Batch has been cancelled.")
-		}[doc.status]);
-
-		if(doc.status=="Submitted") {
-			cur_frm.add_custom_button(__("Make Sales Invoice"), function() { cur_frm.cscript.make_invoice() },
-				"icon-file-alt");
-		}
-	},
-	make_invoice: function() {
-		frappe.model.open_mapped_doc({
-			method: "erpnext.projects.doctype.time_log_batch.time_log_batch.make_sales_invoice",
-			frm: cur_frm
-		});
-	}
-});
-
-frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm) {
-	calculate_time_and_amount(frm);
-});
-
-frappe.ui.form.on("Time Log Batch Detail", "time_logs_remove", function(frm) {
-	calculate_time_and_amount(frm);
-});
-
-frappe.ui.form.on("Time Log Batch", "onload", function(frm) {
-	if (frm.doc.__islocal && frm.doc.time_logs) {
-		calculate_time_and_amount(frm);
-	}
-});
-
-var calculate_time_and_amount = function(frm) {
-	var tl = frm.doc.time_logs || [];
-	total_hr = 0;
-	total_amt = 0;
-	for(var i=0; i<tl.length; i++) {
-		if (tl[i].time_log) {
-			total_hr += tl[i].hours;
-			total_amt += tl[i].billing_amount;
-		}
-	}
-	cur_frm.set_value("total_hours", total_hr);
-	cur_frm.set_value("total_billing_amount", total_amt);
-	
-}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.json b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
deleted file mode 100644
index 3ee6dee..0000000
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.json
+++ /dev/null
@@ -1,305 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "creation": "2013-02-28 17:57:33", 
- "custom": 0, 
- "description": "Batch Time Logs for Billing.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "fields": [
-  {
-   "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": 0, 
-   "options": "TLB-", 
-   "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, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Draft\nSubmitted\nBilled\nCancelled", 
-   "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_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, 
-   "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": "Will be updated after Sales Invoice is Submitted.", 
-   "fieldname": "sales_invoice", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Invoice", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Invoice", 
-   "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_5", 
-   "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": "time_logs", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Time Logs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Time Log Batch Detail", 
-   "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": "section_break_8", 
-   "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": "0", 
-   "description": "updated via Time Logs", 
-   "fieldname": "total_hours", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Total Hours", 
-   "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_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, 
-   "default": "0", 
-   "description": "updated via Time Logs", 
-   "fieldname": "total_billing_amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Total Billing Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Time Log Batch", 
-   "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, 
- "icon": "icon-time", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.535984", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Time Log Batch", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.py b/erpnext/projects/doctype/time_log_batch/time_log_batch.py
deleted file mode 100644
index a692949..0000000
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-from frappe.utils import flt
-from frappe.model.document import Document
-from frappe.model.mapper import get_mapped_doc
-
-class TimeLogBatch(Document):
-
-	def validate(self):
-		self.set_status()
-		self.total_hours = 0.0
-		self.total_billing_amount = 0.0
-		for d in self.get("time_logs"):
-			tl = frappe.get_doc("Time Log", d.time_log)
-			self.update_time_log_values(d, tl)
-			self.validate_time_log_is_submitted(tl)
-			self.total_hours += flt(tl.hours)
-			self.total_billing_amount += flt(tl.billing_amount)
-
-	def update_time_log_values(self, d, tl):
-		d.update({
-			"hours": tl.hours,
-			"activity_type": tl.activity_type,
-			"billing_amount": tl.billing_amount,
-			"note": tl.note
-		})
-
-	def validate_time_log_is_submitted(self, tl):
-		if tl.status == "Batched for Billing":
-			frappe.throw(_("Time Log {0} already billed").format(tl.name))
-		elif tl.docstatus != 1:
-			frappe.throw(_("Time Log {0} must be 'Submitted'").format(tl.name))
-
-	def set_status(self):
-		self.status = {
-			"0": "Draft",
-			"1": "Submitted",
-			"2": "Cancelled"
-		}[str(self.docstatus or 0)]
-
-		if self.sales_invoice:
-			self.status = "Billed"
-
-	def on_submit(self):
-		self.update_status(self.name)
-
-	def before_cancel(self):
-		self.update_status(None)
-
-	def before_update_after_submit(self):
-		self.update_status(self.name)
-
-	def update_status(self, time_log_batch):
-		self.set_status()
-		for d in self.get("time_logs"):
-			tl = frappe.get_doc("Time Log", d.time_log)
-			tl.time_log_batch = time_log_batch
-			tl.sales_invoice = self.sales_invoice
-			tl.flags.ignore_validate_update_after_submit = True
-			tl.save()
-
-@frappe.whitelist()
-def make_sales_invoice(source_name, target=None):
-	def update_item(source_doc, target_doc, source_parent):
-		target_doc.stock_uom = "Hour"
-		target_doc.description = "via Time Logs"
-		target_doc.qty = 1
-
-	target = frappe.new_doc("Sales Invoice")
-	target.append("items", get_mapped_doc("Time Log Batch", source_name, {
-		"Time Log Batch": {
-			"doctype": "Sales Invoice Item",
-			"field_map": {
-				"total_billing_amount": "rate",
-				"name": "time_log_batch"
-			},
-			"postprocess": update_item
-		}
-	}))
-
-	return target
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js b/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js
deleted file mode 100644
index fe82b07..0000000
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js
+++ /dev/null
@@ -1,8 +0,0 @@
-frappe.listview_settings['Time Log Batch'] = {
-	add_fields: ["status", "total_hours"],
-	get_indicator: function(doc) {
-		if (doc.status== "Billed") {
-			return [__("Billed"), "green", "status,=," + "Billed"]
-		}
-	}
-};
diff --git a/erpnext/projects/doctype/time_log_batch_detail/README.md b/erpnext/projects/doctype/time_log_batch_detail/README.md
deleted file mode 100644
index daa04aa..0000000
--- a/erpnext/projects/doctype/time_log_batch_detail/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Time Log detail for parent Time Log Batch.
\ No newline at end of file
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
deleted file mode 100644
index ad89b74..0000000
--- a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2013-03-05 09:11:06", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "time_log", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Time Log", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Time Log", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "200px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "200px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "hours", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Hours", 
-   "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": "section_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": "activity_type", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Activity Type", 
-   "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": "billing_amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Billing Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "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, 
- "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.590738", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Time Log Batch Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
deleted file mode 100644
index c9af6fa..0000000
--- a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.document import Document
-
-class TimeLogBatchDetail(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/__init__.py b/erpnext/projects/doctype/timesheet/__init__.py
similarity index 100%
rename from erpnext/projects/doctype/time_log/__init__.py
rename to erpnext/projects/doctype/timesheet/__init__.py
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
new file mode 100644
index 0000000..300933a
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+import datetime
+from frappe.utils import now_datetime, nowdate
+from erpnext.projects.doctype.timesheet.timesheet import OverlapError
+from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
+
+class TestTimesheet(unittest.TestCase):
+	def test_timesheet_billing_amount(self):
+		salary_structure = make_salary_structure("_T-Employee-0001")
+		timesheet = make_timesheet("_T-Employee-0001", True)
+
+		self.assertEquals(timesheet.total_hours, 2)
+		self.assertEquals(timesheet.time_logs[0].billing_rate, 50)
+		self.assertEquals(timesheet.time_logs[0].billing_amount, 100)
+
+	def test_salary_slip_from_timesheet(self):
+		salary_structure = make_salary_structure("_T-Employee-0001")
+		timesheet = make_timesheet("_T-Employee-0001", simulate = True)
+		salary_slip = make_salary_slip(timesheet.name)
+		salary_slip.submit()
+
+		self.assertEquals(salary_slip.total_working_hours, 2)
+		self.assertEquals(salary_slip.hour_rate, 50)
+		self.assertEquals(salary_slip.net_pay, 150)
+		self.assertEquals(salary_slip.timesheets[0].time_sheet, timesheet.name)
+		self.assertEquals(salary_slip.timesheets[0].working_hours, 2)
+		
+		timesheet = frappe.get_doc('Timesheet', timesheet.name)
+		self.assertEquals(timesheet.status, 'Payslip')
+		salary_slip.cancel()
+
+		timesheet = frappe.get_doc('Timesheet', timesheet.name)
+		self.assertEquals(timesheet.status, 'Submitted')
+
+	def test_sales_invoice_from_timesheet(self):
+		timesheet = make_timesheet("_T-Employee-0001", simulate = True, billable = 1)
+		sales_invoice = make_sales_invoice(timesheet.name)
+		sales_invoice.customer = "_Test Customer"
+		sales_invoice.due_date = nowdate()
+
+		item = sales_invoice.append('items', {})
+		item.item_code = '_Test Item'
+		item.qty = 2
+		item.rate = 100
+
+		sales_invoice.submit()
+		
+		timesheet = frappe.get_doc('Timesheet', timesheet.name)
+		self.assertEquals(sales_invoice.total_billing_amount, 100)
+		self.assertEquals(timesheet.status, 'Billed')
+
+def make_salary_structure(employee):
+	name = frappe.db.get_value('Salary Structure', {'employee': employee, 'salary_slip_based_on_timesheet': 1}, 'name')
+	if name:
+		salary_structure = frappe.get_doc('Salary Structure', name)
+	else:
+		salary_structure = frappe.new_doc("Salary Structure")
+
+	salary_structure.salary_slip_based_on_timesheet = 1
+	salary_structure.employee = employee
+	salary_structure.from_date = nowdate()
+	salary_structure.salary_component = "Basic"
+	salary_structure.hour_rate = 50.0
+	salary_structure.company= "_Test Company"
+
+	salary_structure.set('earnings', [])
+	salary_structure.set('deductions', [])
+
+	es = salary_structure.append('earnings', {
+		"salary_component": "_Test Allowance",
+		"amount": 100 
+	})
+
+	ds = salary_structure.append('deductions', {
+		"salary_component": "_Test Professional Tax",
+		"amount": 50
+	})
+
+	salary_structure.save(ignore_permissions=True)
+
+	return salary_structure
+
+def make_timesheet(employee, simulate=False, billable = 0, activity_type="_Test Activity Type", project=None, task=None):
+	update_activity_type(activity_type)
+	timesheet = frappe.new_doc("Timesheet")
+	timesheet.employee = employee
+	timesheet_detail = timesheet.append('time_logs', {})
+	timesheet_detail.billable = billable
+	timesheet_detail.activity_type = activity_type
+	timesheet_detail.from_time = now_datetime()
+	timesheet_detail.hours = 2
+	timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours= timesheet_detail.hours)
+	timesheet_detail.project = project
+	timesheet_detail.task = task
+
+	for data in timesheet.get('time_logs'):
+		if simulate:
+			while True:
+				try:
+					timesheet.save(ignore_permissions=True)
+					break
+				except OverlapError:
+					data.from_time = data.from_time + datetime.timedelta(minutes=10)
+					data.to_time = data.from_time + datetime.timedelta(hours= data.hours)
+		else:
+			timesheet.save(ignore_permissions=True)
+
+	timesheet.submit()
+
+	return timesheet
+
+def update_activity_type(activity_type):
+	activity_type = frappe.get_doc('Activity Type',activity_type)
+	activity_type.billing_rate = 50.0
+	activity_type.save(ignore_permissions=True)
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
new file mode 100644
index 0000000..f816def
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -0,0 +1,159 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
+
+frappe.ui.form.on("Timesheet", {
+	setup: function(frm) {
+		frm.get_field('time_logs').grid.editable_fields = [
+			{fieldname: 'billable', columns: 2},
+			{fieldname: 'activity_type', columns: 2},
+			{fieldname: 'from_time', columns: 2},
+			{fieldname: 'hours', columns: 2},
+			{fieldname: 'to_time', columns: 2},
+		];
+
+		frm.fields_dict.employee.get_query = function() {
+			return {
+				query:"erpnext.projects.doctype.timesheet.timesheet.get_employee_list"
+			}
+		}
+
+		frm.fields_dict['time_logs'].grid.get_field('task').get_query = function(frm, cdt, cdn) {
+			child = locals[cdt][cdn];
+			return{
+				filters: {
+					'project': child.project
+				}
+			}
+		}
+	},
+
+	onload: function(frm){
+		if (frm.doc.__islocal && frm.doc.time_logs) {
+			frm.set_value("employee", "")
+			calculate_time_and_amount(frm);
+		}
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.docstatus==1) {
+			if(!frm.doc.sales_invoice && frm.doc.total_billing_amount > 0
+				&& !frm.doc.production_order){
+				frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
+					"icon-file-alt");
+			}
+
+			if(!frm.doc.salary_slip && frm.doc.employee){
+				frm.add_custom_button(__("Make Salary Slip"), function() { frm.trigger("make_salary_slip") },
+					"icon-file-alt");
+			}
+		}
+	},
+
+	make_invoice: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.projects.doctype.timesheet.timesheet.make_sales_invoice",
+			frm: frm
+		});
+	},
+
+	make_salary_slip: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.projects.doctype.timesheet.timesheet.make_salary_slip",
+			frm: frm
+		});
+	},
+})
+
+frappe.ui.form.on("Timesheet Detail", {
+	time_logs_remove: function(frm) {
+		calculate_time_and_amount(frm);
+	},
+
+	from_time: function(frm, cdt, cdn) {
+		calculate_end_time(frm, cdt, cdn)
+	},
+
+	to_time: function(frm, cdt, cdn) {
+		var child = locals[cdt][cdn];
+
+		if(frm._setting_hours) return;
+		frappe.model.set_value(cdt, cdn, "hours", moment(child.to_time).diff(moment(child.from_time),
+			"seconds") / 3600);
+	},
+
+	hours: function(frm, cdt, cdn) {
+		calculate_end_time(frm, cdt, cdn)
+	},
+
+	billing_rate: function(frm, cdt, cdn) {
+		calculate_billing_costing_amount(frm, cdt, cdn)
+	},
+
+	costing_rate: function(frm, cdt, cdn) {
+		calculate_billing_costing_amount(frm, cdt, cdn)
+	},
+
+	billable: function(frm, cdt, cdn) {
+		calculate_billing_costing_amount(frm, cdt, cdn)
+	},
+
+	activity_type: function(frm, cdt, cdn) {
+		child = locals[cdt][cdn];
+		frappe.call({
+			method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
+			args: {
+				employee: frm.doc.employee,
+				activity_type: child.activity_type
+			},
+			callback: function(r){
+				if(r.message){
+					frappe.model.set_value(cdt, cdn, 'billing_rate', r.message['billing_rate']);
+					frappe.model.set_value(cdt, cdn, 'costing_rate', r.message['costing_rate']);
+					calculate_billing_costing_amount(frm, cdt, cdn)
+				}
+			}
+		})
+	}
+});
+
+calculate_end_time = function(frm, cdt, cdn){
+	var child = locals[cdt][cdn];
+
+	var d = moment(child.from_time);
+	d.add(child.hours, "hours");
+	frm._setting_hours = true;
+	frappe.model.set_value(cdt, cdn, "to_time", d.format(moment.defaultDatetimeFormat));
+	frm._setting_hours = false;
+
+	calculate_billing_costing_amount(frm, cdt, cdn)
+}
+
+var calculate_billing_costing_amount = function(frm, cdt, cdn){
+	child = locals[cdt][cdn]
+	billing_amount = costing_amount = 0.0;
+
+	if(child.hours && child.billable){
+		billing_amount = (child.hours * child.billing_rate);
+		costing_amount = flt(child.costing_rate * child.hours);
+	}
+
+	frappe.model.set_value(cdt, cdn, 'billing_amount', billing_amount);
+	frappe.model.set_value(cdt, cdn, 'costing_amount', costing_amount);
+	calculate_time_and_amount(frm)
+}
+
+var calculate_time_and_amount = function(frm) {
+	var tl = frm.doc.time_logs || [];
+	total_hr = 0;
+	total_billing_amount = 0;
+	for(var i=0; i<tl.length; i++) {
+		if (tl[i].hours) {
+			total_hr += tl[i].hours;
+			total_billing_amount += tl[i].billing_amount;
+		}
+	}
+
+	cur_frm.set_value("total_hours", total_hr);
+	cur_frm.set_value("total_billing_amount", total_billing_amount);
+}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
new file mode 100644
index 0000000..a15522b
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -0,0 +1,732 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2013-02-28 17:57:33", 
+ "custom": 0, 
+ "description": "Batch Time Logs for Billing.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "TS-\nTLB-", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "sales_invoice", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Invoice", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "salary_slip", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Salary Slip", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Salary Slip", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Draft\nSubmitted\nBilled\nPayslip\nCompleted\nCancelled", 
+   "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, 
+   "collapsible_depends_on": "", 
+   "depends_on": "eval:!doc.production_order", 
+   "fieldname": "employee_detail", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Employee Detail", 
+   "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, 
+   "depends_on": "", 
+   "description": "List of employee which has \"Salary Slip Based on Timesheet\" is enabled in salary structure.", 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "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, 
+   "depends_on": "employee", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Start Date", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "End Date", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "depends_on": "production_order", 
+   "fieldname": "production_detail", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Production Detail", 
+   "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": "production_order", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Production Order", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Production Order", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "time_logs", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Time Sheets", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Timesheet Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "0", 
+   "description": "updated via Time Logs", 
+   "fieldname": "total_hours", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Total Hours", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "0", 
+   "depends_on": "", 
+   "description": "updated via Time Logs", 
+   "fieldname": "total_billing_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Billing 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_18", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "note", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Note", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Timesheet", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-time", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-13 23:44:05.086570", 
+ "modified_by": "Administrator", 
+ "module": "Projects", 
+ "name": "Timesheet", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Projects User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Manufacturing User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
new file mode 100644
index 0000000..6881e0b
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -0,0 +1,295 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+from datetime import timedelta
+from frappe.utils import flt, time_diff_in_hours, get_datetime, getdate, cint, get_datetime_str
+from frappe.model.document import Document
+from frappe.model.mapper import get_mapped_doc
+from erpnext.manufacturing.doctype.workstation.workstation import (check_if_within_operating_hours,
+	WorkstationHolidayError)
+from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
+
+class OverlapError(frappe.ValidationError): pass
+class OverProductionLoggedError(frappe.ValidationError): pass
+
+class Timesheet(Document):
+	def validate(self):
+		self.set_status()
+		self.total_hours = 0.0
+		self.total_billing_amount = 0.0
+		self.validate_dates()
+		self.validate_time_logs()
+		self.update_cost()
+		for d in self.get("time_logs"):
+			self.total_hours += flt(d.hours)
+			if d.billable: self.total_billing_amount += flt(d.billing_amount)
+
+	def set_status(self):
+		self.status = {
+			"0": "Draft",
+			"1": "Submitted",
+			"2": "Cancelled"
+		}[str(self.docstatus or 0)]
+
+		if self.sales_invoice:
+			self.status = "Billed"
+
+		if self.salary_slip:
+			self.status = "Payslip"
+
+		if self.sales_invoice and self.salary_slip:
+			self.status = "Completed"
+
+	def set_dates(self):
+		if self.docstatus < 2:
+			start_date = min([d.from_time for d in self.time_logs])
+			end_date = max([d.to_time for d in self.time_logs])
+
+			if start_date and end_date:
+				self.start_date = getdate(start_date)
+				self.end_date = getdate(end_date)
+
+	def before_submit(self):
+		self.set_dates()
+
+	def before_cancel(self):
+		self.set_status()
+
+	def on_cancel(self):
+		self.update_production_order(None)
+		self.update_task_and_project()
+
+	def on_submit(self):
+		self.validate_mandatory_fields()
+		self.update_production_order(self.name)
+		self.update_task_and_project()
+
+	def validate_mandatory_fields(self):
+		if self.production_order:
+			production_order = frappe.get_doc("Production Order", self.production_order)
+			pending_qty = flt(production_order.qty) - flt(production_order.produced_qty)
+
+		for data in self.time_logs:
+			if not data.from_time and not data.to_time:
+				frappe.throw(_("Row {0}: From Time and To Time is mandatory.").format(data.idx))
+
+			if not data.activity_type and self.employee:
+				frappe.throw(_("Row {0}: Activity Type is mandatory.").format(data.idx))
+
+			if flt(data.hours) == 0.0:
+				frappe.throw(_("Row {0}: Hours value must be greater than zero.").format(data.idx))
+
+			if self.production_order and flt(data.completed_qty) == 0:
+				frappe.throw(_("Row {0}: Completed Qty must be greater than zero.").format(data.idx))
+
+			if self.production_order and flt(pending_qty) < flt(data.completed_qty):
+				frappe.throw(_("Row {0}: Completed Qty cannot be more than {0} for operation {1}").format(data.idx, pending_qty, self.operation),
+					OverProductionLoggedError)
+
+			if data.billable and flt(data.billing_rate) == 0.0 and data.activity_type:
+				frappe.throw(_("Row {0}: Billing Rate must be greater than zero.").format(data.idx))
+
+	def update_production_order(self, time_sheet):
+		if self.production_order:
+			pro = frappe.get_doc('Production Order', self.production_order)
+
+			for timesheet in self.time_logs:
+				for data in pro.operations:
+					if data.name == timesheet.operation_id:
+						summary = self.get_actual_timesheet_summary(timesheet.operation_id)
+						data.time_sheet = time_sheet
+						data.completed_qty = summary.completed_qty 
+						data.actual_operation_time = summary.mins
+						data.actual_start_time = summary.from_time
+						data.actual_end_time = summary.to_time
+
+			pro.flags.ignore_validate_update_after_submit = True
+			pro.update_operation_status()
+			pro.calculate_operating_cost()
+			pro.set_actual_dates()
+			pro.save()
+
+	def get_actual_timesheet_summary(self, operation_id):
+		"""Returns 'Actual Operating Time'. """
+		return frappe.db.sql("""select
+			sum(tsd.hours*60) as mins, sum(tsd.completed_qty) as completed_qty, min(tsd.from_time) as from_time,
+			max(tsd.to_time) as to_time from `tabTimesheet Detail` as tsd, `tabTimesheet` as ts where 
+			ts.production_order = %s and tsd.operation_id = %s and ts.docstatus=1 and ts.name = tsd.parent""",
+			(self.production_order, operation_id), as_dict=1)[0]
+
+	def update_task_and_project(self):
+		for data in self.time_logs:
+			if data.task:
+				task = frappe.get_doc("Task", data.task)
+				task.update_time_and_costing()
+				task.save()
+
+			elif data.project:
+				frappe.get_doc("Project", data.project).update_project()
+
+	def validate_dates(self):
+		for data in self.time_logs:
+			if time_diff_in_hours(data.to_time, data.from_time) < 0:
+				frappe.throw(_("To date cannot be before from date"))
+
+	def validate_time_logs(self):
+		for data in self.get('time_logs'):
+			self.check_workstation_timings(data)
+			self.validate_overlap(data)
+
+	def validate_overlap(self, data):
+		if self.production_order:
+			self.validate_overlap_for("workstation", data, data.workstation)
+		else:
+			self.validate_overlap_for("user", data, self.user)
+			self.validate_overlap_for("employee", data, self.employee)
+
+	def validate_overlap_for(self, fieldname, args, value):
+		if not value: return
+
+		existing = self.get_overlap_for(fieldname, args, value)
+		if existing:
+			frappe.throw(_("Row {0}: From Time and To Time overlap with existing from and to time").format(args.idx),
+				OverlapError)
+
+	def get_overlap_for(self, fieldname, args, value):
+		cond = "ts.`{0}`".format(fieldname)
+		if fieldname == 'workstation':
+			cond = "tsd.`{0}`".format(fieldname)
+
+		existing = frappe.db.sql("""select ts.name as name, tsd.from_time as from_time, tsd.to_time as to_time from 
+			`tabTimesheet Detail` tsd, `tabTimesheet` ts where {0}=%(val)s and tsd.parent = ts.name and
+			(
+				(%(from_time)s > tsd.from_time and %(from_time)s < tsd.to_time) or
+				(%(to_time)s > tsd.from_time and %(to_time)s < tsd.to_time) or
+				(%(from_time)s <= tsd.from_time and %(to_time)s >= tsd.to_time))
+			and tsd.name!=%(name)s
+			and ts.docstatus < 2""".format(cond),
+			{
+				"val": value,
+				"from_time": args.from_time,
+				"to_time": args.to_time,
+				"name": args.name or "No Name"
+			}, as_dict=True)
+
+		return existing[0] if existing else None
+
+	def check_workstation_timings(self, args):
+		"""Checks if **Time Log** is between operating hours of the **Workstation**."""
+		if args.workstation and args.from_time and args.to_time:
+			check_if_within_operating_hours(args.workstation, args.operation, args.from_time, args.to_time)
+
+	def schedule_for_production_order(self, index):
+		for data in self.time_logs:
+			if data.idx == index:
+				self.move_to_next_day(data) #check for workstation holiday
+				self.move_to_next_non_overlapping_slot(data) #check for overlap
+				break
+
+	def move_to_next_non_overlapping_slot(self, data):
+		overlapping = self.get_overlap_for("workstation", data, data.workstation)
+		if overlapping:
+			time_sheet = self.get_last_working_slot(overlapping.name, data.workstation)
+			data.from_time = get_datetime(time_sheet.to_time) + get_mins_between_operations()
+			data.to_time = self.get_to_time(data)
+			self.check_workstation_working_day(data)
+
+	def get_last_working_slot(self, time_sheet, workstation):
+		return frappe.db.sql(""" select max(from_time) as from_time, max(to_time) as to_time 
+			from `tabTimesheet Detail` where workstation = %(workstation)s""",
+			{'workstation': workstation}, as_dict=True)[0]
+
+	def move_to_next_day(self, data):
+		"""Move start and end time one day forward"""
+		self.check_workstation_working_day(data)
+
+	def check_workstation_working_day(self, data):
+		while True:
+			try:
+				self.check_workstation_timings(data)
+				break
+			except WorkstationHolidayError:
+				if frappe.message_log: frappe.message_log.pop()
+				data.from_time = get_datetime(data.from_time) + timedelta(hours=24)
+				data.to_time = self.get_to_time(data)
+
+	def get_to_time(self, data):
+		return get_datetime(data.from_time) + timedelta(hours=data.hours)
+
+	def update_cost(self):
+		for data in self.time_logs:
+			if data.activity_type and not data.billing_amount:
+				rate = get_activity_cost(self.employee, data.activity_type)
+				hours =  data.hours or 0
+				if rate:
+					data.billing_rate = flt(rate.get('billing_rate'))
+					data.costing_rate = flt(rate.get('costing_rate'))
+					data.billing_amount = data.billing_rate * hours
+					data.costing_amount = data.costing_rate * hours
+
+@frappe.whitelist()
+def make_sales_invoice(source_name, target=None):
+	target = frappe.new_doc("Sales Invoice")
+
+	target.append("timesheets", get_mapped_doc("Timesheet", source_name, {
+		"Timesheet": {
+			"doctype": "Sales Invoice Timesheet",
+			"field_map": {
+				"total_billing_amount": "billing_amount",
+				"name": "time_sheet"
+			},
+		}
+	}))
+	
+	target.run_method("calculate_billing_amount_from_timesheet")
+
+	return target
+
+@frappe.whitelist()
+def make_salary_slip(source_name, target_doc=None):
+	target = frappe.new_doc("Salary Slip")
+	set_missing_values(source_name, target)
+	
+	target.append("timesheets", get_mapped_doc("Timesheet", source_name, {
+		"Timesheet": {
+			"doctype": "Salary Slip Timesheet",
+			"field_map": {
+				"total_hours": "working_hours",
+				"name": "time_sheet"
+			},
+		}
+	}))
+	
+	target.run_method("get_emp_and_leave_details")
+
+	return target
+
+def set_missing_values(time_sheet, target):
+	doc = frappe.get_doc('Timesheet', time_sheet)
+	target.employee = doc.employee
+	target.employee_name = doc.employee_name
+	target.salary_slip_based_on_timesheet = 1
+	target.start_date = doc.start_date
+	target.end_date = doc.end_date
+
+@frappe.whitelist()
+def get_activity_cost(employee=None, activity_type=None):
+	rate = frappe.db.get_values("Activity Cost", {"employee": employee,
+		"activity_type": activity_type}, ["costing_rate", "billing_rate"], as_dict=True)
+	if not rate:
+		rate = frappe.db.get_values("Activity Type", {"activity_type": activity_type},
+			["costing_rate", "billing_rate"], as_dict=True)
+
+	return rate[0] if rate else {}
+
+@frappe.whitelist()
+def get_employee_list(doctype, txt, searchfield, start, page_len, filters):
+	return frappe.db.sql("""select distinct(employee) as employee
+		from `tabSalary Structure` where salary_slip_based_on_timesheet=1
+		and employee like %(txt)s limit %(start)s, %(page_len)s""", 
+		{'txt': "%%%s%%"%(txt), 'start': start, 'page_len': page_len})
diff --git a/erpnext/projects/doctype/timesheet/timesheet_list.js b/erpnext/projects/doctype/timesheet/timesheet_list.js
new file mode 100644
index 0000000..c538fa1
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/timesheet_list.js
@@ -0,0 +1,16 @@
+frappe.listview_settings['Timesheet'] = {
+	add_fields: ["status", "total_hours"],
+	get_indicator: function(doc) {
+		if (doc.status== "Billed") {
+			return [__("Billed"), "green", "status,=," + "Billed"]
+		}
+		
+		if (doc.status== "Payslip") {
+			return [__("Payslip"), "green", "status,=," + "Payslip"]
+		}
+		
+		if (doc.status== "Completed") {
+			return [__("Completed"), "green", "status,=," + "Completed"]
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log_batch_detail/__init__.py b/erpnext/projects/doctype/timesheet_detail/__init__.py
similarity index 100%
rename from erpnext/projects/doctype/time_log_batch_detail/__init__.py
rename to erpnext/projects/doctype/timesheet_detail/__init__.py
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
new file mode 100644
index 0000000..9413629
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
@@ -0,0 +1,546 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2013-03-05 09:11:06", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:!parent.production_order", 
+   "fieldname": "billable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billable", 
+   "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": "activity_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Activity Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Activity Type", 
+   "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": "from_time", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "From Time", 
+   "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": "section_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "hours", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Hours", 
+   "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": "to_time", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "To Time", 
+   "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, 
+   "depends_on": "eval:!parent.production_order", 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "billing_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billing Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "costing_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Costing 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, 
+   "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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "0", 
+   "depends_on": "", 
+   "description": "To display value check Billable", 
+   "fieldname": "billing_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Billing Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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, 
+   "default": "0", 
+   "description": "To display value check Billable", 
+   "fieldname": "costing_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Costing 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, 
+   "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, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:parent.production_order", 
+   "fieldname": "completed_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Completed Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "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": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "task", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:parent.production_order", 
+   "fieldname": "workstation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Workstation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Workstation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "depends_on": "eval:parent.production_order", 
+   "fieldname": "operation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Operation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Operation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "depends_on": "eval:parent.production_order", 
+   "fieldname": "operation_id", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Operation 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 09:59:01.622745", 
+ "modified_by": "Administrator", 
+ "module": "Projects", 
+ "name": "Timesheet Detail", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.py b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.py
new file mode 100644
index 0000000..7da94b7
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TimesheetDetail(Document):
+	pass
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.js
deleted file mode 100644
index a1baed7..0000000
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.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
-
-frappe.query_reports["Daily Time Log Summary"] = {
-	"filters": [
-		{
-			"fieldname":"from_date",
-			"label": __("From Date"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.get_today()
-		},
-		{
-			"fieldname":"to_date",
-			"label": __("To Date"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.get_today()
-		},
-	]
-}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
deleted file mode 100644
index 2cdaf6b..0000000
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "apply_user_permissions": 1, 
- "creation": "2013-04-03 11:27:52", 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.019543", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Daily Time Log Summary", 
- "owner": "Administrator", 
- "ref_doctype": "Time Log", 
- "report_name": "Daily Time Log Summary", 
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py b/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
deleted file mode 100644
index 74436a3..0000000
--- a/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
+++ /dev/null
@@ -1,83 +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 flt
-
-def execute(filters=None):
-	if not filters:
-		filters = {}
-	elif filters.get("from_date") or filters.get("to_date"):
-		filters["from_time"] = "00:00:00"
-		filters["to_time"] = "24:00:00"
-
-	columns = [_("Time Log") + ":Link/Time Log:120", _("Employee") + "::150", _("From Datetime") + "::140",
-		_("To Datetime") + "::140", _("Hours") + "::70", _("Activity Type") + "::120", _("Task") + ":Link/Task:150",
-		_("Task Subject") + "::180", _("Project") + ":Link/Project:120", _("Status") + "::70"]
-
-	user_map = get_user_map()
-	task_map = get_task_map()
-
-	conditions = build_conditions(filters)
-	time_logs = frappe.db.sql("""select * from `tabTime Log`
-		where docstatus < 2 %s order by owner asc""" % (conditions, ), filters, as_dict=1)
-
-	if time_logs:
-		users = [time_logs[0].owner]
-
-	data = []
-	total_hours = total_employee_hours = count = 0
-	for tl in time_logs:
-		if tl.owner not in users:
-			users.append(tl.owner)
-			data.append(["", "", "", "Total", total_employee_hours, "", "", "", "", ""])
-			total_employee_hours = 0
-
-		data.append([tl.name, user_map[tl.owner], tl.from_time, tl.to_time, tl.hours,
-				tl.activity_type, tl.task, task_map.get(tl.task), tl.project, tl.status])
-
-		count += 1
-		total_hours += flt(tl.hours)
-		total_employee_hours += flt(tl.hours)
-
-		if count == len(time_logs):
-			data.append(["", "", "", "Total Hours", total_employee_hours, "", "", "", "", ""])
-
-	if total_hours:
-		data.append(["", "", "", "Grand Total", total_hours, "", "", "", "", ""])
-
-	return columns, data
-
-def get_user_map():
-	users = frappe.db.sql("""select name,
-		concat(first_name, if(last_name, (' ' + last_name), '')) as fullname
-		from tabUser""", as_dict=1)
-	user_map = {}
-	for p in users:
-		user_map.setdefault(p.name, []).append(p.fullname)
-
-	return user_map
-
-def get_task_map():
-	tasks = frappe.db.sql("""select name, subject from tabTask""", as_dict=1)
-	task_map = {}
-	for t in tasks:
-		task_map.setdefault(t.name, []).append(t.subject)
-
-	return task_map
-
-def build_conditions(filters):
-	conditions = ""
-	if filters.get("from_date"):
-		conditions += " and from_time >= timestamp(%(from_date)s, %(from_time)s)"
-	if filters.get("to_date"):
-		conditions += " and to_time <= timestamp(%(to_date)s, %(to_time)s)"
-
-	from frappe.desk.reportview import build_match_conditions
-	match_conditions = build_match_conditions("Time Log")
-	if match_conditions:
-		conditions += " and %s" % match_conditions
-
-	return conditions
diff --git a/erpnext/projects/report/daily_time_log_summary/__init__.py b/erpnext/projects/report/daily_timesheet_summary/__init__.py
similarity index 100%
rename from erpnext/projects/report/daily_time_log_summary/__init__.py
rename to erpnext/projects/report/daily_timesheet_summary/__init__.py
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
new file mode 100644
index 0000000..93cb940
--- /dev/null
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
@@ -0,0 +1,19 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Daily Timesheet Summary"] = {
+	"filters": [
+		{
+			"fieldname":"from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.get_today()
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.get_today()
+		},
+	]
+}
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json
new file mode 100644
index 0000000..be5f139
--- /dev/null
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-07-06 19:31:25.534583", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-07-06 19:31:25.534583", 
+ "modified_by": "Administrator", 
+ "module": "Projects", 
+ "name": "Daily Timesheet Summary", 
+ "owner": "Administrator", 
+ "ref_doctype": "Timesheet", 
+ "report_name": "Daily Timesheet Summary", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
new file mode 100644
index 0000000..ab0b4a1
--- /dev/null
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	if not filters:
+		filters = {}
+	elif filters.get("from_date") or filters.get("to_date"):
+		filters["from_time"] = "00:00:00"
+		filters["to_time"] = "24:00:00"
+
+	columns = [_("Timesheet") + ":Link/Timesheet:120", _("Employee") + "::150", _("From Datetime") + "::140",
+		_("To Datetime") + "::140", _("Hours") + "::70", _("Activity Type") + "::120", _("Task") + ":Link/Task:150",
+		_("Project") + ":Link/Project:120", _("Status") + "::70"]
+		
+	conditions = "ts.docstatus = 1"
+	if filters.get("from_date"):
+		conditions += " and tsd.from_time >= timestamp(%(from_date)s, %(from_time)s)"
+	if filters.get("to_date"):
+		conditions += " and tsd.to_time <= timestamp(%(to_date)s, %(to_time)s)"
+	
+	data = get_data(conditions, filters)
+
+	return columns, data
+
+def get_data(conditions, filters):
+	time_sheet = frappe.db.sql(""" select ts.name, ts.employee, tsd.from_time, tsd.to_time, tsd.hours,
+		tsd.activity_type, tsd.task, tsd.project, ts.status from `tabTimesheet Detail` tsd, 
+		`tabTimesheet` ts where ts.name = tsd.parent and %s order by ts.name"""%(conditions), filters, as_list=1)
+
+	return time_sheet
diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index 1f6e2b3..d663ad0 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py
@@ -7,10 +7,6 @@
 import frappe
 
 @frappe.whitelist()
-def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
-	return frappe.db.get_values("Time Log", filters, ["name", "activity_type", "owner"])
-
-@frappe.whitelist()
 def query_task(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import build_match_conditions
 
diff --git a/erpnext/projects/doctype/time_log/__init__.py b/erpnext/projects/web_form/__init__.py
similarity index 100%
copy from erpnext/projects/doctype/time_log/__init__.py
copy to erpnext/projects/web_form/__init__.py
diff --git a/erpnext/projects/doctype/time_log/__init__.py b/erpnext/projects/web_form/tasks/__init__.py
similarity index 100%
copy from erpnext/projects/doctype/time_log/__init__.py
copy to erpnext/projects/web_form/tasks/__init__.py
diff --git a/erpnext/projects/web_form/tasks/tasks.js b/erpnext/projects/web_form/tasks/tasks.js
new file mode 100644
index 0000000..699703c
--- /dev/null
+++ b/erpnext/projects/web_form/tasks/tasks.js
@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+})
\ No newline at end of file
diff --git a/erpnext/projects/web_form/tasks/tasks.json b/erpnext/projects/web_form/tasks/tasks.json
new file mode 100644
index 0000000..1d952fc
--- /dev/null
+++ b/erpnext/projects/web_form/tasks/tasks.json
@@ -0,0 +1,84 @@
+{
+ "allow_comments": 1, 
+ "allow_delete": 1, 
+ "allow_edit": 1, 
+ "allow_multiple": 1, 
+ "breadcrumbs": "[{\"title\":\"Tasks\", \"name\":\"tasks\"}]", 
+ "creation": "2016-06-24 15:50:33.091287", 
+ "doc_type": "Task", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "modified": "2016-07-07 06:04:30.979390", 
+ "modified_by": "Administrator", 
+ "module": "Projects", 
+ "name": "tasks", 
+ "owner": "Administrator", 
+ "published": 1, 
+ "route": "tasks", 
+ "success_url": "/projects?project=Collaborative Project Management", 
+ "title": "Task", 
+ "web_form_fields": [
+  {
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Project", 
+   "options": "Project", 
+   "read_only": 1, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Subject", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Status", 
+   "options": "Open\nClosed\nCancelled", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Details", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "priority", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Priority", 
+   "options": "Low\nMedium\nHigh\nUrgent", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "exp_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "label": "Expected Start Date", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "exp_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "label": "Expected End Date", 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/projects/web_form/tasks/tasks.py b/erpnext/projects/web_form/tasks/tasks.py
new file mode 100644
index 0000000..6f387fe
--- /dev/null
+++ b/erpnext/projects/web_form/tasks/tasks.py
@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	if frappe.form_dict.project:
+		context.parents = [{'title': frappe.form_dict.project, 'route': '/projects?project='+ frappe.form_dict.project}]
+		
+	elif context.doc and context.doc.get('project'):
+		context.parents = [{'title': context.doc.project, 'route': '/projects?project='+ context.doc.project}]
\ No newline at end of file
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index ff8bf94..340ebdb 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -8,16 +8,29 @@
 	],
 	"js/erpnext.min.js": [
 		"public/js/conf.js",
-		"public/js/feature_setup.js",
 		"public/js/utils.js",
 		"public/js/queries.js",
+		"public/js/sms_manager.js",
 		"public/js/utils/party.js",
 		"public/js/templates/address_list.html",
 		"public/js/templates/contact_list.html",
+		"public/js/controllers/stock_controller.js",
+		"public/js/payment/payments.js",
+		"public/js/controllers/taxes_and_totals.js",
+		"public/js/controllers/transaction.js",
 		"public/js/pos/pos.html",
 		"public/js/pos/pos_bill_item.html",
 		"public/js/pos/pos_item.html",
 		"public/js/pos/pos_tax_row.html",
-		"public/js/pos/pos.js"
+		"public/js/pos/pos_invoice_list.html",
+		"public/js/payment/pos_payment.html",
+		"public/js/payment/payment_details.html",
+		"public/js/templates/item_selector.html",
+		"public/js/utils/item_selector.js"
+	],
+	"js/item-dashboard.min.js": [
+		"stock/dashboard/item_dashboard.html",
+		"stock/dashboard/item_dashboard_list.html",
+		"stock/dashboard/item_dashboard.js"
 	]
 }
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index 621efb5..9a015c2 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -13,17 +13,20 @@
   margin: -10px auto;
 }
 /* pos */
+.pos-item-area {
+  padding: 0px 10px;
+}
+.pos-item-wrapper {
+  padding: 5px;
+}
 .pos-item {
-  display: inline-block;
   overflow: hidden;
   text-overflow: ellipsis;
   cursor: pointer;
   padding: 5px;
-  height: 0px;
-  padding-bottom: 38%;
-  width: 30%;
-  margin: 1.6%;
+  padding-bottom: 15px;
   border: 1px solid #d1d8dd;
+  margin-bottom: 5px;
 }
 .pos-item-text {
   padding: 0px 5px;
@@ -36,7 +39,13 @@
   border: 1px dashed #d1d8dd;
 }
 .pos-item-image {
-  padding-bottom: 100%;
+  width: 100%;
+  height: 0px;
+  padding: 50% 0;
+  text-align: center;
+  line-height: 0;
+  color: #d1d8dd;
+  font-size: 30px;
   background-size: cover;
   border: 1px solid transparent;
   background-position: top center;
@@ -98,7 +107,7 @@
 }
 .erpnext-icon {
   width: 24px;
-  margin-right: 0px;
+  ackmargin-right: 0px;
   margin-top: -3px;
 }
 .pos .discount-amount-area .discount-field-col {
@@ -107,3 +116,56 @@
 .pos .discount-amount-area .input-group {
   margin-top: 2px;
 }
+.dashboard-list-item {
+  background-color: inherit;
+  padding: 5px 0px;
+  border-bottom: 1px solid #d1d8dd;
+}
+#page-stock-balance .dashboard-list-item {
+  padding: 5px 15px;
+}
+.dashboard-list-item:last-child {
+  border-bottom: none;
+}
+.payment-toolbar {
+  margin-left: 35px;
+}
+.payment-mode {
+  cursor: pointer;
+  font-family: sans-serif;
+  font-size: 15px;
+}
+.pos-payment-row .col-xs-6 {
+  padding: 10px;
+}
+.pos-payment-row {
+  border-bottom: 1px solid #d1d8dd;
+  margin: 2px 0px 5px 0px;
+  height: 60px;
+}
+.pos-payment-row:hover,
+.pos-keyboard-key:hover {
+  background-color: #FAFBFC;
+  cursor: pointer;
+}
+.pos-keyboard-key,
+.delete-btn {
+  border: 1px solid #d1d8dd;
+  height: 85px;
+  width: 85px;
+  margin: 10px 10px;
+  font-size: 24px;
+  font-weight: 200;
+  background-color: #FDFDFD;
+  border-color: #e8e8e8;
+}
+.amount-label {
+  font-size: 16px;
+}
+.selected-payment-mode {
+  background-color: #FAFBFC;
+  cursor: pointer;
+}
+.pos-invoice-list {
+  padding: 15px 10px;
+}
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 77ce04b..065e281 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -9,11 +9,6 @@
   display: block;
   text-align: center;
 }
-.product-image-wrapper {
-  max-width: 300px;
-  margin: auto;
-  border-radius: 4px;
-}
 @media (max-width: 767px) {
   .product-image {
     height: 0px;
@@ -28,8 +23,8 @@
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center top;
-  border-radius: 0.5em;
-  border: 1px solid #EBEFF2;
+  border-radius-top: 4px;
+  border-radius-right: 4px;
 }
 .product-image.missing-image {
   width: 100%;
@@ -38,10 +33,10 @@
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center top;
-  border-radius: 0.5em;
-  border: 1px solid #EBEFF2;
-  border: 1px dashed #d1d8dd;
+  border-radius-top: 4px;
+  border-radius-right: 4px;
   position: relative;
+  background-color: #EBEFF2;
 }
 .product-image.missing-image .octicon {
   font-size: 32px;
@@ -50,9 +45,212 @@
 .product-text {
   padding: 15px 0px;
 }
+.product-label {
+  padding-bottom: 4px;
+  text-transform: uppercase;
+  font-size: 12px;
+}
+.product-search {
+  margin-bottom: 15px;
+}
 @media (max-width: 767px) {
   .product-search {
     width: 100%;
-    margin-bottom: 13px;
   }
 }
+.borderless td,
+.borderless th {
+  border-bottom: 1px solid #EBEFF2;
+  padding-left: 0px !important;
+  line-height: 1.8em !important;
+}
+.item-desc {
+  border-top: 2px solid #EBEFF2;
+  padding-top: 10px;
+}
+.featured-products {
+  border-top: 1px solid #EBEFF2;
+}
+.transaction-list-item:hover,
+.transaction-list-item:active,
+.transaction-list-item:focus {
+  background-color: #fafbfc;
+}
+.transaction-list-item .indicator {
+  font-weight: inherit;
+  color: #8D99A6;
+}
+.transaction-list-item .items-preview,
+.transaction-list-item .transaction-time {
+  margin-top: 5px;
+}
+.transaction-subheading .indicator {
+  font-weight: inherit;
+  color: #8D99A6;
+}
+.order-container {
+  margin: 50px 0px;
+}
+.order-container .order-item-header .h6 {
+  padding: 7px 15px;
+}
+.order-container .order-items {
+  margin: 30px 0px 0px;
+}
+.order-container .order-item-table {
+  margin: 0px -15px;
+}
+.order-container .order-item-header {
+  border-bottom: 1px solid #d1d8dd;
+}
+.order-container .order-image-col {
+  padding-right: 0px;
+}
+.order-container .order-image {
+  max-width: 55px;
+  max-height: 55px;
+  margin-top: -5px;
+}
+.order-container .order-taxes {
+  margin-top: 30px;
+}
+.order-container .order-taxes .row {
+  margin-top: 15px;
+}
+.order-container .tax-grand-total-row {
+  padding-top: 15px;
+  padding-bottom: 30px;
+}
+.order-container .tax-grand-total {
+  display: inline-block;
+  font-size: 16px;
+  font-weight: bold;
+  margin-top: 5px;
+}
+.cart-container {
+  margin: 50px 0px;
+}
+.cart-container .checkout {
+  margin-bottom: 15px;
+}
+.cart-container .cart-item-header .h6 {
+  padding: 7px 15px;
+}
+.cart-container .cart-items {
+  margin: 30px 0px 0px;
+}
+.cart-container .cart-item-table {
+  margin: 0px -15px;
+}
+.cart-container .cart-item-header {
+  border-bottom: 1px solid #d1d8dd;
+}
+.cart-container .cart-image-col {
+  padding-right: 0px;
+}
+.cart-container .cart-image {
+  max-width: 55px;
+  max-height: 55px;
+  margin-top: -5px;
+}
+.cart-container .cart-taxes {
+  margin-top: 30px;
+}
+.cart-container .cart-taxes .row {
+  margin-top: 15px;
+}
+.cart-container .tax-grand-total-row {
+  border-top: 1px solid #d1d8dd;
+  padding-top: 15px;
+}
+.cart-container .cart-addresses {
+  margin-top: 50px;
+}
+.cart-items-dropdown .cart-dropdown,
+.item_name_dropdown {
+  display: none;
+}
+.cart-dropdown-container {
+  width: 400px;
+  padding: 15px;
+}
+.cart-dropdown-container .item-price {
+  display: block !important;
+  padding-bottom: 10px;
+}
+.cart-dropdown-container .cart-item-header {
+  border-bottom: 1px solid #d1d8dd;
+}
+.cart-dropdown-container .cart-items-dropdown {
+  max-height: 350px;
+  overflow: auto;
+}
+.cart-dropdown-container .cart-items-dropdown .cart-dropdown {
+  display: block;
+  margin-top: 15px;
+}
+.cart-dropdown-container .item_name_dropdown {
+  display: block;
+}
+.cart-dropdown-container .item-description,
+.cart-dropdown-container .cart-items .checkout,
+.cart-dropdown-container .item_name_and_description {
+  display: none;
+}
+.cart-dropdown-container .checkout-btn {
+  padding-top: 25px;
+}
+.cart-dropdown-container .col-name-description {
+  margin-bottom: 8px;
+}
+.number-spinner {
+  width: 100px;
+  margin-top: 5px;
+}
+.cart-btn {
+  border-color: #ccc;
+}
+.cart-qty {
+  text-align: center;
+}
+.product-list-link .row {
+  border-bottom: 1px solid #EBEFF2;
+}
+.product-list-link .row:hover {
+  background-color: #fafbfc;
+}
+.product-list-link .row > div {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+.product-list-link:first-child .row {
+  border-top: 1px solid #EBEFF2;
+}
+.item-group-nav-buttons {
+  margin-top: 15px;
+}
+.footer-subscribe .btn-default {
+  background-color: transparent;
+  border: 1px solid #d1d8dd;
+}
+@media (min-width: 992px) {
+  .footer-subscribe {
+    max-width: 350px;
+  }
+}
+.item-group-content {
+  margin-top: 30px;
+}
+.product-image-img {
+  border: 1px solid #EBEFF2;
+  border-radius: 3px;
+}
+.product-text {
+  border-top: 1px solid #EBEFF2;
+  padding: 15px;
+  word-wrap: break-word;
+  height: 75px;
+}
+.product-image-wrapper {
+  padding-bottom: 40px;
+}
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index d8133ce..233bd2e 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -20,12 +20,12 @@
 
 // doctypes created via tree
 $.extend(frappe.create_routes, {
-	"Customer Group": "Sales Browser/Customer Group",
-	"Territory": "Sales Browser/Territory",
-	"Item Group": "Sales Browser/Item Group",
-	"Sales Person": "Sales Browser/Sales Person",
-	"Account": "Accounts Browser/Account",
-	"Cost Center": "Accounts Browser/Cost Center"
+	"Customer Group": "Tree/Customer Group",
+	"Territory": "Tree/Territory",
+	"Item Group": "Tree/Item Group",
+	"Sales Person": "Tree/Sales Person",
+	"Account": "Tree/Account",
+	"Cost Center": "Tree/Cost Center"
 });
 
 // preferred modules for breadcrumbs
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index e19919d..202000f 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -6,6 +6,14 @@
 frappe.provide("erpnext.taxes.flags");
 
 frappe.ui.form.on(cur_frm.doctype, {
+	setup: function(frm) {
+		// set conditional display for rate column in taxes
+		$(frm.wrapper).on('grid-row-render', function(e, grid_row) {
+			if(in_list(['Sales Taxes and Charges', 'Purchase Taxes and Charges'], grid_row.doc.doctype)) {
+				erpnext.taxes.set_conditional_mandatory_rate_or_amount(grid_row);
+			}
+		});
+	},
 	onload: function(frm) {
 		if(frm.get_field("taxes")) {
 			frm.set_query("account_head", "taxes", function(doc) {
@@ -40,10 +48,10 @@
 			frm.get_docfield("taxes", "rate").reqd = 0;
 			frm.get_docfield("taxes", "tax_amount").reqd = 0;
 		}
-		
+
 	},
 	taxes_on_form_rendered: function(frm) {
-		erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm);
+		erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm.open_grid_row());
 	}
 });
 
@@ -58,7 +66,8 @@
 			method: "erpnext.controllers.accounts_controller.get_tax_rate",
 			args: {"account_head":d.account_head},
 			callback: function(r) {
-			  frappe.model.set_value(cdt, cdn, "rate", r.message || 0);
+				frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
+				frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
 			}
 		})
 	}
@@ -67,6 +76,12 @@
 cur_frm.cscript.validate_taxes_and_charges = function(cdt, cdn) {
 	var d = locals[cdt][cdn];
 	var msg = "";
+
+	if(d.account_head && !d.description) {
+		// set description from account head
+		d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
+	}
+
 	if(!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
 		msg = __("Please select Charge Type first");
 		d.row_id = "";
@@ -143,8 +158,14 @@
 	});
 
 	frappe.ui.form.on(cur_frm.cscript.tax_table, "charge_type", function(frm, cdt, cdn) {
-		cur_frm.cscript.validate_taxes_and_charges(cdt, cdn);
-		erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm);
+		frm.cscript.validate_taxes_and_charges(cdt, cdn);
+		var open_form = frm.open_grid_row();
+		if(open_form) {
+			erpnext.taxes.set_conditional_mandatory_rate_or_amount(open_form);
+		} else {
+			// apply in current row
+			erpnext.taxes.set_conditional_mandatory_rate_or_amount(frm.get_field('taxes').grid.get_grid_row(cdn));
+		}
 	});
 
 	frappe.ui.form.on(cur_frm.cscript.tax_table, "included_in_print_rate", function(frm, cdt, cdn) {
@@ -160,18 +181,19 @@
 	});
 }
 
-erpnext.taxes.set_conditional_mandatory_rate_or_amount = function(frm) {
-	var grid_row = frm.open_grid_row();
-	if(grid_row.doc.charge_type==="Actual") {
-		grid_row.toggle_display("tax_amount", true);
-		grid_row.toggle_reqd("tax_amount", true);
-		grid_row.toggle_display("rate", false);
-		grid_row.toggle_reqd("rate", false);
-	} else {
-		grid_row.toggle_display("rate", true);
-		grid_row.toggle_reqd("rate", true);
-		grid_row.toggle_display("tax_amount", false);
-		grid_row.toggle_reqd("tax_amount", false);
+erpnext.taxes.set_conditional_mandatory_rate_or_amount = function(grid_row) {
+	if(grid_row) {
+		if(grid_row.doc.charge_type==="Actual") {
+			grid_row.toggle_editable("tax_amount", true);
+			grid_row.toggle_reqd("tax_amount", true);
+			grid_row.toggle_editable("rate", false);
+			grid_row.toggle_reqd("rate", false);
+		} else {
+			grid_row.toggle_editable("rate", true);
+			grid_row.toggle_reqd("rate", true);
+			grid_row.toggle_editable("tax_amount", false);
+			grid_row.toggle_reqd("tax_amount", false);
+		}
 	}
 }
 
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index a2ee1b7..8405e3d 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -1,16 +1,42 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.provide("erpnext");
-frappe.require("assets/erpnext/js/controllers/stock_controller.js");
+erpnext.taxes_and_totals = erpnext.payments.extend({
+	setup: function() {
+		if(this.frm.get_field('taxes')) {
+			this.frm.get_field('taxes').grid.editable_fields = [
+				{fieldname: 'charge_type', columns: 2},
+				{fieldname: 'account_head', columns: 2},
+				{fieldname: 'rate', columns: 2},
+				{fieldname: 'tax_amount', columns: 2},
+				{fieldname: 'total', columns: 2}
+			];
+		}
 
-erpnext.taxes_and_totals = erpnext.stock.StockController.extend({
+	},
+	apply_pricing_rule_on_item: function(item){
+		if(!item.margin_type){
+			item.margin_rate_or_amount = 0.0;
+		}
+
+		if(item.margin_type == "Percentage"){
+			item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100);
+		}else{
+			item.total_margin = item.price_list_rate + item.margin_rate_or_amount;
+		}
+
+		item.rate = flt(item.total_margin , 2);
+
+		if(item.discount_percentage){
+			discount_value = flt(item.total_margin) * flt(item.discount_percentage) / 100;
+			item.rate = flt((item.total_margin) - (discount_value), precision('rate'));
+		}
+	},
+
 	calculate_taxes_and_totals: function(update_paid_amount) {
 		this.discount_amount_applied = false;
 		this._calculate_taxes_and_totals();
-
-		if (frappe.meta.get_docfield(this.frm.doc.doctype, "discount_amount"))
-			this.apply_discount_amount();
+		this.calculate_discount_amount();
 
 		// Advance calculation applicable to Sales /Purchase Invoice
 		if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)
@@ -27,6 +53,11 @@
 		this.frm.refresh_fields();
 	},
 
+	calculate_discount_amount: function(){
+		if (frappe.meta.get_docfield(this.frm.doc.doctype, "discount_amount"))
+			this.apply_discount_amount();
+	},
+
 	_calculate_taxes_and_totals: function() {
 		this.validate_conversion_rate();
 		this.calculate_item_values();
@@ -44,7 +75,7 @@
 		this.frm.doc.conversion_rate = flt(this.frm.doc.conversion_rate, precision("conversion_rate"));
 		var conversion_rate_label = frappe.meta.get_label(this.frm.doc.doctype, "conversion_rate",
 			this.frm.doc.name);
-		var company_currency = this.get_company_currency();
+		var company_currency = this.frm.doc.currency || this.get_company_currency();
 
 		if(!this.frm.doc.conversion_rate) {
 			if(this.frm.doc.currency == company_currency) {
@@ -59,7 +90,7 @@
 						"to_currency": company_currency
 					}));
 			}
-			
+
 		}
 	},
 
@@ -101,7 +132,7 @@
 
 			$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0 });
 
-			if (!this.discount_amount_applied) {
+			if (!this.discount_amount_applied && cur_frm) {
 				cur_frm.cscript.validate_taxes_and_charges(tax.doctype, tax.name);
 				me.validate_inclusive_tax(tax);
 			}
@@ -256,7 +287,7 @@
 					me.round_off_totals(tax);
 
 					// adjust Discount Amount loss in last tax iteration
-					if ((i == me.frm.doc["taxes"].length - 1) && me.discount_amount_applied 
+					if ((i == me.frm.doc["taxes"].length - 1) && me.discount_amount_applied
 							&& me.frm.doc.apply_discount_on == "Grand Total" && me.frm.doc.discount_amount)
 						me.adjust_discount_amount_loss(tax);
 				}
@@ -321,10 +352,10 @@
 		tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount +
 			discount_amount_loss, precision("tax_amount", tax));
 		tax.total = flt(tax.total + discount_amount_loss, precision("total", tax));
-		
+
 		this.set_in_company_currency(tax, ["total", "tax_amount_after_discount_amount"]);
 	},
-	
+
 	manipulate_grand_total_for_inclusive_tax: function() {
 		var me = this;
 		// if fully inclusive taxes and diff
@@ -342,8 +373,8 @@
 					last_tax.tax_amount += diff;
 					last_tax.tax_amount_after_discount += diff;
 					last_tax.total += diff;
-					
-					this.set_in_company_currency(last_tax, 
+
+					this.set_in_company_currency(last_tax,
 						["total", "tax_amount", "tax_amount_after_discount_amount"]);
 				}
 			}
@@ -392,14 +423,14 @@
 
 		// rounded totals
 		if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
-			this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.grand_total, 
+			this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.grand_total,
 				this.frm.doc.currency, precision("rounded_total"));
 		}
 		if(frappe.meta.get_docfield(this.frm.doc.doctype, "base_rounded_total", this.frm.doc.name)) {
-			var company_currency = this.get_company_currency();
-			
-			this.frm.doc.base_rounded_total = 
-				round_based_on_smallest_currency_fraction(this.frm.doc.base_grand_total, 
+			var company_currency = this.frm.doc.currency || this.get_company_currency();
+
+			this.frm.doc.base_rounded_total =
+				round_based_on_smallest_currency_fraction(this.frm.doc.base_grand_total,
 					company_currency, precision("base_rounded_total"));
 		}
 	},
@@ -436,13 +467,14 @@
 	apply_discount_amount: function() {
 		var me = this;
 		var distributed_amount = 0.0;
+		this.frm.doc.base_discount_amount = 0.0;
 
 		if (this.frm.doc.discount_amount) {
 			if(!this.frm.doc.apply_discount_on)
 				frappe.throw(__("Please select Apply Discount On"));
 
-			this.frm.set_value("base_discount_amount",
-				flt(this.frm.doc.discount_amount * this.frm.doc.conversion_rate, precision("base_discount_amount")))
+			this.frm.doc.base_discount_amount = flt(this.frm.doc.discount_amount * this.frm.doc.conversion_rate,
+				precision("base_discount_amount"));
 
 			var total_for_discount_amount = this.get_total_for_discount_amount();
 			// calculate item amount after Discount Amount
@@ -458,8 +490,6 @@
 				this.discount_amount_applied = true;
 				this._calculate_taxes_and_totals();
 			}
-		} else {
-			this.frm.set_value("base_discount_amount", 0);
 		}
 	},
 
@@ -497,48 +527,98 @@
 
 		this.calculate_outstanding_amount(update_paid_amount);
 	},
-	
+
 	calculate_outstanding_amount: function(update_paid_amount) {
 		// NOTE:
 		// paid_amount and write_off_amount is only for POS Invoice
 		// total_advance is only for non POS Invoice
 		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"]);
-		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 
+		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(
-				(flt(this.frm.doc.grand_total*this.frm.doc.conversion_rate, precision("grand_total")) 
-					- this.frm.doc.total_advance - this.frm.doc.base_write_off_amount), 
+				(flt(this.frm.doc.grand_total*this.frm.doc.conversion_rate, precision("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") {
+
+		if(this.frm.doc.doctype == "Sales Invoice" || this.frm.doc.doctype == "Purchase Invoice") {
 			frappe.model.round_floats_in(this.frm.doc, ["paid_amount"]);
-			
-			if(this.frm.doc.is_pos) {
-				if(!this.frm.doc.paid_amount || update_paid_amount===undefined || update_paid_amount) {
-					this.frm.doc.paid_amount = flt(total_amount_to_pay);
-				}
-			} else {
-				this.frm.doc.paid_amount = 0
-			}
+
 			this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
-			this.frm.refresh_field("paid_amount");
-			this.frm.refresh_field("base_paid_amount");
-			
-			var paid_amount = (this.frm.doc.party_account_currency == this.frm.doc.currency) ? 
+
+			if(this.frm.refresh_field){
+				this.frm.refresh_field("paid_amount");
+				this.frm.refresh_field("base_paid_amount");
+			}
+
+			if(this.frm.doc.doctype == "Sales Invoice"){
+				this.set_default_payment(total_amount_to_pay, update_paid_amount)
+				this.calculate_paid_amount()
+			}
+
+			var outstanding_amount = 0.0
+
+			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"));
-				
+
+			if (total_amount_to_pay > paid_amount){
+				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"));
-		}		
-		this.frm.set_value("outstanding_amount", outstanding_amount);
-	}
+		}
+
+		this.frm.doc.outstanding_amount = outstanding_amount;
+		this.calculate_change_amount()
+	},
+
+	set_default_payment: function(total_amount_to_pay, update_paid_amount){
+		var me = this;
+		payment_status = true;
+		if(this.frm.doc.is_pos && (!this.frm.doc.paid_amount || update_paid_amount===undefined || update_paid_amount)){
+			$.each(this.frm.doc['payments'] || [], function(index, data){
+				if(data.type == "Cash" && payment_status) {
+					data.amount = total_amount_to_pay;
+					payment_status = false;
+				}else if(me.frm.doc.paid_amount){
+					data.amount = 0.0;
+				}
+			})
+		}
+	},
+
+	calculate_paid_amount: function(){
+		var me = this;
+		var paid_amount = base_paid_amount = 0.0;
+		$.each(this.frm.doc['payments'] || [], function(index, data){
+			if(data.amount > -1){
+				data.base_amount = flt(data.amount * me.frm.doc.conversion_rate);
+				paid_amount += data.amount;
+				base_paid_amount += data.base_amount;
+			}
+		})
+
+		this.frm.doc.paid_amount = flt(paid_amount, precision("paid_amount"));
+		this.frm.doc.base_paid_amount = flt(base_paid_amount, precision("base_paid_amount"));
+	},
+
+	calculate_change_amount: function(){
+		var change_amount = 0.0;
+		if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
+			change_amount = flt(this.frm.doc.paid_amount - this.frm.doc.grand_total,
+				precision("change_amount"))
+		}
+
+		this.frm.doc.change_amount = flt(change_amount,
+			precision("change_amount"))
+		this.frm.doc.base_change_amount = flt(change_amount * this.frm.doc.conversion_rate,
+			precision("base_change_amount"))
+	},
 })
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index acc70df..2b73cf4 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1,26 +1,104 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.provide("erpnext");
-frappe.require("assets/erpnext/js/controllers/taxes_and_totals.js");
-frappe.require("assets/erpnext/js/utils.js");
-
 erpnext.TransactionController = erpnext.taxes_and_totals.extend({
+	setup: function() {
+		this._super();
+
+		if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)) {
+			this.frm.get_field('advances').grid.editable_fields = [
+				{fieldname: 'reference_name', columns: 3},
+				{fieldname: 'remarks', columns: 3},
+				{fieldname: 'advance_amount', columns: 2},
+				{fieldname: 'allocated_amount', columns: 2}
+			];
+		}
+
+		frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
+			var item = frappe.get_doc(cdt, cdn);
+			frappe.model.round_floats_in(item, ["rate", "price_list_rate"]);
+
+			if(item.price_list_rate) {
+				item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0, precision("discount_percentage", item));
+			} else {
+				item.discount_percentage = 0.0;
+			}
+
+			cur_frm.cscript.set_gross_profit(item);
+			cur_frm.cscript.calculate_taxes_and_totals();
+		})
+
+		frappe.ui.form.on(this.frm.cscript.tax_table, "rate", function(frm, cdt, cdn) {
+			cur_frm.cscript.calculate_taxes_and_totals();
+		});
+
+		frappe.ui.form.on(this.frm.cscript.tax_table, "tax_amount", function(frm, cdt, cdn) {
+			cur_frm.cscript.calculate_taxes_and_totals();
+		});
+
+		frappe.ui.form.on(this.frm.cscript.tax_table, "row_id", function(frm, cdt, cdn) {
+			cur_frm.cscript.calculate_taxes_and_totals();
+		});
+
+		frappe.ui.form.on(this.frm.cscript.tax_table, "included_in_print_rate", function(frm, cdt, cdn) {
+			cur_frm.cscript.set_dynamic_labels();
+			cur_frm.cscript.calculate_taxes_and_totals();
+		});
+
+		frappe.ui.form.on(this.frm.doctype, "apply_discount_on", function(frm) {
+			if(frm.doc.additional_discount_percentage) {
+				frm.trigger("additional_discount_percentage");
+			} else {
+				cur_frm.cscript.calculate_taxes_and_totals();
+			}
+		});
+
+		frappe.ui.form.on(this.frm.doctype, "additional_discount_percentage", function(frm) {
+			if (frm.via_discount_amount) {
+				return;
+			}
+
+			if(!frm.doc.apply_discount_on) {
+				frappe.msgprint(__("Please set 'Apply Additional Discount On'"));
+				return
+			}
+
+			frm.via_discount_percentage = true;
+
+			if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
+				// Reset discount amount and net / grand total
+				frm.set_value("discount_amount", 0);
+			}
+
+			var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]);
+			var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
+				precision("discount_amount"));
+
+			frm.set_value("discount_amount", discount_amount);
+			delete frm.via_discount_percentage;
+		});
+
+		frappe.ui.form.on(this.frm.doctype, "discount_amount", function(frm) {
+			frm.cscript.set_dynamic_labels();
+
+			if (!frm.via_discount_percentage) {
+				frm.via_discount_amount = true;
+				frm.set_value("additional_discount_percentage", 0);
+				delete frm.via_discount_amount;
+			}
+
+			frm.cscript.calculate_taxes_and_totals();
+		});
+
+	},
 	onload: function() {
 		var me = this;
+		//this.frm.show_print_first = true;
 		if(this.frm.doc.__islocal) {
 			var today = get_today(),
 				currency = frappe.defaults.get_user_default("currency");
 
-			$.each(["posting_date", "transaction_date"], function(i, fieldname) {
-				if (me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname] && me.frm[fieldname]) {
-					me.frm.set_value(fieldname, me.frm[fieldname]);
-				}
-			});
-
 			$.each({
-				posting_date: today,
-				transaction_date: today,
 				currency: currency,
 				price_list_currency: currency,
 				status: "Draft",
@@ -31,7 +109,7 @@
 			});
 
 			if(this.frm.doc.company && !this.frm.doc.amended_from) {
-				cur_frm.script_manager.trigger("company");
+				this.frm.script_manager.trigger("company");
 			}
 		}
 
@@ -81,7 +159,7 @@
 				me.calculate_taxes_and_totals();
 		}
 		if(frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
-			cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
+			this.setup_item_selector();
 		}
 	},
 
@@ -90,9 +168,7 @@
 		erpnext.hide_company();
 		this.show_item_wise_taxes();
 		this.set_dynamic_labels();
-		erpnext.pos.make_pos_btn(this.frm);
 		this.setup_sms();
-		this.make_show_payments_btn();
 	},
 
 	apply_default_taxes: function() {
@@ -125,38 +201,26 @@
 	},
 
 	send_sms: function() {
-		frappe.require("assets/erpnext/js/sms_manager.js");
 		var sms_man = new SMSManager(this.frm.doc);
 	},
 
-	make_show_payments_btn: function() {
-		var me = this;
-		if (in_list(["Purchase Invoice", "Sales Invoice"], this.frm.doctype)) {
-			if(this.frm.doc.outstanding_amount !== this.frm.doc.base_grand_total) {
-				this.frm.add_custom_button(__("Payments"), function() {
-					frappe.route_options = {
-						"Journal Entry Account.reference_type": me.frm.doc.doctype,
-						"Journal Entry Account.reference_name": me.frm.doc.name
-					};
-
-					frappe.set_route("List", "Journal Entry");
-				}, __("View"));
-			}
-		}
-	},
-
 	barcode: function(doc, cdt, cdn) {
 		var d = locals[cdt][cdn];
 		if(d.barcode=="" || d.barcode==null) {
 			// barcode cleared, remove item
 			d.item_code = "";
 		}
-		this.item_code(doc, cdt, cdn);
+		this.item_code(doc, cdt, cdn, true);
 	},
 
-	item_code: function(doc, cdt, cdn) {
+	item_code: function(doc, cdt, cdn, from_barcode) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);
+
+		// clear barcode if setting item (else barcode will take priority)
+		if(!from_barcode) {
+			item.barcode = null;
+		}
 		if(item.item_code || item.barcode || item.serial_no) {
 			if(!this.validate_company_and_party()) {
 				cur_frm.fields_dict["items"].grid.grid_rows[item.idx - 1].remove();
@@ -308,8 +372,8 @@
 
 		if (this.frm.doc.posting_date) var date = this.frm.doc.posting_date;
 		else var date = this.frm.doc.transaction_date;
-		
-		if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") && 
+
+		if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
 			in_list(['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'], this.frm.doctype)){
 				erpnext.utils.get_shipping_address(this.frm, function(){
 					set_party_account(set_pricing);
@@ -368,7 +432,8 @@
 
 		var company_currency = this.get_company_currency();
 		// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
-		if(this.frm.doc.currency !== company_currency && !this.frm.doc.ignore_pricing_rule) {
+		if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
+				&& !this.frm.doc.ignore_pricing_rule) {
 			this.get_exchange_rate(this.frm.doc.currency, company_currency,
 				function(exchange_rate) {
 					me.frm.set_value("conversion_rate", exchange_rate);
@@ -449,10 +514,15 @@
 		this.frm.toggle_reqd("plc_conversion_rate",
 			!!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
 
-		var company_currency = this.get_company_currency();
-		this.change_form_labels(company_currency);
-		this.change_grid_labels(company_currency);
-		this.frm.refresh_fields();
+		if(this.frm.doc_currency!==this.frm.doc.currency) {
+			// reset names only when the currency is different
+
+			var company_currency = this.get_company_currency();
+			this.change_form_labels(company_currency);
+			this.change_grid_labels(company_currency);
+			this.frm.refresh_fields();
+			this.frm.doc_currency = this.frm.doc.currency;
+		}
 	},
 
 	change_form_labels: function(company_currency) {
@@ -471,7 +541,7 @@
 		setup_field_label_map(["base_total", "base_net_total", "base_total_taxes_and_charges",
 			"base_discount_amount", "base_grand_total", "base_rounded_total", "base_in_words",
 			"base_taxes_and_charges_added", "base_taxes_and_charges_deducted", "total_amount_to_pay",
-			"base_paid_amount", "base_write_off_amount"
+			"base_paid_amount", "base_write_off_amount", "base_change_amount"
 		], company_currency);
 
 		setup_field_label_map(["total", "net_total", "total_taxes_and_charges", "discount_amount",
@@ -651,6 +721,12 @@
 					"parenttype": d.parenttype,
 					"parent": d.parent
 				});
+
+				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
+				if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), d.doctype){
+					item_list[0]["margin_type"] = d.margin_type
+					item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount
+				}
 			}
 		};
 
@@ -853,7 +929,7 @@
 			if(!this.frm.doc.recurring_id) {
 				this.frm.set_value('recurring_id', this.frm.doc.name);
 			}
-			
+
 			var owner_email = this.frm.doc.owner=="Administrator"
 				? frappe.user_info("Administrator").email
 				: this.frm.doc.owner;
@@ -881,89 +957,47 @@
 			}
 		}
 	},
-	
+
 	set_gross_profit: function(item) {
 		if (this.frm.doc.doctype == "Sales Order" && item.valuation_rate) {
 			rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
 			item.gross_profit = flt(((rate - item.valuation_rate) * item.qty), precision("amount", item));
 		}
-	}
-});
+	},
 
-frappe.ui.form.on(cur_frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
-	var item = frappe.get_doc(cdt, cdn);
-	frappe.model.round_floats_in(item, ["rate", "price_list_rate"]);
+	setup_item_selector: function() {
+		// TODO: remove item selector
 
-	if(item.price_list_rate) {
-		item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0, precision("discount_percentage", item));
-	} else {
-		item.discount_percentage = 0.0;
-	}
-	
-	cur_frm.cscript.set_gross_profit(item);
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
-
-frappe.ui.form.on(cur_frm.cscript.tax_table, "rate", function(frm, cdt, cdn) {
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
-
-frappe.ui.form.on(cur_frm.cscript.tax_table, "tax_amount", function(frm, cdt, cdn) {
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
-
-frappe.ui.form.on(cur_frm.cscript.tax_table, "row_id", function(frm, cdt, cdn) {
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
-
-frappe.ui.form.on(cur_frm.cscript.tax_table, "included_in_print_rate", function(frm, cdt, cdn) {
-	cur_frm.cscript.set_dynamic_labels();
-	cur_frm.cscript.calculate_taxes_and_totals();
-})
-
-frappe.ui.form.on(cur_frm.doctype, "apply_discount_on", function(frm) {
-	if(frm.doc.additional_discount_percentage) {
-		frm.trigger("additional_discount_percentage");
-	} else {
-		cur_frm.cscript.calculate_taxes_and_totals();
-	}
-})
-
-frappe.ui.form.on(cur_frm.doctype, "additional_discount_percentage", function(frm) {
-	if (frm.via_discount_amount) {
 		return;
+		if(!this.item_selector) {
+			this.item_selector = new erpnext.ItemSelector({frm: this.frm});
+		}
+	},
+
+	get_advances: function() {
+		if(!this.frm.is_return) {
+			return this.frm.call({
+				method: "set_advances",
+				doc: this.frm.doc,
+				callback: function(r, rt) {
+					refresh_field("advances");
+				}
+			})
+		}
+	},
+
+	make_payment_entry: function() {
+		return frappe.call({
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
+			args: {
+				"dt": cur_frm.doc.doctype,
+				"dn": cur_frm.doc.name
+			},
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+				// cur_frm.refresh_fields()
+			}
+		});
 	}
-
-	if(!frm.doc.apply_discount_on) {
-		frappe.msgprint(__("Please set 'Apply Additional Discount On'"));
-		return
-	}
-
-	frm.via_discount_percentage = true;
-
-	if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
-		// Reset discount amount and net / grand total
-		frm.set_value("discount_amount", 0);
-	}
-
-	var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]);
-	var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
-		precision("discount_amount"));
-
-	frm.set_value("discount_amount", discount_amount);
-	delete frm.via_discount_percentage;
-});
-
-frappe.ui.form.on(cur_frm.doctype, "discount_amount", function(frm) {
-	frm.cscript.set_dynamic_labels();
-
-	if (!frm.via_discount_percentage) {
-		frm.via_discount_amount = true;
-		frm.set_value("additional_discount_percentage", 0);
-		delete frm.via_discount_amount;
-	}
-
-	frm.cscript.calculate_taxes_and_totals();
-});
-
-
+});
\ No newline at end of file
diff --git a/erpnext/public/js/feature_setup.js b/erpnext/public/js/feature_setup.js
deleted file mode 100644
index 6dfc962..0000000
--- a/erpnext/public/js/feature_setup.js
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-/* features setup "Dictionary", "Script"
-Dictionary Format
-	'projects': {
-		'Sales Order': {
-			'fields':['project'],
-			'items':['projected_qty']
-		},
-		'Purchase Order': {
-			'fields':['project']
-		}
-	}
-// ====================================================================*/
-frappe.provide("erpnext.feature_setup");
-erpnext.feature_setup.feature_dict = {
-	'fs_projects': {
-		'BOM': {'fields':['project']},
-		'Delivery Note': {'fields':['project']},
-		'Purchase Invoice': {'items':['project']},
-		'Production Order': {'fields':['project']},
-		'Purchase Order': {'items':['project']},
-		'Purchase Receipt': {'items':['project']},
-		'Sales Invoice': {'fields':['project']},
-		'Sales Order': {'fields':['project']},
-		'Stock Entry': {'fields':['project']},
-		'Timesheet': {'timesheet_details':['project']}
-	},
-	'fs_discounts': {
-		'Delivery Note': {'items':['discount_percentage']},
-		'Quotation': {'items':['discount_percentage']},
-		'Sales Invoice': {'items':['discount_percentage']},
-		'Sales Order': {'items':['discount_percentage','price_list_rate']}
-	},
-	'fs_purchase_discounts': {
-		'Purchase Order': {'items':['base_price_list_rate', 'discount_percentage', 'price_list_rate']},
-		'Purchase Receipt': {'items':['base_price_list_rate', 'discount_percentage', 'price_list_rate']},
-		'Purchase Invoice': {'items':['base_price_list_rate', 'discount_percentage', 'price_list_rate']}
-	},
-	'fs_brands': {
-		'Delivery Note': {'items':['brand']},
-		'Material Request': {'items':['brand']},
-		'Item': {'fields':['brand']},
-		'Purchase Order': {'items':['brand']},
-		'Purchase Invoice': {'items':['brand']},
-		'Quotation': {'items':['brand']},
-		'Sales Invoice': {'items':['brand']},
-		'Product Bundle': {'fields':['new_item_brand']},
-		'Sales Order': {'items':['brand']},
-		'Serial No': {'fields':['brand']}
-	},
-	'fs_after_sales_installations': {
-		'Delivery Note': {'fields':['installation_status','per_installed'],'items':['installed_qty']}
-	},
-	'fs_item_batch_nos': {
-		'Delivery Note': {'items':['batch_no']},
-		'Item': {'fields':['has_batch_no']},
-		'Purchase Receipt': {'items':['batch_no']},
-		'Quality Inspection': {'fields':['batch_no']},
-		'Sales and Pruchase Return Wizard': {'return_details':['batch_no']},
-		'Sales Invoice': {'items':['batch_no']},
-		'Stock Entry': {'items':['batch_no']},
-		'Stock Ledger Entry': {'fields':['batch_no']}
-	},
-	'fs_item_serial_nos': {
-		'Warranty Claim': {'fields':['serial_no']},
-		'Delivery Note': {'items':['serial_no'],'packed_items':['serial_no']},
-		'Installation Note': {'items':['serial_no']},
-		'Item': {'fields':['has_serial_no']},
-		'Maintenance Schedule': {'items':['serial_no'],'schedules':['serial_no']},
-		'Maintenance Visit': {'purposes':['serial_no']},
-		'Purchase Receipt': {'items':['serial_no']},
-		'Quality Inspection': {'fields':['item_serial_no']},
-		'Sales and Pruchase Return Wizard': {'return_details':['serial_no']},
-		'Sales Invoice': {'items':['serial_no']},
-		'Stock Entry': {'items':['serial_no']},
-		'Stock Ledger Entry': {'fields':['serial_no']}
-	},
-	'fs_item_barcode': {
-		'Item': {'fields': ['barcode']},
-		'Delivery Note': {'items': ['barcode']},
-		'Sales Invoice': {'items': ['barcode']},
-		'Stock Entry': {'items': ['barcode']},
-		'Purchase Receipt': {'items': ['barcode']}
-	},
-	'fs_item_group_in_details': {
-		'Delivery Note': {'items':['item_group']},
-		'Opportunity': {'items':['item_group']},
-		'Material Request': {'items':['item_group']},
-		'Item': {'fields':['item_group']},
-		'Global Defaults': {'fields':['default_item_group']},
-		'Purchase Order': {'items':['item_group']},
-		'Purchase Receipt': {'items':['item_group']},
-		'Purchase Voucher': {'items':['item_group']},
-		'Quotation': {'items':['item_group']},
-		'Sales Invoice': {'items':['item_group']},
-		'Product Bundle': {'fields':['serial_no']},
-		'Sales Order': {'items':['item_group']},
-		'Serial No': {'fields':['item_group']},
-		'Sales Partner': {'targets':['item_group']},
-		'Sales Person': {'targets':['item_group']},
-		'Territory': {'targets':['item_group']}
-	},
-	'fs_page_break': {
-		'Delivery Note': {'items':['page_break'],'packed_items':['page_break']},
-		'Material Request': {'items':['page_break']},
-		'Purchase Order': {'items':['page_break']},
-		'Purchase Receipt': {'items':['page_break']},
-		'Purchase Voucher': {'items':['page_break']},
-		'Quotation': {'items':['page_break']},
-		'Sales Invoice': {'items':['page_break']},
-		'Sales Order': {'items':['page_break']}
-	},
-	'fs_exports': {
-		'Delivery Note': {
-			'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
-				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'POS Profile': {'fields':['conversion_rate','currency']},
-		'Quotation': {
-			'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
-				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'Sales Invoice': {
-			'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
-				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'Product Bundle': {'fields':['currency']},
-		'Sales Order': {
-			'fields': ['conversion_rate','currency','base_grand_total','base_in_words','base_rounded_total',
-				'base_total', 'base_net_total', 'base_discount_amount', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		}
-	},
-
-	'fs_imports': {
-		'Purchase Invoice': {
-			'fields': ['conversion_rate', 'currency', 'base_grand_total', 'base_discount_amount',
-		 		'base_in_words', 'base_total', 'base_net_total', 'base_taxes_and_charges_added',
-		 		'base_taxes_and_charges_deducted', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate', 'base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'Purchase Order': {
-			'fields': ['conversion_rate','currency', 'base_grand_total', 'base_discount_amount',
-				'base_in_words', 'base_total', 'base_net_total', 'base_taxes_and_charges_added',
-			 	'base_taxes_and_charges_deducted', 'base_total_taxes_and_charges'],
-			'items': ['base_price_list_rate', 'base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'Purchase Receipt': {
-			'fields': ['conversion_rate', 'currency','base_grand_total', 'base_in_words', 'base_total',
-			 	'base_net_total', 'base_taxes_and_charges_added', 'base_taxes_and_charges_deducted',
-				'base_total_taxes_and_charges', 'base_discount_amount'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		},
-		'Supplier Quotation': {
-			'fields': ['conversion_rate', 'currency','base_grand_total', 'base_in_words', 'base_total',
-			 	'base_net_total', 'base_taxes_and_charges_added', 'base_taxes_and_charges_deducted',
-				'base_total_taxes_and_charges', 'base_discount_amount'],
-			'items': ['base_price_list_rate','base_amount','base_rate', 'base_net_rate', 'base_net_amount']
-		}
-	},
-
-	'fs_item_advanced': {
-		'Item': {'fields':['customer_items']}
-	},
-	'fs_sales_extras': {
-		'Address': {'fields':['sales_partner']},
-		'Contact': {'fields':['sales_partner']},
-		'Customer': {'fields':['sales_team']},
-		'Delivery Note': {'fields':['sales_team']},
-		'Item': {'fields':['customer_items']},
-		'Sales Invoice': {'fields':['sales_team']},
-		'Sales Order': {'fields':['sales_team']}
-	},
-	'fs_more_info': {
-		"Warranty Claim": {"fields": ["more_info"]},
-		'Material Request': {'fields':['more_info']},
-		'Lead': {'fields':['more_info']},
-		'Opportunity': {'fields':['more_info']},
-		'Purchase Invoice': {'fields':['more_info']},
-		'Purchase Order': {'fields':['more_info']},
-		'Purchase Receipt': {'fields':['more_info']},
-		'Supplier Quotation': {'fields':['more_info']},
-		'Quotation': {'fields':['more_info']},
-		'Sales Invoice': {'fields':['more_info']},
-		'Sales Order': {'fields':['more_info']},
-		'Delivery Note': {'fields':['more_info']},
-	},
-	'fs_quality': {
-		'Item': {'fields':['inspection_criteria','inspection_required']},
-		'Purchase Receipt': {'items':['qa_no']}
-	},
-	'fs_manufacturing': {
-		'Item': {'fields':['manufacturing']}
-	},
-	'fs_pos': {
-		'Sales Invoice': {'fields':['is_pos']}
-	},
-	'fs_recurring_invoice': {
-		'Sales Invoice': {'fields': ['recurring_invoice']}
-	}
-}
-
-$(document).bind('form_refresh', function() {
-	var feature_dict = erpnext.feature_setup.feature_dict;
-	for(var sys_feat in sys_defaults) {
-		if(sys_defaults[sys_feat]=='0'
-			&& (sys_feat in feature_dict)) { //"Features to hide" exists
-			if(cur_frm.doc.doctype in feature_dict[sys_feat]) {
-				for(var fort in feature_dict[sys_feat][cur_frm.doc.doctype]) {
-					if(fort=='fields') {
-						hide_field(feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
-					} else if(cur_frm.fields_dict[fort]) {
-						cur_frm.fields_dict[fort].grid.set_column_disp(feature_dict[sys_feat][cur_frm.doc.doctype][fort], false);
-					} else {
-						msgprint(__('Grid "')+fort+__('" does not exists'));
-					}
-				}
-			}
-
-		}
-	}
-})
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 557a392..c1e53a2 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -28,7 +28,7 @@
 				{ "value": "Half-Yearly", "label": __("Half-Yearly") },
 				{ "value": "Yearly", "label": __("Yearly") }
 			],
-			"default": "Yearly",
+			"default": "Monthly",
 			"reqd": 1
 		}
 	],
@@ -68,5 +68,20 @@
 	"tree": true,
 	"name_field": "account",
 	"parent_field": "parent_account",
-	"initial_depth": 3
+	"initial_depth": 3,
+	onload: function(report) {
+		// dropdown for links to other financial statements
+		report.page.add_inner_button(__("Balance Sheet"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Balance Sheet', {company: filters.company});
+		}, 'Financial Statements');
+		report.page.add_inner_button(__("Profit and Loss"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Profit and Loss Statement', {company: filters.company});
+		}, 'Financial Statements');
+		report.page.add_inner_button(__("Cash Flow Statement"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Cash Flow', {company: filters.company});
+		}, 'Financial Statements');
+	}
 };
diff --git a/erpnext/public/js/payment/payment_details.html b/erpnext/public/js/payment/payment_details.html
new file mode 100644
index 0000000..18f9d03
--- /dev/null
+++ b/erpnext/public/js/payment/payment_details.html
@@ -0,0 +1,11 @@
+<div class="row pos-payment-row" type="{{type}}" idx={{idx}}>
+    <div class="col-xs-6">{{mode_of_payment}}</div>
+	<div class="col-xs-6">
+		<div class="input-group">
+			<input disabled class="form-control text-right amount" idx="{{idx}}" type="text" value="{{format_number(amount, 2)}}">
+			<span class="input-group-btn">
+				<button type="button" class="btn btn-default clr" idx="{{idx}}" style="border:1px solid #d1d8dd">C</button>
+			</span>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
new file mode 100644
index 0000000..90766e9
--- /dev/null
+++ b/erpnext/public/js/payment/payments.js
@@ -0,0 +1,166 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+erpnext.payments = erpnext.stock.StockController.extend({
+	make_payment: function() {
+		var me = this;
+
+		this.dialog = new frappe.ui.Dialog({
+			title: 'Payment'
+		});
+	
+		this.dialog.show();
+		this.$body = this.dialog.body;
+		this.dialog.$wrapper.find('.modal-dialog').css("width", "750px");
+		this.set_payment_primary_action();
+		this.make_keyboard();
+	},
+
+	set_payment_primary_action: function(){
+		var me = this;
+	
+		this.dialog.set_primary_action(__("Submit"), function() {
+			me.dialog.hide()
+			me.write_off_amount()
+		})
+	},
+
+	make_keyboard: function(){
+		var me = this;
+		$(this.$body).empty();
+		$(this.$body).html(frappe.render_template('pos_payment', this.frm.doc))
+		this.show_payment_details();
+		this.bind_keyboard_event()
+		this.clear_amount()
+	},
+
+	make_multimode_payment: function(){
+		var me = this;
+
+		if(this.frm.doc.change_amount > 0){
+			me.payment_val = me.doc.outstanding_amount
+		}
+
+		this.payments = frappe.model.add_child(this.frm.doc, 'Multi Mode Payment', "payments");
+		this.payments.mode_of_payment = this.dialog.fields_dict.mode_of_payment.get_value();
+		this.payments.amount = flt(this.payment_val);
+	},
+
+	show_payment_details: function(){
+		var me = this;
+		multimode_payments = $(this.$body).find('.multimode-payments').empty();
+		if(this.frm.doc.payments.length){
+			$.each(this.frm.doc.payments, function(index, data){
+				$(frappe.render_template('payment_details', {
+					mode_of_payment: data.mode_of_payment,
+					amount: data.amount,
+					idx: data.idx,
+					currency: me.frm.doc.currency,
+					type: data.type
+				})).appendTo(multimode_payments)
+			})
+		}else{
+			$("<p>No payment mode selected in pos profile</p>").appendTo(multimode_payments)
+		}
+	},
+
+	set_outstanding_amount: function(){
+		this.selected_mode = $(this.$body).find(repl("input[idx='%(idx)s']",{'idx': this.idx}));
+		this.highlight_selected_row()
+		this.payment_val = 0.0
+		if(this.frm.doc.outstanding_amount > 0 && flt(this.selected_mode.val()) == 0.0){
+			//When user first time click on row
+			this.payment_val = flt(this.frm.doc.outstanding_amount)
+			this.selected_mode.val(format_number(this.payment_val, 2));
+			this.update_paid_amount()
+		}else if(flt(this.selected_mode.val()) > 0){
+			//If user click on existing row which has value
+			this.payment_val = flt(this.selected_mode.val());
+		}
+		this.selected_mode.select()
+		this.bind_amount_change_event();
+	},
+	
+	bind_keyboard_event: function(){
+		var me = this;
+		this.payment_val = '';
+		this.bind_payment_mode_keys_event();
+		this.bind_keyboard_keys_event();
+	},
+
+	bind_payment_mode_keys_event: function(){
+		var me = this;
+		$(this.$body).find('.pos-payment-row').click(function(){
+			me.idx = $(this).attr("idx");
+			me.set_outstanding_amount()
+		})
+	},
+
+	highlight_selected_row: function(){
+		var me = this;
+		selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']",{'idx': this.idx}));
+		$(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode')
+		selected_row.addClass('selected-payment-mode')
+		$(this.$body).find('.amount').attr('disabled', true);
+		this.selected_mode.attr('disabled', false);
+	},
+	
+	bind_keyboard_keys_event: function(){
+		var me = this;
+		$(this.$body).find('.pos-keyboard-key').click(function(){
+			me.payment_val += $(this).text();
+			me.selected_mode.val(format_number(me.payment_val, 2))
+			me.idx = me.selected_mode.attr("idx")
+			me.update_paid_amount()
+		})
+		
+		$(this.$body).find('.delete-btn').click(function(){
+			me.payment_val =  cstr(flt(me.selected_mode.val())).slice(0, -1);
+			me.selected_mode.val(format_number(me.payment_val, 2));
+			me.idx = me.selected_mode.attr("idx")
+			me.update_paid_amount();
+		})
+
+	},
+	
+	bind_amount_change_event: function(){
+		var me = this;
+		me.selected_mode.change(function(){
+			me.payment_val =  flt($(this).val()) || 0.0;
+			me.selected_mode.val(format_number(me.payment_val, 2))
+			me.idx = me.selected_mode.attr("idx")
+			me.update_paid_amount()
+		})
+	},
+
+	clear_amount: function(){
+		var me = this;
+		$(this.$body).find('.clr').click(function(e){
+			e.stopPropagation();
+			me.idx = $(this).attr("idx");
+			me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']",{'idx': me.idx}));
+			me.payment_val = 0.0;
+			me.selected_mode.val(0.0);
+			me.update_paid_amount();
+		})
+	},
+
+	update_paid_amount: function(){
+		var me = this;
+		$.each(this.frm.doc.payments, function(index, data){
+			if(cint(me.idx) == cint(data.idx)){
+				data.amount = flt(me.selected_mode.val(), 2)
+			}
+		})
+		this.calculate_outstanding_amount(false);
+		this.show_amounts();
+	},
+	
+	show_amounts: function(){
+		var me = this;
+		$(this.$body).find('.paid_amount').text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency));
+		$(this.$body).find('.change_amount').text(format_currency(this.frm.doc.change_amount, this.frm.doc.currency))
+		$(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, this.frm.doc.currency))
+		this.update_invoice();
+	}
+})
\ No newline at end of file
diff --git a/erpnext/public/js/payment/pos_payment.html b/erpnext/public/js/payment/pos_payment.html
new file mode 100644
index 0000000..223850c
--- /dev/null
+++ b/erpnext/public/js/payment/pos_payment.html
@@ -0,0 +1,40 @@
+<div class="pos_payment row">
+    	<div class="col-sm-6">
+			<div class="row">
+				<div class="col-xs-6 text-center"> 
+					<p class="amount-label"> Total <h3>{%= format_currency(grand_total, currency) %} </h3></p>
+				</div>
+				<div class="col-xs-6 text-center"> 
+					<p class="amount-label"> Paid <h3 class="paid_amount">{%= format_currency(paid_amount, currency) %}</h3></p>
+				</div>              
+			</div>
+				<hr>
+			<div class="multimode-payments">
+    		</div>
+    	</div>
+    	<div class="col-sm-6">
+            <div class="row">
+				<div class="col-xs-6 text-center"> 
+					<p class="amount-label"> Outstanding <h3 class="outstanding_amount">{%= format_currency(outstanding_amount, currency) %} </h3></p>
+				</div>
+				<div class="col-xs-6 text-center"> 
+					<p class="amount-label"> Change <h3 class="change_amount">{%= format_currency(change_amount, currency) %}</h3></p>
+				</div>              
+            </div>
+			<hr>
+            <div class="payment-toolbar">
+				{% for(var i=0; i<3; i++) { %}
+					<div class="row">
+						{% for(var j=i*3; j<(i+1)*3; j++) { %}
+							<button type="button"  class="btn btn-default pos-keyboard-key">{{j+1}}</button>
+						{% } %}
+					</div>
+				{% } %}   
+				<div class="row">
+					<button type="button"  class="btn btn-default delete-btn">Del</button>
+					<button type="button"  class="btn btn-default pos-keyboard-key">0</button>
+					<button type="button"  class="btn btn-default pos-keyboard-key">.</button>
+				</div>
+            </div>
+    	</div>
+</div>
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index d12b9b2..9d0ab60 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -24,22 +24,24 @@
 							<div class="tax-table small"></div>
 						</div>
                     </div>
-                    <div class="row pos-bill-row discount-amount-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount") %}</h6></div>
-						<div class="col-xs-3 discount-field-col">
-							<div class="input-group input-group-sm">
-								<span class="input-group-addon">%</span>
-								<input type="text" class="form-control discount-percentage text-right">
+					{% if (apply_discount_on) { %}
+	                    <div class="row pos-bill-row discount-amount-area">
+	                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount") %}</h6></div>
+							<div class="col-xs-3 discount-field-col">
+								<div class="input-group input-group-sm">
+									<span class="input-group-addon">%</span>
+									<input type="text" class="form-control discount-percentage text-right">
+								</div>
 							</div>
-						</div>
-                        <div class="col-xs-3 discount-field-col">
-							<div class="input-group input-group-sm">
-								<span class="input-group-addon">{%= get_currency_symbol(currency) %}</span>
-								<input type="text" class="form-control discount-amount text-right"
-							  		placeholder="{%= 0.00 %}">
+	                        <div class="col-xs-3 discount-field-col">
+								<div class="input-group input-group-sm">
+									<span class="input-group-addon">{%= get_currency_symbol(currency) %}</span>
+									<input type="text" class="form-control discount-amount text-right"
+								  		placeholder="{%= 0.00 %}">
+								</div>
 							</div>
-						</div>
-                    </div>
+	                    </div>
+					{% } %} 
                     <div class="row pos-bill-row grand-total-area">
                         <div class="col-xs-6"><h6>{%= __("Grand Total") %}</h6></div>
                         <div class="col-xs-6"><h6 class="grand-total text-right"></h6></div>
@@ -47,12 +49,16 @@
     			</div>
     		</div>
     	</div>
-    	<div class="col-sm-7 pos-item-area">
+    	<div class="col-sm-7 pos-items-section">
+			<div class="row pos-item-area">
+
+			</div>
+			<span id="customer-results" style="color:#68a;"></span>
             <div class="row pos-item-toolbar">
             	<div class="search-area col-xs-12"></div>
             </div>
     		<div class="item-list-area">
-				<div class="item-list"></div>
+				<div class="app-listing item-list"></ul>
     		</div>
     	</div>
     </div>
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
deleted file mode 100644
index 4e3898f..0000000
--- a/erpnext/public/js/pos/pos.js
+++ /dev/null
@@ -1,581 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.provide("erpnext.pos");
-
-erpnext.pos.PointOfSale = Class.extend({
-	init: function(wrapper, frm) {
-		this.wrapper = wrapper;
-		this.frm = frm;
-		this.wrapper.html(frappe.render_template("pos", {currency: this.frm.currency}));
-
-		this.check_transaction_type();
-		this.make();
-
-		var me = this;
-		$(this.frm.wrapper).on("refresh-fields", function() {
-			me.refresh();
-		});
-
-		this.wrapper.find('input.discount-percentage').on("change", function() {
-			frappe.model.set_value(me.frm.doctype, me.frm.docname,
-				"additional_discount_percentage", flt(this.value));
-		});
-
-		this.wrapper.find('input.discount-amount').on("change", function() {
-			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", flt(this.value));
-		});
-	},
-	check_transaction_type: function() {
-		var me = this;
-
-		// Check whether the transaction is "Sales" or "Purchase"
-		if (frappe.meta.has_field(cur_frm.doc.doctype, "customer")) {
-			this.set_transaction_defaults("Customer");
-		}
-		else if (frappe.meta.has_field(cur_frm.doc.doctype, "supplier")) {
-			this.set_transaction_defaults("Supplier");
-		}
-	},
-	set_transaction_defaults: function(party) {
-		var me = this;
-		this.party = party;
-		this.price_list = (party == "Customer" ?
-			this.frm.doc.selling_price_list : this.frm.doc.buying_price_list);
-		this.price_list_field = (party == "Customer" ? "selling_price_list" : "buying_price_list");
-		this.sales_or_purchase = (party == "Customer" ? "Sales" : "Purchase");
-	},
-	make: function() {
-		this.make_party();
-		this.make_search();
-		this.make_item_list();
-	},
-	make_party: function() {
-		var me = this;
-		this.party_field = frappe.ui.form.make_control({
-			df: {
-				"fieldtype": "Link",
-				"options": this.party,
-				"label": this.party,
-				"fieldname": this.party.toLowerCase(),
-				"placeholder": this.party
-			},
-			parent: this.wrapper.find(".party-area"),
-			frm: this.frm,
-			doctype: this.frm.doctype,
-			docname: this.frm.docname,
-			only_input: true,
-		});
-		this.party_field.make_input();
-		this.party_field.$input.on("change", function() {
-			if(!me.party_field.autocomplete_open)
-				frappe.model.set_value(me.frm.doctype, me.frm.docname,
-					me.party.toLowerCase(), this.value);
-		});
-	},
-	make_search: function() {
-		var me = this;
-		this.search = frappe.ui.form.make_control({
-			df: {
-				"fieldtype": "Data",
-				"label": "Item",
-				"fieldname": "pos_item",
-				"placeholder": "Search Item"
-			},
-			parent: this.wrapper.find(".search-area"),
-			only_input: true,
-		});
-		this.search.make_input();
-		this.search.$input.on("keypress", function() {
-			if(!me.search.autocomplete_open)
-				if(me.item_timeout)
-					clearTimeout(me.item_timeout);
-				me.item_timeout = setTimeout(function() { me.make_item_list(); }, 1000);
-		});
-	},
-	make_item_list: function() {
-		var me = this;
-		if(!this.price_list) {
-			msgprint(__("Price List not found or disabled"));
-			return;
-		}
-
-		me.item_timeout = null;
-		frappe.call({
-			method: 'erpnext.accounts.doctype.sales_invoice.pos.get_items',
-			args: {
-				sales_or_purchase: this.sales_or_purchase,
-				price_list: this.price_list,
-				item: this.search.$input.val()
-			},
-			callback: function(r) {
-				var $wrap = me.wrapper.find(".item-list");
-				me.wrapper.find(".item-list").empty();
-				if (r.message) {
-					if (r.message.length === 1) {
-						var item = r.message[0];
-						if (item.serial_no) {
-							me.add_to_cart(item.item_code, item.serial_no);
-							me.search.$input.val("");
-							return;
-
-						} else if (item.barcode) {
-							me.add_to_cart(item.item_code);
-							me.search.$input.val("");
-							return;
-						}
-					}
-
-					$.each(r.message, function(index, obj) {
-						$(frappe.render_template("pos_item", {
-							item_code: obj.name,
-							item_price: format_currency(obj.price_list_rate, obj.currency),
-							item_name: obj.name===obj.item_name ? "" : obj.item_name,
-							item_image: obj.image ? "url('" + obj.image + "')" : null
-						})).tooltip().appendTo($wrap);
-					});
-				}
-
-				// if form is local then allow this function
-				$(me.wrapper).find("div.pos-item").on("click", function() {
-					if(me.frm.doc.docstatus==0) {
-						me.add_to_cart($(this).attr("data-item-code"));
-					}
-				});
-			}
-		});
-	},
-	add_to_cart: function(item_code, serial_no) {
-		var me = this;
-		var caught = false;
-
-		if(!me.frm.doc[me.party.toLowerCase()] && ((me.frm.doctype == "Quotation" &&
-				me.frm.doc.quotation_to == "Customer")
-				|| me.frm.doctype != "Quotation")) {
-			msgprint(__("Please select {0} first.", [me.party]));
-			return;
-		}
-
-		// get no_of_items
-		var no_of_items = me.wrapper.find(".pos-bill-item").length;
-
-		// check whether the item is already added
-		if (no_of_items != 0) {
-			$.each(this.frm.doc["items"] || [], function(i, d) {
-				if (d.item_code == item_code) {
-					caught = true;
-					if (serial_no)
-						frappe.model.set_value(d.doctype, d.name, "serial_no", d.serial_no + '\n' + serial_no);
-					else
-						frappe.model.set_value(d.doctype, d.name, "qty", d.qty + 1);
-				}
-			});
-		}
-
-		// if item not found then add new item
-		if (!caught)
-			this.add_new_item_to_grid(item_code, serial_no);
-
-		this.refresh();
-		this.refresh_search_box();
-	},
-	add_new_item_to_grid: function(item_code, serial_no) {
-		var me = this;
-
-		var child = frappe.model.add_child(me.frm.doc, this.frm.doctype + " Item", "items");
-		child.item_code = item_code;
-		child.qty = 1;
-
-		if (serial_no)
-			child.serial_no = serial_no;
-
-		this.frm.script_manager.trigger("item_code", child.doctype, child.name);
-		frappe.after_ajax(function() {
-			me.frm.script_manager.trigger("qty", child.doctype, child.name);
-		})
-	},
-	refresh_search_box: function() {
-		var me = this;
-
-		// Clear Item Box and remake item list
-		if (this.search.$input.val()) {
-			this.search.set_input("");
-			this.make_item_list();
-		}
-	},
-	update_qty: function(item_code, qty) {
-		var me = this;
-		$.each(this.frm.doc["items"] || [], function(i, d) {
-			if (d.item_code == item_code) {
-				if (qty == 0) {
-					frappe.model.clear_doc(d.doctype, d.name);
-					me.refresh_grid();
-				} else {
-					frappe.model.set_value(d.doctype, d.name, "qty", qty);
-				}
-			}
-		});
-		this.refresh();
-	},
-	refresh: function() {
-		var me = this;
-
-		this.refresh_item_list();
-		this.refresh_fields();
-
-		// if form is local then only run all these functions
-		if (this.frm.doc.docstatus===0) {
-			this.call_when_local();
-		}
-
-		this.disable_text_box_and_button();
-		this.set_primary_action();
-
-		// If quotation to is not Customer then remove party
-		if (this.frm.doctype == "Quotation" && this.frm.doc.quotation_to!="Customer") {
-			this.party_field.$input.prop("disabled", true);
-		}
-	},
-	refresh_fields: function() {
-		this.party_field.set_input(this.frm.doc[this.party.toLowerCase()]);
-		this.party_field.frm = this.frm;
-		this.party_field.doctype = this.frm.doctype;
-		this.party_field.docname = this.frm.docname;
-
-		this.wrapper.find('input.discount-percentage').val(this.frm.doc.additional_discount_percentage);
-		this.wrapper.find('input.discount-amount').val(this.frm.doc.discount_amount);
-
-		this.show_items_in_item_cart();
-		this.show_taxes();
-		this.set_totals();
-	},
-	refresh_item_list: function() {
-		var me = this;
-		// refresh item list on change of price list
-		if (this.frm.doc[this.price_list_field] != this.price_list) {
-			this.price_list = this.frm.doc[this.price_list_field];
-			this.make_item_list();
-		}
-	},
-	show_items_in_item_cart: function() {
-		var me = this;
-		var $items = this.wrapper.find(".items").empty();
-
-		$.each(this.frm.doc.items|| [], function(i, d) {
-			$(frappe.render_template("pos_bill_item", {
-				item_code: d.item_code,
-				item_name: (d.item_name===d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
-				qty: d.qty,
-				actual_qty: d.actual_qty,
-				projected_qty: d.projected_qty,
-				rate: format_currency(d.rate, me.frm.doc.currency),
-				amount: format_currency(d.amount, me.frm.doc.currency)
-			})).appendTo($items);
-		});
-
-		this.wrapper.find("input.pos-item-qty").on("focus", function() {
-			$(this).select();
-		});
-	},
-	show_taxes: function() {
-		var me = this;
-		var taxes = this.frm.doc["taxes"] || [];
-		$(this.wrapper)
-			.find(".tax-area").toggleClass("hide", (taxes && taxes.length) ? false : true)
-			.find(".tax-table").empty();
-
-		$.each(taxes, function(i, d) {
-			if (d.tax_amount) {
-				$(frappe.render_template("pos_tax_row", {
-					description: d.description,
-					tax_amount: format_currency(flt(d.tax_amount)/flt(me.frm.doc.conversion_rate),
-						me.frm.doc.currency)
-				})).appendTo(me.wrapper.find(".tax-table"));
-			}
-		});
-	},
-	set_totals: function() {
-		var me = this;
-		this.wrapper.find(".net-total").text(format_currency(me.frm.doc["net_total"], me.frm.doc.currency));
-		this.wrapper.find(".grand-total").text(format_currency(me.frm.doc.grand_total, me.frm.doc.currency));
-	},
-	call_when_local: function() {
-		var me = this;
-
-		// append quantity to the respective item after change from input box
-		$(this.wrapper).find("input.pos-item-qty").on("change", function() {
-			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
-			me.update_qty(item_code, $(this).val());
-		});
-
-		// increase/decrease qty on plus/minus button
-		$(this.wrapper).find(".pos-qty-btn").on("click", function() {
-			var $item = $(this).parents(".pos-bill-item:first");
-			me.increase_decrease_qty($item, $(this).attr("data-action"));
-		});
-
-		this.focus();
-	},
-	focus: function() {
-		if(this.frm.doc[this.party.toLowerCase()]) {
-			this.search.$input.focus();
-		} else {
-			if(!(this.frm.doctype == "Quotation" && this.frm.doc.quotation_to!="Customer"))
-				this.party_field.$input.focus();
-		}
-	},
-	increase_decrease_qty: function($item, operation) {
-		var item_code = $item.attr("data-item-code");
-		var item_qty = cint($item.find("input.pos-item-qty").val());
-
-		if (operation == "increase-qty")
-			this.update_qty(item_code, item_qty + 1);
-		else if (operation == "decrease-qty" && item_qty != 0)
-			this.update_qty(item_code, item_qty - 1);
-	},
-	disable_text_box_and_button: function() {
-		var me = this;
-		// if form is submitted & cancelled then disable all input box & buttons
-		$(this.wrapper)
-			.find(".pos-qty-btn")
-			.toggle(this.frm.doc.docstatus===0);
-
-		$(this.wrapper).find('input, button').prop("disabled", !(this.frm.doc.docstatus===0));
-
-		this.wrapper.find(".pos-item-area").toggleClass("hide", me.frm.doc.docstatus!==0);
-
-	},
-	set_primary_action: function() {
-		var me = this;
-		if (this.frm.page.current_view_name==="main") return;
-
-		if (this.frm.doctype == "Sales Invoice" && this.frm.doc.docstatus===0) {
-			if (!this.frm.doc.is_pos) {
-				this.frm.set_value("is_pos", 1);
-			}
-			this.frm.page.set_primary_action(__("Pay"), function() {
-				me.make_payment();
-			});
-		} else if (this.frm.doc.docstatus===1) {
-			this.frm.page.set_primary_action(__("New"), function() {
-				erpnext.open_as_pos = true;
-				new_doc(me.frm.doctype);
-			});
-		}
-	},
-	refresh_delete_btn: function() {
-		$(this.wrapper).find(".remove-items").toggle($(".item-cart .warning").length ? true : false);
-	},
-	remove_selected_items: function() {
-		var me = this;
-		var selected_items = [];
-		var no_of_items = $(this.wrapper).find("#cart tbody tr").length;
-		for(var x=0; x<=no_of_items - 1; x++) {
-			var row = $(this.wrapper).find("#cart tbody tr:eq(" + x + ")");
-			if(row.attr("data-selected") == "true") {
-				selected_items.push(row.attr("id"));
-			}
-		}
-
-		var child = this.frm.doc["items"] || [];
-
-		$.each(child, function(i, d) {
-			for (var i in selected_items) {
-				if (d.item_code == selected_items[i]) {
-					frappe.model.clear_doc(d.doctype, d.name);
-				}
-			}
-		});
-
-		this.refresh_grid();
-	},
-	refresh_grid: function() {
-		this.frm.dirty();
-		this.frm.fields_dict["items"].grid.refresh();
-		this.frm.script_manager.trigger("calculate_taxes_and_totals");
-		this.refresh();
-	},
-	with_modes_of_payment: function(callback) {
-		var me = this;
-		if(me.modes_of_payment) {
-			callback();
-		} else {
-			me.modes_of_payment = [];
-			$.ajax("/api/resource/Mode of Payment").success(function(data) {
-				$.each(data.data, function(i, d) { me.modes_of_payment.push(d.name); });
-				callback();
-			});
-		}
-	},
-	make_payment: function() {
-		var me = this;
-		var no_of_items = this.frm.doc.items.length;
-
-		if (no_of_items == 0)
-			msgprint(__("Payment cannot be made for empty cart"));
-		else {
-
-			this.with_modes_of_payment(function() {
-				// prefer cash payment!
-				var default_mode = me.frm.doc.mode_of_payment ? me.frm.doc.mode_of_payment :
-					me.modes_of_payment.indexOf(__("Cash"))!==-1 ? __("Cash") : undefined;
-
-				// show payment wizard
-				var dialog = new frappe.ui.Dialog({
-					width: 400,
-					title: 'Payment',
-					fields: [
-						{fieldtype:'Currency',
-							fieldname:'total_amount', label: __('Total Amount'),
-							"default": me.frm.doc.grand_total},
-						{fieldtype:'Select', fieldname:'mode_of_payment',
-							label: __('Mode of Payment'),
-							options: me.modes_of_payment.join('\n'), reqd: 1,
-							"default": default_mode},
-						{fieldtype:'Currency', fieldname:'paid_amount', label:__('Amount Paid'),
-							reqd:1, "default": me.frm.doc.grand_total,
-							change: function() {
-								var values = dialog.get_values();
-
-								var actual_change = flt(values.paid_amount - values.total_amount,
-									precision("paid_amount"));
-
-								if (actual_change > 0) {
-									var rounded_change =
-										round_based_on_smallest_currency_fraction(actual_change,
-											me.frm.doc.currency, precision("paid_amount"));
-								} else {
-									var rounded_change = 0;
-								}
-
-								dialog.set_value("change", rounded_change);
-								dialog.get_input("change").trigger("change");
-
-							}},
-						{fieldtype:'Currency', fieldname:'change', label: __('Change'),
-							"default": 0.0, hidden: 1, change: function() {
-								var values = dialog.get_values();
-								var write_off_amount = (flt(values.paid_amount) - flt(values.change)) - values.total_amount;
-								dialog.get_field("write_off_amount").toggle(write_off_amount);
-								dialog.set_value("write_off_amount", write_off_amount);
-							}
-						},
-						{fieldtype:'Currency', fieldname:'write_off_amount',
-							label: __('Write Off'), "default": 0.0, hidden: 1},
-					]
-				});
-				me.dialog = dialog;
-				dialog.show();
-
-				// make read only
-				dialog.get_input("total_amount").prop("disabled", true);
-				dialog.get_input("write_off_amount").prop("disabled", true);
-
-				// toggle amount paid and change
-				dialog.get_input("mode_of_payment").on("change", function() {
-					var is_cash = dialog.get_value("mode_of_payment") === __("Cash");
-					dialog.get_field("paid_amount").toggle(is_cash);
-					dialog.get_field("change").toggle(is_cash);
-
-					if (is_cash && !dialog.get_value("change")) {
-						// set to nearest 5
-						dialog.set_value("paid_amount", dialog.get_value("total_amount"));
-						dialog.get_input("paid_amount").trigger("change");
-					} else if (!is_cash) {
-						dialog.set_value("paid_amount", dialog.get_value("total_amount"));
-						dialog.set_value("change", 0);
-					}
-				}).trigger("change");
-
-				me.set_pay_button(dialog);
-			});
-		}
-	},
-	set_pay_button: function(dialog) {
-		var me = this;
-		dialog.set_primary_action(__("Pay"), function() {
-			var values = dialog.get_values();
-			var is_cash = values.mode_of_payment === __("Cash");
-			if (!is_cash) {
-				values.write_off_amount = values.change = 0.0;
-				values.paid_amount = values.total_amount;
-			}
-			me.frm.set_value("mode_of_payment", values.mode_of_payment);
-
-			var paid_amount = flt((flt(values.paid_amount) - flt(values.change)), precision("paid_amount"));
-			me.frm.set_value("paid_amount", paid_amount);
-
-			// specifying writeoff amount here itself, so as to avoid recursion issue
-			me.frm.set_value("write_off_amount", me.frm.doc.grand_total - paid_amount);
-			me.frm.set_value("outstanding_amount", 0);
-
-			me.frm.savesubmit(this);
-			dialog.hide();
-		})
-
-	}
-});
-
-erpnext.pos.make_pos_btn = function(frm) {
-	frm.page.add_menu_item(__("{0} View", [frm.page.current_view_name === "pos" ? "Form" : "Point-of-Sale"]), function() {
-		erpnext.pos.toggle(frm);
-	});
-
-	if(frm.pos_btn) return;
-
-	// Show POS button only if it is enabled from features setup
-	if (cint(sys_defaults.fs_pos_view)!==1 || frm.doctype==="Material Request") {
-		return;
-	}
-
-	if(!frm.pos_btn) {
-		frm.pos_btn = frm.page.add_action_icon("icon-th", function() {
-			erpnext.pos.toggle(frm);
-		});
-	}
-
-	if(erpnext.open_as_pos && frm.page.current_view_name !== "pos") {
-		erpnext.pos.toggle(frm, true);
-	}
-}
-
-erpnext.pos.toggle = function(frm, show) {
-	// Check whether it is Selling or Buying cycle
-	var price_list = frappe.meta.has_field(cur_frm.doc.doctype, "selling_price_list") ?
-		frm.doc.selling_price_list : frm.doc.buying_price_list;
-
-	if(show!==undefined) {
-		if((show===true && frm.page.current_view_name === "pos")
-			|| (show===false && frm.page.current_view_name === "main")) {
-			return;
-		}
-	}
-
-	if(frm.page.current_view_name!=="pos") {
-		// before switching, ask for pos name
-		if(!price_list) {
-			frappe.throw(__("Please select Price List"));
-		}
-
-		if(!frm.doc.company) {
-			frappe.throw(__("Please select Company"));
-		}
-	}
-
-	// make pos
-	if(!frm.pos) {
-		var wrapper = frm.page.add_view("pos", "<div>");
-		frm.pos = new erpnext.pos.PointOfSale(wrapper, frm);
-	}
-
-	// toggle view
-	frm.page.set_view(frm.page.current_view_name==="pos" ? "main" : "pos");
-
-	frm.toolbar.current_status = null;
-	frm.refresh();
-
-	// refresh
-	if(frm.page.current_view_name==="pos") {
-		frm.pos.refresh();
-	}
-}
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index c93c76c..c21e1d5 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -9,8 +9,7 @@
                 </div>
                 {% if(actual_qty != null) { %}
                 <div style="margin-top: 5px;" class="text-muted small text-right">
-                    <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
-                    <span title="{%= __("Projected") %}">({%= projected_qty || 0 %})<span>
+                    <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>                
                 </div>
                 {% } %}
             </div>
@@ -18,6 +17,7 @@
         </div>
     </div>
     <div class="col-xs-3 text-right">
-        <h6>{%= amount %}<div class="text-muted" style="margin-top: 5px;">{%= rate %}</div></h6>
+        <div class="text-muted" style="margin-top: 5px;"><input type="text" value="{%= rate %}" class="form-control input-sm pos-item-rate text-right"></div>
+		<p><h6>{%= amount %}</h6></p>
     </div>
 </div>
diff --git a/erpnext/public/js/pos/pos_invoice_list.html b/erpnext/public/js/pos/pos_invoice_list.html
new file mode 100644
index 0000000..c0b4764
--- /dev/null
+++ b/erpnext/public/js/pos/pos_invoice_list.html
@@ -0,0 +1,6 @@
+<div class="row list-row pos-invoice-list" invoice-name = "{{name}}">
+	<div class="col-xs-2">{%= sr %}</div>
+	<div class="col-xs-4">{%= customer %}</div>
+	<div class="col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
+	<div class="col-xs-4 text-right">{%= grand_total %}</div>
+</div>
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
index 1235db9..aec36a7 100644
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -1,9 +1,13 @@
-<div class="pos-item" data-item-code="{%= item_code %}" title="{%= item_name || item_code %}">
-	<div class="pos-item-image {% if (!item_image) { %} no-image {% } %}"
-		 style="{% if (item_image) { %} background-image: {%= item_image %} {% } %}">
+<div class="pos-item-wrapper col-xs-3">
+	<div class="pos-item" data-item-code="{%= item_code %}" title="{%= item_name || item_code %}">
+		<div class="pos-item-image"
+			 style="{% if (item_image) { %} background-image: {{ item_image }} {% }
+			 	else { %} background-color: {{ color }} {% } %}">
+			{% if (!item_image) { %}{{ abbr }}{% } %}
+		</div>
+		<div class="pos-item-text">
+			<h6 class="item-code text-ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
+			<div class="small text-ellipsis">{%= item_price %}</div>
+		</div>
 	</div>
-	<div class="pos-item-text">
-		<h6 class="item-code text-ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
-		<div class="small text-ellipsis">{%= item_price %}</div>
-	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index 12307fb..7c4bf0f 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -62,7 +62,7 @@
 	},
 
 	not_a_group_filter: function() {
-		return { filters: { is_group: "No" } };
+		return { filters: { is_group: 0 } };
 	},
 
 	employee: function() {
@@ -71,7 +71,11 @@
 
 	warehouse: function(doc) {
 		return {
-			filters: [["Warehouse", "company", "in", ["", cstr(doc.company)]]]
+			filters: [
+				["Warehouse", "company", "in", ["", cstr(doc.company)]],
+				["Warehouse", "is_group", "=",0]
+				
+			]
 		}
 	}
 });
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 2eb73a3..55d3296 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -9,27 +9,49 @@
 
 function load_erpnext_slides() {
 	$.extend(erpnext.wiz, {
-		org: {
-			app_name: "erpnext",
-			title: __("The Organization"),
-			icon: "icon-building",
+		select_domain: {
+			domains: ["all"],
+			title: __('Select your Domain'),
 			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:'domain', label: __('Domain'), fieldtype:'Select',
 					options: [
 						{"label": __("Distribution"), "value": "Distribution"},
+						{"label": __("Education"), "value": "Education"},
 						{"label": __("Manufacturing"), "value": "Manufacturing"},
 						{"label": __("Retail"), "value": "Retail"},
-						{"label": __("Services"), "value": "Services"},
-						{"label": __("Other"), "value": "Other"},
+						{"label": __("Services"), "value": "Services"}
 					], reqd:1},
+			],
+			help: __('Select the nature of your business.'),
+			onload: function(slide) {
+				slide.get_input("domain").on("change", function() {
+					frappe.wiz.domain = $(this).val();
+					frappe.wizard.refresh_slides();
+				});
+			},
+			css_class: "single-column"
+		},
+		org: {
+			domains: ["all"],
+			title: __("The Organization"),
+			icon: "icon-building",
+			fields: [
+				{fieldname:'company_name',
+					label: frappe.wiz.domain==='Education' ?
+					 	__('Institute Name') : __('Company Name'),
+					fieldtype:'Data', reqd:1},
+				{fieldname:'company_abbr',
+					label: frappe.wiz.domain==='Education' ?
+					 	__('Institute Abbreviation') : __('Company Abbreviation'),
+					fieldtype:'Data'},
+				{fieldname:'company_tagline',
+					label: __('What does it do?'),
+					fieldtype:'Data',
+					placeholder: frappe.wiz.domain==='Education' ?
+					 	__('e.g. "Primary School" or "University"') :
+						__('e.g. "Build tools for builders"'),
+					reqd:1},
+				{fieldname:'bank_account', label: __('Bank Name'), fieldtype:'Data', reqd:1},
 				{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
 					options: "", fieldtype: 'Select'},
 
@@ -40,7 +62,9 @@
 				{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.'),
+			help: (frappe.wiz.domain==='Education' ?
+				__('The name of the institute for which you are setting up this system.'):
+				__('The name of your company for which you are setting up this system.')),
 
 			onload: function(slide) {
 				erpnext.wiz.org.load_chart_of_accounts(slide);
@@ -66,7 +90,7 @@
 			css_class: "single-column",
 
 			set_fy_dates: function(slide) {
-				var country = slide.wiz.get_values().country;
+				var country = frappe.wizard.values.country;
 
 				if(country) {
 					var fy = erpnext.wiz.fiscal_years[country];
@@ -84,7 +108,7 @@
 			},
 
 			load_chart_of_accounts: function(slide) {
-				var country = slide.wiz.get_values().country;
+				var country = frappe.wizard.values.country;
 
 				if(country) {
 					frappe.call({
@@ -133,7 +157,7 @@
 		},
 
 		branding: {
-			app_name: "erpnext",
+			domains: ["all"],
 			icon: "icon-bookmark",
 			title: __("The Brand"),
 			help: __('Upload your letter head and logo. (you can edit them later).'),
@@ -155,7 +179,7 @@
 		},
 
 		users: {
-			app_name: "erpnext",
+			domains: ["all"],
 			icon: "icon-money",
 			title: __("Add Users"),
 			help: __("Add users to your organization, other than yourself"),
@@ -172,11 +196,14 @@
 							options: "Email"},
 						{fieldtype:"Column Break"},
 						{fieldtype: "Check", fieldname: "user_sales_" + i,
-							label:__("Sales"), default: 1},
+							label:__("Sales"), "default": 1,
+							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
 						{fieldtype: "Check", fieldname: "user_purchaser_" + i,
-							label:__("Purchaser"), default: 1},
+							label:__("Purchaser"), "default": 1,
+							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
 						{fieldtype: "Check", fieldname: "user_accountant_" + i,
-							label:__("Accountant"), default: 1},
+							label:__("Accountant"), "default": 1,
+							hidden: frappe.wiz.domain==='Education' ? 1 : 0},
 					]);
 				}
 			},
@@ -184,7 +211,7 @@
 		},
 
 		taxes: {
-			app_name: "erpnext",
+			domains: ['manufacturing', 'services', 'retail', 'distribution'],
 			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."),
@@ -205,7 +232,7 @@
 		},
 
 		customers: {
-			app_name: "erpnext",
+			domains: ['manufacturing', 'services', 'retail', 'distribution'],
 			icon: "icon-group",
 			title: __("Your Customers"),
 			help: __("List a few of your customers. They could be organizations or individuals."),
@@ -228,7 +255,7 @@
 		},
 
 		suppliers: {
-			app_name: "erpnext",
+			domains: ['manufacturing', 'services', 'retail', 'distribution'],
 			icon: "icon-group",
 			title: __("Your Suppliers"),
 			help: __("List a few of your suppliers. They could be organizations or individuals."),
@@ -251,7 +278,7 @@
 		},
 
 		items: {
-			app_name: "erpnext",
+			domains: ['manufacturing', 'services', 'retail', 'distribution'],
 			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."),
@@ -269,7 +296,7 @@
 							"default": __("Products")},
 						{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
 							options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
-								__("Hour"), __("Minute")],
+								__("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")],
 							"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")},
@@ -287,6 +314,81 @@
 			},
 			css_class: "two-column"
 		},
+
+		program: {
+			domains: ["education"],
+			title: __("Program"),
+			help: __("Example: Masters in Computer Science"),
+			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:"program_" + i, label:__("Program") + " " + i, placeholder: __("Program Name")},
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "single-column"
+		},
+
+		course: {
+			domains: ["education"],
+			title: __("Course"),
+			help: __("Example: Basic Mathematics"),
+			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:"course_" + i, label:__("Course") + " " + i,  placeholder: __("Course Name")},
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "single-column"
+		},
+
+
+		instructor: {
+			domains: ["education"],
+			title: __("Instructor"),
+			help: __("People who teach at your organisation"),
+			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:"instructor_" + i, label:__("Instructor") + " " + i,  placeholder: __("Instructor Name")},
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "single-column"
+		},
+
+		room: {
+			domains: ["education"],
+			title: __("Room"),
+			help: __("Classrooms/ Laboratories etc where lectures can be scheduled."),
+			fields: [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<4; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break", show_section_border: true},
+						{fieldtype:"Data", fieldname:"room_" + i, label:__("Room") + " " + i},
+						{fieldtype:"Column Break"},
+						{fieldtype:"Int", fieldname:"room_capacity_" + i, label:__("Room") + " " + i + " Capacity"},
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "two-column"
+		},
 	});
 
 	// Source: https://en.wikipedia.org/wiki/Fiscal_year
@@ -315,12 +417,42 @@
 
 frappe.wiz.on("before_load", function() {
 	load_erpnext_slides();
+
+	frappe.wiz.add_slide(erpnext.wiz.select_domain);
 	frappe.wiz.add_slide(erpnext.wiz.org);
 	frappe.wiz.add_slide(erpnext.wiz.branding);
-	frappe.wiz.add_slide(erpnext.wiz.users);
+
+	if (!(frappe.boot.limits && frappe.boot.limits.users===1)) {
+		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";
+	frappe.wiz.add_slide(erpnext.wiz.program);
+	frappe.wiz.add_slide(erpnext.wiz.course);
+	frappe.wiz.add_slide(erpnext.wiz.instructor);
+	frappe.wiz.add_slide(erpnext.wiz.room);
+
+	if(frappe.wizard && frappe.wizard.domain && frappe.wizard.domain !== 'Education') {
+		frappe.wiz.welcome_page = "#welcome-to-erpnext";
+	}
 });
+
+test_values_edu = {
+	"language":"english",
+	"domain":"Education",
+	"country":"India",
+	"timezone":"Asia/Kolkata",
+	"currency":"INR",
+	"first_name":"Tester",
+	"email":"test@example.com",
+	"password":"test",
+	"company_name":"Hogwarts",
+	"company_abbr":"HS",
+	"company_tagline":"School for magicians",
+	"bank_account":"Gringotts Wizarding Bank",
+	"fy_start_date":"2016-04-01",
+	"fy_end_date":"2017-03-31"
+}
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index b667177..f5819a8 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -10,11 +10,29 @@
 		$('.navbar li[data-label="User"] a')
 			.html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
 	}
+	
 	// update login
+	shopping_cart.show_shoppingcart_dropdown();
 	shopping_cart.set_cart_count();
+	shopping_cart.bind_dropdown_cart_buttons();
 });
 
 $.extend(shopping_cart, {
+	show_shoppingcart_dropdown: function() {
+		$(".shopping-cart").on('shown.bs.dropdown', function() {
+			if (!$('.shopping-cart-menu .cart-container').length) {
+				return frappe.call({
+					method: 'erpnext.shopping_cart.cart.get_shopping_cart_menu',
+					callback: function(r) {
+						if (r.message) {
+							$('.shopping-cart-menu').html(r.message);
+						}
+					}
+				});
+			}
+		});
+	},
+	
 	update_cart: function(opts) {
 		if(!full_name || full_name==="Guest") {
 			if(localStorage) {
@@ -32,7 +50,10 @@
 				},
 				btn: opts.btn,
 				callback: function(r) {
-					shopping_cart.set_cart_count();
+					shopping_cart.set_cart_count();	
+					if (r.message.shopping_cart_menu) {
+						$('.shopping-cart-menu').html(r.message.shopping_cart_menu);
+					}					
 					if(opts.callback)
 						opts.callback(r);
 				}
@@ -43,22 +64,19 @@
 	set_cart_count: function() {
 		var cart_count = getCookie("cart_count");
 		
-		if($(".cart-icon").length == 0) {
-			$('<div class="cart-icon" style="float:right;padding-top:10px;">\
-				<a href="/cart" class="text-muted small">\
-					<div class="btn btn-primary cart"> Cart\
-						<span id="cart-count" class="label" style="padding-left:5px;margin-left:5px;\
-								margin-right:-5px;background-color: #2905E2;">\
-						</span>\
-					</div>\
-				</a></div>').appendTo($('.hidden-xs'))
-		}
+		if(cart_count) {
+			$(".shopping-cart").toggle(true);	
+		}		
 		
 		var $cart = $('.cart-icon');
 		var $badge = $cart.find("#cart-count");
 
 		if(parseInt(cart_count) === 0 || cart_count === undefined) {
 			$cart.css("display", "none");
+			$(".cart-items").html('Cart is Empty');
+			$(".cart-tax-items").hide();
+			$(".btn-place-order").hide();
+			$(".cart-addresses").hide();
 		}
 		else {
 			$cart.css("display", "inline");
@@ -69,5 +87,49 @@
 		} else {
 			$badge.remove();
 		}
-	}
+	},
+	
+	shopping_cart_update: function(item_code, newVal, cart_dropdown) {
+		frappe.freeze();
+		shopping_cart.update_cart({
+			item_code: item_code,
+			qty: newVal,
+			with_items: 1,
+			btn: this,
+			callback: function(r) {
+				frappe.unfreeze();
+				if(!r.exc) {
+					$(".cart-items").html(r.message.items);
+					$(".cart-tax-items").html(r.message.taxes);
+					if (cart_dropdown != true) {
+						$(".cart-icon").hide();
+					}					
+				}
+			},
+		});
+	},
+	
+	
+	bind_dropdown_cart_buttons: function() {
+		$(".cart-icon").on('click', '.number-spinner button', function () {
+			var btn = $(this),
+				input = btn.closest('.number-spinner').find('input'),
+				oldValue = input.val().trim(),
+				newVal = 0;
+			
+				if (btn.attr('data-dir') == 'up') {
+					newVal = parseInt(oldValue) + 1;
+				} else {
+					if (oldValue > 1) {
+						newVal = parseInt(oldValue) - 1;
+					}
+			}
+			input.val(newVal);
+			var item_code = input.attr("data-item-code"); 
+			shopping_cart.shopping_cart_update(item_code, newVal, true);
+			return false;
+		});
+		
+	},
+	
 });
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index a8229ba..28ff55d 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/stock_grid_report.js");
 
 erpnext.StockAnalytics = erpnext.StockGridReport.extend({
 	init: function(wrapper, opts) {
@@ -79,7 +78,7 @@
 		this.trigger_refresh_on_change(["value_or_qty", "brand", "warehouse", "range"]);
 
 		this.show_zero_check();
-		this.setup_plot_check();
+		this.setup_chart_check();
 	},
 	init_filter_values: function() {
 		this._super();
@@ -199,9 +198,6 @@
 			}
 		});
 	},
-	get_plot_points: function(item, col, idx) {
-		return [[dateutil.user_to_obj(col.name).getTime(), item[col.field]]]
-	},
 	show_stock_ledger: function(item_code) {
 		frappe.route_options = {
 			item_code: item_code,
@@ -211,3 +207,4 @@
 		frappe.set_route("query-report", "Stock Ledger");
 	}
 });
+
diff --git a/erpnext/public/js/templates/item_selector.html b/erpnext/public/js/templates/item_selector.html
new file mode 100644
index 0000000..47da67c
--- /dev/null
+++ b/erpnext/public/js/templates/item_selector.html
@@ -0,0 +1,16 @@
+<div class="row pos-item-area">
+{% for (var i=0; i < data.length; i++) { var item = data[i]; %}
+<div class="col-xs-3 pos-item-wrapper">
+	<div class="pos-item" data-name="{{ item.name }}">
+		<div class="pos-item-image"
+			{% if(item.image) { %}style="background-image: url({{ item.image }});"{% }
+			else { %}style="background-color: {{ item.color }};"{% } %}>
+			{% if(!item.image) { %}{{ item.abbr }}{% } %}
+		</div>
+		<div class="pos-item-text">
+			<h6 class="item-code text-ellipsis">{{ item.name }}</h6>
+		</div>
+	</div>
+</div>
+{% } %}
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 9c287e7..ece8284 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -33,7 +33,7 @@
 
 	setup_serial_no: function() {
 		var grid_row = cur_frm.open_grid_row();
-		if(!grid_row.fields_dict.serial_no ||
+		if(!grid_row || !grid_row.fields_dict.serial_no ||
 			grid_row.fields_dict.serial_no.get_status()!=="Write") return;
 
 		var $btn = $('<button class="btn btn-sm btn-default">'+__("Add Serial No")+'</button>')
@@ -86,14 +86,14 @@
 		$(frm.fields_dict['address_html'].wrapper).html("");
 		frm.fields_dict['contact_html'] && $(frm.fields_dict['contact_html'].wrapper).html("");
 	},
-	
+
 	render_address_and_contact: function(frm) {
 		// render address
 		$(frm.fields_dict['address_html'].wrapper)
 			.html(frappe.render_template("address_list",
 				cur_frm.doc.__onload))
 			.find(".btn-address").on("click", function() {
-				new_doc("Address");
+				frappe.new_doc("Address");
 			});
 
 		// render contact
@@ -102,7 +102,7 @@
 				.html(frappe.render_template("contact_list",
 					cur_frm.doc.__onload))
 				.find(".btn-contact").on("click", function() {
-					new_doc("Contact");
+					frappe.new_doc("Contact");
 				}
 			);
 		}
@@ -120,6 +120,65 @@
 	}
 });
 
+erpnext.utils.map_current_doc = function(opts) {
+	if(opts.get_query_filters) {
+		opts.get_query = function() {
+			return {filters: opts.get_query_filters};
+		}
+	}
+	var _map = function() {
+		// remove first item row if empty
+		if($.isArray(cur_frm.doc.items) && cur_frm.doc.items.length > 0) {
+			if(!cur_frm.doc.items[0].item_code) {
+				cur_frm.doc.items = cur_frm.doc.items.splice(1);
+			}
+		}
+
+		return frappe.call({
+			// Sometimes we hit the limit for URL length of a GET request
+			// as we send the full target_doc. Hence this is a POST request.
+			type: "POST",
+			method: opts.method,
+			args: {
+				"source_name": opts.source_name,
+				"target_doc": cur_frm.doc
+			},
+			callback: function(r) {
+				if(!r.exc) {
+					var doc = frappe.model.sync(r.message);
+					cur_frm.refresh();
+				}
+			}
+		});
+	}
+	if(opts.source_doctype) {
+		var d = new frappe.ui.Dialog({
+			title: __("Get From ") + __(opts.source_doctype),
+			fields: [
+				{
+					fieldtype: "Link",
+					label: __(opts.source_doctype),
+					fieldname: opts.source_doctype,
+					options: opts.source_doctype,
+					get_query: opts.get_query,
+					reqd:1
+				},
+			]
+		});
+		d.set_primary_action(__('Get Items'), function() {
+			var values = d.get_values();
+			if(!values)
+				return;
+			opts.source_name = values[opts.source_doctype];
+			d.hide();
+			_map();
+		})
+		d.show();
+	} else if(opts.source_name) {
+		_map();
+	}
+}
+
 // add description on posting time
 $(document).on('app_ready', function() {
 	if(!frappe.datetime.is_timezone_same()) {
@@ -131,4 +190,4 @@
 			});
 		});
 	}
-});
+});
\ No newline at end of file
diff --git a/erpnext/public/js/utils/item_selector.js b/erpnext/public/js/utils/item_selector.js
new file mode 100644
index 0000000..87d2fc8
--- /dev/null
+++ b/erpnext/public/js/utils/item_selector.js
@@ -0,0 +1,95 @@
+erpnext.ItemSelector = Class.extend({
+	init: function(opts) {
+		$.extend(this, opts);
+
+		this.grid = this.frm.get_field("items").grid;
+		this.setup();
+	},
+
+	setup: function() {
+		var me = this;
+		if(!this.grid.add_items_button) {
+			this.grid.add_items_button = this.grid.add_custom_button(__('Add Items'), function() {
+				if(!me.dialog) {
+					me.make_dialog();
+				}
+				me.dialog.show();
+				me.render_items();
+				setTimeout(function() { me.dialog.input.focus(); }, 1000);
+			});
+		}
+	},
+
+	make_dialog: function() {
+		this.dialog = new frappe.ui.Dialog({
+			title: __('Add Items')
+		});
+		var body = $(this.dialog.body);
+		body.html('<div><p><input type="text" class="form-control"></p>\
+			<br><div class="results"></div></div>');
+
+		this.dialog.input = body.find('.form-control');
+		this.dialog.results = body.find('.results');
+
+		var me = this;
+		this.dialog.results.on('click', '.pos-item', function() {
+			me.add_item($(this).attr('data-name'))
+		});
+
+		this.dialog.input.on('keyup', function() {
+			if(me.timeout_id) {
+				clearTimeout(me.timeout_id);
+			}
+			me.timeout_id = setTimeout(function() {
+				me.render_items();
+				me.timeout_id = undefined;
+			}, 500);
+		});
+	},
+
+	add_item: function(item_code) {
+		// add row or update qty
+		var added = false;
+
+		// find row with item if exists
+		$.each(this.frm.doc.items || [], function(i, d) {
+			if(d.item_code===item_code) {
+				frappe.model.set_value(d.doctype, d.name, 'qty', d.qty + 1);
+				show_alert(__("Added {0} ({1})", [item_code, d.qty]));
+				added = true;
+				return false;
+			}
+		});
+
+		if(!added) {
+			var d = this.grid.add_new_row();
+			frappe.model.set_value(d.doctype, d.name, 'item_code', item_code);
+
+			// after item fetch
+			frappe.after_ajax(function() {
+				setTimeout(function() {
+					frappe.model.set_value(d.doctype, d.name, 'qty', 1);
+					show_alert(__("Added {0} ({1})", [item_code, 1]));
+				}, 100);
+			});
+		}
+
+	},
+
+	render_items: function() {
+		var args = erpnext.queries.item();
+		args.txt = this.dialog.input.val();
+		args.as_dict = 1;
+
+		var me = this;
+		frappe.link_search("Item", args, function(r) {
+			$.each(r.values, function(i, d) {
+				if(!d.image) {
+					d.abbr = frappe.get_abbr(d.item_name);
+					d.color = frappe.get_palette(d.item_name);
+				}
+			});
+			me.dialog.results.html(frappe.render_template('item_selector', {'data':r.values}));
+		});
+	}
+})
\ No newline at end of file
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index d630779..f5496ed 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -2,6 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext.utils");
+
 erpnext.utils.get_party_details = function(frm, method, args, callback) {
 	if(!method) {
 		method = "erpnext.accounts.party.get_party_details";
@@ -162,4 +163,4 @@
 			}
 		}
 	});
-}
+}
\ No newline at end of file
diff --git a/erpnext/public/js/website_utils.js b/erpnext/public/js/website_utils.js
index b0fc557..b541606 100644
--- a/erpnext/public/js/website_utils.js
+++ b/erpnext/public/js/website_utils.js
@@ -18,7 +18,7 @@
 erpnext.subscribe_to_newsletter = function(opts, btn) {
 	return frappe.call({
 		type: "POST",
-		method: "erpnext.crm.doctype.newsletter.newsletter.subscribe",
+		method: "frappe.email.doctype.newsletter.newsletter.subscribe",
 		btn: btn,
 		args: {"email": opts.email},
 		callback: opts.callback
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 813a567..404540a 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -1,3 +1,5 @@
+@import "../../../../frappe/frappe/public/less/variables.less";
+
 .erpnext-footer {
 	margin: 11px auto;
 	text-align: center;
@@ -16,20 +18,23 @@
 }
 
 /* pos */
-.pos {
+
+.pos-item-area {
+	padding: 0px 10px;
+}
+
+.pos-item-wrapper {
+	padding: 5px;
 }
 
 .pos-item {
-	display: inline-block;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	cursor: pointer;
 	padding: 5px;
-	height: 0px;
-	padding-bottom: 38%;
-	width: 30%;
-	margin: 1.6%;
+	padding-bottom: 15px;
 	border: 1px solid #d1d8dd;
+	margin-bottom: 5px;
 }
 
 .pos-item-text {
@@ -46,7 +51,13 @@
 }
 
 .pos-item-image {
-	padding-bottom: 100%;
+	width: 100%;
+	height: 0px;
+	padding: 50% 0;
+	text-align: center;
+	line-height: 0;
+	color: @text-extra-muted;
+	font-size: 30px;
 	background-size: cover;
 	border: 1px solid transparent;
 	background-position: top center;
@@ -121,7 +132,7 @@
 }
 
 .erpnext-icon {
-	width: 24px;
+	width: 24px;ack
 	margin-right: 0px;
 	margin-top: -3px;
 }
@@ -130,8 +141,71 @@
 	.discount-field-col {
 		padding-left: 0px;
 	}
-	
+
 	.input-group {
 		margin-top: 2px;
 	}
-}
\ No newline at end of file
+}
+
+.dashboard-list-item {
+	background-color: inherit;
+	padding: 5px 0px;
+	border-bottom: 1px solid @border-color;
+}
+
+#page-stock-balance .dashboard-list-item {
+	padding: 5px 15px;
+}
+
+.dashboard-list-item:last-child {
+	border-bottom: none;
+}
+
+.payment-toolbar {
+	margin-left: 35px;
+}
+
+.payment-mode {
+	cursor: pointer;
+	font-family: sans-serif;
+	font-size: 15px;
+}
+
+.pos-payment-row .col-xs-6 {
+	padding :10px;
+}
+
+.pos-payment-row {
+	border-bottom:1px solid #d1d8dd;
+    	margin: 2px 0px 5px 0px;
+	height: 60px;
+}
+
+.pos-payment-row:hover, .pos-keyboard-key:hover{
+	background-color: #FAFBFC;
+	cursor: pointer;
+}
+
+.pos-keyboard-key, .delete-btn {
+	border: 1px solid #d1d8dd;
+	height:85px;
+	width:85px;
+	margin:10px 10px;
+	font-size:24px;
+	font-weight:200;
+	background-color: #FDFDFD;
+	border-color: #e8e8e8;
+}
+
+.amount-label {
+	font-size: 16px;
+}
+
+.selected-payment-mode {
+	background-color: #FAFBFC;
+	cursor: pointer;
+}
+
+.pos-invoice-list {
+	padding: 15px 10px;
+}
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index 96dd096..4aa3940 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -1,10 +1,13 @@
 @border-color: #d1d8dd;
-@light-border-color:  #EBEFF2;
+@light-border-color: #EBEFF2;
+@text-muted: #8D99A6;
+@light-bg: #fafbfc;
 
 .web-long-description {
 	font-size: 18px;
 	line-height: 200%;
 }
+
 .item-stock {
 	margin-bottom: 10px !important;
 }
@@ -14,12 +17,6 @@
 	text-align: center;
 }
 
-.product-image-wrapper {
-	max-width: 300px;
-	margin: auto;
-	border-radius: 4px;
-}
-
 @media (max-width: 767px) {
 	.product-image {
 		height: 0px;
@@ -35,14 +32,14 @@
 	background-size: cover;
 	background-repeat: no-repeat;
 	background-position: center top;
-	border-radius: 0.5em;
-	border: 1px solid @light-border-color;
+	border-radius-top: 4px;
+	border-radius-right: 4px;
 }
 
 .product-image.missing-image {
 	.product-image-square;
-	border: 1px dashed @border-color;
 	position: relative;
+	background-color: @light-border-color;
 }
 
 .product-image.missing-image .octicon {
@@ -54,9 +51,280 @@
 	padding: 15px 0px;
 }
 
+.product-label {
+	padding-bottom: 4px;
+	text-transform: uppercase;
+	font-size: 12px;
+}
+
+.product-search {
+	margin-bottom: 15px;
+}
+
+
 @media (max-width: 767px) {
 	.product-search {
 		width: 100%;
-		margin-bottom: 13px;
 	}
 }
+
+.borderless td, .borderless th {
+  border-bottom: 1px solid @light-border-color;
+  padding-left:0px !important;
+  line-height: 1.8em !important;
+}
+
+.item-desc {
+	 border-top: 2px solid @light-border-color;
+	 padding-top:10px;
+}
+
+.featured-products {
+	border-top: 1px solid @light-border-color;
+}
+
+.transaction-list-item {
+	&:hover,
+	&:active,
+	&:focus {
+		background-color: @light-bg;
+	}
+
+	.indicator {
+		font-weight: inherit;
+		color: @text-muted;
+	}
+
+	.transaction-time {
+		// margin-left: 15px;
+	}
+
+	.items-preview,
+	.transaction-time {
+		margin-top: 5px;
+	}
+}
+
+// order.html
+.transaction-subheading {
+	.indicator {
+		font-weight: inherit;
+		color: @text-muted;
+	}
+}
+
+.order-container {
+	margin: 50px 0px;
+
+	.order-item-header .h6 {
+		padding: 7px 15px;
+	}
+
+	.order-items {
+		margin: 30px 0px 0px;
+	}
+
+	.order-item-table {
+		margin: 0px -15px;
+	}
+
+	.order-item-header {
+		border-bottom: 1px solid #d1d8dd;
+	}
+
+	.order-image-col {
+		padding-right: 0px;
+	}
+
+	.order-image {
+		max-width: 55px;
+		max-height: 55px;
+		margin-top: -5px;
+	}
+
+	.order-taxes {
+		margin-top: 30px;
+
+		.row {
+			margin-top: 15px;
+		}
+	}
+
+	.tax-grand-total-row {
+		padding-top: 15px;
+		padding-bottom: 30px;
+	}
+
+	.tax-grand-total {
+		display: inline-block;
+		font-size: 16px;
+		font-weight: bold;
+		margin-top: 5px;
+	}
+}
+
+.cart-container {
+	margin: 50px 0px;
+	
+	.checkout {
+		margin-bottom:15px;
+	}
+
+	.cart-item-header .h6 {
+		padding: 7px 15px;
+	}
+
+	.cart-items {
+		margin: 30px 0px 0px;
+	}
+
+	.cart-item-table {
+		margin: 0px -15px;
+	}
+
+	.cart-item-header {
+		border-bottom: 1px solid #d1d8dd;
+	}
+
+	.cart-image-col {
+		padding-right: 0px;
+	}
+
+	.cart-image {
+		max-width: 55px;
+		max-height: 55px;
+		margin-top: -5px;
+	}
+
+	.cart-taxes {
+		margin-top: 30px;
+
+		.row {
+			margin-top: 15px;
+		}
+	}
+
+	.tax-grand-total-row {
+		border-top: 1px solid @border-color;
+		padding-top: 15px;
+	}
+
+	.cart-addresses {
+		margin-top: 50px;
+	}
+}
+
+.cart-items-dropdown .cart-dropdown,
+.item_name_dropdown {
+	display: none;
+
+}
+
+.cart-dropdown-container {
+	width: 400px;
+	padding: 15px;
+	
+	.item-price {
+		display: block !important;
+		padding-bottom: 10px;
+	}
+
+	.cart-item-header {
+		border-bottom: 1px solid #d1d8dd;
+	}
+	
+	.cart-items-dropdown {
+		max-height: 350px;
+		overflow: auto;	
+	}
+	
+	.cart-items-dropdown .cart-dropdown {
+		display:block;
+	   	margin-top:15px;
+	}
+
+	.item_name_dropdown {
+		display:block;
+	}
+
+	.item-description,
+	.cart-items .checkout,
+	.item_name_and_description {
+		display: none;
+	}
+
+	.checkout-btn {
+		padding-top:25px;
+	}
+	.col-name-description {
+		margin-bottom:8px;
+	}
+}
+
+.number-spinner {
+	width:100px;
+	margin-top:5px;
+}
+
+.cart-btn {
+	border-color: #ccc;
+}
+.cart-qty {
+	text-align:center;
+}
+
+.product-list-link {
+	.row {
+		border-bottom: 1px solid @light-border-color;
+	}
+
+	.row:hover {
+		background-color: @light-bg;
+	}
+
+	.row > div {
+		padding-top: 15px;
+		padding-bottom: 15px;
+	}
+}
+
+.product-list-link:first-child .row {
+	border-top: 1px solid @light-border-color;
+}
+
+.item-group-nav-buttons {
+	margin-top: 15px;
+}
+
+.footer-subscribe {
+	.btn-default {
+		background-color: transparent;
+		border: 1px solid @border-color;
+	}
+}
+
+@media (min-width: 992px) {
+	.footer-subscribe {
+		max-width: 350px;
+	}
+}
+
+.item-group-content {
+	margin-top: 30px;
+}
+
+.product-image-img {
+	border: 1px solid @light-border-color;
+	border-radius: 3px;
+}
+
+.product-text {
+	border-top: 1px solid @light-border-color;
+	padding: 15px;
+	word-wrap: break-word;
+	height: 75px;
+}
+
+.product-image-wrapper {
+	padding-bottom: 40px;
+}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/__init__.py
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
new file mode 100644
index 0000000..26577b4
--- /dev/null
+++ b/erpnext/schools/api.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe import _
+from frappe.model.mapper import get_mapped_doc
+from frappe.utils import flt
+
+@frappe.whitelist()
+def enroll_student(source_name):
+	"""Creates a Student Record and returns a Program Enrollment.
+
+	:param source_name: Student Applicant.
+	"""
+	student = get_mapped_doc("Student Applicant", source_name,
+		{"Student Applicant": {
+			"doctype": "Student",
+			"field_map": {
+				"name": "student_applicant"
+			}
+		}})
+	student.save()
+
+	program_enrollment = frappe.new_doc("Program Enrollment")
+	program_enrollment.student = student.name
+	program_enrollment.student_name = student.title
+	program_enrollment.program = frappe.db.get_value("Student Applicant", source_name, "program")
+	return program_enrollment
+
+@frappe.whitelist()
+def check_attendance_records_exist(course_schedule):
+	"""Check if Attendance Records are made against the specified Course Schedule.
+
+	:param course_schedule: Course Schedule.
+	"""
+	return frappe.get_list("Student Attendance", filters={"course_schedule": course_schedule})
+
+@frappe.whitelist()
+def mark_attendance(students_present, students_absent, course_schedule):
+	"""Creates Multiple Attendance Records.
+
+	:param students_present: Students Present JSON.
+	:param students_absent: Students Absent JSON.
+	:param course_schedule: Course Schedule.
+	"""
+	present = json.loads(students_present)
+	absent = json.loads(students_absent)
+
+	for d in present:
+		make_attendance_records(d["student"], d["student_name"], course_schedule, "Present")
+
+	for d in absent:
+		make_attendance_records(d["student"], d["student_name"], course_schedule, "Absent")
+
+	frappe.msgprint(_("Attendance has been marked successfully."))
+
+def make_attendance_records(student, student_name, course_schedule, status):
+	"""Creates Attendance Record.
+
+	:param student: Student.
+	:param student_name: Student Name.
+	:param course_schedule: Course Schedule.
+	:param status: Status (Present/Absent)
+	"""
+	student_attendance = frappe.new_doc("Student Attendance")
+	student_attendance.student = student
+	student_attendance.student_name = student_name
+	student_attendance.course_schedule = course_schedule
+	student_attendance.status = status
+	student_attendance.submit()
+	frappe.db.commit()
+
+@frappe.whitelist()
+def get_student_group_students(student_group):
+	"""Returns List of student, student_name in Student Group.
+
+	:param student_group: Student Group.
+	"""
+	students = frappe.get_list("Student Group Student", fields=["student", "student_name"] , filters={"parent": student_group}, order_by= "idx")
+	return students
+
+@frappe.whitelist()
+def get_fee_structure(program, academic_term=None):
+	"""Returns Fee Structure.
+
+	:param program: Program.
+	:param academic_term: Academic Term.
+	"""
+	fee_structure = frappe.db.get_values("Fee Structure", {"program": program,
+		"academic_term": academic_term}, 'name', as_dict=True)
+	return fee_structure[0].name if fee_structure else None
+
+@frappe.whitelist()
+def get_fee_amount(fee_structure):
+	"""Returns Fee Amount.
+
+	:param fee_structure: Fee Structure.
+	"""
+	if fee_structure:
+		fs = frappe.get_list("Fee Amount", fields=["fees_category", "amount"] , filters={"parent": fee_structure}, order_by= "idx")
+		return fs
+
+@frappe.whitelist()
+def get_fee_schedule(program):
+	"""Returns Fee Schedule.
+
+	:param program: Program.
+	"""
+	fs = frappe.get_list("Program Fee", fields=["academic_term", "fee_structure", "due_date", "amount"] ,
+		filters={"parent": program}, order_by= "idx")
+	return fs
+
+@frappe.whitelist()
+def collect_fees(fees, amt):
+	paid_amount = flt(amt) + flt(frappe.db.get_value("Fees", fees, "paid_amount"))
+	total_amount = flt(frappe.db.get_value("Fees", fees, "total_amount"))
+	frappe.db.set_value("Fees", fees, "paid_amount", paid_amount)
+	frappe.db.set_value("Fees", fees, "outstanding_amount", (total_amount - paid_amount))
+	return paid_amount
+
+@frappe.whitelist()
+def get_course_schedule_events(start, end, filters=None):
+	"""Returns events for Course Schedule Calendar view rendering.
+
+	:param start: Start date-time.
+	:param end: End date-time.
+	:param filters: Filters (JSON).
+	"""
+	from frappe.desk.calendar import get_event_conditions
+	conditions = get_event_conditions("Course Schedule", filters)
+
+	data = frappe.db.sql("""select name, course,
+			timestamp(schedule_date, from_time) as from_datetime,
+			timestamp(schedule_date, to_time) as to_datetime,
+			room, student_group, 0 as 'allDay'
+		from `tabCourse Schedule`
+		where ( schedule_date between %(start)s and %(end)s )
+		{conditions}""".format(conditions=conditions), {
+			"start": start,
+			"end": end
+			}, as_dict=True, update={"allDay": 0})
+
+	return data
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/academic_term/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/academic_term/__init__.py
diff --git a/erpnext/schools/doctype/academic_term/academic_term.json b/erpnext/schools/doctype/academic_term/academic_term.json
new file mode 100644
index 0000000..1e788e2
--- /dev/null
+++ b/erpnext/schools/doctype/academic_term/academic_term.json
@@ -0,0 +1,94 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:term_name", 
+ "creation": "2015-09-08 17:19:19.158228", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "term_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Term Name", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Academic Term", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/schools/doctype/academic_term/academic_term.py
new file mode 100644
index 0000000..1a4526b
--- /dev/null
+++ b/erpnext/schools/doctype/academic_term/academic_term.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AcademicTerm(Document):
+	pass
diff --git a/erpnext/schools/doctype/academic_term/test_academic_term.py b/erpnext/schools/doctype/academic_term/test_academic_term.py
new file mode 100644
index 0000000..0964a56
--- /dev/null
+++ b/erpnext/schools/doctype/academic_term/test_academic_term.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Academic Term')
+
+class TestAcademicTerm(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/academic_term/test_records.json b/erpnext/schools/doctype/academic_term/test_records.json
new file mode 100644
index 0000000..9807221
--- /dev/null
+++ b/erpnext/schools/doctype/academic_term/test_records.json
@@ -0,0 +1,11 @@
+[
+	{
+		"term_name": "_Test Academic Term"
+	},
+	{
+		"term_name": "_Test Academic Term 1"
+	},
+	{
+		"term_name": "_Test Academic Term 2"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/academic_year/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/academic_year/__init__.py
diff --git a/erpnext/schools/doctype/academic_year/academic_year.js b/erpnext/schools/doctype/academic_year/academic_year.js
new file mode 100644
index 0000000..21caa63
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/academic_year.js
@@ -0,0 +1,10 @@
+frappe.ui.form.on("Academic Year", "refresh", function(frm) {
+	if(!frm.doc.__islocal) {
+		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				academic_year: frm.doc.name
+			}
+			frappe.set_route("List", "Student Group");
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/academic_year.json b/erpnext/schools/doctype/academic_year/academic_year.json
new file mode 100644
index 0000000..8f69d7f
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/academic_year.json
@@ -0,0 +1,139 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:academic_year_name", 
+ "creation": "2015-09-07 12:49:51.303026", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_year_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year Name", 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "year_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Year Start Date", 
+   "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": "year_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Year End Date", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Academic Year", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": ""
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/academic_year/academic_year.py b/erpnext/schools/doctype/academic_year/academic_year.py
new file mode 100644
index 0000000..4b955de
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/academic_year.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AcademicYear(Document):
+	pass
diff --git a/erpnext/schools/doctype/academic_year/test_academic_year.py b/erpnext/schools/doctype/academic_year/test_academic_year.py
new file mode 100644
index 0000000..9da75a7
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/test_academic_year.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Academic Year')
+
+class TestAcademicYear(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/academic_year/test_records.json b/erpnext/schools/doctype/academic_year/test_records.json
new file mode 100644
index 0000000..dba4f12
--- /dev/null
+++ b/erpnext/schools/doctype/academic_year/test_records.json
@@ -0,0 +1,11 @@
+[
+	{
+		"academic_year_name": "2014-2015"
+	},
+	{
+		"academic_year_name": "2015-2016"
+	},
+	{
+		"academic_year_name": "2016-2017"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/schools/doctype/announcement/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/schools/doctype/announcement/__init__.py
diff --git a/erpnext/schools/doctype/announcement/announcement.js b/erpnext/schools/doctype/announcement/announcement.js
new file mode 100644
index 0000000..5b1d1c0
--- /dev/null
+++ b/erpnext/schools/doctype/announcement/announcement.js
@@ -0,0 +1,9 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Announcement', {
+	onload: function(frm) {
+		frm.add_fetch('instructor', 'instructor_name' , 'posted_by');
+	}
+});
+
diff --git a/erpnext/schools/doctype/announcement/announcement.json b/erpnext/schools/doctype/announcement/announcement.json
new file mode 100644
index 0000000..831b71f
--- /dev/null
+++ b/erpnext/schools/doctype/announcement/announcement.json
@@ -0,0 +1,315 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "announcement.#####", 
+ "beta": 0, 
+ "creation": "2016-06-23 05:37:33.996289", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "receiver", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Receiver", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student\nStudent Group\nAll Students", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval: doc.receiver == \"Student\"", 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "eval: doc.receiver == \"Student Group\"", 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "posted_by", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Posted By", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "subject", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Subject", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Announcement", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 06:30:12.825629", 
+ "modified_by": "r@r.com", 
+ "module": "Schools", 
+ "name": "Announcement", 
+ "name_case": "", 
+ "owner": "demo@erpnext.com", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "subject", 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/announcement.py b/erpnext/schools/doctype/announcement/announcement.py
new file mode 100644
index 0000000..1a3fe75d
--- /dev/null
+++ b/erpnext/schools/doctype/announcement/announcement.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class Announcement(Document):
+	def validate(self):
+		self.validate_receiver()
+		self.set_posted_by()
+
+	def validate_receiver(self):
+		if self.receiver == "Student":
+			if not self.student:
+				frappe.throw(_("Please select a Student"))
+				self.student_group = None
+		elif self.receiver == "Student Group":
+			if not self.student_group:
+				frappe.throw(_("Please select a Student Group"))
+				self.student = None
+		else:
+			self.student_group = None
+			self.student = None
+
+	def set_posted_by(self):
+		if self.instructor:
+			self.posted_by = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
+		else:
+			self.posted_by = frappe.session.user
+
+
+
+
+def get_message_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	user = frappe.session.user
+	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+	if student:
+		sg_list = frappe.db.sql("""select parent from `tabStudent Group Student` as sgs
+				where sgs.student = %s """,(student))
+
+		data = frappe.db.sql("""select name, receiver, subject, description, posted_by, modified,
+			student, student_group
+		    from `tabAnnouncement` as announce
+			where (announce.receiver = "Student" and announce.student = %s)
+			or (announce.receiver = "Student Group" and announce.student_group in %s)
+			or announce.receiver = "All Students"
+			and announce.docstatus = 1	
+			order by announce.idx asc limit {0} , {1}"""
+			.format(limit_start, limit_page_length), (student,sg_list), as_dict = True)
+
+		for announcement in data:
+			try:
+				num_attachments = frappe.db.sql(""" select count(file_url) from tabFile as file
+													where file.attached_to_name=%s 
+													and file.attached_to_doctype=%s""",(announcement.name,"Announcement"))
+
+			except IOError or frappe.DoesNotExistError:
+				pass
+				frappe.local.message_log.pop()
+
+			announcement.num_attachments = num_attachments[0][0]
+
+		return data
+
+def get_list_context(context=None):
+	return {
+		"show_sidebar": True,
+		'no_breadcrumbs': True,
+		"title": _("Announcements"),
+		"get_list": get_message_list,
+		"row_template": "templates/includes/announcement/announcement_row.html"
+	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/test_announcement.py b/erpnext/schools/doctype/announcement/test_announcement.py
new file mode 100644
index 0000000..b0200a2
--- /dev/null
+++ b/erpnext/schools/doctype/announcement/test_announcement.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Announcement')
+
+class TestAnnouncement(unittest.TestCase):
+	pass
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/schools/doctype/attendance_tool_student/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/schools/doctype/attendance_tool_student/__init__.py
diff --git a/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json
new file mode 100644
index 0000000..731de83
--- /dev/null
+++ b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.json
@@ -0,0 +1,114 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-11-10 16:28:51.366668", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Name", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Absent\nPresent\n", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:30:02.983801", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Attendance Tool Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.py b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.py
new file mode 100644
index 0000000..99a89d9
--- /dev/null
+++ b/erpnext/schools/doctype/attendance_tool_student/attendance_tool_student.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class AttendanceToolStudent(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/course/.txt
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/course/.txt
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/course/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/course/__init__.py
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js
new file mode 100644
index 0000000..75cf4f8
--- /dev/null
+++ b/erpnext/schools/doctype/course/course.js
@@ -0,0 +1,31 @@
+frappe.ui.form.on("Course", "refresh", function(frm) {
+	if(!cur_frm.doc.__islocal) {
+		frm.add_custom_button(__("Program"), function() {
+			frappe.route_options = {
+				"Program Course.course": frm.doc.name
+			}
+			frappe.set_route("List", "Program");
+		});
+		
+		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
+			frappe.set_route("List", "Student Group");
+		});
+		
+		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
+			frappe.set_route("List", "Course Schedule");
+		});
+		
+		frm.add_custom_button(__("Examination"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
+			frappe.set_route("List", "Examination");
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
new file mode 100644
index 0000000..f3d82e6
--- /dev/null
+++ b/erpnext/schools/doctype/course/course.json
@@ -0,0 +1,181 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:course_name", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:39:55.181893", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "course_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course Code", 
+   "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": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "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": "course_intro", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course Intro", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "department", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/schools/doctype/course/course.py
new file mode 100644
index 0000000..beeb6ec
--- /dev/null
+++ b/erpnext/schools/doctype/course/course.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class Course(Document):
+	pass
+
+def get_sg_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	user = frappe.session.user
+	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+	if student:
+		return frappe.db.sql('''select group_name, course, academic_term, academic_year, SG.name from `tabStudent Group`
+			as SG, `tabStudent Group Student` as SGS where SG.group_name = SGS.parent and SGS.student = %s
+			order by SG.group_name asc limit {0} , {1}'''.format(limit_start, limit_page_length), student, as_dict=True)
+
+def get_list_context(context=None):
+	return {
+		"show_sidebar": True,
+		'no_breadcrumbs': True,
+		"title": _("Courses"),
+		"get_list": get_sg_list,
+		"row_template": "templates/includes/course/course_row.html"
+	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/test_course.py b/erpnext/schools/doctype/course/test_course.py
new file mode 100644
index 0000000..b18f4a9
--- /dev/null
+++ b/erpnext/schools/doctype/course/test_course.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Course')
+
+class TestCourse(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/course/test_records.json b/erpnext/schools/doctype/course/test_records.json
new file mode 100644
index 0000000..5dc981a
--- /dev/null
+++ b/erpnext/schools/doctype/course/test_records.json
@@ -0,0 +1,14 @@
+[
+	{
+		"course_name": "_Test Course",
+		"course_code": "TC100"
+	},
+	{
+		"course_name": "_Test Course 1",
+		"course_code": "TC101"
+	},
+	{
+		"course_name": "_Test Course 2",
+		"course_code": "TC102"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/course_schedule/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/course_schedule/__init__.py
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
new file mode 100644
index 0000000..2defbd5
--- /dev/null
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.js
@@ -0,0 +1,137 @@
+frappe.provide("schools")
+
+frappe.ui.form.on("Course Schedule" ,{
+	onload: function(frm) {
+		if (frm.doc.from_datetime && frm.doc.to_datetime) {
+			var from_datetime = moment(frm.doc.from_datetime);
+			var to_datetime = moment(frm.doc.to_datetime);
+			frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
+			frm.doc.from_time = from_datetime.format("HH:mm:ss");
+			frm.doc.to_time = to_datetime.format("HH:mm:ss");
+		}
+	},
+	
+	refresh :function(frm) {
+		if(!frm.doc.__islocal) {
+			frappe.call({
+				method: "erpnext.schools.api.check_attendance_records_exist",
+				args: {
+					"course_schedule": frm.doc.name
+				},
+				callback: function(r) {
+					if(r.message) {
+						hide_field('attendance');
+						frm.events.view_attendance(frm)
+					}
+					else {
+						frappe.call({
+							method: "erpnext.schools.api.get_student_group_students",
+							args: {
+								"student_group": frm.doc.student_group
+							},
+							callback: function(r) {
+								if (r.message) {
+									frm.events.get_students(frm, r.message)
+								}
+							}
+						});
+					}
+				}
+			});
+		}
+		else {
+			hide_field('attendance');
+		}
+	},
+	
+	view_attendance: function(frm) {
+		hide_field('attendance');
+		frm.add_custom_button(__("View attendance"), function() {
+			frappe.route_options = {
+				course_schedule: frm.doc.name
+			}
+			frappe.set_route("List", "Student Attendance");
+		});
+	},
+	
+	get_students: function(frm, students) {
+		if(!frm.students_area) {
+		frm.students_area = $('<div>')
+			.appendTo(frm.fields_dict.students_html.wrapper);
+		}
+		frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
+	}
+});
+
+
+schools.StudentsEditor = Class.extend({
+	init: function(frm, wrapper, students) {
+		this.wrapper = wrapper;
+		this.frm = frm;
+		this.make(frm, students);
+	},
+	make: function(frm, students) {
+		var me = this;
+		
+		$(this.wrapper).empty();
+		var student_toolbar = $('<p>\
+			<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
+			<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
+			<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
+
+		student_toolbar.find(".btn-add")
+			.html(__('Check all'))
+			.on("click", function() {
+			$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+				if(!$(check).is(":checked")) {
+					check.checked = true;
+				}
+			});
+		});
+
+		student_toolbar.find(".btn-remove")
+			.html(__('Uncheck all'))
+			.on("click", function() {
+			$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+				if($(check).is(":checked")) {
+					check.checked = false;
+				}
+			});
+		});
+		
+		student_toolbar.find(".btn-mark-att")
+			.html(__('Mark Attendence'))
+			.on("click", function() {
+				var students_present = [];
+				var students_absent = [];
+				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+					if($(check).is(":checked")) {
+						students_present.push(students[i]);
+					}
+					else {
+						students_absent.push(students[i]);
+					}
+				});
+				frappe.call({
+					method: "erpnext.schools.api.mark_attendance",
+					args: {
+						"students_present": students_present,
+						"students_absent": students_absent,
+						"course_schedule": frm.doc.name
+					},
+					callback: function(r) {
+						frm.events.view_attendance(frm)
+					}
+				});
+		});
+
+		
+		$.each(students, function(i, m) {
+			$(repl('<div class="col-sm-6">\
+				<div class="checkbox">\
+				<label><input type="checkbox" class="students-check" student="%(student)s">\
+				%(student)s</label>\
+			</div></div>', {student: m.student_name})).appendTo(me.wrapper);
+		});
+	}
+})
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
new file mode 100644
index 0000000..137c589
--- /dev/null
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -0,0 +1,402 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SH.####", 
+ "creation": "2015-09-09 16:34:04.960369", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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_break_2", 
+   "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": "course", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "student_group.course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "instructor_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.Instructor_name", 
+   "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": "section_break_6", 
+   "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": "Today", 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Schedule Date", 
+   "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": "room", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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_break_9", 
+   "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": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "To Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": 1, 
+   "fieldname": "attendance", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Attendance", 
+   "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": "students_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Students HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Title", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Course Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "schedule_date", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/schools/doctype/course_schedule/course_schedule.py
new file mode 100644
index 0000000..36ad29b
--- /dev/null
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class CourseSchedule(Document):
+	def validate(self):
+		self.instructor_name = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
+		self.set_title()
+		self.validate_date()
+		self.validate_overlap()
+		
+	def set_title(self):
+		"""Set document Title"""
+		self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)
+
+	def validate_date(self):
+		"""Validates if from_time is greater than to_time"""
+		if self.from_time > self.to_time:
+			frappe.throw("From Time cannot be greater than To Time.")
+	
+	def validate_overlap(self):
+		"""Validates overlap for Student Group, Instructor, Room"""
+		
+		from erpnext.schools.utils import validate_overlap_for
+
+		validate_overlap_for(self, "Course Schedule", "student_group" )
+		validate_overlap_for(self, "Course Schedule", "instructor")
+		validate_overlap_for(self, "Course Schedule", "room")
+
+		validate_overlap_for(self, "Examination", "student_group")
+		validate_overlap_for(self, "Examination", "room")
+		validate_overlap_for(self, "Examination", "supervisor", self.instructor)
+
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js b/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js
new file mode 100644
index 0000000..94ce720
--- /dev/null
+++ b/erpnext/schools/doctype/course_schedule/course_schedule_calendar.js
@@ -0,0 +1,38 @@
+frappe.views.calendar["Course Schedule"] = {
+	field_map: {
+		// from_datetime and to_datetime don't exist as docfields but are used in onload
+		"start": "from_datetime",
+		"end": "to_datetime",
+		"id": "name",
+		"title": "course",
+		"allDay": "allDay"
+	},
+	gantt: false,
+	filters: [
+		{
+			"fieldtype": "Link",
+			"fieldname": "student_group",
+			"options": "Student Group",
+			"label": __("Student Group")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "course",
+			"options": "Course",
+			"label": __("Course")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "instructor",
+			"options": "Instructor",
+			"label": __("Instructor")
+		},
+		{
+			"fieldtype": "Link",
+			"fieldname": "room",
+			"options": "Room",
+			"label": __("Room")
+		}
+	],
+	get_events_method: "erpnext.schools.api.get_course_schedule_events"
+}
diff --git a/erpnext/schools/doctype/course_schedule/test_course_schedule.py b/erpnext/schools/doctype/course_schedule/test_course_schedule.py
new file mode 100644
index 0000000..f5e17f2
--- /dev/null
+++ b/erpnext/schools/doctype/course_schedule/test_course_schedule.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+import datetime
+from frappe.utils import today, to_timedelta
+from erpnext.schools.utils import OverlapError
+
+# test_records = frappe.get_test_records('Course Schedule')
+
+class TestCourseSchedule(unittest.TestCase):
+	def test_student_group_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+
+		cs2 = make_course_schedule_test_record(schedule_date=cs1.schedule_date, from_time= cs1.from_time, 
+			to_time= cs1.to_time, instructor="_T-Instructor-00002", room="RM0002", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+
+	def test_instructor_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="_Test Student Group 1", room="RM0002", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+
+	def test_room_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="_Test Student Group 1", instructor="_T-Instructor-00002", do_not_save= 1)
+		self.assertRaises(OverlapError, cs2.save)
+		
+	def test_no_conflict(self):
+		cs1 = make_course_schedule_test_record(simulate= True)
+		
+		make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
+			student_group="_Test Student Group 1", instructor="_T-Instructor-00002", room="RM0002")
+
+def make_course_schedule_test_record(**args):
+	args = frappe._dict(args)
+
+	course_schedule = frappe.new_doc("Course Schedule")
+	course_schedule.student_group = args.student_group or "_Test Student Group"
+	course_schedule.course = args.course or "_Test Course"
+	course_schedule.instructor = args.instructor or "_T-Instructor-00001"
+	course_schedule.room = args.room or "RM0001"
+	
+	course_schedule.schedule_date = args.schedule_date or today()
+	course_schedule.from_time = args.from_time or to_timedelta("01:00:00")
+	course_schedule.to_time = args.to_time or course_schedule.from_time + datetime.timedelta(hours= 1)
+
+	
+	if not args.do_not_save:
+		if args.simulate:
+			while True:
+				try:
+					course_schedule.save()
+					break
+				except OverlapError:
+					course_schedule.from_time = course_schedule.from_time + datetime.timedelta(minutes=10)
+					course_schedule.to_time = course_schedule.from_time + datetime.timedelta(hours= 1)
+		else:
+			course_schedule.save()
+
+	return course_schedule
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/discussion/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/discussion/__init__.py
diff --git a/erpnext/schools/doctype/discussion/discussion.js b/erpnext/schools/doctype/discussion/discussion.js
new file mode 100644
index 0000000..df3c2b8
--- /dev/null
+++ b/erpnext/schools/doctype/discussion/discussion.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Discussion', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/schools/doctype/discussion/discussion.json b/erpnext/schools/doctype/discussion/discussion.json
new file mode 100644
index 0000000..ad58831
--- /dev/null
+++ b/erpnext/schools/doctype/discussion/discussion.json
@@ -0,0 +1,160 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "Discussion.####", 
+ "beta": 0, 
+ "creation": "2016-06-13 07:57:38.326925", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Subject", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Discussion", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Discussion", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "subject", 
+ "track_seen": 1
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/discussion/discussion.py b/erpnext/schools/doctype/discussion/discussion.py
new file mode 100644
index 0000000..96732e3
--- /dev/null
+++ b/erpnext/schools/doctype/discussion/discussion.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class Discussion(Document):
+	def validate(self):
+		if not self.owner== frappe.session.user:
+			frappe.throw(_("Not Permitted"))
+
+def get_discussions(doctype, txt, filters, limit_start, limit_page_length=20):
+	from frappe.www.list import get_list
+	if not filters:
+		filters = []
+		filters.append(("Discussion", "course", "=", frappe.form_dict.course))
+	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=True)
+
+def get_list_context(context=None):
+	course_name = frappe.form_dict.course
+	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course_name), 'show_always': 0L, 'title': u'Topics'},
+				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course_name), 'show_always': 0L, 'title': u'Discussions'},
+
+	]
+	sidebar_title = course_name
+	return {
+		"show_sidebar": True,
+		'no_breadcrumbs': True,
+		"get_list" : get_discussions,
+		"title": _("Discussions"),
+		"sidebar_items" : portal_items,
+		"sidebar_title" : sidebar_title,
+		"row_template": "templates/includes/discussion/discussion_row.html"
+	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/discussion/test_discussion.py b/erpnext/schools/doctype/discussion/test_discussion.py
new file mode 100644
index 0000000..31799f0
--- /dev/null
+++ b/erpnext/schools/doctype/discussion/test_discussion.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Discussion')
+
+class TestDiscussion(unittest.TestCase):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/examination/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/examination/__init__.py
diff --git a/erpnext/schools/doctype/examination/examination.js b/erpnext/schools/doctype/examination/examination.js
new file mode 100644
index 0000000..b1091f3
--- /dev/null
+++ b/erpnext/schools/doctype/examination/examination.js
@@ -0,0 +1,28 @@
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
+cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
+cur_frm.add_fetch("student", "title", "student_name");
+
+frappe.ui.form.on("Examination" ,{
+	student_group : function(frm) {
+		frm.set_value("results" ,"");
+		if (frm.doc.student_group) {
+			frappe.call({
+				method: "erpnext.schools.api.get_student_group_students",
+				args: {
+					"student_group": frm.doc.student_group
+				},
+				callback: function(r) {
+					if (r.message) {
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(cur_frm.doc, "Examination Result", "results");
+							row.student = d.student;
+							row.student_name = d.student_name;
+						});
+					}
+					refresh_field("results");
+				}
+			});
+		}
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/examination/examination.json b/erpnext/schools/doctype/examination/examination.json
new file mode 100644
index 0000000..f882289
--- /dev/null
+++ b/erpnext/schools/doctype/examination/examination.json
@@ -0,0 +1,497 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:exam_name", 
+ "creation": "2015-11-12 16:34:34.658092", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "exam_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exam Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "exam_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exam Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_2", 
+   "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": "supervisor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supervisor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "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": "supervisor_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supervisor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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": "examiner", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Examiner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "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": "examiner_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Examiner Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "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": 1, 
+   "collapsible_depends_on": "", 
+   "depends_on": "", 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Schedule", 
+   "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": "Today", 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Schedule Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "room", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "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": "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": 0, 
+   "collapsible": 0, 
+   "fieldname": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": 1, 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Results", 
+   "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": "results", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "results", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Examination Result", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Examination", 
+   "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": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Examination", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/examination/examination.py b/erpnext/schools/doctype/examination/examination.py
new file mode 100644
index 0000000..c1a3d1a
--- /dev/null
+++ b/erpnext/schools/doctype/examination/examination.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+import frappe
+from frappe import _
+
+class Examination(Document):
+	def validate(self):
+		self.validate_overlap()
+	
+	def validate_overlap(self):
+		"""Validates overlap for Student Group, Supervisor, Room"""
+
+		from erpnext.schools.utils import validate_overlap_for
+
+		validate_overlap_for(self, "Examination", "student_group")
+		validate_overlap_for(self, "Course Schedule", "student_group" )
+		
+		if self.room:
+			validate_overlap_for(self, "Examination", "room")
+			validate_overlap_for(self, "Course Schedule", "room")
+
+		if self.supervisor:
+			validate_overlap_for(self, "Examination", "supervisor")
+			validate_overlap_for(self, "Course Schedule", "instructor", self.supervisor)
+
+def get_examination_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	user = frappe.session.user
+	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+	if student:
+		return frappe. db.sql('''select course, schedule_date, from_time, to_time, sgs.name from `tabExamination` as exam, 
+			`tabStudent Group Student` as sgs where exam.student_group = sgs.parent and sgs.student = %s and exam.docstatus=1
+			order by exam.name asc limit {0} , {1}'''
+			.format(limit_start, limit_page_length), student, as_dict = True)
+
+def get_list_context(context=None):
+	return {
+		"show_sidebar": True,
+		'no_breadcrumbs': True,
+		"title": _("Examination Schedule"),
+		"get_list": get_examination_list,
+		"row_template": "templates/includes/examination/examination_row.html"
+	}
diff --git a/erpnext/schools/doctype/examination/test_examination.py b/erpnext/schools/doctype/examination/test_examination.py
new file mode 100644
index 0000000..be276f9
--- /dev/null
+++ b/erpnext/schools/doctype/examination/test_examination.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Examination')
+
+class TestExamination(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/examination_result/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/examination_result/__init__.py
diff --git a/erpnext/schools/doctype/examination_result/examination_result.json b/erpnext/schools/doctype/examination_result/examination_result.json
new file mode 100644
index 0000000..932dff1
--- /dev/null
+++ b/erpnext/schools/doctype/examination_result/examination_result.json
@@ -0,0 +1,137 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-11-13 17:18:06.468332", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Name", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "result", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Result", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:27:02.405667", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Examination Result", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/examination_result/examination_result.py b/erpnext/schools/doctype/examination_result/examination_result.py
new file mode 100644
index 0000000..0d7a435
--- /dev/null
+++ b/erpnext/schools/doctype/examination_result/examination_result.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ExaminationResult(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/fee_amount/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/fee_amount/__init__.py
diff --git a/erpnext/schools/doctype/fee_amount/fee_amount.json b/erpnext/schools/doctype/fee_amount/fee_amount.json
new file mode 100644
index 0000000..942b6ef
--- /dev/null
+++ b/erpnext/schools/doctype/fee_amount/fee_amount.json
@@ -0,0 +1,120 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "", 
+ "beta": 0, 
+ "creation": "2015-09-16 13:07:27.675453", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "fees_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Fees Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "options": "Fee Category", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:25:44.368245", 
+ "modified_by": "r@r.com", 
+ "module": "Schools", 
+ "name": "Fee Amount", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_amount/fee_amount.py b/erpnext/schools/doctype/fee_amount/fee_amount.py
new file mode 100644
index 0000000..a26e1d9
--- /dev/null
+++ b/erpnext/schools/doctype/fee_amount/fee_amount.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class FeeAmount(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/fee_category/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/fee_category/__init__.py
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
new file mode 100644
index 0000000..33b0dab
--- /dev/null
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -0,0 +1,129 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:category_name", 
+ "creation": "2015-09-16 13:01:10.448734", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "category_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-flag", 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Fee Category", 
+ "name_case": "", 
+ "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": "Administrator", 
+   "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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "description", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_category/fee_category.py b/erpnext/schools/doctype/fee_category/fee_category.py
new file mode 100644
index 0000000..5523444
--- /dev/null
+++ b/erpnext/schools/doctype/fee_category/fee_category.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class FeeCategory(Document):
+	pass
diff --git a/erpnext/schools/doctype/fee_category/test_fee_category.py b/erpnext/schools/doctype/fee_category/test_fee_category.py
new file mode 100644
index 0000000..48e7589
--- /dev/null
+++ b/erpnext/schools/doctype/fee_category/test_fee_category.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Fee Category')
+
+class TestFeeCategory(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/fee_structure/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/fee_structure/__init__.py
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.js b/erpnext/schools/doctype/fee_structure/fee_structure.js
new file mode 100644
index 0000000..e3d4544
--- /dev/null
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.js
@@ -0,0 +1,9 @@
+frappe.ui.form.on("Fee Amount", {
+	amount: function(frm) {
+		total_amount = 0;
+		for(var i=0;i<frm.doc.amount.length;i++) {
+			total_amount += frm.doc.amount[i].amount;
+		}
+		frm.set_value("total_amount", total_amount);
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
new file mode 100644
index 0000000..da41493
--- /dev/null
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -0,0 +1,288 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-16 13:03:20.430704", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "earning_name", 
+   "oldfieldtype": "Data", 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "FS.", 
+   "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": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "options": "Academic Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "300px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Amount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Total 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-flag", 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Fee Structure", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "program", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.py b/erpnext/schools/doctype/fee_structure/fee_structure.py
new file mode 100644
index 0000000..b4fc279
--- /dev/null
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class FeeStructure(Document):
+	def validate(self):
+		self.calculate_total()
+		
+	def calculate_total(self):
+		"""Calculates total amount."""
+		self.total_amount = 0
+		for d in self.amount:
+			self.total_amount += d.amount
+	
diff --git a/erpnext/schools/doctype/fee_structure/test_fee_structure.py b/erpnext/schools/doctype/fee_structure/test_fee_structure.py
new file mode 100644
index 0000000..785ae4e
--- /dev/null
+++ b/erpnext/schools/doctype/fee_structure/test_fee_structure.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Fee Structure')
+
+class TestFeeStructure(unittest.TestCase):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/fees/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/fees/__init__.py
diff --git a/erpnext/schools/doctype/fees/fees.js b/erpnext/schools/doctype/fees/fees.js
new file mode 100644
index 0000000..0e9ad76
--- /dev/null
+++ b/erpnext/schools/doctype/fees/fees.js
@@ -0,0 +1,79 @@
+
+cur_frm.add_fetch("student", "title", "student_name");
+
+frappe.ui.form.on("Fees", {
+	refresh: function(frm) {
+		if (frm.doc.docstatus === 1 && (frm.doc.total_amount > frm.doc.paid_amount)) {
+			frm.add_custom_button(__("Collect Fees"), function() {
+				frappe.prompt({fieldtype:"Float", label: __("Amount Paid"), fieldname:"amt"},
+					function(data) {
+						frappe.call({
+							method:"erpnext.schools.api.collect_fees",
+							args: {
+								"fees": frm.doc.name,
+								"amt": data.amt
+							},
+							callback: function(r) {
+								frm.doc.paid_amount = r.message
+								frm.doc.outstanding_amount = frm.doc.total_amount - r.message
+								frm.refresh()
+							}
+						});
+					}, __("Enter Paid Amount"), __("Collect"));
+			});
+		}
+	},
+	
+	program: function(frm) {
+		if (frm.doc.program && frm.doc.academic_term) {
+			frappe.call({
+				method: "erpnext.schools.api.get_fee_structure",
+				args: {
+					"program": frm.doc.program,
+					"academic_term": frm.doc.academic_term
+				},
+				callback: function(r) {
+					if(r.message) {
+						frm.set_value("fee_structure" ,r.message);
+					}
+				}
+			});
+		}
+	},
+
+	academic_term: function() {
+		frappe.ui.form.trigger("Fees", "program");
+	},
+
+	fee_structure: function(frm) {
+		frm.set_value("amount" ,"");
+		if (frm.doc.fee_structure) {
+			frappe.call({
+				method: "erpnext.schools.api.get_fee_amount",
+				args: {
+					"fee_structure": frm.doc.fee_structure
+				},
+				callback: function(r) {
+					if (r.message) {
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Fee Amount", "amount");
+							row.fees_category = d.fees_category;
+							row.amount = d.amount;
+						});
+					}
+					refresh_field("amount");
+				}
+			});
+		}
+	}
+});
+
+frappe.ui.form.on("Fee Amount", {
+	amount: function(frm) {
+		total_amount = 0;
+		for(var i=0;i<frm.doc.amount.length;i++) {
+			total_amount += frm.doc.amount[i].amount;
+		}
+		frm.set_value("total_amount", total_amount);
+	}
+});
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
new file mode 100644
index 0000000..576d69e
--- /dev/null
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -0,0 +1,516 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-22 16:57:22.143710", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "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": "fee_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "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": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Name", 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "FEE.", 
+   "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": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "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": "program_enrollment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program Enrollment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Enrollment", 
+   "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": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Due Date", 
+   "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": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Amount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Fees", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "paid_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Paid Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "outstanding_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Outstanding Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-21 06:20:10.878913", 
+ "modified_by": "r@r.com", 
+ "module": "Schools", 
+ "name": "Fees", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/fees.py b/erpnext/schools/doctype/fees/fees.py
new file mode 100644
index 0000000..0f2db50
--- /dev/null
+++ b/erpnext/schools/doctype/fees/fees.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+import frappe
+from frappe import _
+
+class Fees(Document):
+	def validate(self):
+		self.calculate_total()
+		
+	def calculate_total(self):
+		"""Calculates total amount."""
+		self.total_amount = 0
+		for d in self.amount:
+			self.total_amount += d.amount
+
+def get_fee_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	user = frappe.session.user
+	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+	if student:
+		return frappe. db.sql('''select name, program, due_date, paid_amount, outstanding_amount, total_amount from `tabFees`
+			where student= %s and docstatus=1
+			order by due_date asc limit {0} , {1}'''
+			.format(limit_start, limit_page_length), student, as_dict = True)
+
+def get_list_context(context=None):
+	return {
+		"show_sidebar": True,
+		"show_search": True,
+		'no_breadcrumbs': True,
+		"title": _("Fees"),
+		"get_list": get_fee_list,
+		"row_template": "templates/includes/fee/fee_row.html"
+	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/fees_list.js b/erpnext/schools/doctype/fees/fees_list.js
new file mode 100644
index 0000000..6b985e3
--- /dev/null
+++ b/erpnext/schools/doctype/fees/fees_list.js
@@ -0,0 +1,14 @@
+frappe.listview_settings['Fees'] = {
+	add_fields: [ "total_amount", "paid_amount", "due_date"],
+	get_indicator: function(doc) {
+		if ((doc.total_amount > doc.paid_amount) && doc.due_date < get_today()) {
+			return [__("Overdue"), "red", ["due_date,<,"+get_today()], ["due_date,<,"+get_today()]];
+		}
+		else if (doc.total_amount > doc.paid_amount) {
+			return [__("Pending"), "orange"];
+		}
+		else {
+			return [__("Paid"), "green"];
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/test_fees.py b/erpnext/schools/doctype/fees/test_fees.py
new file mode 100644
index 0000000..3ea83ee
--- /dev/null
+++ b/erpnext/schools/doctype/fees/test_fees.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Fees')
+
+class TestFees(unittest.TestCase):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/instructor/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/instructor/__init__.py
diff --git a/erpnext/schools/doctype/instructor/instructor.js b/erpnext/schools/doctype/instructor/instructor.js
new file mode 100644
index 0000000..51d2886
--- /dev/null
+++ b/erpnext/schools/doctype/instructor/instructor.js
@@ -0,0 +1,13 @@
+cur_frm.add_fetch("employee", "department", "department");
+cur_frm.add_fetch("employee", "image", "image");
+
+frappe.ui.form.on("Instructor", "refresh", function(frm) {
+	if(!frm.doc.__islocal) {
+		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				instructor: frm.doc.name
+			}
+			frappe.set_route("List", "Course Schedule");
+		});
+	}
+});
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
new file mode 100644
index 0000000..922e175
--- /dev/null
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -0,0 +1,232 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-11-04 15:56:30.004034", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "instructor_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee", 
+   "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": "column_break_5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "INS/", 
+   "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": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "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": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "demo@erpnext.com", 
+ "module": "Schools", 
+ "name": "Instructor", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "instructor_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/instructor/instructor.py b/erpnext/schools/doctype/instructor/instructor.py
new file mode 100644
index 0000000..4331b91
--- /dev/null
+++ b/erpnext/schools/doctype/instructor/instructor.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Instructor(Document):
+	pass
diff --git a/erpnext/schools/doctype/instructor/test_instructor.py b/erpnext/schools/doctype/instructor/test_instructor.py
new file mode 100644
index 0000000..4061422
--- /dev/null
+++ b/erpnext/schools/doctype/instructor/test_instructor.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Instructor')
+
+class TestInstructor(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/instructor/test_records.json b/erpnext/schools/doctype/instructor/test_records.json
new file mode 100644
index 0000000..3747c0d
--- /dev/null
+++ b/erpnext/schools/doctype/instructor/test_records.json
@@ -0,0 +1,12 @@
+[
+	{
+		"naming_series": "_T-Instructor-",
+		"employee": "_T-Employee-0001",
+		"instructor_name": "_Test Instructor"
+	},
+	{
+		"naming_series": "_T-Instructor-",
+		"employee": "_T-Employee-0002", 
+		"instructor_name": "_Test Instructor 2"
+	}
+]
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/program/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/program/__init__.py
diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/schools/doctype/program/program.js
new file mode 100644
index 0000000..7b9f920
--- /dev/null
+++ b/erpnext/schools/doctype/program/program.js
@@ -0,0 +1,44 @@
+// Copyright (c) 2015, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("course", "course_code", "course_code");
+cur_frm.add_fetch('fee_structure', 'total_amount', 'amount');
+
+frappe.ui.form.on("Program", "refresh", function(frm) {
+	if(!frm.doc.__islocal) {
+		frm.add_custom_button(__("Student Applicant"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
+			frappe.set_route("List", "Student Applicant");
+		});
+		
+		frm.add_custom_button(__("Program Enrollment"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
+			frappe.set_route("List", "Program Enrollment");
+		});
+		
+		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
+			frappe.set_route("List", "Student Group");
+		});
+		
+		frm.add_custom_button(__("Fee Structure"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
+			frappe.set_route("List", "Fee Structure");
+		});
+		
+		frm.add_custom_button(__("Fees"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
+			frappe.set_route("List", "Fees");
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json
new file mode 100644
index 0000000..8041f61
--- /dev/null
+++ b/erpnext/schools/doctype/program/program.json
@@ -0,0 +1,281 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:program_name", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:54:03.609282", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "program_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "program_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Program Code", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "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": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course", 
+   "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": "courses", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Courses", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Course", 
+   "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": "fee_schedule", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fee Schedule", 
+   "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": "fees", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fees", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Fee", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Program", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "department", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/program.py b/erpnext/schools/doctype/program/program.py
new file mode 100644
index 0000000..0ece961
--- /dev/null
+++ b/erpnext/schools/doctype/program/program.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Program(Document):
+	def validate(self):
+		self.validate_course()
+		
+	def validate_course(self):
+		for d in self.courses:
+			if not d.course_code:
+				d.course_code = frappe.db.get_value("Course", d.course, "course_code")
diff --git a/erpnext/schools/doctype/program/test_program.py b/erpnext/schools/doctype/program/test_program.py
new file mode 100644
index 0000000..a4accda
--- /dev/null
+++ b/erpnext/schools/doctype/program/test_program.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Program')
+
+class TestProgram(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/program/test_records.json b/erpnext/schools/doctype/program/test_records.json
new file mode 100644
index 0000000..c0f8231
--- /dev/null
+++ b/erpnext/schools/doctype/program/test_records.json
@@ -0,0 +1,8 @@
+[
+	{
+		"program_name": "_Test Program"
+	},
+	{
+		"program_name": "_Test Program 2"
+	}
+]
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/program_course/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/program_course/__init__.py
diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json
new file mode 100644
index 0000000..e9a397e
--- /dev/null
+++ b/erpnext/schools/doctype/program_course/program_course.json
@@ -0,0 +1,164 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-09-07 14:37:01.886859", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course Code", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "required", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Required", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-21 12:27:02.330118", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Program Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_course/program_course.py b/erpnext/schools/doctype/program_course/program_course.py
new file mode 100644
index 0000000..684b6fa
--- /dev/null
+++ b/erpnext/schools/doctype/program_course/program_course.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProgramCourse(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/program_enrollment/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/program_enrollment/__init__.py
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.js b/erpnext/schools/doctype/program_enrollment/program_enrollment.js
new file mode 100644
index 0000000..038afd9
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch('fee_structure', 'total_amount', 'amount');
+
+frappe.ui.form.on("Program Enrollment", {
+	program: function(frm) {
+		if (frm.doc.program) {
+			frappe.call({
+				method: "erpnext.schools.api.get_fee_schedule",
+				args: {
+					"program": frm.doc.program
+				},
+				callback: function(r) {
+					if(r.message) {
+						frm.set_value("fees" ,r.message);
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
new file mode 100644
index 0000000..6977a24
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
@@ -0,0 +1,289 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "PE.#####", 
+ "beta": 0, 
+ "creation": "2015-12-02 12:58:32.916080", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "student_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "student.title", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "Today", 
+   "fieldname": "enrollment_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Enrollment Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "fees", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fees", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Fee", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Program Enrollment", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Program Enrollment", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.py b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
new file mode 100644
index 0000000..ca193dd
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import msgprint, _
+from frappe.model.document import Document
+from frappe.utils import comma_and
+
+class ProgramEnrollment(Document):
+	def validate(self):
+		self.validate_duplication()
+	
+	def on_submit(self):
+		self.update_student_joining_date()
+		self.make_fee_records()
+	
+	def validate_duplication(self):
+		enrollment = frappe.db.sql("""select name from `tabProgram Enrollment` where student= %s and program= %s 
+			and academic_year= %s and docstatus<2 and name != %s""", (self.student, self.program, self.academic_year, self.name))
+		if enrollment:
+			frappe.throw(_("Student is already enrolled."))
+	
+	def update_student_joining_date(self):
+		date = frappe.db.sql("select min(enrollment_date) from `tabProgram Enrollment` where student= %s", self.student)
+		frappe.db.set_value("Student", self.student, "joining_date", date)
+		
+	def make_fee_records(self):
+		from erpnext.schools.api import get_fee_amount
+		fee_list = []
+		for d in self.fees:
+			fee_amount = get_fee_amount(d.fee_structure)
+			if fee_amount:
+				fees = frappe.new_doc("Fees")
+				fees.update({
+					"student": self.student,
+					"academic_year": self.academic_year,
+					"academic_term": d.academic_term,
+					"fee_structure": d.fee_structure,
+					"program": self.program,
+					"due_date": d.due_date,
+					"student_name": self.student_name,
+					"program_enrollment": self.name,
+					"amount": fee_amount
+				})
+				
+				fees.save()
+				fees.submit()
+				fee_list.append(fees.name)
+		if fee_list:
+			fee_list = ["""<a href="#Form/Fees/%s" target="_blank">%s</a>""" % \
+				(fee, fee) for fee in fee_list]
+			msgprint(_("Fee Records Created - {0}").format(comma_and(fee_list)))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment/test_program_enrollment.py b/erpnext/schools/doctype/program_enrollment/test_program_enrollment.py
new file mode 100644
index 0000000..c26e899
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment/test_program_enrollment.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Program Enrollment')
+
+class TestProgramEnrollment(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/schools/doctype/program_enrollment_fee/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/schools/doctype/program_enrollment_fee/__init__.py
diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
new file mode 100644
index 0000000..6760384
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.json
@@ -0,0 +1,163 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-19 05:52:56.322125", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "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": "fee_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Due Date", 
+   "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": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:27:02.547926", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Program Enrollment Fee", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py
new file mode 100644
index 0000000..03a311e
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_fee/program_enrollment_fee.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProgramEnrollmentFee(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/program_enrollment_tool/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/program_enrollment_tool/__init__.py
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
new file mode 100644
index 0000000..3dd00c0
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
@@ -0,0 +1,33 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+cur_frm.add_fetch("student", "title", "student_name");
+cur_frm.add_fetch("student_applicant", "title", "student_name");
+
+frappe.ui.form.on("Program Enrollment Tool", {
+	"refresh": function(frm) {
+		frm.disable_save();
+	},
+	
+	"get_students": function(frm) {
+		frm.set_value("students",[]);
+		frappe.call({
+			method: "get_students",
+			doc:frm.doc,
+			callback: function(r) {
+				if(r.message) {
+					frm.set_value("students", r.message);
+				}
+			}
+		})
+	},
+	
+	"enroll_students": function(frm) {
+		frappe.call({
+			method: "enroll_students",
+			doc:frm.doc,
+			callback: function(r) {
+					frm.set_value("students", []);
+			}
+		})
+	}
+});
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
new file mode 100644
index 0000000..0b0cd7b
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
@@ -0,0 +1,331 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-10 03:01:05.178956", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "get_students_from", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Students From", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStudent Applicants\nProgram Enrollments", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "get_students", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Students", 
+   "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": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "students", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program Enrollment Tool Student", 
+   "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": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "new_program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "New Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "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": "new_academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "New Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "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": "enroll_students", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Enroll Students", 
+   "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": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "demo@erpnext.com", 
+ "module": "Schools", 
+ "name": "Program Enrollment Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
new file mode 100644
index 0000000..b483ef5
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class ProgramEnrollmentTool(Document):
+	def get_students(self):
+		if not self.get_students_from:
+			frappe.throw(_("Mandatory feild - Get Students From"))
+		elif not self.program:
+			frappe.throw(_("Mandatory feild - Program"))
+		elif not self.academic_year:
+			frappe.throw(_("Mandatory feild - Academic Year"))
+		else:
+			if self.get_students_from == "Student Applicants":
+				students = frappe.db.sql("select name as student_applicant, title as student_name from \
+					`tabStudent Applicant` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
+			else:
+				students = frappe.db.sql("select student, student_name from \
+					`tabProgram Enrollment` where program = %s and academic_year = %s",(self.program, self.academic_year), as_dict=1)
+		if students:
+			return students
+		else:
+			frappe.throw(_("No students Found"))
+			
+	def enroll_students(self):
+		for stud in self.students:
+			prog_enrollment = frappe.new_doc("Program Enrollment")
+			prog_enrollment.student = stud.student
+			prog_enrollment.student_name = stud.student_name
+			prog_enrollment.program = self.new_program
+			prog_enrollment.academic_year = self.new_academic_year
+			prog_enrollment.save()
+		frappe.msgprint("Students have been enrolled.")
+			
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/schools/doctype/program_enrollment_tool_student/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/schools/doctype/program_enrollment_tool_student/__init__.py
diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
new file mode 100644
index 0000000..9e200d7
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.json
@@ -0,0 +1,140 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-06-10 03:29:02.539914", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "student_applicant", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Applicant", 
+   "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, 
+   "depends_on": "", 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Name", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:32:12.784608", 
+ "modified_by": "r@r.com", 
+ "module": "Schools", 
+ "name": "Program Enrollment Tool Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py
new file mode 100644
index 0000000..38dc1c8
--- /dev/null
+++ b/erpnext/schools/doctype/program_enrollment_tool_student/program_enrollment_tool_student.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProgramEnrollmentToolStudent(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/program_fee/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/program_fee/__init__.py
diff --git a/erpnext/schools/doctype/program_fee/program_fee.json b/erpnext/schools/doctype/program_fee/program_fee.json
new file mode 100644
index 0000000..6b320a0
--- /dev/null
+++ b/erpnext/schools/doctype/program_fee/program_fee.json
@@ -0,0 +1,163 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-05-19 05:52:56.322125", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "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": "fee_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fee Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fee Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Due Date", 
+   "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": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:27:02.153696", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Program Fee", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_fee/program_fee.py b/erpnext/schools/doctype/program_fee/program_fee.py
new file mode 100644
index 0000000..cadcc4e
--- /dev/null
+++ b/erpnext/schools/doctype/program_fee/program_fee.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ProgramFee(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/room/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/room/__init__.py
diff --git a/erpnext/schools/doctype/room/room.js b/erpnext/schools/doctype/room/room.js
new file mode 100644
index 0000000..032db98
--- /dev/null
+++ b/erpnext/schools/doctype/room/room.js
@@ -0,0 +1,10 @@
+frappe.ui.form.on("Room", "refresh", function(frm) {
+	if(!cur_frm.doc.__islocal) {
+		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				room: frm.doc.name
+			}
+			frappe.set_route("List", "Course Schedule");
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/room.json b/erpnext/schools/doctype/room/room.json
new file mode 100644
index 0000000..b7a6d94
--- /dev/null
+++ b/erpnext/schools/doctype/room/room.json
@@ -0,0 +1,146 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "RM.####", 
+ "creation": "2015-09-09 16:20:14.613061", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "room_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Room Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "room_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Room Number", 
+   "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": "seating_capacity", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Seating Capacity", 
+   "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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Room", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "room_name", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/room.py b/erpnext/schools/doctype/room/room.py
new file mode 100644
index 0000000..f26e9c4
--- /dev/null
+++ b/erpnext/schools/doctype/room/room.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Room(Document):
+	pass
diff --git a/erpnext/schools/doctype/room/test_records.json b/erpnext/schools/doctype/room/test_records.json
new file mode 100644
index 0000000..6edf076
--- /dev/null
+++ b/erpnext/schools/doctype/room/test_records.json
@@ -0,0 +1,17 @@
+[
+	{
+		"room_name": "_Test Room",
+		"room_number": "1001",
+		"seating_capacity": 100
+	},
+	{
+		"room_name": "_Test Room 1",
+		"room_number": "1002",
+		"seating_capacity": 100
+	},
+	{
+		"room_name": "_Test Room 2",
+		"room_number": "1003",
+		"seating_capacity": 100
+	}
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/room/test_room.py b/erpnext/schools/doctype/room/test_room.py
new file mode 100644
index 0000000..33ffd91
--- /dev/null
+++ b/erpnext/schools/doctype/room/test_room.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Room')
+
+class TestRoom(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/scheduling_tool/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/scheduling_tool/__init__.py
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
new file mode 100644
index 0000000..7109771
--- /dev/null
+++ b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
@@ -0,0 +1,14 @@
+cur_frm.add_fetch("student_group", "program", "program");
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("student_group", "academic_year", "academic_year");
+cur_frm.add_fetch("student_group", "academic_term", "academic_term");
+
+frappe.ui.form.on("Scheduling Tool", "refresh", function(frm) {
+	frm.disable_save();
+	frm.page.set_primary_action(__("Schedule Course"), function() {
+		frappe.call({
+			method: "schedule_course",
+			doc:frm.doc
+		})
+	});
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
new file mode 100644
index 0000000..0143c8b
--- /dev/null
+++ b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
@@ -0,0 +1,539 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2015-09-23 15:37:38.108475", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "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, 
+   "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": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "section_break_6", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "room", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Room", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Room", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_9", 
+   "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, 
+   "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": "instructor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "instructor_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Instructor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "instructor.instructor_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "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, 
+   "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, 
+   "default": "", 
+   "fieldname": "from_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "From Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "", 
+   "fieldname": "course_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course Start Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "day", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Day", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "rechedule", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rechedule", 
+   "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": "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, 
+   "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": "to_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To TIme", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "default": "", 
+   "fieldname": "course_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course End Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Scheduling Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
new file mode 100644
index 0000000..4a62a74
--- /dev/null
+++ b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import calendar
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import add_days, getdate
+from erpnext.schools.utils import OverlapError
+
+class SchedulingTool(Document):
+	def schedule_course(self):
+		"""Creates course schedules as per specified parametes"""
+		
+		course_schedules= []
+		course_schedules_errors= []
+		rescheduled= []
+		reschedule_errors= []
+		
+		self.validate_mandatory()
+		self.validate_date()
+		self.instructor_name= frappe.db.get_value("Instructor", self.instructor, "instructor_name")
+		self.course= frappe.db.get_value("Student Group", self.student_group, "course")
+		
+		if self.rechedule:
+			rescheduled, reschedule_errors = self.delete_course_schedule(rescheduled, reschedule_errors)
+		
+		date = self.course_start_date
+		while(date < self.course_end_date):
+			if self.day == calendar.day_name[getdate(date).weekday()]:
+				course_schedule = self.make_course_schedule(date)
+				try:
+					course_schedule.save()
+				except OverlapError:
+					course_schedules_errors.append(date)
+				else:
+					course_schedules.append(course_schedule.name + " on " + date)
+				
+				date = add_days(date, 7)
+			else:
+				date = add_days(date, 1)
+			
+		frappe.local.message_log = []
+		if course_schedules:
+			frappe.msgprint(_("Course Schedules created:") + "\n" + "\n".join(course_schedules))
+		if course_schedules_errors:
+			frappe.msgprint(_("There were errors while scheduling course on :") + "\n" + "\n".join(course_schedules_errors))
+		if rescheduled:
+			frappe.msgprint(_("Course Schedules deleted:") + "\n" + "\n".join(rescheduled))
+		if reschedule_errors:
+			frappe.msgprint(_("There were errors while deleting following schedules:") + "\n" + "\n".join(reschedule_errors))
+			
+	def validate_mandatory(self):
+		"""Validates all mandatory fields"""
+		fields = ['student_group', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
+		for d in  fields:
+			if not self.get(d):
+				frappe.throw(_("{0} is mandatory").format(self.meta.get_label(d)))	
+
+	def validate_date(self):
+		"""Validates if Course Start Date is greater than Course End Date"""
+		if self.course_start_date > self.course_end_date:
+			frappe.throw("Course Start Date cannot be greater than Course End Date.")
+
+	def delete_course_schedule(self, rescheduled, reschedule_errors):
+		"""Delete all course schedule within the Date range and specified filters"""
+		schedules = frappe.get_list("Course Schedule", fields=["name", "schedule_date"], filters = 
+			[["student_group", "=", self.student_group],
+			["schedule_date", ">=", self.course_start_date], 
+			["schedule_date", "<=", self.course_end_date]])
+		for d in schedules:
+			try:
+				if self.day == calendar.day_name[getdate(d.schedule_date).weekday()]:
+					frappe.delete_doc("Course Schedule", d.name)
+					rescheduled.append(d.name)
+			except:
+				reschedule_errors.append(d.name)
+		return rescheduled, reschedule_errors
+			
+	def make_course_schedule(self, date):
+		"""Makes a new Course Schedule.
+		:param date: Date on which Course Schedule will be created."""
+		
+		course_schedule = frappe.new_doc("Course Schedule")
+		course_schedule.student_group = self.student_group
+		course_schedule.course = self.course
+		course_schedule.instructor = self.instructor
+		course_schedule.instructor_name = self.instructor_name
+		course_schedule.room = self.room
+		course_schedule.schedule_date= date
+		course_schedule.from_time= self.from_time
+		course_schedule.to_time= self.to_time
+		return course_schedule
diff --git a/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py b/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py
new file mode 100644
index 0000000..4ec3747
--- /dev/null
+++ b/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Scheduling Tool')
+
+class TestSchedulingTool(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/schools/doctype/sg_creation_tool_course/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/schools/doctype/sg_creation_tool_course/__init__.py
diff --git a/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json
new file mode 100644
index 0000000..8814f88
--- /dev/null
+++ b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.json
@@ -0,0 +1,163 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-01-04 15:03:57.940079", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "course_code", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Course Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "course.course_code", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "max_strength", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Max Strength", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:31:41.252860", 
+ "modified_by": "r@r.com", 
+ "module": "Schools", 
+ "name": "SG Creation Tool Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.py b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.py
new file mode 100644
index 0000000..4024c69
--- /dev/null
+++ b/erpnext/schools/doctype/sg_creation_tool_course/sg_creation_tool_course.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class SGCreationToolCourse(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/student/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/student/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/student/student.js
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/student/student.js
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
new file mode 100644
index 0000000..70648c2
--- /dev/null
+++ b/erpnext/schools/doctype/student/student.json
@@ -0,0 +1,614 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-07 13:00:55.938280", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "First Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "middle_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Middle Name", 
+   "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": "last_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Last Name", 
+   "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": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "STUD.", 
+   "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, 
+   "default": "Today", 
+   "fieldname": "joining_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Joining Date", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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, 
+   "width": "10"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "!doc.__islocal", 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Personal 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "mother_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mother's Name", 
+   "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": "mother_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mother's / Guardian 1 Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "father_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Father's Name", 
+   "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": "father_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Father's/ Guardian 2 Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_applicant", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Applicant", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Applicant", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Date of Birth", 
+   "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": "gender", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale", 
+   "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": "blood_group", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Blood Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
+   "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": "nationality", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Nationality", 
+   "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": "student_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "", 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Title", 
+   "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, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "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": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student.py b/erpnext/schools/doctype/student/student.py
new file mode 100644
index 0000000..a34bb6a
--- /dev/null
+++ b/erpnext/schools/doctype/student/student.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Student(Document):
+
+	def validate(self):
+		self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name]))
+
+		if self.student_applicant:
+			self.check_unique()
+			self.update_applicant_status()
+
+	def check_unique(self):
+		"""Validates if the Student Applicant is Unique"""
+		student = frappe.db.sql("select name from `tabStudent` where student_applicant=%s and name!=%s", (self.student_applicant, self.name))
+		if student:
+			frappe.throw("Student {0} exist against student applicant {1}".format(student[0][0], self.student_applicant))
+
+	def update_applicant_status(self):
+		"""Updates Student Applicant status to Admitted"""
+		if self.student_applicant:
+			frappe.db.set_value("Student Applicant", self.student_applicant, "application_status", "Admitted")
+
+def get_timeline_data(doctype, name):
+	'''Return timeline for attendance'''
+	return dict(frappe.db.sql('''select unix_timestamp(cs.schedule_date), count(*)
+		from `tabCourse Schedule` as cs , `tabStudent Attendance` as sa where
+			sa.course_schedule = cs.name
+			and sa.student=%s
+			and cs.schedule_date > date_sub(curdate(), interval 1 year)
+			and status = 'Present'
+			group by cs.schedule_date''', name))
diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py
new file mode 100644
index 0000000..0c22c7b
--- /dev/null
+++ b/erpnext/schools/doctype/student/student_dashboard.py
@@ -0,0 +1,15 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on the attendance of this Student'),
+	'fieldname': 'student',
+	'transactions': [
+		{
+			'items': ['Student Group', 'Student Attendance', 'Program Enrollment' ]
+		},
+		{
+			'items': ['Fees', 'Examination']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/test_records.json b/erpnext/schools/doctype/student/test_records.json
new file mode 100644
index 0000000..e280794
--- /dev/null
+++ b/erpnext/schools/doctype/student/test_records.json
@@ -0,0 +1,32 @@
+[
+	{
+		"first_name": "_Test",
+		"middle_name": "Student",
+		"last_name": "Name",
+		"program": "_Test Program",
+		"date_of_birth": "2000-01-01",
+		"gender": "Male",
+		"blood_group": "A+"
+		
+	},
+	{
+		"first_name": "_Test",
+		"middle_name": "Student",
+		"last_name": "Name 1",
+		"program": "_Test Program",
+		"date_of_birth": "2000-01-01",
+		"gender": "Male",
+		"blood_group": "A+"
+		
+	},
+	{
+		"first_name": "_Test",
+		"middle_name": "Student",
+		"last_name": "Name 2",
+		"program": "_Test Program",
+		"date_of_birth": "2000-01-01",
+		"gender": "Male",
+		"blood_group": "A+"
+		
+	}
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/test_student.py b/erpnext/schools/doctype/student/test_student.py
new file mode 100644
index 0000000..cc6537f
--- /dev/null
+++ b/erpnext/schools/doctype/student/test_student.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student')
+
+class TestStudent(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/student_applicant/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/student_applicant/__init__.py
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/schools/doctype/student_applicant/student_applicant.js
new file mode 100644
index 0000000..6857a66
--- /dev/null
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.js
@@ -0,0 +1,29 @@
+frappe.ui.form.on("Student Applicant", {
+	refresh: function(frm) {
+		if(frm.doc.application_status== "Applied" && frm.doc.docstatus== 1 ) {
+			frm.add_custom_button(__("Approve"), function() {
+				frm.set_value("application_status", "Approved");
+				frm.save_or_update();
+				
+			}).addClass("btn-primary");
+			
+			frm.add_custom_button(__("Reject"), function() {
+				frm.set_value("application_status", "Rejected");
+				frm.save_or_update();
+			}).addClass("btn-danger");
+		}
+		
+		if(frm.doc.application_status== "Approved" && frm.doc.docstatus== 1 ) {
+			frm.add_custom_button(__("Enroll"), function() {
+				frm.events.enroll(frm)
+			}).addClass("btn-primary");
+		}
+	},
+	
+	enroll: function(frm) {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.schools.api.enroll_student",
+			frm: frm
+		})
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
new file mode 100644
index 0000000..f2635c8
--- /dev/null
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -0,0 +1,691 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2015-09-11 11:50:09.740807", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "First Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "middle_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Middle Name", 
+   "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": "last_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Last Name", 
+   "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": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Naming Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "AP.", 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.docstatus != 0", 
+   "fieldname": "application_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Application Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Applied\nApproved\nRejected\nAdmitted", 
+   "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, 
+   "default": "Today", 
+   "fieldname": "application_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Application Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "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": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "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": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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": 1, 
+   "collapsible_depends_on": "eval: doc.__islocal == 1", 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Personal 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "mother_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mother's Name", 
+   "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": "mother_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mother's / Guardian 1 Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "father_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Father's Name", 
+   "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": "father_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Father's/ Guardian 2 Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_12", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Date of Birth", 
+   "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": "gender", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nMale\nFemale", 
+   "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": "blood_group", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Blood Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
+   "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": "nationality", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Nationality", 
+   "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": "student_email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Email 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "title", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Title", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Student Applicant", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_field": "image", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Applicant", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "title", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.py b/erpnext/schools/doctype/student_applicant/student_applicant.py
new file mode 100644
index 0000000..5ef72cb
--- /dev/null
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-777777yyy
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class StudentApplicant(Document):
+	def validate(self):
+		self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name]))
+
+	def on_update_after_submit(self):
+		student = frappe.get_list("Student",  filters= {"student_applicant": self.name})
+		if student:
+			frappe.throw(_("Cannot change status as student {0} is linked with student application {1}").format(student[0].name, self.name))
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant_list.js b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
new file mode 100644
index 0000000..43402d8
--- /dev/null
+++ b/erpnext/schools/doctype/student_applicant/student_applicant_list.js
@@ -0,0 +1,17 @@
+frappe.listview_settings['Student Applicant'] = {
+	add_fields: [ "application_status"],
+	get_indicator: function(doc) {
+		if (doc.application_status=="Applied") {
+			return [__("Applied"), "orange", "application_status,=,Applied"];
+		}
+		else if (doc.application_status=="Approved") {
+			return [__("Approved"), "green", "application_status,=,Approved"];
+		}
+		else if (doc.application_status=="Rejected") {
+			return [__("Rejected"), "red", "application_status,=,Rejected"];
+		}
+		else if (doc.application_status=="Admitted") {
+			return [__("Admitted"), "blue", "application_status,=,Admitted"];
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/test_student_applicant.py b/erpnext/schools/doctype/student_applicant/test_student_applicant.py
new file mode 100644
index 0000000..9734a88
--- /dev/null
+++ b/erpnext/schools/doctype/student_applicant/test_student_applicant.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Applicant')
+
+class TestStudentApplicant(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/report/employee_holiday_attendance/__init__.py b/erpnext/schools/doctype/student_attendance/__init__.py
similarity index 100%
copy from erpnext/hr/report/employee_holiday_attendance/__init__.py
copy to erpnext/schools/doctype/student_attendance/__init__.py
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/schools/doctype/student_attendance/student_attendance.json
new file mode 100644
index 0000000..bdeac7a
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -0,0 +1,209 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "SA.######", 
+ "creation": "2015-11-05 15:20:23.045996", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student", 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "student_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Student Name", 
+   "no_copy": 0, 
+   "options": "student.title", 
+   "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": "column_break_3", 
+   "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": "course_schedule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course Schedule", 
+   "no_copy": 0, 
+   "options": "Course Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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, 
+   "default": "Present", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Status", 
+   "no_copy": 0, 
+   "options": "Present\nAbsent", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "no_copy": 1, 
+   "options": "Student Attendance", 
+   "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, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Attendance", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "student_name"
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/schools/doctype/student_attendance/student_attendance.py
new file mode 100644
index 0000000..65dbd68
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class StudentAttendance(Document):
+	def validate(self):
+		self.validate_duplication()
+		
+	def validate_duplication(self):
+		"""Check if the Attendance Record is Unique"""
+		attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+			student= %s and course_schedule= %s and name != %s""",
+			(self.student, self.course_schedule, self.name))
+		if attendance_records:
+			frappe.throw(_("Attendance Record {0} exists against Student {1} for Course Schedule {2}")
+				.format(attendance_records[0][0], self.student, self.course_schedule))
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance_list.js b/erpnext/schools/doctype/student_attendance/student_attendance_list.js
new file mode 100644
index 0000000..0d3e7ad
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance/student_attendance_list.js
@@ -0,0 +1,11 @@
+frappe.listview_settings['Student Attendance'] = {
+	add_fields: [ "status"],
+	get_indicator: function(doc) {
+		if (doc.status=="Absent") {
+			return [__("Absent"), "orange", "status,=,Absent"];
+		}
+		else if (doc.status=="Present") {
+			return [__("Present"), "green", "status,=,Present"];
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/test_student_attendance.py b/erpnext/schools/doctype/student_attendance/test_student_attendance.py
new file mode 100644
index 0000000..9f41538
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance/test_student_attendance.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Attendance')
+
+class TestStudentAttendance(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/student_attendance/untitled.txt b/erpnext/schools/doctype/student_attendance/untitled.txt
new file mode 100644
index 0000000..b2f4c36
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance/untitled.txt
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class Studentattendance(Document):
+	def validate(self):
+		self.validate_duplication()
+		
+	def validate_duplication(self):
+		attendance_records= frappe.db.sql("""select name from `tabStudent attendance` where \
+			student= %s and course_schedule= %s and name != %s""",
+			(self.student, self.course_schedule, self.name))
+		if attendance_records:
+			frappe.throw(_("attendance Record {0} exists against Student {1} for Course Schedule {2}")
+				.format(attendance_records[0][0], self.student, self.course_schedule))
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/student_group/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/student_group/__init__.py
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
new file mode 100644
index 0000000..a993ff7
--- /dev/null
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -0,0 +1,19 @@
+cur_frm.add_fetch("student", "title", "student_name");
+
+frappe.ui.form.on("Student Group", "refresh", function(frm) {
+	if(!frm.doc.__islocal) {
+		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				student_group: frm.doc.name
+			}
+			frappe.set_route("List", "Course Schedule");
+		});
+		
+		frm.add_custom_button(__("Examination"), function() {
+			frappe.route_options = {
+				student_group: frm.doc.name
+			}
+			frappe.set_route("List", "Examination");
+		});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
new file mode 100644
index 0000000..38a7747
--- /dev/null
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -0,0 +1,324 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:group_name", 
+ "creation": "2015-09-07 12:55:52.072792", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "group_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Group Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "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": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "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": 1, 
+   "unique": 0
+  }, 
+  {
+   "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, 
+   "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": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "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": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Set 0 for no limit", 
+   "fieldname": "max_strength", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Max Strength", 
+   "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": 1, 
+   "collapsible_depends_on": "", 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Students", 
+   "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": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "students", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group Student", 
+   "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": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics 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": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "program, course", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "group_name", 
+ "version": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.py b/erpnext/schools/doctype/student_group/student_group.py
new file mode 100644
index 0000000..0acbed9
--- /dev/null
+++ b/erpnext/schools/doctype/student_group/student_group.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class StudentGroup(Document):
+	def validate(self):
+		self.validate_strength()
+		self.validate_student_name()
+		
+	def validate_strength(self):
+		if self.max_strength and len(self.students) > self.max_strength:
+			frappe.throw(_("""Cannot enroll more than {0} students for this student group.""").format(self.max_strength))
+
+	def validate_student_name(self):
+		for d in self.students:
+			d.student_name = frappe.db.get_value("Student", d.student, "title")
diff --git a/erpnext/schools/doctype/student_group/test_records.json b/erpnext/schools/doctype/student_group/test_records.json
new file mode 100644
index 0000000..23186ca
--- /dev/null
+++ b/erpnext/schools/doctype/student_group/test_records.json
@@ -0,0 +1,16 @@
+[
+	{
+		"group_name": "_Test Student Group",
+		"program": "_Test Program",
+		"course": "_Test Course",
+		"academic_year": "2014-2015",
+		"academic_term": "_Test Academic Term"
+	},
+	{
+		"group_name": "_Test Student Group 1",
+		"program": "_Test Program",
+		"course": "_Test Course 2",
+		"academic_year": "2014-2015",
+		"academic_term": "_Test Academic Term"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/test_student_group.py b/erpnext/schools/doctype/student_group/test_student_group.py
new file mode 100644
index 0000000..6b599aa
--- /dev/null
+++ b/erpnext/schools/doctype/student_group/test_student_group.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Group')
+
+class TestStudentGroup(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/schools/doctype/student_group_creation_tool/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/schools/doctype/student_group_creation_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
new file mode 100644
index 0000000..056574c
--- /dev/null
+++ b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
@@ -0,0 +1,23 @@
+frappe.ui.form.on("Student Group Creation Tool", "refresh", function(frm) {
+	frm.disable_save();
+	frm.page.set_primary_action(__("Create Student Groups"), function() {
+		frappe.call({
+			method: "create_student_groups",
+			doc:frm.doc
+		})
+	});
+	
+});
+
+frappe.ui.form.on("Student Group Creation Tool", "get_courses", function(frm) {
+	frm.set_value("courses",[]);
+	frappe.call({
+		method: "get_courses",
+		doc:frm.doc,
+		callback: function(r) {
+			if(r.message) {
+				frm.set_value("courses", r.message);
+			}
+		}
+	})
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
new file mode 100644
index 0000000..2c53b70
--- /dev/null
+++ b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
@@ -0,0 +1,252 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2016-01-04 14:45:36.576933", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "academic_year", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Year", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "academic_term", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Academic Term", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Academic Term", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "get_courses", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Get Courses", 
+   "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": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Leave blank if you wish to fetch all courses for selected academic term", 
+   "fieldname": "program", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Program", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Program", 
+   "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": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "courses", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Courses", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "SG Creation Tool Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "demo@erpnext.com", 
+ "module": "Schools", 
+ "name": "Student Group Creation Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Administrator", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py
new file mode 100644
index 0000000..65cf755
--- /dev/null
+++ b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class StudentGroupCreationTool(Document):
+	def get_courses(self):
+		if self.program:
+			courses = frappe.db.sql("""select course, course_code, parent as program, "student_group_name"
+				from `tabProgram Course` where academic_term= %s and parent= %s""",
+				(self.academic_term, self.program), as_dict=1)
+		else:
+			courses = frappe.db.sql("""select course, course_code, parent as program, "student_group_name"
+				from `tabProgram Course` where academic_term= %s""",
+				self.academic_term, as_dict=1)
+
+		for d in courses:
+			if d.course_code:
+				d.student_group_name = d.course_code + "-" + self.academic_year
+			else:
+				d.student_group_name = None
+
+		return courses
+
+	def create_student_groups(self):
+		if not self.courses:
+			frappe.throw(_("""No Student Groups created."""))
+
+		for d in self.courses:
+			if not d.course:
+				frappe.throw(_("""Course is mandatory in row {0}""".format(d.idx)))
+
+			if not d.student_group_name:
+				frappe.throw(_("""Student Group Name is mandatory in row {0}""".format(d.idx)))
+
+			student_group = frappe.new_doc("Student Group")
+			student_group.group_name = d.student_group_name
+			student_group.course = d.course
+			student_group.max_strength = d.max_strength
+			student_group.academic_term = self.academic_term
+			student_group.academic_year = self.academic_year
+			student_group.save()
+
+		frappe.msgprint(_("Student Groups created."))
diff --git a/erpnext/crm/doctype/newsletter_list/__init__.py b/erpnext/schools/doctype/student_group_student/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter_list/__init__.py
copy to erpnext/schools/doctype/student_group_student/__init__.py
diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.json b/erpnext/schools/doctype/student_group_student/student_group_student.json
new file mode 100644
index 0000000..94493ae
--- /dev/null
+++ b/erpnext/schools/doctype/student_group_student/student_group_student.json
@@ -0,0 +1,112 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2015-09-11 15:14:58.501830", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Student Name", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2016-07-21 12:27:02.479077", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Group Student", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.py b/erpnext/schools/doctype/student_group_student/student_group_student.py
new file mode 100644
index 0000000..1fe4ea1
--- /dev/null
+++ b/erpnext/schools/doctype/student_group_student/student_group_student.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentGroupStudent(Document):
+	pass
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/doctype/topic/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/doctype/topic/__init__.py
diff --git a/erpnext/schools/doctype/topic/test_topic.py b/erpnext/schools/doctype/topic/test_topic.py
new file mode 100644
index 0000000..1d2974e
--- /dev/null
+++ b/erpnext/schools/doctype/topic/test_topic.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Topic')
+
+class TestTopic(unittest.TestCase):
+	pass
diff --git a/erpnext/schools/doctype/topic/topic.js b/erpnext/schools/doctype/topic/topic.js
new file mode 100644
index 0000000..bd9379d
--- /dev/null
+++ b/erpnext/schools/doctype/topic/topic.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Topic', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/schools/doctype/topic/topic.json
new file mode 100644
index 0000000..6aedc1e
--- /dev/null
+++ b/erpnext/schools/doctype/topic/topic.json
@@ -0,0 +1,160 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "Topic.####", 
+ "beta": 0, 
+ "creation": "2016-06-28 07:06:38.749398", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Course", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "topic_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Topic Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "introduction", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Introduction", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "content", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Content", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-07-18 10:30:50.243271",
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Topic", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "course", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/topic/topic.py b/erpnext/schools/doctype/topic/topic.py
new file mode 100644
index 0000000..5dba561
--- /dev/null
+++ b/erpnext/schools/doctype/topic/topic.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class Topic(Document):
+	pass
+
+def get_topic_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	user = frappe.session.user
+	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+	if student:
+		data = frappe. db.sql('''select name, course, modified,topic_name, introduction, content from `tabTopic` as topic
+								where topic.course = %s 
+								order by idx asc limit {0} , {1}'''.format(limit_start, limit_page_length),filters.course,as_dict = True)
+		
+		for topic in data:
+			try:
+				num_attachments = frappe.db.sql(""" select count(file_url) from tabFile as file
+													where file.attached_to_name=%s 
+													and file.attached_to_doctype=%s""",(topic.name,"Topic"))
+
+			except IOError or frappe.DoesNotExistError:
+				pass
+				frappe.local.message_log.pop()
+
+			topic.num_attachments = num_attachments[0][0]
+
+		return data
+
+def get_list_context(context=None):
+	course = frappe.get_doc('Course', frappe.form_dict.course)
+	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course.name), 'show_always': 0L, 'title': u'Topics'},
+				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course.name), 'show_always': 0L, 'title': u'Discussions'},
+
+	]
+	return {
+		"show_sidebar": True,
+		"title": _("Topic"),
+		'no_breadcrumbs': True,
+		"sidebar_items" : portal_items,
+		"sidebar_title" : course.name,
+		"get_list": get_topic_list,
+		"row_template": "templates/includes/topic/topic_row.html"
+	}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/report/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/report/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/schools/report/student_fee_collection/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/schools/report/student_fee_collection/__init__.py
diff --git a/erpnext/schools/report/student_fee_collection/student_fee_collection.json b/erpnext/schools/report/student_fee_collection/student_fee_collection.json
new file mode 100644
index 0000000..d4afcb9
--- /dev/null
+++ b/erpnext/schools/report/student_fee_collection/student_fee_collection.json
@@ -0,0 +1,19 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-06-22 02:58:41.024538", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-07-18 02:58:42.727096", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Student Fee Collection", 
+ "owner": "Administrator", 
+ "query": "SELECT\n student as \"Student:Link/Student:200\",\n student_name as \"Student Name::200\",\n sum(paid_amount) as \"Paid Amount:Currency:150\",\n sum(outstanding_amount) as \"Outstanding Amount:Currency:150\",\n sum(total_amount) as \"Total Amount:Currency:150\"\nFROM\n `tabFees` \nGROUP BY\n student", 
+ "ref_doctype": "Fees", 
+ "report_name": "Student Fee Collection", 
+ "report_type": "Query Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/utils.py b/erpnext/schools/utils.py
new file mode 100644
index 0000000..c7e92c2
--- /dev/null
+++ b/erpnext/schools/utils.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For lice
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+class OverlapError(frappe.ValidationError): pass
+
+def validate_overlap_for(doc, doctype, fieldname, value=None):
+	"""Checks overlap for specified feild.
+	
+	:param fieldname: Checks Overlap for this feild 
+	"""
+	
+	existing = get_overlap_for(doc, doctype, fieldname, value)
+	if existing:
+		frappe.throw(_("This {0} conflicts with {1} for {2} {3}").format(doc.doctype, existing.name,
+			doc.meta.get_label(fieldname) if not value else fieldname , value or doc.get(fieldname)), OverlapError)
+	
+def get_overlap_for(doc, doctype, fieldname, value=None):
+	"""Returns overlaping document for specified feild.
+	
+	:param fieldname: Checks Overlap for this feild 
+	"""
+
+	existing = frappe.db.sql("""select name, from_time, to_time from `tab{0}`
+		where `{1}`=%(val)s and schedule_date = %(schedule_date)s and
+		(
+			(from_time > %(from_time)s and from_time < %(to_time)s) or
+			(to_time > %(from_time)s and to_time < %(to_time)s) or
+			(%(from_time)s > from_time and %(from_time)s < to_time) or
+			(%(from_time)s = from_time and %(to_time)s = to_time))
+		and name!=%(name)s""".format(doctype, fieldname),
+		{
+			"schedule_date": doc.schedule_date,
+			"val": value or doc.get(fieldname),
+			"from_time": doc.from_time,
+			"to_time": doc.to_time,
+			"name": doc.name or "No Name"
+		}, as_dict=True)
+
+	return existing[0] if existing else None
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/web_form/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/web_form/__init__.py
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/schools/web_form/discussion/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/schools/web_form/discussion/__init__.py
diff --git a/erpnext/schools/web_form/discussion/discussion.js b/erpnext/schools/web_form/discussion/discussion.js
new file mode 100644
index 0000000..4130b0c
--- /dev/null
+++ b/erpnext/schools/web_form/discussion/discussion.js
@@ -0,0 +1,4 @@
+frappe.ready(function() {
+	var form = $('form[data-web-form="discussion"]'),
+		owner = form.attr('data-owner');
+})
\ No newline at end of file
diff --git a/erpnext/schools/web_form/discussion/discussion.json b/erpnext/schools/web_form/discussion/discussion.json
new file mode 100644
index 0000000..4a781d1
--- /dev/null
+++ b/erpnext/schools/web_form/discussion/discussion.json
@@ -0,0 +1,49 @@
+{
+ "allow_comments": 1, 
+ "allow_delete": 1, 
+ "allow_edit": 1, 
+ "allow_multiple": 1, 
+ "creation": "2016-06-26 20:46:09.598755", 
+ "doc_type": "Discussion", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "modified": "2016-07-19 07:55:37.826664", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "discussion", 
+ "owner": "Administrator", 
+ "published": 1, 
+ "route": "discussion", 
+ "success_url": "", 
+ "title": "Discussion", 
+ "web_form_fields": [
+  {
+   "fieldname": "course", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Course", 
+   "options": "Course", 
+   "read_only": 1, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "subject", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Subject", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Description", 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/schools/web_form/discussion/discussion.py b/erpnext/schools/web_form/discussion/discussion.py
new file mode 100644
index 0000000..23ff052
--- /dev/null
+++ b/erpnext/schools/web_form/discussion/discussion.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context=None):
+	pass
+
+def has_website_permission(doc, ptype, user, verbose=False):
+	return True
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 1d4bd41..5b41ad8 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -6,8 +6,6 @@
 		frappe.setup_language_field(frm);
 	},
 	refresh: function(frm) {
-		frm.cscript.setup_dashboard(frm.doc);
-
 		if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
 		} else {
@@ -25,24 +23,6 @@
 		var grid = cur_frm.get_field("sales_team").grid;
 		grid.set_column_disp("allocated_amount", false);
 		grid.set_column_disp("incentives", false);
-
-		frm.events.add_custom_buttons(frm);
-	},
-	add_custom_buttons: function(frm) {
-		["Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"].forEach(function(doctype, i) {
-			if(frappe.model.can_read(doctype)) {
-				frm.add_custom_button(__(doctype), function() {
-					frappe.route_options = {"customer": frm.doc.name};
-					frappe.set_route("List", doctype);
-				}, __("View"));
-			}
-			if(frappe.model.can_create(doctype)) {
-				frm.add_custom_button(__(doctype), function() {
-					frappe.route_options = {"customer": frm.doc.name};
-					new_doc(doctype);
-				}, __("Make"));
-			}
-		});
 	},
 	validate: function(frm) {
 		if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
@@ -64,43 +44,9 @@
 cur_frm.add_fetch('lead_name', 'company_name', 'customer_name');
 cur_frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
 
-cur_frm.cscript.setup_dashboard = function(doc) {
-	cur_frm.dashboard.reset(doc);
-	if(doc.__islocal)
-		return;
-	if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager"))
-		cur_frm.dashboard.set_headline('<span class="text-muted">'+ __('Loading...')+ '</span>')
-
-	cur_frm.dashboard.add_doctype_badge("Opportunity", "customer");
-	cur_frm.dashboard.add_doctype_badge("Quotation", "customer");
-	cur_frm.dashboard.add_doctype_badge("Sales Order", "customer");
-	cur_frm.dashboard.add_doctype_badge("Delivery Note", "customer");
-	cur_frm.dashboard.add_doctype_badge("Sales Invoice", "customer");
-	cur_frm.dashboard.add_doctype_badge("Project", "customer");
-
-	return frappe.call({
-		type: "GET",
-		method: "erpnext.selling.doctype.customer.customer.get_dashboard_info",
-		args: {
-			customer: cur_frm.doc.name
-		},
-		callback: function(r) {
-			if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
-				cur_frm.dashboard.set_headline(
-					__("Total billing this year") + ": <b>"
-					+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
-					+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
-					+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)
-					+ '</b></span>');
-			}
-			cur_frm.dashboard.set_badge_count(r.message);
-		}
-	});
-}
-
 cur_frm.fields_dict['customer_group'].get_query = function(doc, dt, dn) {
 	return{
-		filters:{'is_group': 'No'}
+		filters:{'is_group': 0}
 	}
 }
 
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 8e4434b..2a954b1 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-06-11 14:26:44", 
  "custom": 0, 
  "description": "Buyer of Goods and Services.", 
@@ -18,9 +19,10 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "", 
+   "label": "Name and Type", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
@@ -43,6 +45,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -61,12 +64,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Full Name", 
@@ -92,6 +96,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Type", 
@@ -118,6 +123,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "From Lead", 
@@ -140,10 +146,63 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Active", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Active\nDormant\nOpen", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -168,6 +227,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Customer Group", 
@@ -195,6 +255,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
@@ -221,6 +282,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax ID", 
@@ -246,6 +308,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
@@ -265,14 +328,15 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "", 
+   "label": "Currency and Price List", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -294,6 +358,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Currency", 
@@ -318,6 +383,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Price List", 
@@ -342,6 +408,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -365,6 +432,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Language", 
@@ -391,6 +459,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address and Contact", 
@@ -415,6 +484,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address HTML", 
@@ -434,10 +504,35 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "website", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -461,6 +556,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact HTML", 
@@ -481,14 +577,15 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "collapsible_depends_on": "accounts", 
+   "collapsible_depends_on": "", 
    "fieldname": "default_receivable_accounts", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Default Receivable Accounts", 
+   "label": "Accounting", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -511,6 +608,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
@@ -532,10 +630,11 @@
    "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "eval:doc.credit_days || doc.credit_limit", 
-   "fieldname": "column_break2", 
+   "fieldname": "credit_limit_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
@@ -560,6 +659,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days Based On", 
@@ -586,6 +686,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
@@ -611,6 +712,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
@@ -638,6 +740,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -664,6 +767,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Details", 
@@ -685,33 +789,11 @@
    "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, 
-   "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": "is_frozen", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Frozen", 
@@ -737,6 +819,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner and Commission", 
@@ -762,6 +845,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
@@ -788,6 +872,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission Rate", 
@@ -814,6 +899,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team", 
@@ -838,6 +924,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team Details", 
@@ -860,14 +947,16 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-user", 
- "idx": 1, 
+ "idx": 363, 
+ "image_field": "image", 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-02-22 16:16:41.563405", 
+ "modified": "2016-06-09 14:39:17.712638", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
@@ -1054,9 +1143,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "customer_name,customer_group,territory", 
  "sort_order": "ASC", 
- "title_field": "customer_name"
-}
+ "title_field": "customer_name", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index df91d63..ee3f6e6 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -10,7 +10,8 @@
 from frappe.desk.reportview import build_match_conditions
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.utilities.address_and_contact import load_address_and_contact
-from erpnext.accounts.party import validate_party_accounts
+from erpnext.accounts.party import validate_party_accounts, get_timeline_data # keep this
+from erpnext.accounts.party_status import get_party_status
 
 class Customer(TransactionBase):
 	def get_feed(self):
@@ -42,6 +43,7 @@
 	def validate(self):
 		self.flags.is_new_doc = self.is_new()
 		validate_party_accounts(self)
+		self.status = get_party_status(self)
 
 	def update_lead_status(self):
 		if self.lead_name:
@@ -125,33 +127,6 @@
 			{set_field} where customer=%(newdn)s"""\
 			.format(set_field=set_field), ({"newdn": newdn}))
 
-@frappe.whitelist()
-def get_dashboard_info(customer):
-	if not frappe.has_permission("Customer", "read", customer):
-		frappe.msgprint(_("Not permitted"), raise_exception=True)
-
-	out = {}
-	for doctype in ["Opportunity", "Quotation", "Sales Order", "Delivery Note",
-		"Sales Invoice", "Project"]:
-		out[doctype] = frappe.db.get_value(doctype,
-			{"customer": customer, "docstatus": ["!=", 2] }, "count(*)")
-
-	billing_this_year = frappe.db.sql("""
-		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""",
-		(customer, frappe.db.get_default("fiscal_year")))
-
-	total_unpaid = frappe.db.sql("""select sum(outstanding_amount)
-		from `tabSales Invoice`
-		where customer=%s and docstatus = 1""", customer)
-
-	out["billing_this_year"] = billing_this_year[0][0] if billing_this_year else 0
-	out["total_unpaid"] = total_unpaid[0][0] if total_unpaid else 0
-
-	return out
-
 
 def get_customer_list(doctype, txt, searchfield, start, page_len, filters):
 	if frappe.db.get_default("cust_master_name") == "Customer Name":
diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py
new file mode 100644
index 0000000..b65c199
--- /dev/null
+++ b/erpnext/selling/doctype/customer/customer_dashboard.py
@@ -0,0 +1,25 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on transactions against this Customer. See timeline below for details'),
+	'fieldname': 'customer',
+	'transactions': [
+		{
+			'label': _('Pre Sales'),
+			'items': ['Opportunity', 'Quotation']
+		},
+		{
+			'label': _('Orders'),
+			'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
+		},
+		{
+			'label': _('Support'),
+			'items': ['Issue']
+		},
+		{
+			'label': _('Projects'),
+			'items': ['Project']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js
index 012d3f8..57cebd4 100644
--- a/erpnext/selling/doctype/customer/customer_list.js
+++ b/erpnext/selling/doctype/customer/customer_list.js
@@ -1,3 +1,12 @@
 frappe.listview_settings['Customer'] = {
-	add_fields: ["customer_name", "territory", "customer_group", "customer_type"]
+	add_fields: ["customer_name", "territory", "customer_group", "customer_type", 'status'],
+	get_indicator: function(doc) {
+		color = {
+			'Open': 'red',
+			'Active': 'green',
+			'Dormant': 'darkgrey'
+		}
+		return [__(doc.status), color[doc.status], "status,=," + doc.status];
+	}
+
 };
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 1ca5ce7..9e53845 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -99,24 +99,24 @@
 		frappe.db.sql("delete from `tabCustomer` where customer_name='_Test Customer 1'")
 
 		if not frappe.db.get_value("Customer", "_Test Customer 1"):
-			test_customer_1 = frappe.get_doc({
-				 "customer_group": "_Test Customer Group",
-				 "customer_name": "_Test Customer 1",
-				 "customer_type": "Individual",
-				 "doctype": "Customer",
-				 "territory": "_Test Territory"
-			}).insert(ignore_permissions=True)
+			test_customer_1 = frappe.get_doc(
+				get_customer_dict('_Test Customer 1')).insert(ignore_permissions=True)
 		else:
 			test_customer_1 = frappe.get_doc("Customer", "_Test Customer 1")
 
-		duplicate_customer = frappe.get_doc({
-			 "customer_group": "_Test Customer Group",
-			 "customer_name": "_Test Customer 1",
-			 "customer_type": "Individual",
-			 "doctype": "Customer",
-			 "territory": "_Test Territory"
-		}).insert(ignore_permissions=True)
+		duplicate_customer = frappe.get_doc(
+			get_customer_dict('_Test Customer 1')).insert(ignore_permissions=True)
 
 		self.assertEquals("_Test Customer 1", test_customer_1.name)
 		self.assertEquals("_Test Customer 1 - 1", duplicate_customer.name)
 		self.assertEquals(test_customer_1.customer_name, duplicate_customer.customer_name)
+
+def get_customer_dict(customer_name):
+	return {
+		 "customer_group": "_Test Customer Group",
+		 "customer_name": customer_name,
+		 "customer_type": "Individual",
+		 "doctype": "Customer",
+		 "territory": "_Test Territory"
+	}
+
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index f0e1eab..5b99691 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/utils.js");
+
 
 frappe.ui.form.on_change("Installation Note", "customer",
 	function(frm) { erpnext.utils.get_party_details(frm); });
@@ -49,7 +49,7 @@
 		if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('From Delivery Note'),
 				function() {
-					frappe.model.map_current_doc({
+					erpnext.utils.map_current_doc({
 						method: "erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note",
 						source_doctype: "Delivery Note",
 						get_query_filters: {
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 29e9a43..5719f22 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -167,7 +167,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -578,7 +578,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -594,7 +594,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-03 02:27:41.801292", 
+ "modified": "2016-04-06 03:15:14.774949", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
@@ -646,5 +646,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "customer_name"
+ "title_field": "customer_name", 
+ "track_seen": 0
 }
\ No newline at end of file
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 5be7ca1..9b8d48f 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -42,6 +45,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Serial No", 
@@ -69,6 +73,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Installed Qty", 
@@ -94,6 +99,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -121,6 +127,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Document Detail No", 
@@ -148,6 +155,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Document No", 
@@ -175,6 +183,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Document Type", 
@@ -198,6 +207,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -205,13 +215,15 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-10 00:18:55.558356", 
+ "modified": "2016-07-11 03:28:00.837535", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 fadf198..83ebab1 100644
--- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-05-23 16:55:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item", 
@@ -25,6 +28,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -49,6 +54,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -64,6 +70,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -73,6 +80,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -89,6 +97,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
@@ -98,6 +107,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -113,6 +123,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -123,6 +134,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -134,18 +146,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:52.274925", 
+ "modified": "2016-07-11 03:28:04.049998", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Product Bundle Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 649faaf..d111c14 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 
-{% include 'selling/sales_common.js' %}
+{% include 'erpnext/selling/sales_common.js' %}
 
 erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
 	onload: function(doc, dt, dn) {
@@ -16,23 +16,20 @@
 	},
 	refresh: function(doc, dt, dn) {
 		this._super(doc, dt, dn);
-
 		if(doc.docstatus == 1 && doc.status!=='Lost') {
-			cur_frm.add_custom_button(__('Sales Order'),
-				cur_frm.cscript['Make Sales Order'], __("Make"));
+			cur_frm.add_custom_button(__('Make Sales Order'),
+				cur_frm.cscript['Make Sales Order']);
 
 			if(doc.status!=="Ordered") {
-				cur_frm.add_custom_button(__('Lost'),
-					cur_frm.cscript['Declare Order Lost'], __("Status"));
+				cur_frm.add_custom_button(__('Set as Lost'),
+					cur_frm.cscript['Declare Order Lost']);
 			}
-
-			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 		}
 
 		if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('Opportunity'),
 				function() {
-					frappe.model.map_current_doc({
+					erpnext.utils.map_current_doc({
 						method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
 						source_doctype: "Opportunity",
 						get_query_filters: {
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 0a3d5b5..f07bc8e 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -3,8 +3,10 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-24 19:29:08", 
  "custom": 0, 
+ "default_print_format": "test123", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
@@ -75,7 +77,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -197,7 +199,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -206,7 +208,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Customer / Lead Name", 
+   "label": "Custome Name", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -223,105 +225,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_address", 
-   "oldfieldtype": "Small Text", 
-   "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": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -460,6 +363,314 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "collapsible_depends_on": "", 
+   "depends_on": "eval:(doc.customer || doc.lead)", 
+   "fieldname": "contact_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address and Contact", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer_address", 
+   "oldfieldtype": "Small Text", 
+   "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, 
+   "depends_on": "eval:doc.customer", 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Contact Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "contact_person", 
+   "oldfieldtype": "Link", 
+   "options": "Contact", 
+   "permlevel": 0, 
+   "print_hide": 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": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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, 
+   "depends_on": "customer", 
+   "fieldname": "col_break98", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "shipping_address_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Shipping 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "shipping_address", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Shipping Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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, 
+   "depends_on": "customer", 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer_group", 
+   "oldfieldtype": "Link", 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 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, 
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 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": 1, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1356,19 +1567,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "base_rounded_total", 
-   "fieldtype": "Currency", 
+   "description": "In Words will be visible once you save the Quotation.", 
+   "fieldname": "base_in_words", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Rounded Total (Company Currency)", 
+   "label": "In Words (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "rounded_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "oldfieldname": "in_words", 
+   "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1384,19 +1595,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "In Words will be visible once you save the Quotation.", 
-   "fieldname": "base_in_words", 
-   "fieldtype": "Data", 
+   "fieldname": "base_rounded_total", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "In Words (Company Currency)", 
+   "label": "Rounded Total (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "in_words", 
-   "oldfieldtype": "Data", 
+   "oldfieldname": "rounded_total", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -1463,7 +1674,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
@@ -1506,7 +1717,7 @@
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1600,213 +1811,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "fieldname": "contact_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_group", 
-   "oldfieldtype": "Link", 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 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": "shipping_address_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Shipping 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "shipping_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Shipping Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
-   "depends_on": "customer", 
-   "fieldname": "col_break98", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.customer", 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Contact Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "contact_person", 
-   "oldfieldtype": "Link", 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 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": 1, 
    "fieldname": "print_settings", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -2121,7 +2125,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-shopping-cart", 
- "idx": 1, 
+ "idx": 82, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -2129,7 +2134,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2016-03-03 06:30:26.308629", 
+ "modified": "2016-07-05 16:44:01.301063", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
@@ -2182,27 +2187,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "match": "", 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Customer", 
-   "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, 
@@ -2321,11 +2305,13 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,transaction_date,customer,lead,order_type", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 3c8add4..6ed1888 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -28,10 +28,6 @@
 	def validate_order_type(self):
 		super(Quotation, self).validate_order_type()
 
-		for d in self.get('items'):
-			if not frappe.db.get_value("Item", d.item_code, "is_sales_item"):
-				frappe.throw(_("Item {0} must be Sales Item").format(d.item_code))
-
 	def validate_quotation_to(self):
 		if self.customer:
 			self.quotation_to = "Customer"
@@ -67,7 +63,7 @@
 
 	def on_cancel(self):
 		#update enquiry status
-		self.set_status()
+		self.set_status(update=True)
 		self.update_opportunity()
 
 	def print_other_charges(self,docname):
diff --git a/erpnext/selling/doctype/quotation/quotation_dashboard.py b/erpnext/selling/doctype/quotation/quotation_dashboard.py
new file mode 100644
index 0000000..80dc6aa
--- /dev/null
+++ b/erpnext/selling/doctype/quotation/quotation_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+data = {
+	'fieldname': 'prevdoc_docname',
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Sales Order']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index 3f30d05..7a59dd7 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 from __future__ import unicode_literals
 
-import frappe, json
+import frappe
 from frappe.utils import flt
 import unittest
 
@@ -32,5 +32,99 @@
 		sales_order.transaction_date = "2013-05-12"
 		sales_order.insert()
 
+	def test_create_quotation_with_margin(self):
+		from erpnext.selling.doctype.quotation.quotation import make_sales_order
+		from erpnext.selling.doctype.sales_order.sales_order \
+			import make_delivery_note, make_sales_invoice
+
+		total_margin = flt((1500*18.75)/100 + 1500)
+
+		test_records[0]['items'][0]['price_list_rate'] = 1500
+		test_records[0]['items'][0]['margin_type'] = 'Percentage'
+		test_records[0]['items'][0]['margin_rate_or_amount'] = 18.75
+
+		quotation = frappe.copy_doc(test_records[0])
+		quotation.insert()
+
+		self.assertEquals(quotation.get("items")[0].rate, total_margin)
+		self.assertRaises(frappe.ValidationError, make_sales_order, quotation.name)
+		quotation.submit()
+
+		sales_order = make_sales_order(quotation.name)
+		sales_order.delivery_date = "2016-01-02"
+		sales_order.naming_series = "_T-Quotation-"
+		sales_order.transaction_date = "2016-01-01"
+		sales_order.insert()
+
+		self.assertEquals(quotation.get("items")[0].rate, total_margin)
+
+		sales_order.submit()
+
+		dn = make_delivery_note(sales_order.name)
+		self.assertEquals(quotation.get("items")[0].rate, total_margin)
+		dn.save()
+
+		si = make_sales_invoice(sales_order.name)
+		self.assertEquals(quotation.get("items")[0].rate, total_margin)
+		si.save()
+
+	def test_party_status_open(self):
+		from erpnext.selling.doctype.customer.test_customer import get_customer_dict
+
+		customer = frappe.get_doc(get_customer_dict('Party Status Test')).insert()
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
+
+		quotation = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
+
+		quotation.submit()
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
+
+		quotation.cancel()
+		quotation.delete()
+		customer.delete()
+
+	def test_party_status_close(self):
+		from erpnext.selling.doctype.customer.test_customer import get_customer_dict
+
+		customer = frappe.get_doc(get_customer_dict('Party Status Test')).insert()
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
+
+		# open quotation
+		quotation = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
+
+		# close quotation (submit)
+		quotation.submit()
+
+		quotation1 = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
+
+		# still open
+		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
+
+		quotation.cancel()
+		quotation.delete()
+
+		quotation1.delete()
+
+		customer.delete()
 
 test_records = frappe.get_test_records('Quotation')
+
+def get_quotation_dict(customer=None, item_code=None):
+	if not customer:
+		customer = '_Test Customer'
+	if not item_code:
+		item_code = '_Test Item'
+
+	return {
+		'doctype': 'Quotation',
+		'customer': customer,
+		'items': [
+			{
+				'item_code': item_code,
+				'qty': 1,
+				'rate': 100
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index b58568f..034147a 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -3,10 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "QUOD/.#####", 
+ "beta": 0, 
  "creation": "2013-03-07 11:42:57", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -325,35 +328,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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_hide_if_no_value": 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": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -434,6 +408,163 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "discount_and_margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Discount and Margin", 
+   "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, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 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": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "total_margin", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "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": "section_break1", 
    "fieldtype": "Section Break", 
@@ -458,6 +589,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "depends_on": "", 
    "fieldname": "rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -1090,6 +1222,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -1097,14 +1230,16 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-26 18:30:22.286356", 
+ "modified": "2016-07-11 03:28:06.436316", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 16c98b9..f1eeccc 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -1,20 +1,23 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'selling/sales_common.js' %}
+{% include 'erpnext/selling/sales_common.js' %}
 
 frappe.ui.form.on("Sales Order", {
 	onload: function(frm) {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(frm.doc);
 		});
+
+		// formatter for material request item
+		frm.set_indicator_formatter('item_code',
+			function(doc) { return (doc.qty<=doc.delivered_qty) ? "green" : "orange" })
 	}
 });
 
 erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend({
 	refresh: function(doc, dt, dn) {
 		this._super();
-		this.frm.dashboard.reset();
 		var allow_purchase = false;
 		var allow_delivery = false;
 
@@ -72,11 +75,12 @@
 
 				if(flt(doc.per_billed)==0) {
 					cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make"));
-					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry, __("Make"));
+					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_payment_entry, __("Make"));
 				}
 
 				// maintenance
-				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
+				if(flt(doc.per_delivered, 2) < 100 &&
+						["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
 					cur_frm.add_custom_button(__('Maintenance Visit'), this.make_maintenance_visit, __("Make"));
 					cur_frm.add_custom_button(__('Maintenance Schedule'), this.make_maintenance_schedule, __("Make"));
 				}
@@ -93,7 +97,7 @@
 		if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('Quotation'),
 				function() {
-					frappe.model.map_current_doc({
+					erpnext.utils.map_current_doc({
 						method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
 						source_doctype: "Quotation",
 						get_query_filters: {
@@ -117,7 +121,7 @@
 	tc_name: function() {
 		this.get_terms();
 	},
-	
+
 	make_material_request: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
@@ -153,19 +157,6 @@
 		})
 	},
 
-	make_bank_entry: function() {
-		return frappe.call({
-			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order",
-			args: {
-				"dt": "Sales Order",
-				"dn": cur_frm.doc.name
-			},
-			callback: function(r) {
-				var doclist = frappe.model.sync(r.message);
-				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-			}
-		});
-	},
 	make_purchase_order: function(){
 		var dialog = new frappe.ui.Dialog({
 			title: __("For Supplier"),
@@ -216,7 +207,7 @@
 	tn = frappe.model.make_new_doc_and_get_name('Contact');
 	locals['Contact'][tn].is_customer = 1;
 	if(doc.customer) locals['Contact'][tn].customer = doc.customer;
-	loaddoc('Contact', tn);
+	frappe.set_route('Form', 'Contact', tn);
 }
 
 cur_frm.fields_dict['project'].get_query = function(doc, cdt, cdn) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7e37cb7..66f6b71 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -76,7 +76,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -141,7 +141,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
@@ -167,103 +167,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
    "default": "Sales", 
    "depends_on": "", 
    "fieldname": "order_type", 
@@ -488,10 +391,208 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "", 
+   "depends_on": "customer", 
+   "fieldname": "contact_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address and Contact", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "col_break46", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "fieldname": "shipping_address_name", 
    "fieldtype": "Link", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
@@ -516,7 +617,7 @@
    "collapsible": 0, 
    "fieldname": "shipping_address", 
    "fieldtype": "Small Text", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
@@ -537,6 +638,58 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": 1, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
@@ -563,34 +716,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "100px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "description": "Rate at which customer's currency is converted to company's base currency", 
    "fieldname": "conversion_rate", 
    "fieldtype": "Float", 
@@ -620,6 +745,34 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "100px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1566,7 +1719,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
@@ -1609,7 +1762,7 @@
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1783,182 +1936,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "depends_on": "customer", 
-   "fieldname": "contact_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break45", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "col_break46", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
    "collapsible_depends_on": "project", 
    "fieldname": "more_info", 
    "fieldtype": "Section Break", 
@@ -3011,14 +2988,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-file-text", 
- "idx": 1, 
+ "idx": 105, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-21 13:11:32.654873", 
+ "modified": "2016-04-14 12:34:16.220066", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
@@ -3110,26 +3087,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Customer", 
-   "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, 
@@ -3171,5 +3128,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 7e008da..ced3679 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -21,6 +21,9 @@
 class WarehouseRequired(frappe.ValidationError): pass
 
 class SalesOrder(SellingController):
+	def __init__(self, arg1, arg2=None):
+		super(SalesOrder, self).__init__(arg1, arg2)
+
 	def validate(self):
 		super(SalesOrder, self).validate()
 
@@ -153,7 +156,7 @@
 		self.check_credit_limit()
 		self.update_reserved_qty()
 
-		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.base_grand_total, self)
+		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.company, self.base_grand_total, self)
 
 		self.update_prevdoc_status('submit')
 
@@ -272,8 +275,7 @@
 			if item.delivered_by_supplier:
 				item_delivered_qty  = frappe.db.sql("""select sum(qty)
 					from `tabPurchase Order Item` poi, `tabPurchase Order` po
-					where poi.prevdoc_detail_docname = %s
-						and poi.prevdoc_doctype = 'Sales Order'
+					where poi.sales_order_item = %s
 						and poi.item_code = %s
 						and poi.parent = po.name
 						and po.docstatus = 1
@@ -285,8 +287,8 @@
 			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,
-		update_modified=False)
+		self.db_set("per_delivered", flt(delivered_qty/tot_qty) * 100,
+			update_modified=False)
 
 	def set_indicator(self):
 		"""Set indicator for portal"""
@@ -310,8 +312,13 @@
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
-	list_context["title"] = _("My Orders")
-	list_context["parents"] = [{"title": _("My Account"), "name": "me"}]
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Orders'),
+	})
+
 	return list_context
 
 @frappe.whitelist()
@@ -337,6 +344,9 @@
 	def postprocess(source, doc):
 		doc.material_request_type = "Purchase"
 
+	def update_item(source, target, source_parent):
+		target.project = source_parent.project
+
 	doc = get_mapped_doc("Sales Order", source_name, {
 		"Sales Order": {
 			"doctype": "Material Request",
@@ -349,7 +359,8 @@
 			"field_map": {
 				"parent": "sales_order",
 				"stock_uom": "uom"
-			}
+			},
+			"postprocess": update_item
 		},
 		"Sales Order Item": {
 			"doctype": "Material Request Item",
@@ -357,7 +368,8 @@
 				"parent": "sales_order",
 				"stock_uom": "uom"
 			},
-			"condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code)
+			"condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code),
+			"postprocess": update_item
 		}
 	}, target_doc, postprocess)
 
@@ -417,7 +429,7 @@
 	def postprocess(source, target):
 		set_missing_values(source, target)
 		#Get the advance paid Journal Entries in Sales Invoice Advance
-		target.get_advances()
+		target.set_advances()
 
 	def set_missing_values(source, target):
 		target.is_pos = 0
@@ -587,9 +599,8 @@
 		"Sales Order Item": {
 			"doctype": "Purchase Order Item",
 			"field_map":  [
-				["name", "prevdoc_detail_docname"],
-				["parent", "prevdoc_docname"],
-				["parenttype", "prevdoc_doctype"],
+				["name", "sales_order_item"],
+				["parent", "sales_order"],
 				["uom", "stock_uom"],
 				["delivery_date", "schedule_date"]
 			],
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
new file mode 100644
index 0000000..feda39d
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -0,0 +1,33 @@
+from frappe import _
+
+data = {
+	'fieldname': 'sales_order',
+	'non_standard_fieldnames': {
+		'Delivery Note': 'against_sales_order',
+	},
+	'internal_links': {
+		'Quotation': ['items', 'prevdoc_docname']
+	},
+	'transactions': [
+		{
+			'label': _('Fulfillment'),
+			'items': ['Sales Invoice', 'Delivery Note']
+		},
+		{
+			'label': _('Purchasing'),
+			'items': ['Material Request', 'Purchase Order']
+		},
+		{
+			'label': _('Projects'),
+			'items': ['Project']
+		},
+		{
+			'label': _('Manufacturing'),
+			'items': ['Production Order']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Quotation']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index edd7cdf..f687868 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -126,6 +126,34 @@
 
 		dn.cancel()
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
+		
+	def test_reserved_qty_for_over_delivery_via_sales_invoice(self):
+		# set over-delivery tolerance
+		frappe.db.set_value('Item', "_Test Item", 'tolerance', 50)
+
+		existing_reserved_qty = get_reserved_qty()
+
+		so = make_sales_order()
+		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
+
+		si = make_sales_invoice(so.name)
+		si.update_stock = 1
+		si.get("items")[0].qty = 12
+		si.insert()
+		si.submit()
+		
+		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
+		
+		so.load_from_db()
+		self.assertEqual(so.get("items")[0].delivered_qty, 12)
+		self.assertEqual(so.per_delivered, 100)
+
+		si.cancel()
+		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
+		
+		so.load_from_db()
+		self.assertEqual(so.get("items")[0].delivered_qty, 0)
+		self.assertEqual(so.per_delivered, 0)
 
 	def test_reserved_qty_for_partial_delivery_with_packing_list(self):
 		existing_reserved_qty_item1 = get_reserved_qty("_Test Item")
@@ -238,9 +266,9 @@
 		from erpnext.stock.doctype.item.test_item import make_item
 		from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
 
-		make_item("_Test Service Product Bundle", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
-		make_item("_Test Service Product Bundle Item 1", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
-		make_item("_Test Service Product Bundle Item 2", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
+		make_item("_Test Service Product Bundle", {"is_stock_item": 0})
+		make_item("_Test Service Product Bundle Item 1", {"is_stock_item": 0})
+		make_item("_Test Service Product Bundle Item 2", {"is_stock_item": 0})
 
 		make_product_bundle("_Test Service Product Bundle",
 			["_Test Service Product Bundle Item 1", "_Test Service Product Bundle Item 2"])
@@ -254,9 +282,9 @@
 		from erpnext.stock.doctype.item.test_item import make_item
 		from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
 
-		make_item("_Test Mix Product Bundle", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
-		make_item("_Test Mix Product Bundle Item 1", {"is_stock_item": 1, "is_sales_item": 1})
-		make_item("_Test Mix Product Bundle Item 2", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
+		make_item("_Test Mix Product Bundle", {"is_stock_item": 0})
+		make_item("_Test Mix Product Bundle Item 1", {"is_stock_item": 1})
+		make_item("_Test Mix Product Bundle Item 2", {"is_stock_item": 0})
 
 		make_product_bundle("_Test Mix Product Bundle",
 			["_Test Mix Product Bundle Item 1", "_Test Mix Product Bundle Item 2"])
@@ -265,7 +293,7 @@
 
 	def test_auto_insert_price(self):
 		from erpnext.stock.doctype.item.test_item import make_item
-		make_item("_Test Item for Auto Price List", {"is_stock_item": 0, "is_pro_applicable": 0, "is_sales_item": 1})
+		make_item("_Test Item for Auto Price List", {"is_stock_item": 0})
 		frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
 
 		item_price = frappe.db.get_value("Item Price", {"price_list": "_Test Price List",
@@ -299,14 +327,13 @@
 		from erpnext.stock.doctype.item.test_item import make_item
 		from erpnext.buying.doctype.purchase_order.purchase_order import update_status
 
-		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1,
-			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier',
+		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1,
+        'default_supplier': '_Test Supplier',
 		    "expense_account": "_Test Account Cost for Goods Sold - _TC",
 		    "cost_center": "_Test Cost Center - _TC"
 			})
 
-		dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "is_sales_item": 1,
-			"is_purchase_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC",
+		dn_item = make_item("_Test Regular Item", {"is_stock_item": 1, "expense_account": "_Test Account Cost for Goods Sold - _TC",
   		  	"cost_center": "_Test Cost Center - _TC"})
 
 		so_items = [
@@ -334,7 +361,7 @@
 		existing_ordered_qty = bin[0].ordered_qty if bin else 0.0
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
 
-		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, 
+		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code,
 			"warehouse": "_Test Warehouse - _TC"}, fields=["reserved_qty"])
 
 		existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0
@@ -342,15 +369,14 @@
 		#create so, po and partial dn
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
-		
+
 		po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier')
 		po.submit()
 
 		dn = create_dn_against_so(so.name, delivered_qty=1)
 
 		self.assertEquals(so.customer, po.customer)
-		self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order")
-		self.assertEquals(po.items[0].prevdoc_docname, so.name)
+		self.assertEquals(po.items[0].sales_order, so.name)
 		self.assertEquals(po.items[0].item_code, po_item.item_code)
 		self.assertEquals(dn.items[0].item_code, dn_item.item_code)
 
@@ -415,6 +441,21 @@
 
 		self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty)
 
+	def test_create_so_with_margin(self):
+		so = make_sales_order(item_code="_Test Item", qty=1, do_not_submit=True)
+		so.items[0].price_list_rate = price_list_rate = 100
+		so.items[0].margin_type = 'Percentage'
+		so.items[0].margin_rate_or_amount = 25
+		so.insert()
+
+		new_so = frappe.copy_doc(so)
+		new_so.save(ignore_permissions=True)
+
+		self.assertEquals(new_so.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
+		new_so.items[0].margin_rate_or_amount = 25
+		new_so.submit()
+
+		self.assertEquals(new_so.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
 
 def make_sales_order(**args):
 	so = frappe.new_doc("Sales Order")
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 fb65ee8..92abed8 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-03-07 11:42:58", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -33,7 +35,7 @@
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0, 
    "width": "150px"
@@ -326,35 +328,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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_hide_if_no_value": 0, 
-   "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, 
@@ -435,6 +408,163 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "discount_and_margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Discount and Margin", 
+   "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, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 0, 
+   "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": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "total_margin", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "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": "section_break_simple1", 
    "fieldtype": "Section Break", 
@@ -459,8 +589,9 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "depends_on": "eval: doc.type != \"\"", 
    "fieldname": "rate", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -502,6 +633,7 @@
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
@@ -1385,6 +1517,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -1392,14 +1525,16 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-02-26 11:08:24.708912", 
+ "modified": "2016-07-11 03:28:07.988319", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ 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 d15ce08..fcd61a1 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.json
+++ b/erpnext/selling/doctype/sales_team/sales_team.json
@@ -2,10 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-04-19 13:30:51", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 1, 
@@ -15,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Person", 
@@ -25,6 +29,7 @@
    "options": "Sales Person", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +47,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contact No.", 
@@ -51,6 +57,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -61,27 +68,6 @@
    "width": "100px"
   }, 
   {
-   "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": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -89,6 +75,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contribution (%)", 
@@ -98,6 +85,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -115,6 +103,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contribution to Net Total", 
@@ -125,6 +114,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -142,6 +132,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Incentives", 
@@ -152,53 +143,33 @@
    "options": "Company:company:default_currency", 
    "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": "parenttype", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Parenttype", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "parenttype", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.395852", 
+ "modified": "2016-07-11 03:28:08.421297", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Team", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
index e37610d..2f9b02c 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.js
@@ -97,11 +97,11 @@
 			"Sales Order", "Delivery Note"]},
 		{fieldtype:"Select", fieldname: "value_or_qty", label:  __("Value or Qty"),
 			options:[{label: __("Value"), value: "Value"}, {label: __("Quantity"), value: "Quantity"}]},
-		{fieldtype:"Select", fieldname: "company", label: __("Company"), link:"Company",
-			default_value: __("Select Company...")},
 		{fieldtype:"Date", fieldname: "from_date", label: __("From Date")},
 		{fieldtype:"Label", fieldname: "to", label: __("To")},
 		{fieldtype:"Date", fieldname: "to_date", label: __("To Date")},
+		{fieldtype:"Select", fieldname: "company", label: __("Company"), link:"Company",
+			default_value: __("Select Company...")},
 		{fieldtype:"Select", label: __("Range"), fieldname: "range",
 			options:[{label: __("Daily"), value: "Daily"}, {label: __("Weekly"), value: "Weekly"},
 				{label: __("Monthly"), value: "Monthly"}, {label: __("Quarterly"), value: "Quarterly"},
@@ -114,7 +114,7 @@
 		this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
 
 		this.show_zero_check()
-		this.setup_plot_check();
+		this.setup_chart_check();
 	},
 	init_filter_values: function() {
 		this._super();
@@ -243,9 +243,5 @@
 		if(!this.checked) {
 			this.data[0].checked = true;
 		}
-	},
-	get_plot_points: function(item, col, idx) {
-		return [[dateutil.str_to_obj(col.id).getTime(), item[col.field]],
-			[dateutil.user_to_obj(col.name).getTime(), item[col.field]]];
 	}
 });
diff --git a/erpnext/selling/page/sales_browser/README.md b/erpnext/selling/page/sales_browser/README.md
deleted file mode 100644
index d6a20e1..0000000
--- a/erpnext/selling/page/sales_browser/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tree editor for Territory, Customer Group, Item Group, Sales Partner
\ No newline at end of file
diff --git a/erpnext/selling/page/sales_browser/__init__.py b/erpnext/selling/page/sales_browser/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/selling/page/sales_browser/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
deleted file mode 100644
index a99fe72..0000000
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.pages["Sales Browser"].on_page_load = function(wrapper){
-	var page = frappe.ui.make_app_page({
-		parent: wrapper,
-		single_column: true,
-	});
-
-	wrapper.page.add_menu_item(__('Refresh'), function() {
-			wrapper.make_tree();
-		});
-
-	wrapper.make_tree = function() {
-		var ctype = frappe.get_route()[1] || 'Territory';
-		return frappe.call({
-			method: 'erpnext.selling.page.sales_browser.sales_browser.get_children',
-			args: {ctype: ctype},
-			callback: function(r) {
-				var root = r.message[0]["value"];
-				erpnext.sales_chart = new erpnext.SalesChart(ctype, root, page,
-					page.main.css({
-						"min-height": "300px",
-						"padding-bottom": "25px"
-					}));
-			}
-		});
-	}
-
-	wrapper.make_tree();
-}
-
-frappe.pages['Sales Browser'].on_page_show = function(wrapper){
-	// set route
-	var ctype = frappe.get_route()[1] || 'Territory';
-
-	wrapper.page.set_title(__('{0} Tree',[__(ctype)]));
-
-	if(erpnext.sales_chart && erpnext.sales_chart.ctype != ctype) {
-		wrapper.make_tree();
-	}
-
-	frappe.breadcrumbs.add(frappe.breadcrumbs.last_module || "Selling");
-};
-
-erpnext.SalesChart = Class.extend({
-	init: function(ctype, root, page, parent) {
-		$(parent).empty();
-		var me = this;
-		me.ctype = ctype;
-		me.page = page;
-		me.can_read = frappe.model.can_read(this.ctype);
-		me.can_create = frappe.boot.user.can_create.indexOf(this.ctype) !== -1 ||
-					frappe.boot.user.in_create.indexOf(this.ctype) !== -1;
-		me.can_write = frappe.model.can_write(this.ctype);
-		me.can_delete = frappe.model.can_delete(this.ctype);
-
-		me.page.set_primary_action(__("New"), function() {
-			me.new_node();
-		}, "octicon octicon-plus");
-
-		this.tree = new frappe.ui.Tree({
-			parent: $(parent),
-			label: __(root),
-			args: {ctype: ctype},
-			method: 'erpnext.selling.page.sales_browser.sales_browser.get_children',
-			toolbar: [
-				{toggle_btn: true},
-				{
-					label:__("Edit"),
-					condition: function(node) {
-						return !node.root && me.can_read;
-					},
-					click: function(node) {
-						frappe.set_route("Form", me.ctype, node.label);
-					}
-				},
-				{
-					label:__("Add Child"),
-					condition: function(node) { return me.can_create && node.expandable; },
-					click: function(node) {
-						me.new_node();
-					},
-					btnClass: "hidden-xs"
-				},
-				{
-					label:__("Rename"),
-					condition: function(node) { return !node.root && me.can_write; },
-					click: function(node) {
-						frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
-							node.$a.html(new_name);
-						});
-					},
-					btnClass: "hidden-xs"
-				},
-				{
-					label:__("Delete"),
-					condition: function(node) { return !node.root && me.can_delete; },
-					click: function(node) {
-						frappe.model.delete_doc(me.ctype, node.label, function() {
-							node.parent.remove();
-						});
-					},
-					btnClass: "hidden-xs"
-				}
-
-			]
-		});
-	},
-	new_node: function() {
-		var me = this;
-		var node = me.tree.get_selected_node();
-
-		if(!(node && node.expandable)) {
-			frappe.msgprint(__("Select a group node first."));
-			return;
-		}
-
-		var fields = [
-			{fieldtype:'Data', fieldname: 'name_field',
-				label:__('New {0} Name',[__(me.ctype)]), reqd:true},
-			{fieldtype:'Select', fieldname:'is_group', label:__('Group Node'), options:'No\nYes',
-				description: __("Further nodes can be only created under 'Group' type nodes")}
-		]
-
-		if(me.ctype == "Sales Person") {
-			fields.splice(-1, 0, {fieldtype:'Link', fieldname:'employee', label:__('Employee'),
-				options:'Employee', description: __("Please enter Employee Id of this sales person")});
-		}
-
-		// the dialog
-		var d = new frappe.ui.Dialog({
-			title: __('New {0}',[__(me.ctype)]),
-			fields: fields
-		})
-
-		d.set_value("is_group", "No");
-		// create
-		d.set_primary_action(__("Create New"), function() {
-			var btn = this;
-			var v = d.get_values();
-			if(!v) return;
-
-			var node = me.tree.get_selected_node();
-
-			v.parent = node.label;
-			v.ctype = me.ctype;
-
-			return frappe.call({
-				method: 'erpnext.selling.page.sales_browser.sales_browser.add_node',
-				args: v,
-				callback: function(r) {
-					if(!r.exc) {
-						d.hide();
-						if(node.expanded) {
-							node.toggle_node();
-						}
-						node.reload();
-					}
-				}
-			});
-		});
-
-		d.show();
-	},
-});
diff --git a/erpnext/selling/page/sales_browser/sales_browser.json b/erpnext/selling/page/sales_browser/sales_browser.json
deleted file mode 100644
index ace9203..0000000
--- a/erpnext/selling/page/sales_browser/sales_browser.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "creation": "2012-06-14 15:07:26.000000", 
- "docstatus": 0, 
- "doctype": "Page", 
- "icon": "icon-sitemap", 
- "idx": 1, 
- "modified": "2013-07-11 14:43:56.000000", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Sales Browser", 
- "owner": "Administrator", 
- "page_name": "Sales Browser", 
- "roles": [
-  {
-   "role": "Sales Master Manager"
-  }, 
-  {
-   "role": "Material Master Manager"
-  }, 
-  {
-   "role": "Accounts Manager"
-  }, 
-  {
-   "role": "Sales Master Manager"
-  }, 
-  {
-   "role": "Purchase Manager"
-  }, 
-  {
-   "role": "Purchase Master Manager"
-  }, 
-  {
-   "role": "Material Manager"
-  }
- ], 
- "standard": "Yes"
-}
\ No newline at end of file
diff --git a/erpnext/selling/page/sales_browser/sales_browser.py b/erpnext/selling/page/sales_browser/sales_browser.py
deleted file mode 100644
index 018ba3b..0000000
--- a/erpnext/selling/page/sales_browser/sales_browser.py
+++ /dev/null
@@ -1,37 +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
-
-
-@frappe.whitelist()
-def get_children():
-	ctype = frappe.local.form_dict.get('ctype')
-	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}`
-		where docstatus < 2
-		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():
-	ctype = frappe.form_dict.get('ctype')
-	parent_field = 'parent_' + ctype.lower().replace(' ', '_')
-	name_field = ctype.lower().replace(' ', '_') + '_name'
-
-	doc = frappe.new_doc(ctype)
-	doc.update({
-		name_field: frappe.form_dict['name_field'],
-		parent_field: frappe.form_dict['parent'],
-		"is_group": frappe.form_dict['is_group']
-	})
-	if ctype == "Sales Person":
-		doc.employee = frappe.form_dict.get('employee')
-
-	doc.save()
diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.js b/erpnext/selling/report/quotation_trends/quotation_trends.js
index ba62bf1..294aea0 100644
--- a/erpnext/selling/report/quotation_trends/quotation_trends.js
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.js
@@ -1,8 +1,9 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/sales_trends_filters.js");
+frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
+	frappe.query_reports["Quotation Trends"] = {
+		filters: get_filters()
+	}
+});
 
-frappe.query_reports["Quotation Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
diff --git a/erpnext/selling/report/sales_order_trends/sales_order_trends.js b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
index cee6004..863afb8 100644
--- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js
+++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/sales_trends_filters.js");
-
-frappe.query_reports["Sales Order Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
+frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
+	frappe.query_reports["Sales Order Trends"] = {
+		filters: get_filters()
+	}
+});
\ No newline at end of file
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 25045fa..d58adce 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -3,20 +3,31 @@
 
 
 cur_frm.cscript.tax_table = "Sales Taxes and Charges";
-{% include 'accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js' %}
+{% include 'erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js' %}
 
-frappe.provide("erpnext.selling");
-frappe.require("assets/erpnext/js/controllers/transaction.js");
 
 cur_frm.email_field = "contact_email";
 
+frappe.provide("erpnext.selling");
 erpnext.selling.SellingController = erpnext.TransactionController.extend({
+	setup: function() {
+		this._super();
+		this.frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 4},
+			{fieldname: 'qty', columns: 2},
+			{fieldname: 'rate', columns: 2},
+			{fieldname: 'amount', columns: 2}
+		];
+	},
+
 	onload: function() {
 		this._super();
 		this.setup_queries();
 	},
 
 	setup_queries: function() {
+
+
 		var me = this;
 
 		this.frm.add_fetch("sales_partner", "commission_rate", "commission_rate");
@@ -55,8 +66,7 @@
 		if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
 			this.frm.set_query("item_code", "items", function() {
 				return {
-					query: "erpnext.controllers.queries.item_query",
-					filters: {'is_sales_item': 1}
+					query: "erpnext.controllers.queries.item_query"
 				}
 			});
 		}
@@ -122,10 +132,13 @@
 		var item = frappe.get_doc(cdt, cdn);
 		frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]);
 
-		item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0),
-			precision("rate", item));
-		
-		this.set_gross_profit(item);
+		// check if child doctype is Sales Order Item/Qutation Item and calculate the rate
+		if(in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), cdt)
+			this.apply_pricing_rule_on_item(item);
+		else
+			item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0),
+				precision("rate", item));
+
 		this.calculate_taxes_and_totals();
 	},
 
@@ -180,7 +193,7 @@
 	warehouse: function(doc, cdt, cdn) {
 		var me = this;
 		var item = frappe.get_doc(cdt, cdn);
-		
+
 		if(item.item_code && item.warehouse) {
 			return this.frm.call({
 				method: "erpnext.stock.get_item_details.get_bin_details",
@@ -302,27 +315,54 @@
 			callback: function(r) {
 				if(!r.exc){
 					var doc = frappe.model.sync(r.message);
-					console.log(r.message)
 					frappe.set_route("Form", r.message.doctype, r.message.name);
 				}
 			}
 		})
+	},
+
+	rate: function(doc, cdt, cdn){
+		// if user changes the rate then set margin Rate or amount to 0
+		item = locals[cdt][cdn];
+		item.margin_type = "";
+		item.margin_rate_or_amount = 0.0;
+		cur_frm.refresh_fields();
+	},
+
+	margin_rate_or_amount: function(doc, cdt, cdn) {
+		// calculated the revised total margin and rate on margin rate changes
+		item = locals[cdt][cdn];
+		this.apply_pricing_rule_on_item(item)
+		this.calculate_taxes_and_totals();
+		cur_frm.refresh_fields();
+	},
+
+	margin_type: function(doc, cdt, cdn){
+		// calculate the revised total margin and rate on margin type changes
+		item = locals[cdt][cdn];
+		this.apply_pricing_rule_on_item(item, doc,cdt, cdn)
+		this.calculate_taxes_and_totals();
+		cur_frm.refresh_fields();
 	}
 });
 
 frappe.ui.form.on(cur_frm.doctype,"project", function(frm) {
 	if(in_list(["Delivery Note", "Sales Invoice"], frm.doc.doctype)) {
-		frappe.call({
-			method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
-			args: {	project: frm.doc.project	},
-			callback: function(r, rt) {
-				if(!r.exc) {
-					$.each(frm.doc["items"] || [], function(i, row) {
-						frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
-						msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
-					})
+		if(frm.doc.project) {
+			frappe.call({
+				method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
+				args: {	project: frm.doc.project	},
+				callback: function(r, rt) {
+					if(!r.exc) {
+						$.each(frm.doc["items"] || [], function(i, row) {
+							if(r.message) {
+								frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
+								msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
+							}
+						})
+					}
 				}
-			}
-		})
+			})
+		}
 	}
 })
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 01a2d1d..f22e63e 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -18,11 +18,11 @@
 				!frm.doc.__onload.transactions_exist));
 
 			frm.add_custom_button(__('Cost Centers'), function() {
-				frappe.set_route('Accounts Browser', 'Cost Center', {'company': frm.doc.name})
+				frappe.set_route('Tree', 'Cost Center', {'company': frm.doc.name})
 			})
 
 			frm.add_custom_button(__('Chart of Accounts'), function() {
-				frappe.set_route('Accounts Browser', 'Account', {'company': frm.doc.name})
+				frappe.set_route('Tree', 'Account', {'company': frm.doc.name})
 			})
 		}
 
@@ -136,17 +136,27 @@
 		["default_expense_account", {"root_type": "Expense"}],
 		["default_income_account", {"root_type": "Income"}],
 		["round_off_account", {"root_type": "Expense"}],
+		["write_off_account", {"root_type": "Expense"}],
+		["exchange_gain_loss_account", {"root_type": "Expense"}],
+		["accumulated_depreciation_account", 
+			{"root_type": "Asset", "account_type": "Accumulated Depreciation"}],
+		["depreciation_expense_account", {"root_type": "Expense", "account_type": "Depreciation"}],
+		["disposal_account", {"report_type": "Profit and Loss"}],
 		["cost_center", {}],
-		["round_off_cost_center", {}]
+		["round_off_cost_center", {}],
+		["depreciation_cost_center", {}]
 	], function(i, v) {
 		erpnext.company.set_custom_query(frm, v);
 	});
 
 	if (sys_defaults.auto_accounting_for_stock) {
 		$.each([
-			["stock_adjustment_account", {"root_type": "Expense"}],
-			["expenses_included_in_valuation", {"root_type": "Expense"}],
-			["stock_received_but_not_billed", {"report_type": "Balance Sheet"}]
+			["stock_adjustment_account", 
+				{"root_type": "Expense", "account_type": "Stock Adjustment"}],
+			["expenses_included_in_valuation", 
+				{"root_type": "Expense", "account_type": "Expenses Included in Valuation"}],
+			["stock_received_but_not_billed", 
+				{"root_type": "Liability", "account_type": "Stock Received But Not Billed"}]
 		], function(i, v) {
 			erpnext.company.set_custom_query(frm, v);
 		});
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 76165ef..25e0cfb 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:company_name", 
+ "beta": 0, 
  "creation": "2013-04-10 08:35:39", 
  "custom": 0, 
  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
@@ -253,7 +254,6 @@
    "no_copy": 0, 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
-   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -499,6 +499,58 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "write_off_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Write Off Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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": "exchange_gain_loss_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Exchange Gain / Loss Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "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": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -662,7 +714,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Cost Center", 
+   "label": "Deafult Cost Center", 
    "length": 0, 
    "no_copy": 1, 
    "options": "Cost Center", 
@@ -680,59 +732,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "credit_days_based_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", 
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Credit Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "credit_days", 
-   "oldfieldtype": "Int", 
-   "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, 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "credit_limit", 
    "fieldtype": "Currency", 
@@ -785,21 +784,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "yearly_bgt_flag", 
+   "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "If Yearly Budget Exceeded (for expense account)", 
+   "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "yearly_bgt_flag", 
-   "oldfieldtype": "Select", 
-   "options": "\nWarn\nIgnore\nStop", 
+   "options": "\nFixed Days\nLast Day of the Next Month", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -813,20 +810,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "monthly_bgt_flag", 
-   "fieldtype": "Select", 
+   "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", 
+   "fieldname": "credit_days", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "If Monthly Budget Exceeded (for expense account)", 
+   "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "monthly_bgt_flag", 
-   "oldfieldtype": "Select", 
-   "options": "\nWarn\nIgnore\nStop", 
+   "oldfieldname": "credit_days", 
+   "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -965,6 +961,159 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "fixed_asset_depreciation_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Fixed Asset Depreciation 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "accumulated_depreciation_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Accumulated Depreciation Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "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": "depreciation_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Depreciation Expense Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "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": "column_break_40", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "disposal_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Gain/Loss Account on Asset Disposal", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "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": "depreciation_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset Depreciation Cost Center", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Cost Center", 
+   "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, 
    "description": "For reference only.", 
    "fieldname": "company_info", 
    "fieldtype": "Section Break", 
@@ -1228,6 +1377,7 @@
  "hide_toolbar": 0, 
  "icon": "icon-building", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -1235,8 +1385,8 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-08 20:21:46.331870", 
- "modified_by": "anand@erpnext.com", 
+ "modified": "2016-06-26 09:08:50.476200", 
+ "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
  "owner": "Administrator", 
@@ -1382,7 +1532,9 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index e114aae..65fb420 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -13,7 +13,7 @@
 
 class Company(Document):
 	def onload(self):
-		self.get("__onload").transactions_exist = self.check_if_transactions_exist()
+		self.get("__onload")["transactions_exist"] = self.check_if_transactions_exist()
 
 	def check_if_transactions_exist(self):
 		exists = False
@@ -30,16 +30,16 @@
 		self.validate_abbr()
 		self.validate_default_accounts()
 		self.validate_currency()
-		
+
 	def validate_abbr(self):
 		self.abbr = self.abbr.strip()
-		
+
 		if self.get('__islocal') and len(self.abbr) > 5:
 			frappe.throw(_("Abbreviation cannot have more than 5 characters"))
 
 		if not self.abbr.strip():
 			frappe.throw(_("Abbreviation is mandatory"))
-			
+
 		if frappe.db.sql("select abbr from tabCompany where name!=%s and abbr=%s", (self.name, self.abbr)):
 			frappe.throw(_("Abbreviation already used for another company"))
 
@@ -63,14 +63,17 @@
 	def on_update(self):
 		if not frappe.db.sql("""select name from tabAccount
 				where company=%s and docstatus<2 limit 1""", self.name):
-			self.create_default_accounts()
-			self.create_default_warehouses()
-			self.install_country_fixtures()
+			if not frappe.local.flags.ignore_chart_of_accounts:
+				self.create_default_accounts()
+				self.create_default_warehouses()
+			
+				self.install_country_fixtures()
 
 		if not frappe.db.get_value("Cost Center", {"is_group": 0, "company": self.name}):
 			self.create_default_cost_center()
 
-		self.set_default_accounts()
+		if not frappe.local.flags.ignore_chart_of_accounts:
+			self.set_default_accounts()
 
 		if self.default_currency:
 			frappe.db.set_value("Currency", self.default_currency, "enabled", 1)
@@ -80,20 +83,31 @@
 	def install_country_fixtures(self):
 		path = os.path.join(os.path.dirname(__file__), "fixtures", self.country.lower())
 		if os.path.exists(path.encode("utf-8")):
-			frappe.get_attr("erpnext.setup.doctype.company.fixtures.{0}.install".format(self.country.lower()))(self)
+			frappe.get_attr("erpnext.setup.doctype.company.fixtures.{0}.install"
+				.format(self.country.lower()))(self)
 
 	def create_default_warehouses(self):
-		for whname in (_("Stores"), _("Work In Progress"), _("Finished Goods")):
-			if not frappe.db.exists("Warehouse", whname + " - " + self.abbr):
+		for wh_detail in [
+			{"warehouse_name": _("All Warehouses"), "is_group": 1},
+			{"warehouse_name": _("Stores"), "is_group": 0},
+			{"warehouse_name": _("Work In Progress"), "is_group": 0},
+			{"warehouse_name": _("Finished Goods"), "is_group": 0}]:
+			
+			if not frappe.db.exists("Warehouse", "{0} - {1}".format(wh_detail["warehouse_name"], self.abbr)):
 				stock_group = frappe.db.get_value("Account", {"account_type": "Stock",
 					"is_group": 1, "company": self.name})
 				if stock_group:
-					frappe.get_doc({
+					warehouse = frappe.get_doc({
 						"doctype":"Warehouse",
-						"warehouse_name": whname,
+						"warehouse_name": wh_detail["warehouse_name"],
+						"is_group": wh_detail["is_group"],
 						"company": self.name,
+						"parent_warehouse": "{0} - {1}".format(_("All Warehouses"), self.abbr) \
+							if not wh_detail["is_group"] else "",
 						"create_account_under": stock_group
-					}).insert()
+					})
+					warehouse.flags.ignore_permissions = True
+					warehouse.insert()
 
 	def create_default_accounts(self):
 		if not self.chart_of_accounts:
@@ -111,6 +125,8 @@
 		self._set_default_account("default_cash_account", "Cash")
 		self._set_default_account("default_bank_account", "Bank")
 		self._set_default_account("round_off_account", "Round Off")
+		self._set_default_account("accumulated_depreciation_account", "Accumulated Depreciation")
+		self._set_default_account("depreciation_expense_account", "Depreciation")
 
 		if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")):
 			self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
@@ -159,6 +175,7 @@
 
 		frappe.db.set(self, "cost_center", _("Main") + " - " + self.abbr)
 		frappe.db.set(self, "round_off_cost_center", _("Main") + " - " + self.abbr)
+		frappe.db.set(self, "depreciation_cost_center", _("Main") + " - " + self.abbr)
 
 	def before_rename(self, olddn, newdn, merge=False):
 		if merge:
@@ -185,17 +202,12 @@
 
 		rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name)
 		if not rec:
-			# delete Account
-			frappe.db.sql("delete from `tabAccount` where company = %s", self.name)
-
-			# delete cost center child table - budget detail
-			frappe.db.sql("""delete bd.* from `tabBudget Detail` bd, `tabCost Center` cc
-				where bd.parent = cc.name and cc.company = %s""", self.name)
-			#delete cost center
-			frappe.db.sql("delete from `tabCost Center` WHERE company = %s", self.name)
-
-			# delete account from customer and supplier
-			frappe.db.sql("delete from `tabParty Account` where company=%s", self.name)
+			frappe.db.sql("""delete from `tabBudget Account`
+				where exists(select name from tabBudget 
+					where name=`tabBudget Account`.parent and company = %s)""", self.name)
+			
+			for doctype in ["Account", "Cost Center", "Budget", "Party Account"]:
+				frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name)
 
 		if not frappe.db.get_value("Stock Ledger Entry", {"company": self.name}):
 			frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index b07a794..7e1681c 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -14,15 +14,16 @@
 	doc = frappe.get_doc("Company", company_name)
 
 	if frappe.session.user != doc.owner:
-		frappe.throw(_("Transactions can only be deleted by the creator of the Company"), frappe.PermissionError)
+		frappe.throw(_("Transactions can only be deleted by the creator of the Company"), 
+			frappe.PermissionError)
 
 	delete_bins(company_name)
-	delete_time_logs(company_name)
+	delete_time_sheets(company_name)
 	delete_lead_addresses(company_name)
 
 	for doctype in frappe.db.sql_list("""select parent from
 		tabDocField where fieldtype='Link' and options='Company'"""):
-		if doctype not in ("Account", "Cost Center", "Warehouse", "Budget Detail",
+		if doctype not in ("Account", "Cost Center", "Warehouse", "Budget",
 			"Party Account", "Employee", "Sales Taxes and Charges Template",
 			"Purchase Taxes and Charges Template", "POS Profile", 'BOM'):
 				delete_for_doctype(doctype, company_name)
@@ -69,21 +70,12 @@
 	frappe.db.sql("""delete from tabBin where warehouse in
 			(select name from tabWarehouse where company=%s)""", company_name)
 
-def delete_time_logs(company_name):
+def delete_time_sheets(company_name):
 	# Delete Time Logs as it is linked to Production Order / Project / Task, which are linked to company
 	frappe.db.sql("""
-		delete from `tabTime Log`
+		delete from `tabTimesheet`
 		where
-			(ifnull(project, '') != ''
-				and exists(select name from `tabProject` where name=`tabTime Log`.project and company=%(company)s))
-			or (ifnull(task, '') != ''
-				and exists(select name from `tabTask` where name=`tabTime Log`.task and company=%(company)s))
-			or (ifnull(production_order, '') != ''
-				and exists(select name from `tabProduction Order`
-					where name=`tabTime Log`.production_order and company=%(company)s))
-			or (ifnull(sales_invoice, '') != ''
-				and exists(select name from `tabSales Invoice`
-					where name=`tabTime Log`.sales_invoice and company=%(company)s))
+			company=%(company)s
 	""", {"company": company_name})
 
 def delete_lead_addresses(company_name):
diff --git a/erpnext/setup/doctype/company/fixtures/india/__init__.py b/erpnext/setup/doctype/company/fixtures/india/__init__.py
index 55185ac..a97bf94 100644
--- a/erpnext/setup/doctype/company/fixtures/india/__init__.py
+++ b/erpnext/setup/doctype/company/fixtures/india/__init__.py
@@ -7,13 +7,15 @@
 
 def install(company):
 	docs = [
-		{'doctype': 'Deduction Type', 'name': 'Professional Tax', 'description': 'Professional Tax', 'deduction_name': 'Professional Tax'},
-		{'doctype': 'Deduction Type', 'name': 'Provident Fund', 'description': 'Provident fund', 'deduction_name': 'Provident Fund'},
-		{'doctype': 'Earning Type', 'name': 'House Rent Allowance', 'description': 'House Rent Allowance', 'earning_name': 'House Rent Allowance', 'taxable': 'No'},
+		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'salary_component': 'Professional Tax'},
+		{'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'salary_component': 'Provident Fund'},
+		{'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'salary_component': 'House Rent Allowance', 'taxable': 'No'},
 	]
 
 	for d in docs:
 		try:
-			frappe.get_doc(d).insert()
+			doc = frappe.get_doc(d)
+			doc.flags.ignore_permissions = True
+			doc.insert()
 		except frappe.NameError:
 			pass
diff --git a/erpnext/setup/doctype/customer_group/customer_group.js b/erpnext/setup/doctype/customer_group/customer_group.js
index 7a5d2fa..c199a8e 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.js
+++ b/erpnext/setup/doctype/customer_group/customer_group.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.list_route = "Sales Browser/Customer Group";
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	cur_frm.cscript.set_root_readonly(doc);
@@ -21,7 +20,7 @@
 cur_frm.fields_dict['parent_customer_group'].get_query = function(doc,cdt,cdn) {
 	return {
 		filters: {
-			'is_group': "Yes"
+			'is_group': 1
 		}
 	}
 }
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 34d13bd..38bb558 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -3,11 +3,13 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:customer_group_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:23", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer Group Name", 
@@ -26,6 +29,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -42,6 +46,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Customer Group", 
@@ -52,6 +57,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,19 +71,21 @@
    "collapsible": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
-   "fieldtype": "Select", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node", 
+   "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -93,12 +101,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -114,6 +124,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Price List", 
@@ -122,6 +133,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,6 +149,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days Based On", 
@@ -146,6 +159,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -162,6 +176,7 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
@@ -169,6 +184,7 @@
    "no_copy": 0, 
    "permlevel": 1, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -184,6 +200,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
@@ -191,6 +208,7 @@
    "no_copy": 0, 
    "permlevel": 1, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -206,6 +224,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "lft", 
@@ -215,6 +234,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -230,6 +250,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "rgt", 
@@ -239,6 +260,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -255,6 +277,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
@@ -265,6 +288,7 @@
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -280,6 +304,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Receivable Account", 
@@ -287,6 +312,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -304,6 +330,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
@@ -312,6 +339,7 @@
    "options": "Party Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -324,13 +352,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-sitemap", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:44.374615", 
+ "modified": "2016-07-14 12:43:08.949307", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 
@@ -457,7 +486,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "parent_customer_group"
+ "search_fields": "parent_customer_group", 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/test_records.json b/erpnext/setup/doctype/customer_group/test_records.json
index cc3f87e..4c472b8 100644
--- a/erpnext/setup/doctype/customer_group/test_records.json
+++ b/erpnext/setup/doctype/customer_group/test_records.json
@@ -2,13 +2,13 @@
  {
   "customer_group_name": "_Test Customer Group",
   "doctype": "Customer Group",
-  "is_group": "No",
+  "is_group": 0,
   "parent_customer_group": "All Customer Groups"
  },
  {
   "customer_group_name": "_Test Customer Group 1",
   "doctype": "Customer Group",
-  "is_group": "No",
+  "is_group": 0,
   "parent_customer_group": "All Customer Groups"
  }
 ]
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 2053fc0..4f70cd8 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -60,7 +60,6 @@
 						recipients=user_id,
 						subject="{frequency} Digest".format(frequency=self.frequency),
 						message=msg_for_this_receipient,
-						bulk=True,
 						reference_doctype = self.doctype,
 						reference_name = self.name,
 						unsubscribe_message = _("Unsubscribe from this Email Digest"))
diff --git a/erpnext/setup/doctype/email_digest/quotes.py b/erpnext/setup/doctype/email_digest/quotes.py
index 4b996d9..95afe97 100644
--- a/erpnext/setup/doctype/email_digest/quotes.py
+++ b/erpnext/setup/doctype/email_digest/quotes.py
@@ -28,6 +28,7 @@
 		("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"),
+		("The world’s first speeding ticket was given to a man going 4 times the speed limit! Walter Arnold was traveling at a breakneck 8 miles an hour in a 2mph zone, and was caught by a policeman on bicycle and fined one shilling!"),
 	]
 
 	return random.choice(quotes)
diff --git a/erpnext/setup/doctype/features_setup/README.md b/erpnext/setup/doctype/features_setup/README.md
deleted file mode 100644
index 4bdea47..0000000
--- a/erpnext/setup/doctype/features_setup/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Settings for enabling / disabling certain features that will result in smaller forms.
\ No newline at end of file
diff --git a/erpnext/setup/doctype/features_setup/__init__.py b/erpnext/setup/doctype/features_setup/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/setup/doctype/features_setup/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/setup/doctype/features_setup/features_setup.js b/erpnext/setup/doctype/features_setup/features_setup.js
deleted file mode 100644
index a637a8e..0000000
--- a/erpnext/setup/doctype/features_setup/features_setup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-frappe.ui.form.on('Features Setup', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/setup/doctype/features_setup/features_setup.json b/erpnext/setup/doctype/features_setup/features_setup.json
deleted file mode 100644
index 8dea339..0000000
--- a/erpnext/setup/doctype/features_setup/features_setup.json
+++ /dev/null
@@ -1,801 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2012-12-20 12:50:49", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "materials", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Materials", 
-   "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, 
-   "description": "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.", 
-   "fieldname": "fs_item_serial_nos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Serial Nos", 
-   "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, 
-   "description": "To track items in sales and purchase documents with batch nos. \"Preferred Industry: Chemicals\"", 
-   "fieldname": "fs_item_batch_nos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Batch Nos", 
-   "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, 
-   "description": "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", 
-   "fieldname": "fs_brands", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Brands", 
-   "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, 
-   "description": "To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.", 
-   "fieldname": "fs_item_barcode", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Barcode", 
-   "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": "column_break0", 
-   "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, 
-   "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, 
-   "description": "To maintain the customer wise item code and to make them searchable based on their code use this option", 
-   "fieldname": "fs_item_advanced", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Advanced", 
-   "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, 
-   "description": "To get Item Group in details table", 
-   "fieldname": "fs_item_group_in_details", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item Groups in 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "If checked, only Description, Quantity, Rate and Amount are shown in print of Item table. Any extra field is shown under 'Description' column.", 
-   "fieldname": "compact_item_print", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Compact Item Print", 
-   "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": "sales_and_purchase", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales and Purchase", 
-   "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, 
-   "description": "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.", 
-   "fieldname": "fs_exports", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Exports", 
-   "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, 
-   "description": "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.", 
-   "fieldname": "fs_imports", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Imports", 
-   "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": "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, 
-   "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, 
-   "description": "Field available in Delivery Note, Quotation, Sales Invoice, Sales Order", 
-   "fieldname": "fs_discounts", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Discounts", 
-   "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, 
-   "description": "Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice", 
-   "fieldname": "fs_purchase_discounts", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purchase Discounts", 
-   "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, 
-   "description": "To track any installation or commissioning related work after sales", 
-   "fieldname": "fs_after_sales_installations", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "After Sale Installations", 
-   "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, 
-   "description": "Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet", 
-   "fieldname": "fs_projects", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Projects", 
-   "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, 
-   "description": "If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity", 
-   "fieldname": "fs_sales_extras", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Extras", 
-   "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": "accounts", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.", 
-   "fieldname": "fs_recurring_invoice", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Recurring Invoice", 
-   "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": "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, 
-   "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, 
-   "description": "To enable \"Point of Sale\" features", 
-   "fieldname": "fs_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Point of Sale", 
-   "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, 
-   "description": "To enable \"Point of Sale\" view", 
-   "fieldname": "fs_pos_view", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "POS View", 
-   "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": "production", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Manufacturing", 
-   "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, 
-   "description": "If you involve in manufacturing activity. Enables Item 'Is Manufactured'", 
-   "fieldname": "fs_manufacturing", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Manufacturing", 
-   "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": "column_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, 
-   "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, 
-   "description": "If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt", 
-   "fieldname": "fs_quality", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Quality", 
-   "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": "miscelleneous", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Miscelleneous", 
-   "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, 
-   "description": "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", 
-   "fieldname": "fs_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, 
-   "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": "column_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, 
-   "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": "fs_more_info", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "More Information", 
-   "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
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-glass", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-02-16 04:43:32.144944", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Features Setup", 
- "name_case": "Title Case", 
- "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": "System 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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC"
-}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/features_setup/features_setup.py b/erpnext/setup/doctype/features_setup/features_setup.py
deleted file mode 100644
index 1ac0f74..0000000
--- a/erpnext/setup/doctype/features_setup/features_setup.py
+++ /dev/null
@@ -1,17 +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
-from frappe.model.document import Document
-
-class FeaturesSetup(Document):
-
-	def validate(self):
-		"""
-			update settings in defaults
-		"""
-		from frappe.model import default_fields 
-		from frappe.utils import set_default
-		for key in self.meta.get_valid_columns():
-			if key not in default_fields:
-				set_default(key, self.get(key))
diff --git a/erpnext/setup/doctype/item_group/item_group.js b/erpnext/setup/doctype/item_group/item_group.js
index d440c26..46d4034 100644
--- a/erpnext/setup/doctype/item_group/item_group.js
+++ b/erpnext/setup/doctype/item_group/item_group.js
@@ -3,13 +3,13 @@
 
 frappe.ui.form.on("Item Group", {
 	onload: function(frm) {
-		frm.list_route = "Sales Browser/Item Group";
+		frm.list_route = "Tree/Item Group";
 
 		//get query select item group
 		frm.fields_dict['parent_item_group'].get_query = function(doc,cdt,cdn) {
 			return{
 				filters:[
-					['Item Group', 'is_group', '=', 'Yes'],
+					['Item Group', 'is_group', '=', 1],
 					['Item Group', 'name', '!=', doc.item_group_name]
 				]
 			}
@@ -19,7 +19,7 @@
 	refresh: function(frm) {
 		frm.trigger("set_root_readonly");
 		frm.add_custom_button(__("Item Group Tree"), function() {
-			frappe.set_route("Sales Browser", "Item Group");
+			frappe.set_route("Tree", "Item Group");
 		}, "icon-sitemap");
 	},
 
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index a1ccee2..63e9b17 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -3,12 +3,14 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:item_group_name", 
+ "beta": 0, 
  "creation": "2013-03-28 10:35:29", 
  "custom": 0, 
  "description": "Item Classification", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "General Settings", 
@@ -25,6 +28,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group Name", 
@@ -49,6 +54,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -58,13 +64,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "description": "", 
    "fieldname": "parent_item_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Item Group", 
@@ -75,6 +82,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,19 +96,21 @@
    "collapsible": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
-   "fieldtype": "Select", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node", 
+   "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -116,12 +126,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -137,6 +149,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Income Account", 
@@ -145,6 +158,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -160,6 +174,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Expense Account", 
@@ -168,6 +183,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -183,6 +199,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Cost Center", 
@@ -191,6 +208,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -206,6 +224,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Settings", 
@@ -213,6 +232,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -229,6 +249,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Show in Website", 
@@ -236,6 +257,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -248,47 +270,26 @@
    "bold": 0, 
    "collapsible": 0, 
    "depends_on": "show_in_website", 
-   "fieldname": "page_name", 
+   "fieldname": "route", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Page Name", 
+   "label": "Route", 
    "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, 
-   "depends_on": "show_in_website", 
-   "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": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "unique": 1
   }, 
   {
    "allow_on_submit": 0, 
@@ -300,6 +301,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Slideshow", 
@@ -308,6 +310,7 @@
    "options": "Website Slideshow", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -325,6 +328,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -332,6 +336,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,6 +353,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Specifications", 
@@ -356,6 +362,7 @@
    "options": "Item Website Specification", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -371,6 +378,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
@@ -380,6 +388,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -395,6 +404,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
@@ -404,6 +414,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -420,6 +431,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
@@ -430,6 +442,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -442,13 +455,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-sitemap", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2015-11-16 06:29:48.316308", 
+ "modified": "2016-07-14 12:41:09.269478", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 
@@ -575,7 +589,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "parent_item_group"
+ "search_fields": "parent_item_group", 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 7669bff..5375db0 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 import urllib
-from frappe.utils import nowdate
+from frappe.utils import nowdate, cint, cstr
 from frappe.utils.nestedset import NestedSet
 from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
@@ -16,13 +16,16 @@
 	website = frappe._dict(
 		condition_field = "show_in_website",
 		template = "templates/generators/item_group.html",
-		parent_website_route_field = "parent_item_group",
 		no_cache = 1
 	)
 
 	def autoname(self):
 		self.name = self.item_group_name
 
+	def validate(self):
+		super(ItemGroup, self).validate()
+		self.make_route()
+
 	def on_update(self):
 		NestedSet.on_update(self)
 		WebsiteGenerator.on_update(self)
@@ -30,36 +33,43 @@
 		self.validate_name_with_item()
 		self.validate_one_root()
 
+	def make_route(self):
+		'''Make website route'''
+		if not self.route:
+			self.route = ''
+			if self.parent_item_group:
+				parent_route = frappe.get_doc('Item Group', self.parent_item_group).route
+
+				if parent_route:
+					self.route = parent_route + '/'
+
+			self.route += self.scrub(self.item_group_name)
+
+			return self.route
+
 	def after_rename(self, olddn, newdn, merge=False):
 		NestedSet.after_rename(self, olddn, newdn, merge)
-		WebsiteGenerator.after_rename(self, olddn, newdn, merge)
 
 	def on_trash(self):
 		NestedSet.on_trash(self)
 		WebsiteGenerator.on_trash(self)
 
-	def set_parent_website_route(self):
-		"""Overwrite `parent_website_route` from `WebsiteGenerator`.
-			Only set `parent_website_route` if parent is visble.
-
-			e.g. If `show_in_website` is set for Products then url should be `/products`"""
-		if self.parent_item_group and frappe.db.get_value("Item Group", self.parent_item_group, "show_in_website"):
-			WebsiteGenerator.set_parent_website_route(self)
-		else:
-			self.parent_website_route = ""
-
 	def validate_name_with_item(self):
 		if frappe.db.exists("Item", self.name):
 			frappe.throw(frappe._("An item exists with same name ({0}), please change the item group name or rename the item").format(self.name))
 
 	def get_context(self, context):
+		context.show_search=True
+		context.search_link = '/product_search'
+
 		start = int(frappe.form_dict.start or 0)
 		if start < 0:
 			start = 0
 		context.update({
-			"items": get_product_list_for_group(product_group = self.name, start=start, limit=24),
+			"items": get_product_list_for_group(product_group = self.name, start=start, limit=24, search=frappe.form_dict.get("search")),
 			"parent_groups": get_parent_item_groups(self.name),
-			"title": self.name
+			"title": self.name,
+			"products_as_list": cint(frappe.db.get_single_value('Website Settings', 'products_as_list'))
 		})
 
 		if self.slideshow:
@@ -68,13 +78,12 @@
 		return context
 
 @frappe.whitelist(allow_guest=True)
-def get_product_list_for_group(product_group=None, start=0, limit=10):
+def get_product_list_for_group(product_group=None, start=0, limit=10, search=None):
 	child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(product_group)])
 
 	# base query
-	query = """select name, item_name, page_name, website_image, thumbnail, item_group,
-			web_long_description as website_description,
-			concat(parent_website_route, "/", page_name) as route
+	query = """select name, item_name, item_code, route, image, website_image, thumbnail, item_group,
+			description, web_long_description as website_description
 		from `tabItem`
 		where show_in_website = 1
 			and disabled=0
@@ -83,10 +92,16 @@
 			and (item_group in ({child_groups})
 			or name in (select parent from `tabWebsite Item Group` where item_group in ({child_groups})))
 			""".format(child_groups=child_groups)
+	# search term condition
+	if search:
+		query += """ and (web_long_description like %(search)s
+				or item_name like %(search)s
+				or name like %(search)s)"""
+		search = "%" + cstr(search) + "%"
 
 	query += """order by weightage desc, modified desc limit %s, %s""" % (start, limit)
 
-	data = frappe.db.sql(query, {"product_group": product_group, "today": nowdate()}, as_dict=1)
+	data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
 
 	return [get_item_for_list_in_html(r) for r in data]
 
@@ -101,7 +116,12 @@
 	# user may forget it during upload
 	if (context.get("website_image") or "").startswith("files/"):
 		context["website_image"] = "/" + urllib.quote(context["website_image"])
-	return frappe.get_template("templates/includes/product_in_grid.html").render(context)
+
+	products_template = 'templates/includes/products_as_grid.html'
+	if cint(frappe.db.get_single_value('Products Settings', 'products_as_list')):
+		products_template = 'templates/includes/products_as_list.html'
+
+	return frappe.get_template(products_template).render(context)
 
 def get_group_item_count(item_group):
 	child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(item_group)])
@@ -114,7 +134,7 @@
 
 def get_parent_item_groups(item_group_name):
 	item_group = frappe.get_doc("Item Group", item_group_name)
-	return frappe.db.sql("""select name, page_name from `tabItem Group`
+	return frappe.db.sql("""select name, route from `tabItem Group`
 		where lft <= %s and rgt >= %s
 		and show_in_website=1
 		order by lft asc""", (item_group.lft, item_group.rgt), as_dict=True)
@@ -125,6 +145,5 @@
 
 	for d in get_parent_item_groups(item_group):
 		d = frappe.get_doc("Item Group", d.name)
-		route = d.get_route()
-		if route:
-			clear_cache(route)
\ No newline at end of file
+		if d.route:
+			clear_cache(d.route)
diff --git a/erpnext/setup/doctype/item_group/test_records.json b/erpnext/setup/doctype/item_group/test_records.json
index 60336f0..74f4641 100644
--- a/erpnext/setup/doctype/item_group/test_records.json
+++ b/erpnext/setup/doctype/item_group/test_records.json
@@ -1,68 +1,68 @@
 [
  {
   "doctype": "Item Group", 
-  "is_group": "No", 
+  "is_group": 0, 
   "item_group_name": "_Test Item Group", 
   "parent_item_group": "All Item Groups",
   "default_cost_center": "_Test Cost Center 2 - _TC"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "No", 
+  "is_group": 0, 
   "item_group_name": "_Test Item Group Desktops", 
   "parent_item_group": "All Item Groups"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group A", 
   "parent_item_group": "All Item Groups"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group B", 
   "parent_item_group": "All Item Groups"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group B - 1", 
   "parent_item_group": "_Test Item Group B"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group B - 2", 
   "parent_item_group": "_Test Item Group B"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "No", 
+  "is_group": 0, 
   "item_group_name": "_Test Item Group B - 3", 
   "parent_item_group": "_Test Item Group B"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group C", 
   "parent_item_group": "All Item Groups"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group C - 1", 
   "parent_item_group": "_Test Item Group C"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group C - 2", 
   "parent_item_group": "_Test Item Group C"
  }, 
  {
   "doctype": "Item Group", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "item_group_name": "_Test Item Group D", 
   "parent_item_group": "All Item Groups"
  }
diff --git a/erpnext/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js
index 5917f52..e2584bf 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.js
+++ b/erpnext/setup/doctype/naming_series/naming_series.js
@@ -21,6 +21,7 @@
 }
 
 cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
+	cur_frm.set_value('user_must_always_select', 0);
 	cur_frm.toggle_display(['help_html','set_options', 'user_must_always_select', 'update'],
 		doc.select_doc_for_series);
 
diff --git a/erpnext/setup/doctype/notification_control/notification_control.js b/erpnext/setup/doctype/notification_control/notification_control.js
index 409f99b..c8e199b 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.js
+++ b/erpnext/setup/doctype/notification_control/notification_control.js
@@ -2,8 +2,11 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Notification Control", {
+	refresh: function(frm) {
+		frm.page.set_primary_action(__('Update'), function() { frm.events.set_message(frm); });
+	},
 	select_transaction: function(frm) {
-		frm.set_value("custom_message", frm.events.get_fieldname(frm));
+		frm.set_value("custom_message", frm.doc[frm.events.get_fieldname(frm)]);
 	},
 	set_message: function(frm) {
 		frm.set_value(frm.events.get_fieldname(frm), frm.doc.custom_message);
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index 904965e..540aa13 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -2,6 +2,7 @@
  "allow_copy": 1, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2012-07-12 23:29:45", 
  "custom": 0, 
  "description": "Send automatic emails to Contacts on Submitting transactions.", 
@@ -17,12 +18,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Prompt for Email on Submission of", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -38,12 +42,15 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales", 
+   "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, 
@@ -61,12 +68,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quotation", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -82,12 +92,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -103,12 +116,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Delivery Note", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -124,12 +140,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -145,12 +164,15 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase", 
+   "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, 
@@ -168,12 +190,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Purchase Order", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -189,12 +214,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Purchase Receipt", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -210,12 +238,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Claim", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -232,12 +263,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customize the Notification", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -253,13 +287,16 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Select Transaction", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPurchase Order\nPurchase Receipt\nExpense Claim\nExpense Claim Approved\nExpense Claim Rejected", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -275,34 +312,15 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Custom Message", 
+   "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": "set_message", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Update", 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -318,12 +336,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quotation Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -339,12 +360,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -360,12 +384,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Note Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -381,12 +408,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Invoice Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -402,12 +432,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Order Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -423,12 +456,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipt Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -444,12 +480,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Claim Approved Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -465,12 +504,15 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Claim Rejected Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -488,7 +530,8 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-07-13 06:24:05.436127", 
+ "max_attachments": 0, 
+ "modified": "2016-06-01 13:06:06.981905", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Notification Control", 
@@ -515,6 +558,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 669cabf..cb66b7f 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -15,6 +15,6 @@
 
 cur_frm.fields_dict['targets'].grid.get_field("item_group").get_query = function(doc, dt, dn) {
   return{
-  	filters:{ 'is_group': "No" }
+  	filters:{ 'is_group': 0 }
   }
 }
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index d6a49c5..7cdb30d 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -1,664 +1,694 @@
 {
- "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", 
+ "beta": 0, 
+ "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "partner_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "print_hide_if_no_value": 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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "partner_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "commission_rate", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "print_hide_if_no_value": 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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_contacts", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address & Contacts", 
+   "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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.__islocal", 
+   "fieldname": "address_desc", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address Desc", 
+   "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": "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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,
-   "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, 
+   "ignore_xss_filter": 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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.__islocal", 
+   "fieldname": "contact_desc", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Desc", 
+   "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": "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "partner_target_details_section_break", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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": "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "targets", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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,
-   "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,
+   "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, 
+   "ignore_xss_filter": 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, 
+   "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": "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "website", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "show_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "show_in_website", 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Route", 
+   "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": 1
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "logo", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Logo", 
+   "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, 
+   "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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "partner_website", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Partner 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, 
+   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "show_in_website", 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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,
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "introduction", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Introduction", 
+   "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": "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",
-   "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",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "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, 
+   "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,
- "max_attachments": 0,
- "modified": "2015-11-16 06:29:57.096980",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "Sales Partner",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-06-23 14:45:31.978973", 
+ "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_onload": 0
-}
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index 0e0f4ba..5a2aa49 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.py
@@ -22,7 +22,8 @@
 		self.name = self.partner_name
 
 	def validate(self):
-		self.parent_website_route = "partners"
+		if not self.route:
+			self.route = "partners/" + self.scrub(self.partner_name)
 		super(SalesPartner, self).validate()
 		if self.partner_website and not self.partner_website.startswith("http"):
 			self.partner_website = "http://" + self.partner_website
diff --git a/erpnext/setup/doctype/sales_person/sales_person.js b/erpnext/setup/doctype/sales_person/sales_person.js
index 8bae546..2388739 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.js
+++ b/erpnext/setup/doctype/sales_person/sales_person.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.list_route = "Sales Browser/Sales Person";
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	cur_frm.cscript.set_root_readonly(doc);
@@ -21,7 +20,7 @@
 cur_frm.fields_dict['parent_sales_person'].get_query = function(doc, cdt, cdn) {
 	return{
 		filters: [
-			['Sales Person', 'is_group', '=', 'Yes'],
+			['Sales Person', 'is_group', '=', 1],
 			['Sales Person', 'name', '!=', doc.sales_person_name]
 		]
 	}
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index e99d14f..b42adca 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -3,12 +3,14 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:sales_person_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:24", 
  "custom": 0, 
  "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Name and Employee ID", 
@@ -42,6 +45,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Person Name", 
@@ -68,6 +72,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Sales Person", 
@@ -91,17 +96,18 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "is_group", 
-   "fieldtype": "Select", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node", 
+   "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -120,6 +126,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -142,6 +149,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
@@ -166,6 +174,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
@@ -191,6 +200,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
@@ -216,6 +226,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
@@ -242,6 +253,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Person Targets", 
@@ -267,6 +279,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Targets", 
@@ -294,6 +307,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Distribution", 
@@ -317,13 +331,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-user", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-01-06 02:36:22.551330", 
+ "modified": "2016-07-14 12:44:43.408367", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -390,7 +405,10 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "parent_sales_person"
+ "search_fields": "parent_sales_person", 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_person/sales_person_tree.js b/erpnext/setup/doctype/sales_person/sales_person_tree.js
new file mode 100644
index 0000000..077cf3b
--- /dev/null
+++ b/erpnext/setup/doctype/sales_person/sales_person_tree.js
@@ -0,0 +1,11 @@
+frappe.treeview_settings["Sales Person"] = {
+	fields: [
+		{fieldtype:'Data', fieldname: 'name_field',
+			label:__('New Sales Person Name'), reqd:true},
+		{fieldtype:'Link', fieldname:'employee',
+			label:__('Employee'), options:'Employee',
+			description: __("Please enter Employee Id of this sales person")},
+		{fieldtype:'Check', fieldname:'is_group', label:__('Group Node'),
+			description: __("Further nodes can be only created under 'Group' type nodes")}
+	],
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_person/test_records.json b/erpnext/setup/doctype/sales_person/test_records.json
index cd29d40..75d6cd3 100644
--- a/erpnext/setup/doctype/sales_person/test_records.json
+++ b/erpnext/setup/doctype/sales_person/test_records.json
@@ -2,21 +2,21 @@
  {
   "doctype": "Sales Person", 
   "employee": "_T-Employee-0001", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_sales_person": "Sales Team", 
   "sales_person_name": "_Test Sales Person"
  }, 
  {
   "doctype": "Sales Person", 
   "employee": "_T-Employee-0002", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_sales_person": "Sales Team", 
   "sales_person_name": "_Test Sales Person 1"
  }, 
  {
   "doctype": "Sales Person", 
   "employee": "_T-Employee-0003", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_sales_person": "Sales Team", 
   "sales_person_name": "_Test Sales Person 2"
  }
diff --git a/erpnext/setup/doctype/sms_parameter/sms_parameter.json b/erpnext/setup/doctype/sms_parameter/sms_parameter.json
index 2ccdf9a..afcabfa 100755
--- a/erpnext/setup/doctype/sms_parameter/sms_parameter.json
+++ b/erpnext/setup/doctype/sms_parameter/sms_parameter.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:58", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
@@ -22,6 +25,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Value", 
@@ -46,6 +51,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -59,18 +65,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:57.845086", 
+ "modified": "2016-07-11 03:28:08.624783", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "SMS Parameter", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/target_detail/target_detail.json b/erpnext/setup/doctype/target_detail/target_detail.json
index 0ad842d..9bc8550 100644
--- a/erpnext/setup/doctype/target_detail/target_detail.json
+++ b/erpnext/setup/doctype/target_detail/target_detail.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:27:58", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Group", 
@@ -26,6 +29,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,6 +45,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
@@ -51,6 +56,7 @@
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -66,6 +72,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Target Qty", 
@@ -75,6 +82,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -90,6 +98,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Target  Amount", 
@@ -99,6 +108,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -110,20 +120,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.015624", 
+ "modified": "2016-07-11 03:28:09.255980", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Target Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.js b/erpnext/setup/doctype/territory/territory.js
index cde04b3..69f761a 100644
--- a/erpnext/setup/doctype/territory/territory.js
+++ b/erpnext/setup/doctype/territory/territory.js
@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.list_route = "Sales Browser/Territory";
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 	cur_frm.cscript.set_root_readonly(doc);
@@ -21,7 +20,7 @@
 cur_frm.fields_dict['parent_territory'].get_query = function(doc,cdt,cdn) {
 	return{
 		filters:[
-			['Territory', 'is_group', '=', 'Yes'],
+			['Territory', 'is_group', '=', 1],
 			['Territory', 'name', '!=', doc.territory_name]
 		]
 	}
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index 4ce0fff..3f799ee 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -3,12 +3,14 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:territory_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:24", 
  "custom": 0, 
  "description": "Classification of Customers by region", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory Name", 
@@ -27,6 +30,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -43,6 +47,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Territory", 
@@ -53,6 +58,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -66,19 +72,21 @@
    "collapsible": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
-   "fieldtype": "Select", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node", 
+   "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -94,12 +102,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -116,6 +126,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Territory Manager", 
@@ -126,6 +137,7 @@
    "options": "Sales Person", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -141,6 +153,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
@@ -150,6 +163,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -165,6 +179,7 @@
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
@@ -174,6 +189,7 @@
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -190,6 +206,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
@@ -200,6 +217,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -216,6 +234,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Territory Targets", 
@@ -224,6 +243,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -239,6 +259,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Targets", 
@@ -249,6 +270,7 @@
    "options": "Target Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -265,6 +287,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Distribution", 
@@ -275,6 +298,7 @@
    "options": "Monthly Distribution", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -287,13 +311,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-map-marker", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.337250", 
+ "modified": "2016-07-14 12:43:36.619881", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 
@@ -401,7 +426,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "parent_territory,territory_manager"
+ "search_fields": "parent_territory,territory_manager", 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/test_records.json b/erpnext/setup/doctype/territory/test_records.json
index 2518619..6011a38 100644
--- a/erpnext/setup/doctype/territory/test_records.json
+++ b/erpnext/setup/doctype/territory/test_records.json
@@ -1,31 +1,31 @@
 [
  {
   "doctype": "Territory", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_territory": "All Territories", 
   "territory_name": "_Test Territory"
  }, 
  {
   "doctype": "Territory", 
-  "is_group": "Yes", 
+  "is_group": 1, 
   "parent_territory": "All Territories", 
   "territory_name": "_Test Territory India"
  }, 
  {
   "doctype": "Territory", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_territory": "_Test Territory India", 
   "territory_name": "_Test Territory Maharashtra"
  }, 
  {
   "doctype": "Territory", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_territory": "All Territories", 
   "territory_name": "_Test Territory Rest Of The World"
  }, 
  {
   "doctype": "Territory", 
-  "is_group": "No", 
+  "is_group": 0, 
   "parent_territory": "All Territories", 
   "territory_name": "_Test Territory United States"
  }
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 b0af70c..73084b5 100644
--- a/erpnext/setup/doctype/website_item_group/website_item_group.json
+++ b/erpnext/setup/doctype/website_item_group/website_item_group.json
@@ -2,12 +2,14 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:09", 
  "custom": 0, 
  "description": "Cross Listing of Item in multiple groups", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group", 
@@ -26,6 +29,7 @@
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -37,18 +41,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:30:00.586322", 
+ "modified": "2016-07-11 03:28:09.919314", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Website Item Group", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 6a5c3f5..3337b1f 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 
 import frappe
+from frappe import _
 
 default_mail_footer = """<div style="padding: 7px; text-align: right; color: #888"><small>Sent via
 	<a style="color: #888" href="http://erpnext.org">ERPNext</a></div>"""
@@ -11,7 +12,7 @@
 def after_install():
 	frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert()
 	set_single_defaults()
-	feature_setup()
+	create_compact_item_print_custom_field()
 	from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
 	add_all_roles_to("Administrator")
 	frappe.db.commit()
@@ -24,23 +25,6 @@
 		print
 		return False
 
-def feature_setup():
-	"""save global defaults and features setup"""
-	doc = frappe.get_doc("Features Setup", "Features Setup")
-	doc.flags.ignore_permissions = True
-
-	# store value as 1 for all these fields
-	flds = ['fs_item_serial_nos', 'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
-		'fs_item_advanced', 'fs_packing_details', 'fs_item_group_in_details',
-		'fs_exports', 'fs_imports', 'fs_discounts', 'fs_purchase_discounts',
-		'fs_after_sales_installations', 'fs_projects', 'fs_sales_extras',
-		'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality',
-		'fs_page_break', 'fs_more_info', 'fs_pos_view', 'compact_item_print'
-	]
-	for f in flds:
-		doc.set(f, 1)
-	doc.save()
-
 def set_single_defaults():
 	for dt in frappe.db.sql_list("""select name from `tabDocType` where issingle=1"""):
 		default_values = frappe.db.sql("""select fieldname, `default` from `tabDocField`
@@ -56,3 +40,12 @@
 
 	frappe.db.set_default("date_format", "dd-mm-yyyy")
 
+def create_compact_item_print_custom_field():
+	from frappe.custom.doctype.custom_field.custom_field import create_custom_field
+	create_custom_field('Print Settings', {
+		'label': _('Compact Item Print'),
+		'fieldname': 'compact_item_print',
+		'fieldtype': 'Check',
+		'default': 1,
+		'insert_after': 'with_letterhead'
+	})
\ No newline at end of file
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 fe8a963..cd4d977 100644
--- a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
@@ -22,7 +22,7 @@
 			<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="#modules/Learn">{%= __("View a list of all the help videos") %}</a></li>
-				<li><a class="text-muted" href="https://manual.erpnext.com" target="_blank">{%= __("Read the ERPNext Manual") %}</a></li>
+				<li><a class="text-muted" href="https://frappe.github.io/erpnext/user" target="_blank">{%= __("Read the ERPNext Manual") %}</a></li>
 				<li><a class="text-muted" href="https://discuss.erpnext.com" target="_blank">{%= __("Community Forum") %}</a></li>
 			</ul>
 
diff --git a/erpnext/setup/setup_wizard/data/sample_home_page.css b/erpnext/setup/setup_wizard/data/sample_home_page.css
deleted file mode 100644
index 723bcb9..0000000
--- a/erpnext/setup/setup_wizard/data/sample_home_page.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.page-header {
-	color: white;
-	background: #263248;
-	text-align: center;
-	padding: 80px 0px;
-}
-
-.page-header .page-header-left {
-	width: 100%;
-}
-
-.page-header h1 {
-	color: white;
-}
-
-.slide h2 {
-	margin-bottom: 30px;
-}
-
-.slides {
-	margin-top: -15px;
-}
-
-.slide {
-	padding: 30px 40px;
-	max-width: 800px;
-	margin: auto;
-}
-
-.container {
-	max-width: 900px;
-}
-
-.img-wrapper {
-	text-align: center;
-	padding: 30px;
-	background-color: #eee;
-	border-radius: 5px;
-	margin-bottom: 15px;
-}
diff --git a/erpnext/setup/setup_wizard/data/sample_home_page.html b/erpnext/setup/setup_wizard/data/sample_home_page.html
deleted file mode 100644
index 990bc1e..0000000
--- a/erpnext/setup/setup_wizard/data/sample_home_page.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="slides">
-	<div class="row slide">
-		<h2 class="text-center">{{ _("Awesome Products") }}</h2>
-		<div class="col-md-6 text-center">
-			<div class="img-wrapper">
-				<i class="icon-wrench text-muted" style="font-size: 100px;"></i>
-			</div>
-		</div>
-		<div class="col-md-6">
-			<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p>
-		</div>
-	</div>
-	<div class="row slide alt">
-		<h2 class="text-center">{{ _("Awesome Services") }}</h2>
-		<div class="col-md-6 text-center">
-			<div class="img-wrapper">
-				<i class="icon-phone text-muted" style="font-size: 100px;"></i>
-			</div>
-		</div>
-		<div class="col-md-6">
-			<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p>
-		</div>
-	</div>
-</div>
-<p class="text-center" style="margin-bottom: 50px;">
-	<a href="/products" class="btn btn-success">Explore <i class="icon-chevron-right"></i></a>
-</p>
-<!-- no-sidebar -->
diff --git a/erpnext/setup/setup_wizard/default_website.py b/erpnext/setup/setup_wizard/default_website.py
index e8d4eb43..d137676 100644
--- a/erpnext/setup/setup_wizard/default_website.py
+++ b/erpnext/setup/setup_wizard/default_website.py
@@ -8,34 +8,27 @@
 from frappe.utils import nowdate
 
 class website_maker(object):
-	def __init__(self, company, tagline, user):
-		self.company = company
-		self.tagline = tagline
-		self.user = user
+	def __init__(self, args):
+		self.args = args
+		self.company = args.company_name
+		self.tagline = args.company_tagline
+		self.user = args.name
 		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()
+		homepage = frappe.get_doc('Homepage', 'Homepage')
+		homepage.company = self.company
+		homepage.tag_line = self.tagline
+		homepage.setup_items()
+		homepage.save()
 
 	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.home_page = 'home'
 		website_settings.brand_html = self.company
 		website_settings.copyright = self.company
 		website_settings.top_bar_items = []
@@ -88,5 +81,5 @@
 	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")
+	website_maker({'company':"Test Company", 'company_tagline': "Better Tools for Everyone", 'name': "Administrator"})
 	frappe.db.commit()
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
new file mode 100644
index 0000000..07b2e19
--- /dev/null
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -0,0 +1,142 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def get_domain(domain):
+	'''Written as a function to prevent data mutation effects'''
+	data = {
+		'Manufacturing': {
+			'desktop_icons': ['Item', 'BOM', 'Customer', 'Supplier', 'Sales Order',
+				'Production Order',  'Stock Entry', 'Purchase Order', 'Task', 'Buying', 'Selling',
+				 'Accounts', 'HR', 'ToDo'],
+			'remove_roles': ['Academics User'],
+			'properties': [
+				{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'},
+			],
+			'set_value': [
+				['Stock Settings', None, 'show_barcode_field', 1]
+			],
+			'remove_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
+		},
+
+		'Retail': {
+			'desktop_icons': ['POS', 'Item', 'Customer', 'Sales Invoice',  'Purchase Order', 'Warranty Claim',
+			'Accounts', 'Buying', 'ToDo'],
+			'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User'],
+			'properties': [
+				{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
+				{'doctype': 'Customer', 'fieldname': 'credit_limit_section', 'property': 'hidden', 'value': 1},
+			],
+			'set_value': [
+				['Stock Settings', None, 'show_barcode_field', 1]
+			],
+			'remove_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
+		},
+
+		'Distribution': {
+			'desktop_icons': ['Item', 'Customer', 'Supplier', 'Lead', 'Sales Order',
+				 'Sales Invoice', 'CRM', 'Selling', 'Buying', 'Stock', 'Accounts', 'HR', 'ToDo'],
+			'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User'],
+			'properties': [
+				{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
+			],
+			'set_value': [
+				['Stock Settings', None, 'show_barcode_field', 1]
+			],
+			'remove_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
+		},
+
+		'Services': {
+			'desktop_icons': ['Project', 'Timesheet', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
+				'Expense Claim', 'Employee', 'HR', 'ToDo'],
+			'remove_roles': ['Manufacturing User', 'Manufacturing Manager', 'Academics User'],
+			'properties': [
+				{'doctype': 'Item', 'fieldname': 'is_stock_item', 'property': 'default', 'value': 0},
+			],
+			'set_value': [
+				['Stock Settings', None, 'show_barcode_field', 0]
+			],
+			'remove_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
+		},
+		'Education': {
+			'desktop_icons': ['Student', 'Program', 'Course', 'Student Group', 'Instructor',
+				'Fees',  'ToDo', 'Schools'],
+			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager'],
+			'allow_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
+		},
+	}
+	if not domain in data:
+		raise 'Invalid Domain {0}'.format(domain)
+	return frappe._dict(data[domain])
+
+def setup_domain(domain):
+	'''Setup roles, desktop icons, properties, values, portal sidebar menu based on domain'''
+	data = get_domain(domain)
+	setup_roles(data)
+	setup_desktop_icons(data)
+	setup_properties(data)
+	set_values(data)
+	setup_sidebar_items(data)
+	frappe.clear_cache()
+
+def setup_desktop_icons(data):
+	'''set desktop icons form `data.desktop_icons`'''
+	from frappe.desk.doctype.desktop_icon.desktop_icon import set_desktop_icons
+	if data.desktop_icons:
+		set_desktop_icons(data.desktop_icons)
+
+def setup_properties(data):
+	if data.properties:
+		for args in data.properties:
+			frappe.make_property_setter(args)
+
+def setup_roles(data):
+	'''Add, remove roles from `data.allow_roles` or `data.remove_roles`'''
+	def remove_role(role):
+		frappe.db.sql('delete from tabUserRole where role=%s', role)
+
+	if data.remove_roles:
+		for role in data.remove_roles:
+			remove_role(role)
+
+	if data.allow_roles:
+		# remove all roles other than allowed roles
+		data.allow_roles += ['Administrator', 'Guest', 'System Manager']
+		for role in frappe.get_all('Role'):
+			if not (role.name in data.allow_roles):
+				remove_role(role.name)
+
+def set_values(data):
+	'''set values based on `data.set_value`'''
+	if data.set_value:
+		for args in data.set_value:
+			doc = frappe.get_doc(args[0], args[1] or args[0])
+			doc.set(args[2], args[3])
+			doc.save()
+
+def setup_sidebar_items(data):
+	'''Enable / disable sidebar items'''
+	if data.allow_sidebar_items:
+		# disable all
+		frappe.db.sql('update `tabPortal Menu Item` set enabled=0')
+
+		# enable
+		frappe.db.sql('''update `tabPortal Menu Item` set enabled=1
+			where route in ({0})'''.format(', '.join(['"{0}"'.format(d) for d in data.allow_sidebar_items])))
+
+	if data.remove_sidebar_items:
+		# disable all
+		frappe.db.sql('update `tabPortal Menu Item` set enabled=1')
+
+		# enable
+		frappe.db.sql('''update `tabPortal Menu Item` set enabled=0
+			where route in ({0})'''.format(', '.join(['"{0}"'.format(d) for d in data.remove_sidebar_items])))
+
+
+def reset():
+	from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
+	add_all_roles_to('Administrator')
+
+	frappe.db.sql('delete from `tabProperty Setter`')
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index d3d0cb4..a0e52dd 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -15,17 +15,17 @@
 
 		# item group
 		{'doctype': 'Item Group', 'item_group_name': _('All Item Groups'),
-			'is_group': 'Yes', 'parent_item_group': ''},
+			'is_group': 1, 'parent_item_group': ''},
 		{'doctype': 'Item Group', 'item_group_name': _('Products'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups'), "show_in_website": 1 },
+			'is_group': 0, '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') },
+			'is_group': 0, 'parent_item_group': _('All Item Groups') },
 		{'doctype': 'Item Group', 'item_group_name': _('Services'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+			'is_group': 0, 'parent_item_group': _('All Item Groups') },
 		{'doctype': 'Item Group', 'item_group_name': _('Sub Assemblies'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+			'is_group': 0, 'parent_item_group': _('All Item Groups') },
 		{'doctype': 'Item Group', 'item_group_name': _('Consumable'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+			'is_group': 0, 'parent_item_group': _('All Item Groups') },
 
 		# deduction type
 		{'doctype': 'Deduction Type', 'name': _('Income Tax'), 'description': _('Income Tax'), 'deduction_name': _('Income Tax')},
@@ -95,14 +95,14 @@
 		{'doctype': 'Designation', 'designation_name': _('Researcher')},
 
 		# territory
-		{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
+		{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 1, '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')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('All Customer Groups'), 'is_group': 1, 	'name': _('All Customer Groups'), 'parent_customer_group': ''},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Individual'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Commercial'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Non Profit'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 0, 'parent_customer_group': _('All Customer Groups')},
 
 		# supplier type
 		{'doctype': 'Supplier Type', 'supplier_type': _('Services')},
@@ -114,12 +114,15 @@
 		{'doctype': 'Supplier Type', 'supplier_type': _('Distributor')},
 
 		# Sales Person
-		{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': "Yes", "parent_sales_person": ""},
+		{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': 1, "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': _('Meter'), 'doctype': 'UOM', 'name': _('Meter')},
+		{'uom_name': _('Litre'), 'doctype': 'UOM', 'name': _('Litre')},
+		{'uom_name': _('Gram'), 'doctype': 'UOM', 'name': _('Gram')},
 		{'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},
@@ -127,11 +130,17 @@
 		{'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')},
+		{'doctype': 'Mode of Payment',
+			'mode_of_payment': 'Check' if country=="United States" else _('Cheque'),
+			'type': 'Bank'},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Cash'),
+			'type': 'Cash'},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Credit Card'),
+			'type': 'Bank'},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Wire Transfer'),
+			'type': 'Bank'},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Bank Draft'),
+			'type': 'Bank'},
 
 		# Activity Type
 		{'doctype': 'Activity Type', 'activity_type': _('Planning')},
@@ -174,7 +183,10 @@
 		{"doctype": "Offer Term", "offer_term": _("Incentives")},
 
 		{'doctype': "Print Heading", 'print_heading': _("Credit Note")},
-		{'doctype': "Print Heading", 'print_heading': _("Debit Note")}
+		{'doctype': "Print Heading", 'print_heading': _("Debit Note")},
+
+		{"doctype": "Salary Component", "salary_component": _("Basic")},
+		{"doctype": "Salary Component", "salary_component": _("Income Tax")},
 	]
 
 	from erpnext.setup.setup_wizard.industry_type import get_industry_types
diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
index 63fc2e7..8078ebc 100644
--- a/erpnext/setup/setup_wizard/sample_data.py
+++ b/erpnext/setup/setup_wizard/sample_data.py
@@ -11,26 +11,25 @@
 def make_sample_data():
 	"""Create a few opportunities, quotes, material requests, issues, todos, projects
 	to help the user get started"""
+	items = frappe.get_all("Item")
 
-	selling_items = frappe.get_all("Item", filters = {"is_sales_item": 1})
-	buying_items = frappe.get_all("Item", filters = {"is_purchase_item": 1})
 	customers = frappe.get_all("Customer")
 	warehouses = frappe.get_all("Warehouse")
 
-	if selling_items and customers:
+	if items and customers:
 		for i in range(3):
 			customer = random.choice(customers).name
-			make_opportunity(selling_items, customer)
-			make_quote(selling_items, customer)
+			make_opportunity(items, customer)
+			make_quote(items, customer)
 
 	make_projects()
 
-	if buying_items and warehouses:
-		make_material_request(buying_items)
+	if items and warehouses:
+		make_material_request(items)
 
 	frappe.db.commit()
 
-def make_opportunity(selling_items, customer):
+def make_opportunity(items, customer):
 	b = frappe.get_doc({
 		"doctype": "Opportunity",
 		"enquiry_from": "Customer",
@@ -39,16 +38,16 @@
 		"with_items": 1
 	})
 
-	add_random_children(b, "items", rows=len(selling_items), randomize = {
+	add_random_children(b, "items", rows=len(items), randomize = {
 		"qty": (1, 5),
-		"item_code": ("Item", {"is_sales_item": 1})
+		"item_code": ["Item"]
 	}, unique="item_code")
 
 	b.insert(ignore_permissions=True)
 
 	b.add_comment('Comment', text="This is a dummy record")
 
-def make_quote(selling_items, customer):
+def make_quote(items, customer):
 	qtn = frappe.get_doc({
 		"doctype": "Quotation",
 		"quotation_to": "Customer",
@@ -56,17 +55,17 @@
 		"order_type": "Sales"
 	})
 
-	add_random_children(qtn, "items", rows=len(selling_items), randomize = {
+	add_random_children(qtn, "items", rows=len(items), randomize = {
 		"qty": (1, 5),
-		"item_code": ("Item", {"is_sales_item": 1})
+		"item_code": ["Item"]
 	}, unique="item_code")
 
 	qtn.insert(ignore_permissions=True)
 
 	qtn.add_comment('Comment', text="This is a dummy record")
 
-def make_material_request(buying_items):
-	for i in buying_items:
+def make_material_request(items):
+	for i in items:
 		mr = frappe.get_doc({
 			"doctype": "Material Request",
 			"material_request_type": "Purchase",
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index bd7009e..3cabde1 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -10,9 +10,9 @@
 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
 from frappe.core.doctype.communication.comment import add_info_comment
+from erpnext.setup.setup_wizard.domainify import setup_domain
 
 def setup_complete(args=None):
 	if frappe.db.sql("select name from tabCompany"):
@@ -20,12 +20,11 @@
 
 	install_fixtures.install(args.get("country"))
 
-	update_setup_wizard_access()
+	create_price_lists(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)
@@ -33,13 +32,24 @@
 	create_items(args)
 	create_customers(args)
 	create_suppliers(args)
-	frappe.local.message_log = []
 
-	website_maker(args.company_name.strip(), args.company_tagline, args.name)
+	if args.domain.lower() == 'education':
+		create_academic_term()
+		create_academic_year()
+		create_program(args)
+		create_course(args)
+		create_instructor(args)
+		create_room(args)
+
+	frappe.local.message_log = []
+	setup_domain(args.get('domain'))
+
+	website_maker(args)
 	create_logo(args)
 
 	frappe.db.commit()
 	login_as_first_user(args)
+
 	frappe.db.commit()
 	frappe.clear_cache()
 
@@ -47,21 +57,13 @@
 		try:
 			make_sample_data()
 			frappe.clear_cache()
-		except FiscalYearError:
+		except:
 			# clear message
 			if frappe.message_log:
 				frappe.message_log.pop()
 
 			pass
 
-def update_setup_wizard_access():
-	setup_wizard = frappe.get_doc('Page', 'setup-wizard')
-	for roles in setup_wizard.roles:
-		if roles.role == 'System Manager':
-			roles.role = 'Administrator'
-	setup_wizard.flags.ignore_permissions = 1
-	setup_wizard.save()
-
 def create_fiscal_year_and_company(args):
 	if (args.get('fy_start_date')):
 		curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date'))
@@ -85,9 +87,22 @@
 			'domain': args.get('domain')
 		}).insert()
 
+		#Enable shopping cart
+		enable_shopping_cart(args)
+
 		# Bank Account
 		create_bank_account(args)
 
+def enable_shopping_cart(args):
+	frappe.get_doc({
+		"doctype": "Shopping Cart Settings",
+		"enabled": 1,
+		'company': args.get('company_name').strip(),
+		'price_list': frappe.db.get_value("Price List", {"selling": 1}),
+		'default_customer_group': _("Individual"),
+		'quotation_series': "QTN-",
+	}).insert()
+
 def create_bank_account(args):
 	if args.get("bank_account"):
 		company_name = args.get('company_name').strip()
@@ -145,6 +160,7 @@
 	stock_settings = frappe.get_doc("Stock Settings")
 	stock_settings.item_naming_by = "Item Code"
 	stock_settings.valuation_method = "FIFO"
+	stock_settings.default_warehouse = frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')})
 	stock_settings.stock_uom = _("Nos")
 	stock_settings.auto_indent = 1
 	stock_settings.auto_insert_price_list_rate_if_missing = 1
@@ -286,7 +302,6 @@
 			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={
@@ -300,11 +315,8 @@
 					"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
@@ -432,6 +444,9 @@
 		frappe.local.login_manager.login_as(args.get("email"))
 
 def create_users(args):
+	if frappe.session.user == 'Administrator':
+		return
+
 	# create employee for self
 	emp = frappe.get_doc({
 		"doctype": "Employee",
@@ -487,3 +502,47 @@
 				emp.flags.ignore_mandatory = True
 				emp.insert(ignore_permissions = True)
 
+def create_academic_term():
+	at = ["Semester 1", "Semester 2", "Semester 3"]
+	for d in at:
+		academic_term = frappe.new_doc("Academic Term")
+		academic_term.term_name = d
+		academic_term.save()
+
+def create_academic_year():
+	ac = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
+	for d in ac:
+		academic_year = frappe.new_doc("Academic Year")
+		academic_year.academic_year_name = d
+		academic_year.save()
+
+def create_program(args):
+	for i in xrange(1,6):
+		if args.get("program_" + str(i)):
+			program = frappe.new_doc("Program")
+			program.program_name = args.get("program_" + str(i))
+			program.save()
+
+def create_course(args):
+	for i in xrange(1,6):
+		if args.get("course_" + str(i)):
+			course = frappe.new_doc("Course")
+			course.course_name = args.get("course_" + str(i))
+			course.save()
+
+def create_instructor(args):
+	for i in xrange(1,6):
+		if args.get("instructor_" + str(i)):
+			instructor = frappe.new_doc("Instructor")
+			instructor.instructor_name = args.get("instructor_" + str(i))
+			instructor.save()
+
+def create_room(args):
+	for i in xrange(1,6):
+		if args.get("room_" + str(i)):
+			room = frappe.new_doc("Room")
+			room.room_name = args.get("room_" + str(i))
+			room.seating_capacity = args.get("room_capacity_" + str(i))
+			room.save()
+
+
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index c3bd452..eda2042 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -43,13 +43,15 @@
 			"company_abbr"		:"WP",
 			"industry"			:"Manufacturing",
 			"country"			:"United States",
-			"fy_start_date"		:"2014-01-01",
-			"fy_end_date"		:"2014-12-31",
+			"fy_start_date"		:"2011-01-01",
+			"fy_end_date"		:"2011-12-31",
 			"language"			:"english",
 			"company_tagline"	:"Testing",
 			"email"				:"test@erpnext.com",
 			"password"			:"test",
-			"chart_of_accounts" : "Standard"
+			"chart_of_accounts" : "Standard",
+			"domain"			: "Manufacturing",
+			
 		})
 
 	frappe.db.sql("delete from `tabLeave Allocation`")
@@ -63,6 +65,9 @@
 
 @frappe.whitelist()
 def get_exchange_rate(from_currency, to_currency):
+	if not (from_currency and to_currency):
+		return
+	
 	if from_currency == to_currency:
 		return 1
 	
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 27271af..d5cde4a 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -24,7 +24,7 @@
 
 @frappe.whitelist()
 def get_cart_quotation(doc=None):
-	party = get_customer()
+	party = get_party()
 
 	if not doc:
 		quotation = _get_cart_quotation(party)
@@ -92,8 +92,9 @@
 
 	set_cart_count(quotation)
 
-	if with_items:
-		context = get_cart_quotation(quotation)
+	context = get_cart_quotation(quotation)
+
+	if cint(with_items):
 		return {
 			"items": frappe.render_template("templates/includes/cart/cart_items.html",
 				context),
@@ -101,7 +102,17 @@
 				context),
 		}
 	else:
-		return quotation.name
+		return {
+			'name': quotation.name,
+			'shopping_cart_menu': get_shopping_cart_menu(context)
+		}
+
+@frappe.whitelist()
+def get_shopping_cart_menu(context=None):
+	if not context:
+		context = get_cart_quotation()
+
+	return frappe.render_template('templates/includes/cart/cart_dropdown.html', context)
 
 @frappe.whitelist()
 def update_cart_address(address_fieldname, address_name):
@@ -144,13 +155,13 @@
 def decorate_quotation_doc(doc):
 	for d in doc.get("items", []):
 		d.update(frappe.db.get_value("Item", d.item_code,
-			["thumbnail", "website_image", "description", "page_name"], as_dict=True))
+			["thumbnail", "website_image", "description", "route"], as_dict=True))
 
 	return doc
 
 def _get_cart_quotation(party=None):
 	if not party:
-		party = get_customer()
+		party = get_party()
 
 	quotation = frappe.get_all("Quotation", fields=["name"], filters=
 		{party.doctype.lower(): party.name, "order_type": "Shopping Cart", "docstatus": 0},
@@ -182,7 +193,7 @@
 	return qdoc
 
 def update_party(fullname, company_name=None, mobile_no=None, phone=None):
-	party = get_customer()
+	party = get_party()
 
 	party.customer_name = company_name or fullname
 	party.customer_type == "Company" if company_name else "Individual"
@@ -211,7 +222,7 @@
 
 def apply_cart_settings(party=None, quotation=None):
 	if not party:
-		party = get_customer()
+		party = get_party()
 	if not quotation:
 		quotation = _get_cart_quotation(party)
 
@@ -276,22 +287,28 @@
 # 	# append taxes
 	quotation.append_taxes_from_master()
 
-def get_customer(user=None):
+def get_party(user=None):
 	if not user:
 		user = frappe.session.user
 
-	customer = frappe.db.get_value("Contact", {"email_id": user}, "customer")
+	party = frappe.db.get_value("Contact", {"email_id": user}, ["customer", "supplier"], as_dict=1)
+	if party:
+		party_doctype = 'Customer' if party.customer else 'Supplier'
+		party = party.customer or party.supplier
+
 	cart_settings = frappe.get_doc("Shopping Cart Settings")
-	
+
 	debtors_account = ''
-	
+
 	if cart_settings.enable_checkout:
 		debtors_account = get_debtors_account(cart_settings)
-	
-	if customer:
-		return frappe.get_doc("Customer", customer)
+
+	if party:
+		return frappe.get_doc(party_doctype, party)
 
 	else:
+		if not cart_settings.enabled:
+			return None
 		customer = frappe.new_doc("Customer")
 		fullname = get_fullname(user)
 		customer.update({
@@ -300,7 +317,7 @@
 			"customer_group": get_shopping_cart_settings().default_customer_group,
 			"territory": get_root_of("Territory")
 		})
-		
+
 		if debtors_account:
 			customer.update({
 				"accounts": [{
@@ -308,7 +325,7 @@
 					"account": debtors_account
 				}]
 			})
-		
+
 		customer.flags.ignore_mandatory = True
 		customer.insert(ignore_permissions=True)
 
@@ -326,12 +343,12 @@
 def get_debtors_account(cart_settings):
 	payment_gateway_account_currency = \
 		frappe.get_doc("Payment Gateway Account", cart_settings.payment_gateway_account).currency
-	
+
 	account_name = _("Debtors ({0})".format(payment_gateway_account_currency))
-	
+
 	debtors_account_name = get_account_name("Receivable", "Asset", is_group=0,\
 		account_currency=payment_gateway_account_currency, company=cart_settings.company)
-	
+
 	if not debtors_account_name:
 		debtors_account = frappe.get_doc({
 			"doctype": "Account",
@@ -340,18 +357,21 @@
 			"is_group": 0,
 			"parent_account": get_account_name(root_type="Asset", is_group=1, company=cart_settings.company),
 			"account_name": account_name,
-			"currency": payment_gateway_account_currency	
+			"currency": payment_gateway_account_currency
 		}).insert(ignore_permissions=True)
-		
+
 		return debtors_account.name
-		
+
 	else:
 		return debtors_account_name
-		
+
 
 def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None):
 	if not party:
-		party = get_customer()
+		party = get_party()
+
+	if not party:
+		return []
 
 	address_docs = frappe.db.sql("""select * from `tabAddress`
 		where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
@@ -371,7 +391,7 @@
 
 	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()
+		get_party()
 		doc.link_address()
 
 @frappe.whitelist()
@@ -437,3 +457,6 @@
 				break
 
 	return territory
+
+def show_terms(doc):
+	return doc.tc_name
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py
index 10bbcfe..390bc27 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py
@@ -36,4 +36,6 @@
 		cart_settings.enabled = 1
 		if not frappe.db.get_value("Tax Rule", {"use_for_shopping_cart": 1}, "name"):
 			self.assertRaises(ShoppingCartSetupError, cart_settings.validate_tax_rule)
+			
+		frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 1")
 
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index 9b0278d..5282231 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import unittest
 import frappe
-from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_customer
+from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_party
 
 class TestShoppingCart(unittest.TestCase):
 	"""
@@ -96,19 +96,12 @@
 		self.assertEquals(quotation.net_total, 20)
 		self.assertEquals(len(quotation.get("items")), 1)
 
-		# remove second item
-		update_cart("_Test Item 2", 0)
-		quotation = self.test_get_cart_customer()
-
-		self.assertEquals(len(quotation.get("items")), 0)
-		self.assertEquals(quotation.net_total, 0)
-
 	def test_tax_rule(self):
 		self.login_as_customer()
 		quotation = self.create_quotation()
 
 		from erpnext.accounts.party import set_taxes
-
+		
 		tax_rule_master = set_taxes(quotation.customer, "Customer", \
 			quotation.transaction_date, quotation.company, None, None, \
 			quotation.customer_address, quotation.shipping_address_name, 1)
@@ -125,7 +118,7 @@
 			"doctype": "Quotation",
 			"quotation_to": "Customer",
 			"order_type": "Shopping Cart",
-			"customer": get_customer(frappe.session.user).name,
+			"customer": get_party(frappe.session.user).name,
 			"docstatus": 0,
 			"contact_email": frappe.session.user,
 			"selling_price_list": "_Test Price List Rest of the World",
@@ -191,15 +184,16 @@
 		frappe.set_user("test_cart_user@example.com")
 
 	def login_as_customer(self):
-		self.create_user_if_not_exists("test_contact_customer@example.com")
+		self.create_user_if_not_exists("test_contact_customer@example.com",
+			"_Test Contact For _Test Customer")
 		frappe.set_user("test_contact_customer@example.com")
 
 	def remove_all_items_from_cart(self):
 		quotation = _get_cart_quotation()
-		quotation.set("items", [])
-		quotation.save(ignore_permissions=True)
+		quotation.flags.ignore_permissions=True
+		quotation.delete()
 
-	def create_user_if_not_exists(self, email):
+	def create_user_if_not_exists(self, email, first_name = None):
 		if frappe.db.exists("User", email):
 			return
 
@@ -208,7 +202,7 @@
 			"user_type": "Website User",
 			"email": email,
 			"send_welcome_email": 0,
-			"first_name": email.split("@")[0]
+			"first_name": first_name or email.split("@")[0]
 		}).insert(ignore_permissions=True)
 
 test_dependencies = ["Sales Taxes and Charges Template", "Price List", "Item Price", "Shipping Rule", "Currency Exchange",
diff --git a/erpnext/shopping_cart/utils.py b/erpnext/shopping_cart/utils.py
index b8d5054..50ce5cf 100644
--- a/erpnext/shopping_cart/utils.py
+++ b/erpnext/shopping_cart/utils.py
@@ -4,7 +4,6 @@
 from __future__ import unicode_literals
 
 import frappe
-from frappe import _
 import frappe.defaults
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
 
@@ -16,6 +15,8 @@
 	return False
 
 def set_cart_count(login_manager):
+	role, parties = check_customer_or_supplier()
+	if role == 'Supplier': return
 	if show_cart_count():
 		from erpnext.shopping_cart.cart import set_cart_count
 		set_cart_count()
@@ -28,11 +29,14 @@
 	cart_enabled = is_cart_enabled()
 	context["shopping_cart_enabled"] = cart_enabled
 
-def update_my_account_context(context):
-	context["my_account_list"].extend([
-		{"label": _("Orders"), "url": "orders"},
-		{"label": _("Invoices"), "url": "invoices"},
-		{"label": _("Shipments"), "url": "shipments"},
-		{"label": _("Issues"), "url": "issues"},
-		{"label": _("Addresses"), "url": "addresses"},
-	])
+def check_customer_or_supplier():
+	if frappe.session.user:
+		contacts = frappe.get_all("Contact", fields=["customer", "supplier", "email_id"],
+			filters={"email_id": frappe.session.user})
+
+		customer = [d.customer for d in contacts if d.customer] or None
+		supplier = [d.supplier for d in contacts if d.supplier] or None
+
+		if customer: return 'Customer', customer
+		if supplier : return 'Supplier', supplier
+		return 'Customer', None
\ No newline at end of file
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 445c09d..97ef329 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -30,7 +30,7 @@
 				tabCompany limit 1""") and 'Yes' or 'No'
 
 		bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center,
-			default_terms, default_letter_head from `tabCompany`""",
+			default_terms, default_letter_head, default_bank_account from `tabCompany`""",
 			as_dict=1, update={"doctype":":Company"})
 
 def load_country_and_currency(bootinfo):
@@ -38,7 +38,8 @@
 	if country and frappe.db.exists("Country", country):
 		bootinfo.docs += [frappe.get_doc("Country", country)]
 
-	bootinfo.docs += frappe.db.sql("""select * from tabCurrency
+	bootinfo.docs += frappe.db.sql("""select name, fraction, fraction_units,
+		number_format, smallest_currency_fraction_value, symbol from tabCurrency
 		where enabled=1""", as_dict=1, update={"doctype":":Currency"})
 
 def get_letter_heads():
@@ -51,26 +52,26 @@
 	bootinfo.page_info.update({
 		"Chart of Accounts": {
 			"title": "Chart of Accounts",
-			"route": "Accounts Browser/Account"
+			"route": "Tree/Account"
 		},
 		"Chart of Cost Centers": {
 			"title": "Chart of Cost Centers",
-			"route": "Accounts Browser/Cost Center"
+			"route": "Tree/Cost Center"
 		},
 		"Item Group Tree": {
 			"title": "Item Group Tree",
-			"route": "Sales Browser/Item Group"
+			"route": "Tree/Item Group"
 		},
 		"Customer Group Tree": {
 			"title": "Customer Group Tree",
-			"route": "Sales Browser/Customer Group"
+			"route": "Tree/Customer Group"
 		},
 		"Territory Tree": {
 			"title": "Territory Tree",
-			"route": "Sales Browser/Territory"
+			"route": "Tree/Territory"
 		},
 		"Sales Person Tree": {
 			"title": "Sales Person Tree",
-			"route": "Sales Browser/Sales Person"
+			"route": "Tree/Sales Person"
 		}
 	})
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 7555312..991114d 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -10,6 +10,9 @@
 			"Warranty Claim": {"status": "Open"},
 			"Task": {"status": "Overdue"},
 			"Project": {"status": "Open"},
+			"Item": {"total_projected_qty": ("<", 0)},
+			"Customer": {"status": "Open"},
+			"Supplier": {"status": "Open"},
 			"Lead": {"status": "Open"},
 			"Contact": {"status": "Open"},
 			"Opportunity": {"status": "Open"},
@@ -24,7 +27,6 @@
 			"Leave Application": {"status": "Open"},
 			"Expense Claim": {"approval_status": "Draft"},
 			"Job Applicant": {"status": "Open"},
-			"Purchase Receipt": {"docstatus": 0},
 			"Delivery Note": {"docstatus": 0},
 			"Stock Entry": {"docstatus": 0},
 			"Material Request": {
@@ -32,14 +34,15 @@
 				"status": ("not in", ("Stopped",)),
 				"per_ordered": ("<", 100)
 			},
+			"Request for Quotation": { "docstatus": 0 },
+			"Supplier Quotation": {"docstatus": 0},
 			"Purchase Order": {
 				"status": ("not in", ("Completed", "Closed")),
 				"docstatus": ("<", 2)
 			},
-			"Production Order": { "status": "In Process" },
+			"Purchase Receipt": {"docstatus": 0},
+			"Production Order": { "status": ("in", ("Draft", "Not Started", "In Process")) },
 			"BOM": {"docstatus": 0},
-			"Timesheet": {"docstatus": 0},
-			"Time Log": {"status": "Draft"},
-			"Time Log Batch": {"status": "Draft"}
+			"Timesheet": {"status": "Draft"}
 		}
 	}
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index 824786b..eb5c5d9 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -4,7 +4,7 @@
 	{"doctype":"Role", "role_name":"Item Manager", "name":"Item Manager"},
 	{"doctype":"Role", "role_name":"Stock User", "name":"Stock User"},
 	{"doctype":"Role", "role_name":"Quality Manager", "name":"Quality Manager"},
-	{"doctype":"Item Group", "item_group_name":"All Item Groups", "is_group":"Yes"},
+	{"doctype":"Item Group", "item_group_name":"All Item Groups", "is_group": 1},
 	{"doctype":"Item Group", "item_group_name":"Default", 
-		"parent_item_group":"All Item Groups", "is_group":"No"},
+		"parent_item_group":"All Item Groups", "is_group": 0},
 ]
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/stock/dashboard/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/stock/dashboard/__init__.py
diff --git a/erpnext/stock/dashboard/item_dashboard.html b/erpnext/stock/dashboard/item_dashboard.html
new file mode 100644
index 0000000..1e18969
--- /dev/null
+++ b/erpnext/stock/dashboard/item_dashboard.html
@@ -0,0 +1,7 @@
+<div>
+	<div class="result">
+	</div>
+	<div class="more hidden" style="padding: 15px;">
+		<a class="btn btn-default btn-xs btn-more">More</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
new file mode 100644
index 0000000..33296ee
--- /dev/null
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -0,0 +1,182 @@
+frappe.provide('erpnext.stock');
+
+erpnext.stock.ItemDashboard = Class.extend({
+	init: function(opts) {
+		$.extend(this, opts);
+		this.make();
+	},
+	make: function() {
+		var me = this;
+		this.start = 0;
+		if(!this.sort_by) {
+			this.sort_by = 'projected_qty';
+			this.sort_order = 'asc';
+		}
+
+		this.content = $(frappe.render_template('item_dashboard')).appendTo(this.parent);
+		this.result = this.content.find('.result');
+
+		// move
+		this.content.on('click', '.btn-move', function() {
+			erpnext.stock.move_item($(this).attr('data-item'), $(this).attr('data-warehouse'),
+				null, $(this).attr('data-actual_qty'), null, function() { me.refresh(); });
+		});
+
+		this.content.on('click', '.btn-add', function() {
+			erpnext.stock.move_item($(this).attr('data-item'), null, $(this).attr('data-warehouse'),
+				$(this).attr('data-actual_qty'), $(this).attr('data-rate'),
+				function() { me.refresh(); });
+		});
+
+		// more
+		this.content.find('.btn-more').on('click', function() {
+			me.start += 20;
+			me.refresh();
+		});
+
+	},
+	refresh: function() {
+		if(this.before_refresh) {
+			this.before_refresh();
+		}
+
+		var me = this;
+		frappe.call({
+			method: 'erpnext.stock.dashboard.item_dashboard.get_data',
+			args: {
+				item_code: this.item_code,
+				warehouse: this.warehouse,
+				start: this.start,
+				sort_by: this.sort_by,
+				sort_order: this.sort_order,
+			},
+			callback: function(r) {
+				me.render(r.message);
+			}
+		});
+	},
+	render: function(data) {
+		if(this.start===0) {
+			this.max_count = 0;
+			this.result.empty();
+		}
+
+		var context = this.get_item_dashboard_data(data, this.max_count, true);
+		this.max_count = this.max_count;
+
+		// show more button
+		if(data && data.length===21) {
+			this.content.find('.more').removeClass('hidden');
+
+			// remove the last element
+			data.splice(-1);
+		} else {
+			this.content.find('.more').addClass('hidden');
+		}
+
+		$(frappe.render_template('item_dashboard_list', context)).appendTo(this.result);
+
+	},
+	get_item_dashboard_data: function(data, max_count, show_item) {
+		if(!max_count) max_count = 0;
+		if(!data) data = [];
+		data.forEach(function(d) {
+			d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
+			d.pending_qty = 0;
+			d.total_reserved = d.reserved_qty + d.reserved_qty_for_production;
+			if(d.actual_or_pending > d.actual_qty) {
+				d.pending_qty = d.actual_or_pending - d.actual_qty;
+			}
+
+			max_count = Math.max(d.actual_or_pending, d.actual_qty,
+				d.total_reserved, max_count);
+		});
+		return {
+			data: data,
+			max_count: max_count,
+			show_item: show_item || false
+		}
+	}
+})
+
+erpnext.stock.move_item = function(item, source, target, actual_qty, rate, callback) {
+	var dialog = new frappe.ui.Dialog({
+		title: target ? __('Add Item') : __('Move Item'),
+		fields: [
+			{fieldname: 'item_code', label: __('Item'),
+				fieldtype: 'Link', options: 'Item', read_only: 1},
+			{fieldname: 'source', label: __('Source Warehouse'),
+				fieldtype: 'Link', options: 'Warehouse', read_only: 1},
+			{fieldname: 'target', label: __('Target Warehouse'),
+				fieldtype: 'Link', options: 'Warehouse', reqd: 1},
+			{fieldname: 'qty', label: __('Quantity'), reqd: 1,
+				fieldtype: 'Float', description: __('Available {0}', [actual_qty]) },
+			{fieldname: 'rate', label: __('Rate'), fieldtype: 'Currency', hidden: 1 },
+		],
+	})
+	dialog.show();
+	dialog.get_field('item_code').set_input(item);
+
+	if(source) {
+		dialog.get_field('source').set_input(source);
+	} else {
+		dialog.get_field('source').df.hidden = 1;
+		dialog.get_field('source').refresh();
+	}
+
+	if(rate) {
+		dialog.get_field('rate').set_value(rate);
+		dialog.get_field('rate').df.hidden = 0;
+		dialog.get_field('rate').refresh();
+	}
+
+	if(target) {
+		dialog.get_field('target').df.read_only = 1;
+		dialog.get_field('target').value = target;
+		dialog.get_field('target').refresh();
+	}
+
+	dialog.set_primary_action(__('Submit'), function() {
+		var values = dialog.get_values();
+		if(!values) {
+			return;
+		}
+		if(source && values.qty > actual_qty) {
+			frappe.msgprint(__('Quantity must be less than or equal to {0}', [actual_qty]));
+			return;
+		}
+		if(values.source === values.target) {
+			frappe.msgprint(__('Source and target warehouse must be different'));
+		}
+
+		frappe.call({
+			method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
+			args: values,
+			callback: function(r) {
+				frappe.show_alert(__('Stock Entry {0} created',
+					['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
+				dialog.hide();
+				callback(r);
+			},
+		});
+	});
+
+	$('<p style="margin-left: 10px;"><a class="link-open text-muted small">'
+		+ __("Add more items or open full form") + '</a></p>')
+		.appendTo(dialog.body)
+		.find('.link-open')
+		.on('click', function() {
+			frappe.model.with_doctype('Stock Entry', function() {
+				var doc = frappe.model.get_new_doc('Stock Entry');
+				doc.from_warehouse = dialog.get_value('source');
+				doc.to_warehouse = dialog.get_value('target');
+				row = frappe.model.add_child(doc, 'items');
+				row.item_code = dialog.get_value('item_code');
+				row.f_warehouse = dialog.get_value('target');
+				row.t_warehouse = dialog.get_value('target');
+				row.qty = dialog.get_value('qty');
+				row.basic_rate = dialog.get_value('rate');
+				frappe.set_route('Form', doc.doctype, doc.name);
+			})
+		});
+}
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py
new file mode 100644
index 0000000..5a00b3d
--- /dev/null
+++ b/erpnext/stock/dashboard/item_dashboard.py
@@ -0,0 +1,14 @@
+from __future__ import unicode_literals
+
+import frappe
+
+@frappe.whitelist()
+def get_data(item_code=None, warehouse=None, start=0, sort_by='actual_qty', sort_order='desc'):
+	filters = {}
+	if item_code:
+		filters['item_code'] = item_code
+	if warehouse:
+		filters['warehouse'] = warehouse
+	return frappe.get_list("Bin", filters=filters, fields=['item_code', 'warehouse',
+		'projected_qty', 'reserved_qty', 'reserved_qty_for_production', 'actual_qty', 'valuation_rate'],
+		order_by='{0} {1}'.format(sort_by, sort_order), start=start, page_length = 21)
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
new file mode 100644
index 0000000..f9ffbb3
--- /dev/null
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -0,0 +1,55 @@
+{% for d in data %}
+	<div class="dashboard-list-item">
+		<div class="row">
+			<div class="col-sm-3 small" style="margin-top: 8px;">
+				<a data-type="warehouse" data-name="{{ d.warehouse }}">{{ d.warehouse }}</a>
+			</div>
+			<div class="col-sm-3 small" style="margin-top: 8px;">
+				{% if show_item %}
+					<a data-type="item"
+						data-name="{{ d.item_code }}">{{ d.item_code }}</a>
+				{% endif %}
+			</div>
+			<div class="col-sm-4 small">
+				<span class="inline-graph">
+					<span class="inline-graph-half" title="{{ __("Reserved Qty") }}">
+						<span class="inline-graph-count">{{ d.total_reserved }}</span>
+						<span class="inline-graph-bar">
+							<span class="inline-graph-bar-inner"
+								style="width: {{ cint(Math.abs(d.total_reserved)/max_count * 100) || 5 }}%">
+							</span>
+						</span>
+					</span>
+					<span class="inline-graph-half" title="{{ __("Acutal Qty {0} / Waiting Qty {1}", [d.actual_qty, d.pending_qty]) }}">
+						<span class="inline-graph-count">
+							{{ d.actual_qty }} {{ (d.pending_qty > 0) ? ("(" + d.pending_qty+ ")") : "" }}
+						</span>
+						<span class="inline-graph-bar">
+							<span class="inline-graph-bar-inner dark"
+								style="width: {{ cint(d.actual_qty/max_count * 100) }}%">
+							</span>
+							{% if d.pending_qty > 0 %}
+							<span class="inline-graph-bar-inner" title="{{ __("Projected Qty") }}"
+								style="width: {{ cint(d.pending_qty/max_count * 100) }}%">
+							</span>
+							{% endif %}
+						</span>
+					</span>
+				</span>
+			</div>
+			<div class="col-sm-2 text-right" style="margin-top: 8px;">
+				{% if d.actual_qty %}
+				<button class="btn btn-default btn-xs btn-move"
+					data-warehouse="{{ d.warehouse }}"
+					data-actual_qty="{{ d.actual_qty }}"
+					data-item="{{ d.item_code }}">{{ __("Move") }}</a>
+				{% endif %}
+				<button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
+					data-warehouse="{{ d.warehouse }}"
+					data-actual_qty="{{ d.actual_qty }}"
+					data-item="{{ d.item_code }}"
+					data-rate="{{ d.valuation_rate }}">{{ __("Add") }}</a>
+			</div>
+		</div>
+	</div>
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.js b/erpnext/stock/doctype/bin/bin.js
new file mode 100644
index 0000000..40411b6
--- /dev/null
+++ b/erpnext/stock/doctype/bin/bin.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bin', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 9eb3995..bb0de3f 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -16,6 +16,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Warehouse", 
@@ -42,6 +43,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -69,6 +71,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reserved Quantity", 
@@ -95,6 +98,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Actual Quantity", 
@@ -121,6 +125,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Ordered Quantity", 
@@ -147,6 +152,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Requested Quantity", 
@@ -172,6 +178,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Qty", 
@@ -197,6 +204,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
@@ -218,10 +226,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "reserved_qty_for_production", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reserved Qty for Production", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "ma_rate", 
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Moving Average Rate", 
@@ -247,6 +281,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -273,6 +308,7 @@
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "FCFS Rate", 
@@ -298,6 +334,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
@@ -323,6 +360,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value", 
@@ -350,7 +388,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-02-10 02:39:45.738623", 
+ "modified": "2016-04-18 08:12:57.341517", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Bin", 
@@ -417,8 +455,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code,warehouse", 
- "sort_order": "ASC"
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 1682686..2378e3f 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.utils import flt, nowdate
 import frappe.defaults
 from frappe.model.document import Document
@@ -15,13 +16,19 @@
 		self.validate_mandatory()
 
 		self.projected_qty = flt(self.actual_qty) + flt(self.ordered_qty) + \
-		 	flt(self.indented_qty) + flt(self.planned_qty) - flt(self.reserved_qty)
+			flt(self.indented_qty) + flt(self.planned_qty) - flt(self.reserved_qty)
+		
+		self.block_transactions_against_group_warehouse()
 
 	def validate_mandatory(self):
 		qf = ['actual_qty', 'reserved_qty', 'ordered_qty', 'indented_qty']
 		for f in qf:
 			if (not getattr(self, f, None)) or (not self.get(f)):
 				self.set(f, 0.0)
+	
+	def block_transactions_against_group_warehouse(self):
+		from erpnext.stock.utils import is_group_warehouse
+		is_group_warehouse(self.warehouse)
 
 	def update_stock(self, args, allow_negative_stock=False, via_landed_cost_voucher=False):
 		self.update_qty(args)
@@ -65,10 +72,14 @@
 		self.indented_qty = flt(self.indented_qty) + flt(args.get("indented_qty"))
 		self.planned_qty = flt(self.planned_qty) + flt(args.get("planned_qty"))
 
-		self.projected_qty = flt(self.actual_qty) + flt(self.ordered_qty) + \
-		 	flt(self.indented_qty) + flt(self.planned_qty) - flt(self.reserved_qty)
-
+		self.set_projected_qty()
 		self.save()
+		update_item_projected_qty(self.item_code)
+
+	def set_projected_qty(self):
+		self.projected_qty = (flt(self.actual_qty) + flt(self.ordered_qty)
+			+ flt(self.indented_qty) + flt(self.planned_qty) - flt(self.reserved_qty)
+			- flt(self.reserved_qty_for_production))
 
 	def get_first_sle(self):
 		sle = frappe.db.sql("""
@@ -79,3 +90,26 @@
 			limit 1
 		""", (self.item_code, self.warehouse), as_dict=1)
 		return sle and sle[0] or None
+
+	def update_reserved_qty_for_production(self):
+		'''Update qty reserved for production from Production Item tables
+			in open production orders'''
+		self.reserved_qty_for_production = frappe.db.sql('''select sum(required_qty - transferred_qty)
+			from `tabProduction Order` pro, `tabProduction Order Item` item
+			where
+				item.item_code = %s
+				and item.parent = pro.name
+				and pro.docstatus = 1
+				and pro.source_warehouse = %s''', (self.item_code, self.warehouse))[0][0]
+
+		self.set_projected_qty()
+
+		self.db_set('reserved_qty_for_production', self.reserved_qty_for_production)
+		self.db_set('projected_qty', self.projected_qty)
+
+
+def update_item_projected_qty(item_code):
+	'''Set total_projected_qty in Item as sum of projected qty in all warehouses'''
+	frappe.db.sql('''update tabItem set
+		total_projected_qty = ifnull((select sum(projected_qty) from tabBin where item_code=%s), 0)
+		where name=%s''', (item_code, item_code))
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index f1d11b2..65658d6 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -1,14 +1,22 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'selling/sales_common.js' %};
+{% include 'erpnext/selling/sales_common.js' %};
 
 frappe.provide("erpnext.stock");
 frappe.provide("erpnext.stock.delivery_note");
+
+frappe.ui.form.on('Delivery Note', 'onload', function(frm) {
+	frm.set_indicator_formatter('item_code',
+		function(doc) {
+			return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
+		})
+
+})
+
 erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
 	refresh: function(doc, dt, dn) {
 		this._super();
-
 		if (!doc.is_return && doc.status!="Closed") {
 			if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
 				cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note, __("Make"));
@@ -29,7 +37,7 @@
 			if (this.frm.doc.docstatus===0) {
 				cur_frm.add_custom_button(__('Sales Order'),
 					function() {
-						frappe.model.map_current_doc({
+						erpnext.utils.map_current_doc({
 							method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
 							source_doctype: "Sales Order",
 							get_query_filters: {
@@ -122,7 +130,7 @@
 	tn = frappe.model.make_new_doc_and_get_name('Contact');
 	locals['Contact'][tn].is_customer = 1;
 	if(doc.customer) locals['Contact'][tn].customer = doc.customer;
-	loaddoc('Contact', tn);
+	frappe.set_route('Form', 'Contact', tn);
 }
 
 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index b4bb456..bf2f4f3 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -77,7 +77,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -142,7 +142,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "customer", 
    "fieldname": "customer_name", 
@@ -169,178 +169,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "customer", 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Billing Address Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Billing 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "shipping_address_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Shipping 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "shipping_address", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Shipping 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -562,6 +390,306 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "depends_on": "customer", 
+   "fieldname": "contact_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Address and Contact", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "shipping_address_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Shipping 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "shipping_address", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Shipping 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_mobile", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_email", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Contact Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "col_break21", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "customer", 
+   "fieldname": "customer_address", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Billing Address Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Address", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "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": "address_display", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billing 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "customer_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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, 
+   "description": "", 
+   "fieldname": "territory", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Territory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Territory", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 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": 1, 
    "fieldname": "currency_and_price_list", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1645,7 +1773,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "rounded_total", 
    "fieldtype": "Currency", 
@@ -1690,7 +1818,7 @@
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
@@ -1923,134 +2051,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "depends_on": "customer", 
-   "fieldname": "contact_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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_break21", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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, 
@@ -2216,7 +2216,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "per_billed", 
-   "fieldtype": "Currency", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -2791,7 +2791,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-truck", 
- "idx": 1, 
+ "idx": 146, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -2799,7 +2799,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-18 05:10:56.813113", 
+ "modified": "2016-04-14 12:53:48.081945", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -2891,26 +2891,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Customer", 
-   "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, 
@@ -2932,5 +2912,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "title"
-}
\ No newline at end of file
+ "title_field": "title", 
+ "track_seen": 0
+}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 63abaa5..5e31ac3 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -191,6 +191,8 @@
 		if not self.is_return:
 			self.check_credit_limit()
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating reserved qty in bin depends upon updated delivered qty in SO
 		self.update_stock_ledger()
 		self.make_gl_entries()
 
@@ -201,6 +203,8 @@
 		self.update_prevdoc_status()
 		self.update_billing_status()
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating reserved qty in bin depends upon updated delivered qty in SO
 		self.update_stock_ledger()
 
 		self.cancel_packing_slips()
@@ -325,7 +329,12 @@
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)
-	list_context["title"] = _("My Shipments")
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Shipments'),
+	})
 	return list_context
 
 def get_invoiced_qty_map(delivery_note):
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
new file mode 100644
index 0000000..c2b54f8
--- /dev/null
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -0,0 +1,26 @@
+from frappe import _
+
+data = {
+	'fieldname': 'delivery_note_no',
+	'non_standard_fieldnames': {
+		'Sales Invoice': 'delivery_note',
+		'Packing Slip': 'delivery_note',
+	},
+	'internal_links': {
+		'Sales Order': ['items', 'against_sales_order'],
+	},
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Sales Invoice', 'Packing Slip']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Sales Order', 'Quality Inspection']
+		},
+		{
+			'label': _('Returns'),
+			'items': ['Stock Entry']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 699d8b6..f10b981 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -7,7 +7,7 @@
 import frappe
 import json
 import frappe.defaults
-from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt
+from frappe.utils import cint, nowdate, nowtime, cstr, add_days, flt, today
 from erpnext.stock.stock_ledger import get_previous_sle
 from erpnext.accounts.utils import get_balance_on
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
@@ -516,8 +516,7 @@
 def create_delivery_note(**args):
 	dn = frappe.new_doc("Delivery Note")
 	args = frappe._dict(args)
-	if args.posting_date:
-		dn.posting_date = args.posting_date
+	dn.posting_date = args.posting_date or today()
 	if args.posting_time:
 		dn.posting_time = args.posting_time
 
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 6ed16ce..b40be5e 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-04-22 13:15:44", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
@@ -40,6 +43,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -68,6 +72,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -95,6 +100,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -117,6 +123,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Item Code", 
@@ -140,6 +147,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -164,6 +172,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -191,6 +200,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -214,6 +224,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -238,6 +249,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -263,6 +275,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
@@ -286,6 +299,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
@@ -313,6 +327,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
@@ -337,38 +352,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "price_list_rate", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
-   "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_hide_if_no_value": 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": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -391,6 +379,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
@@ -419,6 +408,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
@@ -442,11 +432,169 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "discount_and_margin", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Discount and Margin", 
+   "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, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 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": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "margin_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPercentage\nAmount", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "margin_rate_or_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Margin Rate or Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 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, 
+   "depends_on": "eval:doc.margin_type && doc.price_list_rate", 
+   "fieldname": "total_margin", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Margin", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "2", 
+   "print_hide": 1, 
+   "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": "section_break_1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -469,6 +617,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
@@ -497,6 +646,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -525,6 +675,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -547,6 +698,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
@@ -575,6 +727,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
@@ -603,6 +756,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
@@ -627,6 +781,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -650,6 +805,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
@@ -675,6 +831,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
@@ -700,6 +857,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -723,6 +881,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
@@ -748,6 +907,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
@@ -773,6 +933,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse and Reference", 
@@ -796,6 +957,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Warehouse", 
@@ -826,6 +988,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Warehouse (Optional)", 
@@ -851,6 +1014,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
@@ -876,6 +1040,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
@@ -902,6 +1067,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Qty at From Warehouse", 
@@ -930,6 +1096,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Batch Qty at From Warehouse", 
@@ -957,6 +1124,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Group", 
@@ -983,6 +1151,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand Name", 
@@ -1011,6 +1180,7 @@
    "fieldtype": "Small Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
@@ -1036,6 +1206,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -1058,6 +1229,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Account", 
@@ -1084,6 +1256,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
@@ -1109,6 +1282,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Sales Order", 
@@ -1133,6 +1307,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Sales Invoice", 
@@ -1157,6 +1332,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Sales Order Item", 
@@ -1184,6 +1360,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Sales Invoice Item", 
@@ -1208,6 +1385,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installed Qty", 
@@ -1235,6 +1413,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billed Amt", 
@@ -1260,6 +1439,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
@@ -1281,20 +1461,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-01 11:16:23.749244", 
+ "modified": "2016-07-11 03:27:59.254550", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index a691f2f..17e379c 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -16,6 +16,7 @@
 	},
 
 	refresh: function(frm) {
+
 		if(frm.doc.is_stock_item) {
 			frm.add_custom_button(__("Balance"), function() {
 				frappe.route_options = {
@@ -39,7 +40,9 @@
 
 		// make sensitive fields(has_serial_no, is_stock_item, valuation_method)
 		// read only if any stock ledger entry exists
-		erpnext.item.make_dashboard(frm);
+		if(!frm.doc.is_fixed_asset) {
+			erpnext.item.make_dashboard(frm);
+		}
 
 		// clear intro
 		frm.set_intro();
@@ -73,6 +76,9 @@
 		}
 
 		erpnext.item.toggle_attributes(frm);
+
+		frm.toggle_enable("is_fixed_asset", (frm.doc.__islocal || (!frm.doc.is_stock_item &&
+			((frm.doc.__onload && frm.doc.__onload.asset_exists) ? false : true))));
 	},
 
 	validate: function(frm){
@@ -82,7 +88,13 @@
 	image: function(frm) {
 		refresh_field("image_view");
 	},
-
+	
+	is_fixed_asset: function(frm) {
+		if (frm.doc.is_fixed_asset) {
+			frm.set_value("is_stock_item", 0);
+		}
+	},
+	
 	page_name: frappe.utils.warn_page_name_change,
 
 	item_code: function(frm) {
@@ -99,11 +111,6 @@
 		});
 	},
 
-	is_stock_item: function(frm) {
-		if(frm.doc.is_pro_applicable && !frm.doc.is_stock_item)
-			frm.set_value("is_pro_applicable", 0);
-	},
-
 	has_variants: function(frm) {
 		erpnext.item.toggle_attributes(frm);
 	}
@@ -111,40 +118,27 @@
 
 $.extend(erpnext.item, {
 	setup_queries: function(frm) {
-		// Expense Account
-		// ---------------------------------
 		frm.fields_dict['expense_account'].get_query = function(doc) {
 			return {
-				filters: {
-					"report_type": "Profit and Loss",
-					"is_group": 0
-				}
+				query: "erpnext.controllers.queries.get_expense_account",
 			}
 		}
 
-		// Income Account
-		// --------------------------------
 		frm.fields_dict['income_account'].get_query = function(doc) {
 			return {
 				query: "erpnext.controllers.queries.get_income_account"
 			}
 		}
 
-
-		// Purchase Cost Center
-		// -----------------------------
 		frm.fields_dict['buying_cost_center'].get_query = function(doc) {
 			return {
-				filters:{ "is_group": 0 }
+				filters: { "is_group": 0 }
 			}
 		}
 
-
-		// Sales Cost Center
-		// -----------------------------
 		frm.fields_dict['selling_cost_center'].get_query = function(doc) {
 			return {
-				filters:{ "is_group": 0 }
+				filters: { "is_group": 0 }
 			}
 		}
 
@@ -159,7 +153,7 @@
 			}
 		}
 
-		frm.fields_dict['item_group'].get_query = function(doc,cdt,cdn) {
+		frm.fields_dict['item_group'].get_query = function(doc, cdt, cdn) {
 			return {
 				filters: [
 					['Item Group', 'docstatus', '!=', 2]
@@ -175,12 +169,48 @@
 			return { query: "erpnext.controllers.queries.supplier_query" }
 		}
 
+		frm.fields_dict['default_warehouse'].get_query = function(doc) {
+			return {
+				filters: { "is_group": 0 }
+			}
+		}
+
+		frm.fields_dict.reorder_levels.grid.get_field("warehouse_group").get_query = function(doc, cdt, cdn) {
+			return {
+				filters: { "is_group": 1 }
+			}
+		}
+
+		frm.fields_dict.reorder_levels.grid.get_field("warehouse").get_query = function(doc, cdt, cdn) {
+			var d = locals[cdt][cdn];
+			
+			var filters = {
+				"is_group": 0
+			}
+			
+			if (d.parent_warehouse) {
+				filters.extend({"parent_warehouse": d.warehouse_group})
+			}
+			
+			return {
+				filters: filters
+			}
+		}
+
 	},
 
 	make_dashboard: function(frm) {
-		frm.dashboard.reset();
 		if(frm.doc.__islocal)
 			return;
+
+		frappe.require('assets/js/item-dashboard.min.js', function() {
+			var section = frm.dashboard.add_section('<h5 style="margin-top: 0px;"><a href="#stock-balance">Stock Levels</a></h5>');
+			erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
+				parent: section,
+				item_code: frm.doc.name
+			});
+			erpnext.item.item_dashboard.refresh();
+		});
 	},
 
 	edit_prices_button: function(frm) {
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index ac889fb..2ab40c5 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:item_code", 
+ "beta": 0, 
  "creation": "2013-05-03 10:45:46", 
  "custom": 0, 
  "default_print_format": "Standard", 
@@ -64,7 +65,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "description": "", 
    "fieldname": "item_code", 
@@ -147,6 +148,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "description": "", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -226,35 +251,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "1", 
-   "description": "", 
-   "fieldname": "is_stock_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -280,17 +276,46 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach", 
+   "default": "1", 
+   "description": "", 
+   "fieldname": "is_stock_item", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Image", 
+   "label": "Maintain Stock", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "image", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item)", 
+   "fieldname": "opening_stock", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Opening Stock", 
+   "length": 0, 
+   "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -306,20 +331,123 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
+   "depends_on": "eval:(doc.__islocal && doc.is_stock_item && doc.opening_stock)", 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Image View", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "standard_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Standard Selling 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "is_fixed_asset", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Fixed Asset", 
+   "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, 
+   "depends_on": "is_fixed_asset", 
+   "fieldname": "asset_category", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Asset Category", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Asset Category", 
+   "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": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -384,30 +512,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "barcode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -425,7 +529,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -604,36 +708,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.is_stock_item", 
-   "description": "", 
-   "fieldname": "is_asset_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "depends_on": "is_stock_item", 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
@@ -956,35 +1030,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "1", 
-   "description": "", 
-   "fieldname": "is_purchase_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "default": "0.00", 
    "depends_on": "is_stock_item", 
    "description": "", 
@@ -1014,7 +1059,32 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "fieldname": "safety_stock", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Safety Stock", 
+   "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, 
+   "depends_on": "", 
    "description": "Average time taken by the supplier to deliver", 
    "fieldname": "lead_time_days", 
    "fieldtype": "Int", 
@@ -1042,7 +1112,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "buying_cost_center", 
    "fieldtype": "Link", 
@@ -1071,7 +1141,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "expense_account", 
    "fieldtype": "Link", 
@@ -1100,7 +1170,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "unit_of_measure_conversion", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1126,7 +1196,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "description": "Will also apply for variants", 
    "fieldname": "uoms", 
    "fieldtype": "Table", 
@@ -1155,7 +1225,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "last_purchase_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1182,7 +1252,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "supplier_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1208,7 +1278,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "default_supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1259,7 +1329,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "manufacturer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1285,7 +1355,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "manufacturer_part_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -1310,7 +1380,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1337,7 +1407,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_purchase_item", 
+   "depends_on": "", 
    "fieldname": "supplier_items", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -1389,65 +1459,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "1", 
-   "description": "", 
-   "fieldname": "is_sales_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.is_sales_item", 
-   "description": "Allow in Sales Order of type \"Service\"", 
-   "fieldname": "is_service_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "default": "0", 
    "description": "Publish Item to hub.erpnext.com", 
    "fieldname": "publish_in_hub", 
@@ -1501,7 +1512,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_sales_item", 
+   "depends_on": "", 
    "fieldname": "income_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1527,7 +1538,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_sales_item", 
+   "depends_on": "", 
    "fieldname": "selling_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1553,7 +1564,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_sales_item", 
+   "depends_on": "", 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -1580,7 +1591,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "is_sales_item", 
+   "depends_on": "", 
    "description": "", 
    "fieldname": "customer_items", 
    "fieldtype": "Table", 
@@ -1607,7 +1618,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "eval:doc.is_sales_item", 
+   "depends_on": "", 
    "fieldname": "max_discount", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -1771,6 +1782,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "depends_on": "is_stock_item", 
    "fieldname": "manufacturing", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1797,26 +1809,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "", 
    "depends_on": "", 
-   "description": "", 
-   "fieldname": "is_pro_applicable", 
-   "fieldtype": "Check", 
+   "fieldname": "default_bom", 
+   "fieldtype": "Link", 
    "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Allow Production Order", 
+   "label": "Default BOM", 
    "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_pro_applicable", 
-   "oldfieldtype": "Select", 
-   "options": "", 
+   "no_copy": 1, 
+   "oldfieldname": "default_bom", 
+   "oldfieldtype": "Link", 
+   "options": "BOM", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1880,34 +1890,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "", 
-   "fieldname": "default_bom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "customer_code", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -1982,18 +1964,18 @@
    "bold": 0, 
    "collapsible": 0, 
    "depends_on": "show_in_website", 
-   "description": "website page link", 
-   "fieldname": "page_name", 
+   "fieldname": "route", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Page Name", 
+   "label": "Route", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -2001,7 +1983,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
+   "unique": 1
   }, 
   {
    "allow_on_submit": 0, 
@@ -2291,21 +2273,21 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "parent_website_route", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
+   "fieldname": "total_projected_qty", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Parent Website Route", 
+   "label": "Total Projected Qty", 
    "length": 0, 
-   "no_copy": 1, 
-   "options": "", 
+   "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -2316,14 +2298,16 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-tag", 
- "idx": 1, 
+ "idx": 2, 
+ "image_field": "image", 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2016-03-10 05:15:41.190950", 
+ "modified": "2016-07-06 17:00:45.561349", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -2490,9 +2474,12 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_name,description,item_group,customer_code", 
+ "sort_field": "idx desc, modified desc", 
  "sort_order": "DESC", 
- "title_field": "item_name"
+ "title_field": "item_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index e26aaa7..de5d545 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+import erpnext
 import json
 import urllib
 import itertools
@@ -12,7 +13,8 @@
 from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups
 from frappe.website.render import clear_cache
 from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
-from erpnext.controllers.item_variant import get_variant, copy_attributes_to_variant, ItemVariantExistsError
+from erpnext.controllers.item_variant import (get_variant, copy_attributes_to_variant,
+	make_variant_item_code, validate_item_variant_attributes, ItemVariantExistsError)
 
 class DuplicateReorderRows(frappe.ValidationError): pass
 
@@ -21,24 +23,21 @@
 		page_title_field = "item_name",
 		condition_field = "show_in_website",
 		template = "templates/generators/item.html",
-		parent_website_route_field = "item_group",
 		no_cache = 1
 	)
 
 	def onload(self):
 		super(Item, self).onload()
-		self.get("__onload").sle_exists = self.check_if_sle_exists()
+		self.set_onload('sle_exists', self.check_if_sle_exists())
+		if self.is_fixed_asset:
+			asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
+			self.set_onload("asset_exists", True if asset else False)
 
 	def autoname(self):
 		if frappe.db.get_default("item_naming_by")=="Naming Series":
 			if self.variant_of:
 				if not self.item_code:
-					item_code_suffix = ""
-					for attribute in self.attributes:
-						attribute_abbr = frappe.db.get_value("Item Attribute Value",
-							{"parent": attribute.attribute, "attribute_value": attribute.attribute_value}, "abbr")
-						item_code_suffix += "-" + str(attribute_abbr or attribute.attribute_value)
-					self.item_code = str(self.variant_of) + item_code_suffix
+					self.item_code = make_variant_item_code(self.variant_of, self)
 			else:
 				from frappe.model.naming import make_autoname
 				self.item_code = make_autoname(self.naming_series+'.#####')
@@ -49,14 +48,24 @@
 		self.name = self.item_code
 
 	def before_insert(self):
-		if self.is_sales_item=="Yes":
-			self.publish_in_hub = 1
+		if not self.description:
+			self.description = self.item_name
+
+		self.publish_in_hub = 1
+
+	def after_insert(self):
+		'''set opening stock and item price'''
+		if self.standard_rate:
+			self.add_price()
+
+		if self.opening_stock:
+			self.set_opening_stock()
 
 	def validate(self):
 		super(Item, self).validate()
 
-		if not self.stock_uom:
-			msgprint(_("Please enter default Unit of Measure"), raise_exception=1)
+		if not self.description:
+			self.description = self.item_name
 
 		self.validate_uom()
 		self.add_default_uom_in_conversion_factor_table()
@@ -67,7 +76,6 @@
 		self.check_item_tax()
 		self.validate_barcode()
 		self.cant_change()
-		self.validate_reorder_level()
 		self.validate_warehouse_for_reorder()
 		self.update_item_desc()
 		self.synced_with_hub = 0
@@ -77,10 +85,12 @@
 		self.validate_variant_attributes()
 		self.validate_website_image()
 		self.make_thumbnail()
+		self.validate_fixed_asset()
 
 		if not self.get("__islocal"):
 			self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
-			self.old_website_item_groups = frappe.db.sql_list("""select item_group from `tabWebsite Item Group`
+			self.old_website_item_groups = frappe.db.sql_list("""select item_group
+				from `tabWebsite Item Group`
 				where parentfield='website_item_groups' and parenttype='Item' and parent=%s""", self.name)
 
 	def on_update(self):
@@ -91,6 +101,46 @@
 		self.update_variants()
 		self.update_template_item()
 
+	def add_price(self, price_list=None):
+		'''Add a new price'''
+		if not price_list:
+			price_list = (frappe.db.get_single_value('Selling Settings', 'selling_price_list')
+				or frappe.db.get_value('Price List', _('Standard Selling')))
+		if price_list:
+			item_price = frappe.get_doc({
+				"doctype": "Item Price",
+				"price_list": price_list,
+				"item_code": self.name,
+				"currency": erpnext.get_default_currency(),
+				"price_list_rate": self.standard_rate
+			})
+			item_price.insert()
+
+	def set_opening_stock(self):
+		'''set opening stock'''
+		if not self.valuation_rate:
+			frappe.throw(_("Valuation Rate is mandatory if Opening Stock entered"))
+
+		from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+		# default warehouse, or Stores
+		default_warehouse = (frappe.db.get_single_value('Stock Settings', 'default_warehouse')
+			or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
+
+		if default_warehouse:
+			stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse,
+				qty=self.opening_stock, rate=self.valuation_rate)
+
+			stock_entry.add_comment("Comment", _("Opening Stock"))
+
+	def make_route(self):
+		if not self.route:
+			return frappe.db.get_value('Item Group', self.item_group, 'route') + '/' + self.scrub(self.item_name)
+
+	def get_parents(self, context):
+		item_group, route = frappe.db.get_value('Item Group', self.item_group, ['name', 'route'])
+		context.parents = [{'name': route, 'label': item_group}]
+
 	def validate_website_image(self):
 		"""Validate if the website image is a public file"""
 		auto_set_website_image = False
@@ -102,21 +152,22 @@
 			return
 
 		# find if website image url exists as public
-		file = frappe.get_all("File", filters={
+		file_doc = frappe.get_all("File", filters={
 			"file_url": self.website_image
 		}, fields=["name", "is_private"], order_by="is_private asc", limit_page_length=1)
 
-		if file:
-			file = file[0]
 
-		if not file:
+		if file_doc:
+			file_doc = file_doc[0]
+
+		if not file_doc:
 			if not auto_set_website_image:
 				frappe.msgprint(_("Website Image {0} attached to Item {1} cannot be found")
 					.format(self.website_image, self.name))
 
 			self.website_image = None
 
-		elif file.is_private:
+		elif file_doc.is_private:
 			if not auto_set_website_image:
 				frappe.msgprint(_("Website Image should be a public file or website URL"))
 
@@ -170,11 +221,21 @@
 
 				self.thumbnail = file_doc.thumbnail_url
 
+	def validate_fixed_asset(self):
+		if self.is_fixed_asset:
+			if self.is_stock_item:
+				frappe.throw(_("Fixed Asset Item must be a non-stock item."))
+
+			if not self.asset_category:
+				frappe.throw(_("Asset Category is mandatory for Fixed Asset item"))
+
 	def get_context(self, context):
+		context.show_search=True
+		context.search_link = '/product_search'
 		if self.variant_of:
 			# redirect to template page!
 			template_item = frappe.get_doc("Item", self.variant_of)
-			frappe.flags.redirect_location = template_item.get_route() + "?variant=" + urllib.quote(self.name)
+			frappe.flags.redirect_location = template_item.route + "?variant=" + urllib.quote(self.name)
 			raise frappe.Redirect
 
 		context.parent_groups = get_parent_item_groups(self.item_group) + \
@@ -344,9 +405,6 @@
 				frappe.throw(_("Conversion factor for default Unit of Measure must be 1 in row {0}").format(d.idx))
 
 	def validate_item_type(self):
-		if self.is_pro_applicable == 1 and self.is_stock_item==0:
-			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)
 
@@ -391,21 +449,30 @@
 
 	def cant_change(self):
 		if not self.get("__islocal"):
-			vals = frappe.db.get_value("Item", self.name,
-				["has_serial_no", "is_stock_item", "valuation_method", "has_batch_no"], as_dict=True)
+			vals = frappe.db.get_value("Item", self.name, ["has_serial_no", "is_stock_item",
+				"valuation_method", "has_batch_no", "is_fixed_asset"], as_dict=True)
 
-			if vals and ((self.is_stock_item == 0 and vals.is_stock_item == 1) or
+			if vals and ((self.is_stock_item != vals.is_stock_item) or
 				vals.has_serial_no != self.has_serial_no or
 				vals.has_batch_no != self.has_batch_no or
 				cstr(vals.valuation_method) != cstr(self.valuation_method)):
-					if self.check_if_sle_exists() == "exists":
-						frappe.throw(_("As there are existing stock transactions for this item, \
+					if self.check_if_linked_document_exists():
+						frappe.throw(_("As there are existing transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'"))
 
-	def validate_reorder_level(self):
-		if len(self.get("reorder_levels", {"material_request_type": "Purchase"})):
-			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 vals and not self.is_fixed_asset and self.is_fixed_asset != vals.is_fixed_asset:
+				asset = frappe.db.get_all("Asset", filters={"item_code": self.name, "docstatus": 1}, limit=1)
+				if asset:
+					frappe.throw(_('"Is Fixed Asset" cannot be unchecked, as Asset record exists against the item'))
+
+	def check_if_linked_document_exists(self):
+		for doctype in ("Sales Order Item", "Delivery Note Item", "Sales Invoice Item",
+			"Material Request Item", "Purchase Order Item", "Purchase Receipt Item",
+			"Purchase Invoice Item", "Stock Entry Detail", "Stock Reconciliation Item"):
+			if frappe.db.get_value(doctype, filters={"item_code": self.name, "docstatus": 1}) or \
+				frappe.db.get_value("Production Order",
+					filters={"production_item": self.name, "docstatus": 1}):
+				return True
 
 		for d in self.get("reorder_levels"):
 			if d.warehouse_reorder_level and not d.warehouse_reorder_qty:
@@ -442,56 +509,58 @@
 		for variant_of in frappe.get_all("Item", filters={"variant_of": self.name}):
 			frappe.delete_doc("Item", variant_of.name)
 
-	def before_rename(self, olddn, newdn, merge=False):
+	def before_rename(self, old_name, new_name, merge=False):
+		if self.item_name==old_name:
+			self.item_name=new_name
+
 		if merge:
 			# Validate properties before merging
-			if not frappe.db.exists("Item", newdn):
-				frappe.throw(_("Item {0} does not exist").format(newdn))
+			if not frappe.db.exists("Item", new_name):
+				frappe.throw(_("Item {0} does not exist").format(new_name))
 
 			field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no"]
-			new_properties = [cstr(d) for d in frappe.db.get_value("Item", newdn, field_list)]
+			new_properties = [cstr(d) for d in frappe.db.get_value("Item", new_name, field_list)]
 			if new_properties != [cstr(self.get(fld)) for fld in field_list]:
 				frappe.throw(_("To merge, following properties must be same for both items")
 					+ ": \n" + ", ".join([self.meta.get_label(fld) for fld in field_list]))
 
-			frappe.db.sql("delete from `tabBin` where item_code=%s", olddn)
+			frappe.db.sql("delete from `tabBin` where item_code=%s", old_name)
 
-	def after_rename(self, olddn, newdn, merge):
-		super(Item, self).after_rename(olddn, newdn, merge)
-		if self.page_name:
+	def after_rename(self, old_name, new_name, merge):
+		if self.route:
 			invalidate_cache_for_item(self)
-			clear_cache(self.page_name)
+			clear_cache(self.route)
 
-		frappe.db.set_value("Item", newdn, "item_code", newdn)
-		
+		frappe.db.set_value("Item", new_name, "item_code", new_name)
+
 		if merge:
-			self.set_last_purchase_rate(newdn)
-			self.recalculate_bin_qty(newdn)
-			
+			self.set_last_purchase_rate(new_name)
+			self.recalculate_bin_qty(new_name)
+
 		for dt in ("Sales Taxes and Charges", "Purchase Taxes and Charges"):
-			for d in frappe.db.sql("""select name, item_wise_tax_detail from `tab{0}` 
+			for d in frappe.db.sql("""select name, item_wise_tax_detail from `tab{0}`
 					where ifnull(item_wise_tax_detail, '') != ''""".format(dt), as_dict=1):
-				
+
 				item_wise_tax_detail = json.loads(d.item_wise_tax_detail)
-				if olddn in item_wise_tax_detail:
-					item_wise_tax_detail[newdn] = item_wise_tax_detail[olddn]
-					item_wise_tax_detail.pop(olddn)
-					
-					frappe.db.set_value(dt, d.name, "item_wise_tax_detail", 
+				if old_name in item_wise_tax_detail:
+					item_wise_tax_detail[new_name] = item_wise_tax_detail[old_name]
+					item_wise_tax_detail.pop(old_name)
+
+					frappe.db.set_value(dt, d.name, "item_wise_tax_detail",
 						json.dumps(item_wise_tax_detail), update_modified=False)
 
-	def set_last_purchase_rate(self, newdn):
-		last_purchase_rate = get_last_purchase_details(newdn).get("base_rate", 0)
-		frappe.db.set_value("Item", newdn, "last_purchase_rate", last_purchase_rate)
+	def set_last_purchase_rate(self, new_name):
+		last_purchase_rate = get_last_purchase_details(new_name).get("base_rate", 0)
+		frappe.db.set_value("Item", new_name, "last_purchase_rate", last_purchase_rate)
 
-	def recalculate_bin_qty(self, newdn):
+	def recalculate_bin_qty(self, new_name):
 		from erpnext.stock.stock_balance import repost_stock
 		frappe.db.auto_commit_on_many_writes = 1
 		existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
 
 		for warehouse in frappe.db.sql("select name from `tabWarehouse`"):
-			repost_stock(newdn, warehouse[0])
+			repost_stock(new_name, warehouse[0])
 
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
 		frappe.db.auto_commit_on_many_writes = 0
@@ -575,8 +644,16 @@
 			variant = get_variant(self.variant_of, args, self.name)
 			if variant:
 				frappe.throw(_("Item variant {0} exists with same attributes")
-					.format(variant), ItemVariantExistsError)			
-			
+					.format(variant), ItemVariantExistsError)
+
+			validate_item_variant_attributes(self, args)
+
+def get_timeline_data(doctype, name):
+	'''returns timeline data based on stock ledger entry'''
+	return dict(frappe.db.sql('''select unix_timestamp(posting_date), count(*)
+		from `tabStock Ledger Entry` where item_code=%s
+			and posting_date > date_sub(curdate(), interval 1 year)
+			group by posting_date''', name))
 
 def validate_end_of_life(item_code, end_of_life=None, disabled=None, verbose=1):
 	if (not end_of_life) or (disabled is None):
diff --git a/erpnext/stock/doctype/item/item_dashboard.py b/erpnext/stock/doctype/item/item_dashboard.py
new file mode 100644
index 0000000..e0f1c21
--- /dev/null
+++ b/erpnext/stock/doctype/item/item_dashboard.py
@@ -0,0 +1,45 @@
+from frappe import _
+
+data = {
+	'heatmap': True,
+	'heatmap_message': _('This is based on stock movement. See {0} for details')\
+		.format('<a href="#query-report/Stock Ledger">' + _('Stock Ledger') + '</a>'),
+	'fieldname': 'item_code',
+	'non_standard_fieldnames': {
+		'Production Order': 'production_item',
+		'Product Bundle': 'new_item_code',
+		'BOM': 'item',
+		'Batch': 'item'
+	},
+	'transactions': [
+		{
+			'label': _('Groups'),
+			'items': ['BOM', 'Product Bundle']
+		},
+		{
+			'label': _('Pricing'),
+			'items': ['Item Price', 'Pricing Rule']
+		},
+		{
+			'label': _('Sell'),
+			'items': ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']
+		},
+		{
+			'label': _('Buy'),
+			'items': ['Material Request', 'Supplier Quotation', 'Request for Quotation',
+				'Purchase Order', 'Purchase Invoice']
+		},
+		{
+			'label': _('Traceability'),
+			'items': ['Serial No', 'Batch']
+		},
+		{
+			'label': _('Move'),
+			'items': ['Stock Entry']
+		},
+		{
+			'label': _('Manufacture'),
+			'items': ['Production Order']
+		}
+	]
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index fffc7fe..40319e5 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,10 +1,12 @@
 frappe.listview_settings['Item'] = {
 	add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of",
-		"has_variants", "end_of_life", "disabled", "is_sales_item"],
+		"has_variants", "end_of_life", "disabled", "total_projected_qty"],
 	filters: [["disabled", "=", "0"]],
 
 	get_indicator: function(doc) {
-		if (doc.disabled) {
+		if(doc.total_projected_qty < 0) {
+			return [__("Shortage"), "red", "total_projected_qty,<,0"];
+		} else if (doc.disabled) {
 			return [__("Disabled"), "grey", "disabled,=,Yes"];
 		} else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) {
 			return [__("Expired"), "grey", "end_of_life,<,Today"];
@@ -12,10 +14,29 @@
 			return [__("Template"), "blue", "has_variants,=,Yes"];
 		} else if (doc.variant_of) {
 			return [__("Variant"), "green", "variant_of,=," + doc.variant_of];
-		} else {
-			return [__("Active"), "blue", "end_of_life,>=,Today"];
 		}
-	}
+	},
+
+	reports: [
+		{
+			name: 'Stock Summary',
+			report_type: 'Page',
+			route: 'stock-balance'
+		},
+		{
+			name: 'Stock Ledger',
+			report_type: 'Script Report'
+		},
+		{
+			name: 'Stock Balance',
+			report_type: 'Script Report'
+		},
+		{
+			name: 'Stock Projected Qty',
+			report_type: 'Script Report'
+		}
+
+	]
 };
 
 frappe.help.youtube_id["Item"] = "qXaEwld4_Ps";
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index a66362d..bd617c6 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -6,7 +6,8 @@
 import frappe
 
 from frappe.test_runner import make_test_records
-from erpnext.controllers.item_variant import create_variant, ItemVariantExistsError, InvalidItemAttributeValueError
+from erpnext.controllers.item_variant import (create_variant, ItemVariantExistsError,
+	InvalidItemAttributeValueError)
 
 test_ignore = ["BOM"]
 test_dependencies = ["Warehouse"]
@@ -35,6 +36,9 @@
 	return item
 
 class TestItem(unittest.TestCase):
+	def setUp(self):
+		frappe.flags.attribute_values = None
+
 	def get_item(self, idx):
 		item_code = test_records[idx].get("item_code")
 		if not frappe.db.exists("Item", item_code):
@@ -86,6 +90,21 @@
 		for key, value in to_check.iteritems():
 			self.assertEquals(value, details.get(key))
 
+	def test_item_attribute_change_after_variant(self):
+		frappe.delete_doc_if_exists("Item", "_Test Variant Item-L", force=1)
+
+		variant = create_variant("_Test Variant Item", {"Test Size": "Large"})
+		variant.save()
+
+		attribute = frappe.get_doc('Item Attribute', 'Test Size')
+		attribute.item_attribute_values = []
+
+		# reset flags
+		frappe.flags.attribute_values = None
+
+		self.assertRaises(InvalidItemAttributeValueError, attribute.save)
+		frappe.db.rollback()
+
 	def test_make_item_variant(self):
 		frappe.delete_doc_if_exists("Item", "_Test Variant Item-L", force=1)
 
@@ -99,10 +118,18 @@
 
 	def test_make_item_variant_with_numeric_values(self):
 		# cleanup
+		for d in frappe.db.get_all('Item', filters={'variant_of':
+				'_Test Numeric Template Item'}):
+			frappe.delete_doc_if_exists("Item", d.name)
+
 		frappe.delete_doc_if_exists("Item", "_Test Numeric Template Item")
-		frappe.delete_doc_if_exists("Item", "_Test Numeric Variant-L-1.5")
 		frappe.delete_doc_if_exists("Item Attribute", "Test Item Length")
 
+		frappe.db.sql('''delete from `tabItem Variant Attribute`
+			where attribute="Test Item Length"''')
+
+		frappe.flags.attribute_values = None
+
 		# make item attribute
 		frappe.get_doc({
 			"doctype": "Item Attribute",
@@ -130,7 +157,8 @@
 			"default_warehouse": "_Test Warehouse - _TC"
 		})
 
-		variant = create_variant("_Test Numeric Template Item", {"Test Size": "Large", "Test Item Length": 1.1})
+		variant = create_variant("_Test Numeric Template Item",
+			{"Test Size": "Large", "Test Item Length": 1.1})
 		self.assertEquals(variant.item_code, None)
 		variant.item_code = "_Test Numeric Variant-L-1.1"
 		variant.item_name = "_Test Numeric Variant Large 1.1m"
diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json
index ca40d45..c05c5f3 100644
--- a/erpnext/stock/doctype/item/test_records.json
+++ b/erpnext/stock/doctype/item/test_records.json
@@ -9,10 +9,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item",
@@ -41,10 +37,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item 2",
@@ -64,10 +56,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item Home Desktop 100",
@@ -93,11 +81,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
-  "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item Home Desktop 200",
   "item_group": "_Test Item Group Desktops",
@@ -113,10 +96,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 0,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Product Bundle Item",
@@ -134,10 +113,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 1,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
   "item_code": "_Test FG Item",
@@ -151,10 +126,6 @@
   "has_batch_no": 0,
   "has_serial_no": 0,
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 0,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Non Stock Item",
@@ -169,10 +140,6 @@
   "has_batch_no": 0,
   "has_serial_no": 1,
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Serialized Item",
@@ -187,10 +154,6 @@
   "has_batch_no": 0,
   "has_serial_no": 1,
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 0,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Serialized Item With Series",
@@ -209,9 +172,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 0,
   "item_code": "_Test Item Home Desktop Manufactured",
@@ -229,10 +189,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 1,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
   "item_code": "_Test FG Item 2",
@@ -250,10 +206,6 @@
   "has_serial_no": 0,
   "income_account": "Sales - _TC",
   "inspection_required": 0,
-  "is_asset_item": 0,
-  "is_pro_applicable": 1,
-  "is_purchase_item": 1,
-  "is_sales_item": 1,
   "is_stock_item": 1,
   "is_sub_contracted_item": 1,
   "item_code": "_Test Variant Item",
@@ -275,6 +227,35 @@
        "warehouse_reorder_qty": 20
       }
   ]
+ },
+ {
+  "default_warehouse": "_Test Warehouse Group-C1 - _TC",
+  "description": "_Test Item 1",
+  "doctype": "Item",
+  "expense_account": "_Test Account Cost for Goods Sold - _TC",
+  "cost_center": "_Test Cost Center - _TC",
+  "has_batch_no": 0,
+  "has_serial_no": 0,
+  "income_account": "Sales - _TC",
+  "inspection_required": 0,
+  "is_stock_item": 1,
+  "is_sub_contracted_item": 0,
+  "item_code": "_Test Item Warehouse Group Wise Reorder",
+  "item_group": "_Test Item Group",
+  "item_name": "_Test Item Warehouse Group Wise Reorder",
+  "apply_warehouse_wise_reorder_level": 1,
+  "reorder_levels": [
+   {
+	"warehouse_group": "_Test Warehouse Group - _TC",
+    "material_request_type": "Purchase",
+    "warehouse": "_Test Warehouse Group-C1 - _TC",
+    "warehouse_reorder_level": 20,
+    "warehouse_reorder_qty": 20
+   }
+  ],
+  "stock_uom": "_Test UOM",
+  "show_in_website": 1,
+  "website_warehouse": "_Test Warehouse Group-C1 - _TC"
  }
 
 ]
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index f2d5345..3220bc5 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -6,13 +6,28 @@
 from frappe.model.document import Document
 from frappe import _
 
+from erpnext.controllers.item_variant import validate_item_variant_attributes, InvalidItemAttributeValueError
+
+
 class ItemAttributeIncrementError(frappe.ValidationError): pass
 
 class ItemAttribute(Document):
+	def __setup__(self):
+		self.flags.ignore_these_exceptions_in_test = [InvalidItemAttributeValueError]
+
 	def validate(self):
+		frappe.flags.attribute_values = None
 		self.validate_numeric()
 		self.validate_duplication()
-		self.validate_attribute_values()
+
+	def on_update(self):
+		self.validate_exising_items()
+
+	def validate_exising_items(self):
+		'''Validate that if there are existing items with attributes, they are valid'''
+		for item in frappe.db.sql('''select distinct i.name from `tabItem Variant Attribute` iva, `tabItem` i
+			where iva.attribute = %s and iva.parent = i.name and i.has_variants = 0''', self.name):
+			validate_item_variant_attributes(item[0])
 
 	def validate_numeric(self):
 		if self.numeric_values:
@@ -39,19 +54,3 @@
 			if d.abbr in abbrs:
 				frappe.throw(_("{0} must appear only once").format(d.abbr))
 			abbrs.append(d.abbr)
-
-	def validate_attribute_values(self):
-		# don't validate numeric values
-		if self.numeric_values:
-			return
-
-		attribute_values = []
-		for d in self.item_attribute_values:
-			attribute_values.append(d.attribute_value)
-
-		variant_attributes = frappe.db.sql("select DISTINCT attribute_value from `tabItem Variant Attribute` where attribute=%s", self.name)
-		if variant_attributes:
-			for d in variant_attributes:
-				if d[0] and d[0] not in attribute_values:
-					frappe.throw(_("Attribute Value {0} cannot be removed from {1} as Item Variants \
-						exist with this Attribute.").format(d[0], self.name))
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 846537a..aac9c1c 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
+ "beta": 0, 
  "creation": "2014-09-26 03:52:31.161255", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute Value", 
@@ -42,6 +45,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Abbreviation", 
@@ -63,21 +67,24 @@
  "hide_toolbar": 0, 
  "icon": "icon-edit", 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-01-06 01:47:08.939754", 
+ "modified": "2016-07-11 03:28:00.926419", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Attribute Value", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 4e9e042..46d480e 100644
--- a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
+++ b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
@@ -3,20 +3,23 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-03-08 15:37:16", 
  "custom": 0, 
  "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Customer Name", 
@@ -27,6 +30,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -44,6 +48,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Ref Code", 
@@ -53,6 +58,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -66,18 +72,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.280253", 
+ "modified": "2016-07-11 03:28:00.992064", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Customer Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 044a0dd..6147db9 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
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:01", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
@@ -25,6 +28,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +46,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Acceptance Criteria", 
@@ -51,6 +56,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,18 +68,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.461235", 
+ "modified": "2016-07-11 03:28:01.074316", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Quality Inspection Parameter", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index fea8bf0..4c98c3f 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -3,27 +3,58 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-03-07 11:42:59", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "warehouse_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Check in (group)", 
+   "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": 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, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Warehouse", 
+   "label": "Request for", 
    "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": 1, 
@@ -39,6 +70,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Re-order Level", 
@@ -46,6 +78,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -61,6 +94,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Re-order Qty", 
@@ -68,6 +102,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -83,6 +118,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Material Request Type", 
@@ -91,6 +127,7 @@
    "options": "Purchase\nTransfer", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -102,18 +139,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 1, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.492627", 
+ "modified": "2016-07-11 03:59:06.870780", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Reorder", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json
index 5388481..ee4f869 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.json
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:01", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier", 
@@ -23,6 +26,7 @@
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -38,6 +42,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier Part Number", 
@@ -45,6 +50,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -58,18 +64,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.527271", 
+ "modified": "2016-07-11 03:28:01.145024", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Supplier", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index c199ec0..e9c9d62 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:01", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Tax", 
@@ -25,6 +28,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +44,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Tax Rate", 
@@ -49,6 +54,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -60,18 +66,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.557063", 
+ "modified": "2016-07-11 03:28:01.235369", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Tax", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json
index b7cc9ea..9da66a2 100644
--- a/erpnext/stock/doctype/item_variant/item_variant.json
+++ b/erpnext/stock/doctype/item_variant/item_variant.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
+ "beta": 0, 
  "creation": "2014-09-26 03:54:04.370259", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Attribute", 
@@ -42,6 +45,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Attribute Value", 
@@ -64,21 +68,24 @@
  "hide_toolbar": 0, 
  "icon": "", 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-01-06 01:47:09.067886", 
+ "modified": "2016-07-11 03:28:01.325414", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 9a86a6c..e5267db 100644
--- a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
+++ b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "", 
+ "beta": 0, 
  "creation": "2015-05-19 05:12:30.344797", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute", 
@@ -42,6 +45,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -66,6 +70,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute Value", 
@@ -92,6 +97,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Numeric Values", 
@@ -117,6 +123,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -141,6 +148,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Range", 
@@ -166,6 +174,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Increment", 
@@ -190,6 +199,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -214,6 +224,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Range", 
@@ -235,21 +246,24 @@
  "hide_toolbar": 0, 
  "icon": "", 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-01-06 01:47:09.098783", 
+ "modified": "2016-07-11 03:28:01.395442", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant Attribute", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 7fc83df..3c32adb 100644
--- a/erpnext/stock/doctype/item_website_specification/item_website_specification.json
+++ b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:01", 
  "custom": 0, 
  "description": "Table for Item that will be shown in Web Site", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Label", 
@@ -23,6 +26,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -47,6 +52,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -60,18 +66,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:48.689782", 
+ "modified": "2016-07-11 03:28:01.497513", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Website Specification", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 9c1a74f..e679054 100644
--- a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+++ b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
@@ -2,10 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:02", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -23,6 +27,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -39,6 +44,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -48,6 +54,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -61,18 +68,47 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "purchase_receipt", 
-   "fieldtype": "Link", 
+   "fieldname": "receipt_document_type", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Purchase Receipt", 
+   "label": "Receipt Document Type", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Purchase Receipt", 
+   "options": "Purchase Invoice\nPurchase Receipt", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
+   "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": "receipt_document", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Receipt Document", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "receipt_document_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -88,12 +124,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -109,6 +147,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -116,6 +155,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -131,6 +171,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
@@ -139,6 +180,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -154,6 +196,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -164,6 +207,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -179,6 +223,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Applicable Charges", 
@@ -187,6 +232,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -202,6 +248,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipt Item", 
@@ -209,6 +256,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -220,18 +268,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "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": "2016-07-11 03:28:01.757912", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Item", 
  "owner": "wasim@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 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 165982f..d65da88 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
@@ -2,29 +2,60 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:02", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "purchase_receipt", 
-   "fieldtype": "Link", 
+   "fieldname": "receipt_document_type", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Purchase Receipt", 
+   "label": "Receipt Document Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nPurchase Invoice\nPurchase Receipt", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "receipt_document", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Receipt Document", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_receipt_no", 
    "oldfieldtype": "Link", 
-   "options": "Purchase Receipt", 
+   "options": "receipt_document_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "220px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -42,6 +73,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier", 
@@ -50,6 +82,7 @@
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,12 +98,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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,13 +122,15 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -109,6 +146,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
@@ -116,6 +154,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -127,18 +166,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.106523", 
+ "modified": "2016-07-20 10:49:34.228751", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Purchase Receipt", 
  "owner": "wasim@webnotestech.com", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 28b6e02..b1f5a8c 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
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2014-07-11 11:51:00.453717", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -23,6 +26,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -38,12 +42,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -60,6 +66,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
@@ -68,6 +75,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -78,21 +86,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.144789", 
+ "modified": "2016-07-11 03:28:01.958276", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Taxes and Charges", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 0bb8f90..15a5759 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -3,25 +3,32 @@
 
 
 frappe.provide("erpnext.stock");
-frappe.require("assets/erpnext/js/controllers/stock_controller.js");
 
 erpnext.stock.LandedCostVoucher = erpnext.stock.StockController.extend({
 	setup: function() {
 		var me = this;
-		this.frm.fields_dict.purchase_receipts.grid.get_field('purchase_receipt').get_query =
-			function() {
+		this.frm.fields_dict.purchase_receipts.grid.get_field('receipt_document').get_query =
+			function(doc, cdt ,cdn) {
+				var d = locals[cdt][cdn]
+
+				var filters = [
+					[d.receipt_document_type, 'docstatus', '=', '1'],
+					[d.receipt_document_type, 'company', '=', me.frm.doc.company],
+				]
+
+				if(d.receipt_document_type == "Purchase Invoice") {
+					filters.push(["Purchase Invoice", "update_stock", "=", "1"])
+				}
+
 				if(!me.frm.doc.company) msgprint(__("Please enter company first"));
 				return {
-					filters:[
-						['Purchase Receipt', 'docstatus', '=', '1'],
-						['Purchase Receipt', 'company', '=', me.frm.doc.company],
-					]
+					filters:filters
 				}
 		};
 
-		this.frm.add_fetch("purchase_receipt", "supplier", "supplier");
-		this.frm.add_fetch("purchase_receipt", "posting_date", "posting_date");
-		this.frm.add_fetch("purchase_receipt", "base_grand_total", "grand_total");
+		this.frm.add_fetch("receipt_document", "supplier", "supplier");
+		this.frm.add_fetch("receipt_document", "posting_date", "posting_date");
+		this.frm.add_fetch("receipt_document", "base_grand_total", "grand_total");
 
 	},
 
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 8f552bf..c947b7b 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -17,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
@@ -25,6 +26,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -40,6 +42,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipts", 
@@ -48,9 +51,10 @@
    "options": "Landed Cost Purchase Receipt", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -63,6 +67,7 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Items From Purchase Receipts", 
@@ -70,6 +75,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -85,6 +91,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipt Items", 
@@ -93,9 +100,10 @@
    "options": "Landed Cost Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -108,6 +116,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
@@ -116,6 +125,7 @@
    "options": "Landed Cost Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -131,6 +141,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -139,6 +150,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -154,6 +166,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
@@ -162,6 +175,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -177,6 +191,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
@@ -185,6 +200,7 @@
    "options": "Landed Cost Voucher", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -200,6 +216,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -207,6 +224,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -223,6 +241,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Distribute Charges Based On", 
@@ -232,6 +251,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -247,6 +267,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -254,6 +275,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -269,6 +291,7 @@
    "fieldtype": "HTML", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Landed Cost Help", 
@@ -277,6 +300,7 @@
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -288,13 +312,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-usd", 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:49.180775", 
+ "modified": "2016-03-31 06:04:21.629139", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Voucher", 
@@ -325,5 +350,6 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index 3418c9e..ac59e06 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -14,9 +14,9 @@
 		for pr in self.get("purchase_receipts"):
 			pr_items = frappe.db.sql("""select pr_item.item_code, pr_item.description,
 				pr_item.qty, pr_item.base_rate, pr_item.base_amount, pr_item.name
-				from `tabPurchase Receipt Item` pr_item where parent = %s
-				and exists(select name from tabItem where name = pr_item.item_code and is_stock_item = 1)""",
-				pr.purchase_receipt, as_dict=True)
+				from `tab{doctype} Item` pr_item where parent = %s
+				and exists(select name from tabItem where name = pr_item.item_code and is_stock_item = 1)
+				""".format(doctype=pr.receipt_document_type), pr.receipt_document, as_dict=True)
 
 			for d in pr_items:
 				item = self.append("items")
@@ -25,13 +25,13 @@
 				item.qty = d.qty
 				item.rate = d.base_rate
 				item.amount = d.base_amount
-				item.purchase_receipt = pr.purchase_receipt
+				item.receipt_document_type = pr.receipt_document_type
+				item.receipt_document = pr.receipt_document
 				item.purchase_receipt_item = d.name
 
 		if self.get("taxes"):
 			self.set_applicable_charges_for_item()
 
-
 	def validate(self):
 		self.check_mandatory()
 		self.validate_purchase_receipts()
@@ -43,25 +43,26 @@
 
 	def check_mandatory(self):
 		if not self.get("purchase_receipts"):
-			frappe.throw(_("Please enter Purchase Receipts"))
+			frappe.throw(_("Please enter Receipt Document"))
 
 		if not self.get("taxes"):
 			frappe.throw(_("Please enter Taxes and Charges"))
 
 	def validate_purchase_receipts(self):
-		purchase_receipts = []
+		receipt_documents = []
+		
 		for d in self.get("purchase_receipts"):
-			if frappe.db.get_value("Purchase Receipt", d.purchase_receipt, "docstatus") != 1:
-				frappe.throw(_("Purchase Receipt must be submitted"))
+			if frappe.db.get_value(d.receipt_document_type, d.receipt_document, "docstatus") != 1:
+				frappe.throw(_("Receipt document must be submitted"))
 			else:
-				purchase_receipts.append(d.purchase_receipt)
+				receipt_documents.append(d.receipt_document)
 
 		for item in self.get("items"):
-			if not item.purchase_receipt:
+			if not item.receipt_document:
 				frappe.throw(_("Item must be added using 'Get Items from Purchase Receipts' button"))
-			elif item.purchase_receipt not in purchase_receipts:
-				frappe.throw(_("Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table")
-					.format(item.idx, item.purchase_receipt))
+			elif item.receipt_document not in receipt_documents:
+				frappe.throw(_("Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table")
+					.format(idx=item.idx, doctype=item.receipt_document_type, docname=item.receipt_document))
 
 	def set_total_taxes_and_charges(self):
 		self.total_taxes_and_charges = sum([flt(d.amount) for d in self.get("taxes")])
@@ -83,36 +84,35 @@
 		self.update_landed_cost()
 
 	def update_landed_cost(self):
-		purchase_receipts = list(set([d.purchase_receipt for d in self.get("items")]))
-		for purchase_receipt in purchase_receipts:
-			pr = frappe.get_doc("Purchase Receipt", purchase_receipt)
+		for d in self.get("items"):
+			doc = frappe.get_doc(d.receipt_document_type, d.receipt_document)
 
 			# set landed cost voucher amount in pr item
-			pr.set_landed_cost_voucher_amount()
+			doc.set_landed_cost_voucher_amount()
 
 			# set valuation amount in pr item
-			pr.update_valuation_rate("items")
+			doc.update_valuation_rate("items")
 
 			# save will update landed_cost_voucher_amount and voucher_amount in PR,
 			# as those fields are allowed to edit after submit
-			pr.save()
+			doc.save()
 
 			# update latest valuation rate in serial no
-			self.update_rate_in_serial_no(pr)
+			self.update_rate_in_serial_no(doc)
 
 			# update stock & gl entries for cancelled state of PR
-			pr.docstatus = 2
-			pr.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
-			pr.make_gl_entries_on_cancel()
+			doc.docstatus = 2
+			doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
+			doc.make_gl_entries_on_cancel()
 
 
 			# update stock & gl entries for submit state of PR
-			pr.docstatus = 1
-			pr.update_stock_ledger(via_landed_cost_voucher=True)
-			pr.make_gl_entries()
+			doc.docstatus = 1
+			doc.update_stock_ledger(via_landed_cost_voucher=True)
+			doc.make_gl_entries()
 
-	def update_rate_in_serial_no(self, purchase_receipt):
-		for item in purchase_receipt.get("items"):
+	def update_rate_in_serial_no(self, receipt_document):
+		for item in receipt_document.get("items"):
 			if item.serial_no:
 				serial_nos = get_serial_nos(item.serial_no)
 				if serial_nos:
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 7f190d2..c58607f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -7,7 +7,7 @@
 import frappe
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
 	import set_perpetual_inventory, get_gl_entries, test_records as pr_test_records
-
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 
 class TestLandedCostVoucher(unittest.TestCase):
 	def test_landed_cost_voucher(self):
@@ -21,10 +21,9 @@
 				"item_code": "_Test Item",
 				"warehouse": "_Test Warehouse - _TC"
 			},
-			fieldname=["qty_after_transaction", "stock_value"],
-			as_dict=1)
+			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
-		self.submit_landed_cost_voucher(pr)
+		self.submit_landed_cost_voucher("Purchase Receipt", pr.name)
 
 		pr_lc_value = frappe.db.get_value("Purchase Receipt Item", {"parent": pr.name}, "landed_cost_voucher_amount")
 		self.assertEquals(pr_lc_value, 25.0)
@@ -35,8 +34,7 @@
 				"item_code": "_Test Item",
 				"warehouse": "_Test Warehouse - _TC"
 			},
-			fieldname=["qty_after_transaction", "stock_value"],
-			as_dict=1)
+			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
 		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
 
@@ -62,7 +60,56 @@
 			self.assertEquals(expected_values[gle.account][1], gle.credit)
 
 		set_perpetual_inventory(0)
+		
+	def test_landed_cost_voucher_against_purchase_invoice(self):
+		set_perpetual_inventory(1)
+		
+		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
+			posting_time=frappe.utils.nowtime())
 
+		last_sle = frappe.db.get_value("Stock Ledger Entry", {
+				"voucher_type": pi.doctype,
+				"voucher_no": pi.name,
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
+
+		self.submit_landed_cost_voucher("Purchase Invoice", pi.name)
+		
+		pi_lc_value = frappe.db.get_value("Purchase Invoice Item", {"parent": pi.name}, 
+			"landed_cost_voucher_amount")
+			
+		self.assertEquals(pi_lc_value, 50.0)
+
+		last_sle_after_landed_cost = frappe.db.get_value("Stock Ledger Entry", {
+				"voucher_type": pi.doctype,
+				"voucher_no": pi.name,
+				"item_code": "_Test Item",
+				"warehouse": "_Test Warehouse - _TC"
+			},
+			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
+
+		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
+
+		self.assertEqual(last_sle_after_landed_cost.stock_value - last_sle.stock_value, 50.0)
+
+		gl_entries = get_gl_entries("Purchase Invoice", pi.name)
+
+		self.assertTrue(gl_entries)
+
+		expected_values = {
+			pi.get("items")[0].warehouse: [300.0, 0.0],
+			"Creditors - _TC": [0.0, 250.0],
+			"Expenses Included In Valuation - _TC": [0.0, 50.0]
+		}
+
+		for gle in gl_entries:
+			self.assertEquals(expected_values[gle.account][0], gle.debit)
+			self.assertEquals(expected_values[gle.account][1], gle.credit)
+
+		set_perpetual_inventory(0)
+		
 	def test_landed_cost_voucher_for_serialized_item(self):
 		set_perpetual_inventory(1)
 		frappe.db.sql("delete from `tabSerial No` where name in ('SN001', 'SN002', 'SN003', 'SN004', 'SN005')")
@@ -74,7 +121,7 @@
 
 		serial_no_rate = frappe.db.get_value("Serial No", "SN001", "purchase_rate")
 
-		self.submit_landed_cost_voucher(pr)
+		self.submit_landed_cost_voucher("Purchase Receipt", pr.name)
 
 		serial_no = frappe.db.get_value("Serial No", "SN001",
 			["warehouse", "purchase_rate"], as_dict=1)
@@ -84,19 +131,23 @@
 
 		set_perpetual_inventory(0)
 
-	def submit_landed_cost_voucher(self, pr):
+	def submit_landed_cost_voucher(self, receipt_document_type, receipt_document):
+		ref_doc = frappe.get_doc(receipt_document_type, receipt_document)
+		
 		lcv = frappe.new_doc("Landed Cost Voucher")
 		lcv.company = "_Test Company"
 		lcv.set("purchase_receipts", [{
-			"purchase_receipt": pr.name,
-			"supplier": pr.supplier,
-			"posting_date": pr.posting_date,
-			"grand_total": pr.base_grand_total
+			"receipt_document_type": receipt_document_type,
+			"receipt_document": receipt_document,
+			"supplier": ref_doc.supplier,
+			"posting_date": ref_doc.posting_date,
+			"grand_total": ref_doc.base_grand_total
 		}])
+		
 		lcv.set("taxes", [{
 			"description": "Insurance Charges",
 			"account": "_Test Account Insurance Charges - _TC",
-			"amount": 50.0
+			"amount": 50
 		}])
 
 		lcv.insert()
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index c4b4b0e..62ae091 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -1,9 +1,23 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
 
-frappe.require("assets/erpnext/js/utils.js");
+frappe.ui.form.on('Material Request', {
+	setup: function(frm) {
+		frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 3},
+			{fieldname: 'qty', columns: 2},
+			{fieldname: 'warehouse', columns: 3},
+			{fieldname: 'schedule_date', columns: 2},
+		];
+	},
+	onload: function(frm) {
+		// formatter for material request item
+		frm.set_indicator_formatter('item_code',
+			function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" })
+	}
+});
 
 frappe.ui.form.on("Material Request Item", {
 	"qty": function(frm, doctype, name) {
@@ -26,6 +40,7 @@
 	},
 
 	refresh: function(doc) {
+		var me = this;
 		this._super();
 
 		if(doc.docstatus==0) {
@@ -34,7 +49,6 @@
 		}
 
 		if(doc.docstatus == 1 && doc.status != 'Stopped') {
-
 			if(flt(doc.per_ordered, 2) < 100) {
 				// make
 				if(doc.material_request_type === "Material Transfer" && doc.status === "Submitted")
@@ -50,9 +64,13 @@
 						this.make_purchase_order, __("Make"));
 
 				if(doc.material_request_type === "Purchase")
+					cur_frm.add_custom_button(__("Request for Quotation"),
+						this.make_request_for_quotation, __("Make"));
+
+				if(doc.material_request_type === "Purchase")
 					cur_frm.add_custom_button(__("Supplier Quotation"),
 					this.make_supplier_quotation, __("Make"));
-				
+
 				if(doc.material_request_type === "Manufacture" && doc.status === "Submitted")
 					cur_frm.add_custom_button(__("Production Order"),
 					this.raise_production_orders, __("Make"));
@@ -69,7 +87,7 @@
 		if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('Sales Order'),
 				function() {
-					frappe.model.map_current_doc({
+					erpnext.utils.map_current_doc({
 						method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
 						source_doctype: "Sales Order",
 						get_query_filters: {
@@ -123,14 +141,18 @@
 				method: "erpnext.manufacturing.doctype.bom.bom.get_bom_items",
 				args: values,
 				callback: function(r) {
-					$.each(r.message, function(i, item) {
-						var d = frappe.model.add_child(cur_frm.doc, "Material Request Item", "items");
-						d.item_code = item.item_code;
-						d.description = item.description;
-						d.warehouse = values.warehouse;
-						d.uom = item.stock_uom;
-						d.qty = item.qty;
-					});
+					if(!r.message) {
+						frappe.throw(__("BOM does not contain any stock item"))
+					} else {
+						$.each(r.message, function(i, item) {
+							var d = frappe.model.add_child(cur_frm.doc, "Material Request Item", "items");
+							d.item_code = item.item_code;
+							d.description = item.description;
+							d.warehouse = values.warehouse;
+							d.uom = item.stock_uom;
+							d.qty = item.qty;
+						});
+					}
 					d.hide();
 					refresh_field("items");
 				}
@@ -159,6 +181,14 @@
 		});
 	},
 
+	make_request_for_quotation: function(){
+		frappe.model.open_mapped_doc({
+			method: "erpnext.stock.doctype.material_request.material_request.make_request_for_quotation",
+			frm: cur_frm,
+			run_link_triggers: true
+		});
+	},
+
 	make_supplier_quotation: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 7234522..6e993c2 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -3,10 +3,12 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-03-07 14:48:38", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -41,6 +44,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
@@ -48,7 +52,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -65,6 +69,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Type", 
@@ -89,6 +94,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -111,6 +117,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -137,6 +144,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
@@ -166,6 +174,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -194,6 +203,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -219,6 +229,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
@@ -232,7 +243,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -245,6 +256,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -270,8 +282,9 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Requested For", 
    "length": 0, 
    "no_copy": 0, 
@@ -289,10 +302,12 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "Today", 
    "fieldname": "transaction_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Transaction Date", 
@@ -320,6 +335,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -345,6 +361,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
@@ -374,6 +391,7 @@
    "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "% Ordered", 
@@ -399,6 +417,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Details", 
@@ -423,6 +442,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
@@ -449,6 +469,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
@@ -474,6 +495,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
@@ -499,6 +521,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
@@ -525,6 +548,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions Content", 
@@ -546,7 +570,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-ticket", 
- "idx": 1, 
+ "idx": 70, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -554,7 +579,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-01-19 06:56:12.592797", 
+ "modified": "2016-06-08 16:36:41.295001", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
@@ -641,10 +666,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,transaction_date", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 679bd2d..b1f1423 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -15,9 +15,9 @@
 from erpnext.manufacturing.doctype.production_order.production_order import get_item_details
 
 
-form_grid_templates = {
-	"items": "templates/form_grid/material_request_grid.html"
-}
+# form_grid_templates = {
+# 	"items": "templates/form_grid/material_request_grid.html"
+# }
 
 class MaterialRequest(BuyingController):
 	def get_feed(self):
@@ -75,10 +75,24 @@
 		pc_obj = frappe.get_doc('Purchase Common')
 		pc_obj.validate_for_items(self)
 
+		self.set_title()
+
+
 		# self.validate_qty_against_so()
 		# NOTE: Since Item BOM and FG quantities are combined, using current data, it cannot be validated
 		# Though the creation of Material Request from a Production Plan can be rethought to fix this
 
+	def set_title(self):
+		'''Set title as comma separated list of items'''
+		items = []
+		for d in self.items:
+			if d.item_code not in items:
+				items.append(d.item_code)
+			if(len(items)==4):
+				break
+
+		self.title = ', '.join(items)
+
 	def on_submit(self):
 		frappe.db.set(self, 'status', 'Submitted')
 		self.update_requested_qty()
@@ -101,7 +115,6 @@
 		pc_obj = frappe.get_doc('Purchase Common')
 
 		pc_obj.check_for_closed_status(self.doctype, self.name)
-		pc_obj.check_docstatus(check = 'Next', doctype = 'Purchase Order', docname = self.name, detail_doctype = 'Purchase Order Item')
 
 		self.update_requested_qty()
 
@@ -200,9 +213,8 @@
 		"Material Request Item": {
 			"doctype": "Purchase Order Item",
 			"field_map": [
-				["name", "prevdoc_detail_docname"],
-				["parent", "prevdoc_docname"],
-				["parenttype", "prevdoc_doctype"],
+				["name", "material_request_item"],
+				["parent", "material_request"],
 				["uom", "stock_uom"],
 				["uom", "uom"]
 			],
@@ -214,6 +226,28 @@
 	return doclist
 
 @frappe.whitelist()
+def make_request_for_quotation(source_name, target_doc=None):
+	doclist = get_mapped_doc("Material Request", source_name, 	{
+		"Material Request": {
+			"doctype": "Request for Quotation",
+			"validation": {
+				"docstatus": ["=", 1],
+				"material_request_type": ["=", "Purchase"]
+			}
+		},
+		"Material Request Item": {
+			"doctype": "Request for Quotation Item",
+			"field_map": [
+				["name", "material_request_item"],
+				["parent", "material_request"],
+				["uom", "uom"]
+			]
+		}
+	}, target_doc)
+
+	return doclist
+
+@frappe.whitelist()
 def make_purchase_order_based_on_supplier(source_name, target_doc=None):
 	if target_doc:
 		if isinstance(target_doc, basestring):
@@ -239,9 +273,8 @@
 			"Material Request Item": {
 				"doctype": "Purchase Order Item",
 				"field_map": [
-					["name", "prevdoc_detail_docname"],
-					["parent", "prevdoc_docname"],
-					["parenttype", "prevdoc_doctype"],
+					["name", "material_request_item"],
+					["parent", "material_request"],
 					["uom", "stock_uom"],
 					["uom", "uom"]
 				],
@@ -286,9 +319,8 @@
 		"Material Request Item": {
 			"doctype": "Supplier Quotation Item",
 			"field_map": {
-				"name": "prevdoc_detail_docname",
-				"parent": "prevdoc_docname",
-				"parenttype": "prevdoc_doctype"
+				"name": "material_request_item",
+				"parent": "material_request"
 			}
 		}
 	}, target_doc, postprocess)
@@ -341,8 +373,8 @@
 	errors =[]
 	production_orders = []
 	for d in mr.items:
-		if (d.qty - d.ordered_qty) >0 :
-			if frappe.db.get_value("Item", d.item_code, "is_pro_applicable"):
+		if (d.qty - d.ordered_qty) >0:
+			if frappe.db.get_value("BOM", {"item": d.item_code, "is_default": 1}):
 				prod_order = frappe.new_doc("Production Order")
 				prod_order.production_item = d.item_code
 				prod_order.qty = d.qty - d.ordered_qty
diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py
new file mode 100644
index 0000000..da6790d
--- /dev/null
+++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py
@@ -0,0 +1,12 @@
+from frappe import _
+
+data = {
+	'docstatus': 1,
+	'fieldname': 'material_request',
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order']
+		},
+	]
+}
\ No newline at end of file
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 eecb42a..dedc675 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -3,10 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:02", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -44,6 +48,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -66,6 +71,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Name", 
@@ -93,6 +99,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -117,6 +124,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -144,6 +152,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -167,6 +176,7 @@
    "fieldtype": "Attach Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -191,6 +201,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Warehouse", 
@@ -214,6 +225,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
@@ -241,6 +253,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Stock UOM", 
@@ -269,6 +282,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "For Warehouse", 
@@ -297,6 +311,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -315,10 +330,12 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "default": "Today", 
    "fieldname": "schedule_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Required Date", 
@@ -346,6 +363,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -370,6 +388,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
@@ -396,6 +415,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
@@ -424,6 +444,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead Time Date", 
@@ -449,6 +470,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order", 
@@ -469,10 +491,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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": 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_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -495,6 +544,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Min Order Qty", 
@@ -522,6 +572,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
@@ -549,6 +600,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Completed Qty", 
@@ -574,6 +626,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
@@ -595,19 +648,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-01-30 06:03:41.424851", 
+ "modified": "2016-07-11 03:28:02.486124", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index b09765d..7be8e97 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -2,10 +2,12 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:00", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -15,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Item", 
@@ -25,6 +28,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +44,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -50,6 +55,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,6 +71,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Name", 
@@ -74,6 +81,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -89,6 +97,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -96,6 +105,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -111,6 +121,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
@@ -120,6 +131,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -137,6 +149,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -144,6 +157,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -159,6 +173,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Warehouse", 
@@ -169,6 +184,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -184,6 +200,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Warehouse (Optional)", 
@@ -193,6 +210,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -208,6 +226,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -215,6 +234,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -230,6 +250,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -239,6 +260,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -254,6 +276,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -261,6 +284,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -276,6 +300,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
@@ -283,6 +308,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -298,6 +324,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -305,6 +332,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -320,6 +348,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
@@ -328,6 +357,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -343,6 +373,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -350,6 +381,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -365,6 +397,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Qty", 
@@ -374,6 +407,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -389,6 +423,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
@@ -398,6 +433,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -413,6 +449,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -420,6 +457,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -435,6 +473,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -445,6 +484,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -460,6 +500,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
@@ -469,6 +510,7 @@
    "oldfieldtype": "Check", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -484,6 +526,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Prevdoc DocType", 
@@ -493,6 +536,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -508,6 +552,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Detail docname", 
@@ -517,6 +562,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -528,18 +574,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.130504", 
+ "modified": "2016-07-11 03:28:02.979081", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packed Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ 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 5a59d94..d8c7952 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -18,6 +18,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -25,6 +26,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,12 +42,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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,6 +66,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Delivery Note", 
@@ -70,6 +75,7 @@
    "options": "Delivery Note", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -85,12 +91,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -106,6 +114,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -114,6 +123,7 @@
    "options": "PS-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -129,12 +139,14 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -150,12 +162,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -172,6 +186,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Package No.", 
@@ -179,6 +194,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -195,12 +211,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -217,6 +235,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Package No.", 
@@ -224,6 +243,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -240,6 +260,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -247,6 +268,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -262,6 +284,7 @@
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Items", 
@@ -269,6 +292,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -284,6 +308,7 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
@@ -292,9 +317,10 @@
    "options": "Packing Slip Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -307,6 +333,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Package Weight Details", 
@@ -314,6 +341,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -330,6 +358,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Weight", 
@@ -337,6 +366,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -352,6 +382,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Weight UOM", 
@@ -360,6 +391,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -375,12 +407,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -397,6 +431,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Weight", 
@@ -404,6 +439,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -419,6 +455,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Weight UOM", 
@@ -427,6 +464,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -442,6 +480,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
@@ -450,6 +489,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -465,6 +505,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
@@ -474,6 +515,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -489,6 +531,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -496,6 +539,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -511,6 +555,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
@@ -519,6 +564,7 @@
    "options": "Packing Slip", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -537,7 +583,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.222925", 
+ "modified": "2016-03-31 06:02:41.545869", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip", 
@@ -646,5 +692,7 @@
  ], 
  "read_only": 0, 
  "read_only_onload": 1, 
- "search_fields": "delivery_note"
+ "search_fields": "delivery_note", 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 f8e5041..4210ef8 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-04-08 13:10:16", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -43,6 +46,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -66,6 +70,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
@@ -91,6 +96,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
@@ -116,6 +122,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -140,6 +147,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -164,6 +172,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity", 
@@ -188,6 +197,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
@@ -213,6 +223,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Net Weight", 
@@ -238,6 +249,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -261,6 +273,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -287,6 +300,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Weight UOM", 
@@ -313,6 +327,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Page Break", 
@@ -336,6 +351,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "DN Detail", 
@@ -355,18 +371,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-02-09 14:46:32.332667", 
+ "modified": "2016-07-11 03:28:03.145397", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
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 ef13baf..a7cef6f6 100644
--- a/erpnext/stock/doctype/price_list_country/price_list_country.json
+++ b/erpnext/stock/doctype/price_list_country/price_list_country.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-09-17 06:49:51.810318", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
@@ -25,6 +28,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -35,21 +39,25 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:51.913575", 
+ "modified": "2016-07-11 03:28:03.978049", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List Country", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index fac8555..792f269 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'buying/doctype/purchase_common/purchase_common.js' %};
+{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
 
 frappe.provide("erpnext.stock");
 
@@ -21,14 +21,26 @@
 				"batch_no": doc.batch_no
 			}
 		}
+
+		$.each(["warehouse", "rejected_warehouse"], function(i, field) {
+			frm.set_query(field, "items", function() {
+				return {
+					filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+				}
+			})
+		})
+
+		frm.set_query("supplier_warehouse", function() {
+			return {
+				filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]]
+			}
+		})
 	}
 });
 
-
 erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
 	refresh: function() {
 		this._super();
-
 		if(this.frm.doc.docstatus===1) {
 			this.show_stock_ledger();
 			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
@@ -40,7 +52,7 @@
 			if(this.frm.doc.docstatus==0) {
 				cur_frm.add_custom_button(__('Purchase Order'),
 					function() {
-						frappe.model.map_current_doc({
+						erpnext.utils.map_current_doc({
 							method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
 							source_doctype: "Purchase Order",
 							get_query_filters: {
@@ -58,9 +70,9 @@
 				if (this.frm.has_perm("submit")) {
 					cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt, __("Status"))
 				}
-				
+
 				cur_frm.add_custom_button(__('Return'), this.make_purchase_return, __("Make"));
-				
+
 				if(flt(this.frm.doc.per_billed) < 100) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __("Make"));
 				}
@@ -76,48 +88,6 @@
 		this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");
 	},
 
-	received_qty: function(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
-		frappe.model.round_floats_in(item, ["qty", "received_qty"]);
-
-		item.qty = (item.qty < item.received_qty) ? item.qty : item.received_qty;
-		this.qty(doc, cdt, cdn);
-	},
-
-	qty: function(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
-		frappe.model.round_floats_in(item, ["qty", "received_qty"]);
-
-		if(!(item.received_qty || item.rejected_qty) && item.qty) {
-			item.received_qty = item.qty;
-		}
-
-		if(item.qty > item.received_qty) {
-			msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "qty", item.name)),
-						__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]))
-			item.qty = item.rejected_qty = 0.0;
-		} else {
-			item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item));
-		}
-
-		this._super(doc, cdt, cdn);
-	},
-
-	rejected_qty: function(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
-		frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);
-
-		if(item.rejected_qty > item.received_qty) {
-			msgprint(__("Error: {0} > {1}", [__(frappe.meta.get_label(item.doctype, "rejected_qty", item.name)),
-						__(frappe.meta.get_label(item.doctype, "received_qty", item.name))]));
-			item.qty = item.rejected_qty = 0.0;
-		} else {
-			item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
-		}
-
-		this.qty(doc, cdt, cdn);
-	},
-
 	make_purchase_invoice: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
@@ -132,10 +102,6 @@
 		})
 	},
 
-	tc_name: function() {
-		this.get_terms();
-	},
-
 	close_purchase_receipt: function() {
 		cur_frm.cscript.update_status("Closed");
 	},
@@ -181,7 +147,7 @@
 	locals['Contact'][tn].is_supplier = 1;
 	if(doc.supplier)
 		locals['Contact'][tn].supplier = doc.supplier;
-	loaddoc('Contact', tn);
+	frappe.set_route('Form', 'Contact', tn);
 }
 
 cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
@@ -242,8 +208,6 @@
 		cur_frm.email_doc(frappe.boot.notification_settings.purchase_receipt_message);
 }
 
-
-
 frappe.provide("erpnext.buying");
 
 frappe.ui.form.on("Purchase Receipt", "is_subcontracted", function(frm) {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index b14a700..f10b634 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1,8 +1,9 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-05-21 16:16:39", 
  "custom": 0, 
  "docstatus": 0, 
@@ -145,7 +146,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "supplier", 
    "fieldname": "supplier_name", 
@@ -198,6 +199,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -836,7 +838,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -1669,7 +1671,7 @@
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -2195,6 +2197,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "language", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Print Language", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "other_details", 
    "fieldtype": "HTML", 
    "hidden": 1, 
@@ -2408,7 +2435,8 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-truck", 
- "idx": 1, 
+ "idx": 261, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 1, 
@@ -2416,7 +2444,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-03-16 15:52:17.581445", 
+ "modified": "2016-06-30 13:42:23.310309", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
@@ -2508,26 +2536,6 @@
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Supplier", 
-   "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, 
@@ -2543,11 +2551,13 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, posting_date, supplier", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index aab81ae..258331c 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import cstr, flt, cint
+from frappe.utils import flt, cint
 
 from frappe import _
 import frappe.defaults
@@ -23,25 +23,24 @@
 		self.status_updater = [{
 			'source_dt': 'Purchase Receipt Item',
 			'target_dt': 'Purchase Order Item',
-			'join_field': 'prevdoc_detail_docname',
+			'join_field': 'purchase_order_item',
 			'target_field': 'received_qty',
 			'target_parent_dt': 'Purchase Order',
 			'target_parent_field': 'per_received',
 			'target_ref_field': 'qty',
 			'source_field': 'qty',
-			'percent_join_field': 'prevdoc_docname',
+			'percent_join_field': 'purchase_order',
 			'overflow_type': 'receipt'
 		},
 		{
 			'source_dt': 'Purchase Receipt Item',
 			'target_dt': 'Purchase Order Item',
-			'join_field': 'prevdoc_detail_docname',
+			'join_field': 'purchase_order_item',
 			'target_field': 'returned_qty',
 			'target_parent_dt': 'Purchase Order',
 			# 'target_parent_field': 'per_received',
 			# 'target_ref_field': 'qty',
 			'source_field': '-1 * qty',
-			# 'percent_join_field': 'prevdoc_docname',
 			# 'overflow_type': 'receipt',
 			'extra_cond': """ and exists (select name from `tabPurchase Receipt` where name=`tabPurchase Receipt Item`.parent and is_return=1)"""
 		}]
@@ -52,146 +51,39 @@
 		self.set_status()
 		self.po_required()
 		self.validate_with_previous_doc()
-		self.validate_purchase_return()
-		self.validate_rejected_warehouse()
-		self.validate_accepted_rejected_qty()
 		self.validate_inspection()
 		self.validate_uom_is_integer("uom", ["qty", "received_qty"])
 		self.validate_uom_is_integer("stock_uom", "stock_qty")
 
 		pc_obj = frappe.get_doc('Purchase Common')
-		pc_obj.validate_for_items(self)
 		self.check_for_closed_status(pc_obj)
 
-		# sub-contracting
-		self.validate_for_subcontracting()
-		self.create_raw_materials_supplied("supplied_items")
-		self.set_landed_cost_voucher_amount()
-		self.update_valuation_rate("items")
-
-
-	def set_landed_cost_voucher_amount(self):
-		for d in self.get("items"):
-			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
-
-	def validate_purchase_return(self):
-		for d in self.get("items"):
-			if self.is_return and flt(d.rejected_qty) != 0:
-				frappe.throw(_("Row #{0}: Rejected Qty can not be entered in Purchase Return").format(d.idx))
-
-			# validate rate with ref PR
-
-	def validate_rejected_warehouse(self):
-		for d in self.get("items"):
-			if flt(d.rejected_qty) and not d.rejected_warehouse:
-				d.rejected_warehouse = self.rejected_warehouse
-				if not d.rejected_warehouse:
-					frappe.throw(_("Row #{0}: Rejected Warehouse is mandatory against rejected Item {1}").format(d.idx, d.item_code))
-
-	# validate accepted and rejected qty
-	def validate_accepted_rejected_qty(self):
-		for d in self.get("items"):
-			if not flt(d.received_qty) and flt(d.qty):
-				d.received_qty = flt(d.qty) - flt(d.rejected_qty)
-
-			elif not flt(d.qty) and flt(d.rejected_qty):
-				d.qty = flt(d.received_qty) - flt(d.rejected_qty)
-
-			elif not flt(d.rejected_qty):
-				d.rejected_qty = flt(d.received_qty) -  flt(d.qty)
-
-			# Check Received Qty = Accepted Qty + Rejected Qty
-			if ((flt(d.qty) + flt(d.rejected_qty)) != flt(d.received_qty)):
-				frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code))
-
-
 	def validate_with_previous_doc(self):
 		super(PurchaseReceipt, self).validate_with_previous_doc({
 			"Purchase Order": {
-				"ref_dn_field": "prevdoc_docname",
+				"ref_dn_field": "purchase_order",
 				"compare_fields": [["supplier", "="], ["company", "="],	["currency", "="]],
 			},
 			"Purchase Order Item": {
-				"ref_dn_field": "prevdoc_detail_docname",
+				"ref_dn_field": "purchase_order_item",
 				"compare_fields": [["project", "="], ["uom", "="], ["item_code", "="]],
 				"is_child_table": True
 			}
 		})
 
 		if cint(frappe.db.get_single_value('Buying Settings', 'maintain_same_rate')) and not self.is_return:
-			self.validate_rate_with_reference_doc([["Purchase Order", "prevdoc_docname", "prevdoc_detail_docname"]])
+			self.validate_rate_with_reference_doc([["Purchase Order", "purchase_order", "purchase_order_item"]])
 
 	def po_required(self):
 		if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes':
 			 for d in self.get('items'):
-				 if not d.prevdoc_docname:
+				 if not d.purchase_order:
 					 frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code))
 
-	def update_stock_ledger(self, allow_negative_stock=False, via_landed_cost_voucher=False):
-		sl_entries = []
-		stock_items = self.get_stock_items()
-
-		for d in self.get('items'):
-			if d.item_code in stock_items and d.warehouse:
-				pr_qty = flt(d.qty) * flt(d.conversion_factor)
-
-				if pr_qty:
-					
-					sle = self.get_sl_entries(d, {
-						"actual_qty": flt(pr_qty),
-						"serial_no": cstr(d.serial_no).strip()
-					})
-					if self.is_return:
-						original_incoming_rate = frappe.db.get_value("Stock Ledger Entry", 
-							{"voucher_type": "Purchase Receipt", "voucher_no": self.return_against, 
-							"item_code": d.item_code}, "incoming_rate")
-							
-						sle.update({
-							"outgoing_rate": original_incoming_rate
-						})
-					else:
-						val_rate_db_precision = 6 if cint(self.precision("valuation_rate", d)) <= 6 else 9
-						incoming_rate = flt(d.valuation_rate, val_rate_db_precision)
-						sle.update({
-							"incoming_rate": incoming_rate
-						})
-					sl_entries.append(sle)
-
-				if flt(d.rejected_qty) > 0:
-					sl_entries.append(self.get_sl_entries(d, {
-						"warehouse": d.rejected_warehouse,
-						"actual_qty": flt(d.rejected_qty) * flt(d.conversion_factor),
-						"serial_no": cstr(d.rejected_serial_no).strip(),
-						"incoming_rate": 0.0
-					}))
-
-		self.bk_flush_supp_wh(sl_entries)
-		self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock,
-			via_landed_cost_voucher=via_landed_cost_voucher)
-
-	def update_ordered_qty(self):
-		po_map = {}
-		for d in self.get("items"):
-			if d.prevdoc_doctype and d.prevdoc_doctype == "Purchase Order" and d.prevdoc_detail_docname:
-				po_map.setdefault(d.prevdoc_docname, []).append(d.prevdoc_detail_docname)
-
-		for po, po_item_rows in po_map.items():
-			if po and po_item_rows:
-				po_obj = frappe.get_doc("Purchase Order", po)
-
-				if po_obj.status in ["Closed", "Cancelled"]:
-					frappe.throw(_("{0} {1} is cancelled or closed").format(_("Purchase Order"), po),
-						frappe.InvalidStatusError)
-
-				po_obj.update_ordered_qty(po_item_rows)
-
 	def get_already_received_qty(self, po, po_detail):
 		qty = frappe.db.sql("""select sum(qty) from `tabPurchase Receipt Item`
-			where prevdoc_detail_docname = %s and docstatus = 1
-			and prevdoc_doctype='Purchase Order' and prevdoc_docname=%s
+			where purchase_order_item = %s and docstatus = 1
+			and purchase_order=%s
 			and parent != %s""", (po_detail, po, self.name))
 		return qty and flt(qty[0][0]) or 0.0
 
@@ -200,16 +92,6 @@
 			["qty", "warehouse"])
 		return po_qty, po_warehouse
 
-	def bk_flush_supp_wh(self, sl_entries):
-		for d in self.get('supplied_items'):
-			# negative quantity is passed as raw material qty has to be decreased
-			# when PR is submitted and it has to be increased when PR is cancelled
-			sl_entries.append(self.get_sl_entries(d, {
-				"item_code": d.rm_item_code,
-				"warehouse": self.supplier_warehouse,
-				"actual_qty": -1*flt(d.consumed_qty),
-			}))
-
 	def validate_inspection(self):
 		for d in self.get('items'):		 #Enter inspection date for all items that require inspection
 			if frappe.db.get_value("Item", d.item_code, "inspection_required") and not d.qa_no:
@@ -221,28 +103,29 @@
 	def check_for_closed_status(self, pc_obj):
 		check_list =[]
 		for d in self.get('items'):
-			if d.meta.get_field('prevdoc_docname') and d.prevdoc_docname and d.prevdoc_docname not in check_list:
-				check_list.append(d.prevdoc_docname)
-				pc_obj.check_for_closed_status(d.prevdoc_doctype, d.prevdoc_docname)
+			if d.meta.get_field('purchase_order') and d.purchase_order and d.purchase_order not in check_list:
+				check_list.append(d.purchase_order)
+				pc_obj.check_for_closed_status('Purchase Order', d.purchase_order)
 
 	# on submit
 	def on_submit(self):
 		purchase_controller = frappe.get_doc("Purchase Common")
 
 		# Check for Approving Authority
-		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.company, self.base_grand_total)
+		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype,
+			self.company, self.base_grand_total)
 
 		# Set status as Submitted
 		frappe.db.set(self, 'status', 'Submitted')
 
 		self.update_prevdoc_status()
-		self.update_ordered_qty()
-
 		self.update_billing_status()
 
 		if not self.is_return:
 			purchase_controller.update_last_purchase_rate(self, 1)
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating ordered qty in bin depends upon updated ordered qty in PO
 		self.update_stock_ledger()
 
 		from erpnext.stock.doctype.serial_no.serial_no import update_serial_nos_after_submit
@@ -272,17 +155,15 @@
 
 		frappe.db.set(self,'status','Cancelled')
 
-		self.update_stock_ledger()
-
 		self.update_prevdoc_status()
-		# Must be called after updating received qty in PO
-		self.update_ordered_qty()
-
 		self.update_billing_status()
 
 		if not self.is_return:
 			pc_obj.update_last_purchase_rate(self, 0)
 
+		# Updating stock ledger should always be called after updating prevdoc status,
+		# because updating ordered qty in bin depends upon updated ordered qty in PO
+		self.update_stock_ledger()
 		self.make_gl_entries_on_cancel()
 
 	def get_current_stock(self):
@@ -307,8 +188,8 @@
 		for d in self.get("items"):
 			if d.item_code in stock_items and flt(d.valuation_rate) and flt(d.qty):
 				if warehouse_account.get(d.warehouse):
-					stock_value_diff = frappe.db.get_value("Stock Ledger Entry", 
-						{"voucher_type": "Purchase Receipt", "voucher_no": self.name, 
+					stock_value_diff = frappe.db.get_value("Stock Ledger Entry",
+						{"voucher_type": "Purchase Receipt", "voucher_no": self.name,
 						"voucher_detail_no": d.name}, "stock_value_difference")
 					if not stock_value_diff:
 						continue
@@ -341,7 +222,8 @@
 							"against": warehouse_account[d.warehouse]["name"],
 							"cost_center": d.cost_center,
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-							"credit": flt(d.landed_cost_voucher_amount)
+							"credit": flt(d.landed_cost_voucher_amount),
+							"project": d.project
 						}))
 
 					# sub-contracting warehouse
@@ -358,21 +240,22 @@
 					valuation_amount_as_per_doc = flt(d.base_net_amount, d.precision("base_net_amount")) + \
 						flt(d.landed_cost_voucher_amount) + flt(d.rm_supp_cost) + flt(d.item_tax_amount)
 
-					divisional_loss = flt(valuation_amount_as_per_doc - stock_value_diff, 
+					divisional_loss = flt(valuation_amount_as_per_doc - stock_value_diff,
 						d.precision("base_net_amount"))
-						
+
 					if divisional_loss:
 						if self.is_return or flt(d.item_tax_amount):
 							loss_account = expenses_included_in_valuation
 						else:
 							loss_account = stock_rbnb
-							
+
 						gl_entries.append(self.get_gl_dict({
 							"account": loss_account,
 							"against": warehouse_account[d.warehouse]["name"],
 							"cost_center": d.cost_center,
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-							"debit": divisional_loss
+							"debit": divisional_loss,
+							"project": d.project
 						}, stock_rbnb_currency))
 
 				elif d.warehouse not in warehouse_with_no_account or \
@@ -440,8 +323,8 @@
 	def update_billing_status(self, update_modified=True):
 		updated_pr = [self.name]
 		for d in self.get("items"):
-			if d.prevdoc_detail_docname:
-				updated_pr += update_billed_amount_based_on_po(d.prevdoc_detail_docname, update_modified)
+			if d.purchase_order_item:
+				updated_pr += update_billed_amount_based_on_po(d.purchase_order_item, update_modified)
 
 		for pr in set(updated_pr):
 			pr_doc = self if (pr == self.name) else frappe.get_doc("Purchase Receipt", pr)
@@ -458,7 +341,7 @@
 	# Get all Delivery Note Item rows against the Sales Order Item row
 	pr_details = frappe.db.sql("""select pr_item.name, pr_item.amount, pr_item.parent
 		from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
-		where pr.name=pr_item.parent and pr_item.prevdoc_detail_docname=%s
+		where pr.name=pr_item.parent and pr_item.purchase_order_item=%s
 			and pr.docstatus=1 and pr.is_return = 0
 		order by pr.posting_date asc, pr.posting_time asc, pr.name asc""", po_detail, as_dict=1)
 
@@ -514,8 +397,8 @@
 			"field_map": {
 				"name": "pr_detail",
 				"parent": "purchase_receipt",
-				"prevdoc_detail_docname": "po_detail",
-				"prevdoc_docname": "purchase_order",
+				"purchase_order_item": "po_detail",
+				"purchase_order": "purchase_order",
 			},
 			"postprocess": update_item,
 			"filter": lambda d: abs(d.qty) - abs(invoiced_qty_map.get(d.name, 0))<=0
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
new file mode 100644
index 0000000..3278032
--- /dev/null
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -0,0 +1,28 @@
+from frappe import _
+
+data = {
+	'fieldname': 'purchase_receipt_no',
+	'non_standard_fieldnames': {
+		'Purchase Invoice': 'purchase_receipt',
+		'Landed Cost Voucher': 'receipt_document'
+	},
+	'internal_links': {
+		'Purchase Order': ['items', 'purchase_order'],
+		'Project': ['items', 'project'],
+		'Quality Inspection': ['items', 'qa_no'],
+	},
+	'transactions': [
+		{
+			'label': _('Related'),
+			'items': ['Purchase Invoice', 'Landed Cost Voucher']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Purchase Order', 'Quality Inspection', 'Project']
+		},
+		{
+			'label': _('Returns'),
+			'items': ['Stock Entry']
+		},
+	]
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index dc81405..eba9201 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -6,7 +6,7 @@
 import unittest
 import frappe
 import frappe.defaults
-from frappe.utils import cint, flt, cstr
+from frappe.utils import cint, flt, cstr, today
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 
 class TestPurchaseReceipt(unittest.TestCase):
@@ -193,6 +193,7 @@
 		po = create_purchase_order()
 		
 		pr1 = make_purchase_receipt(po.name)
+		pr1.posting_date = today()
 		pr1.posting_time = "10:00"
 		pr1.get("items")[0].received_qty = 2
 		pr1.get("items")[0].qty = 2
@@ -209,6 +210,7 @@
 		pi2.submit()
 		
 		pr2 = make_purchase_receipt(po.name)
+		pr2.posting_date = today()
 		pr2.posting_time = "08:00"
 		pr2.get("items")[0].received_qty = 5
 		pr2.get("items")[0].qty = 5
@@ -236,8 +238,7 @@
 def make_purchase_receipt(**args):
 	pr = frappe.new_doc("Purchase Receipt")
 	args = frappe._dict(args)
-	if args.posting_date:
-		pr.posting_date = args.posting_date
+	pr.posting_date = args.posting_date or today()
 	if args.posting_time:
 		pr.posting_time = args.posting_time
 	pr.company = args.company or "_Test Company"
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 b7e4f2d..85ca888 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -3,11 +3,13 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-05-24 19:29:10", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -1077,7 +1079,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_docname", 
+   "fieldname": "purchase_order", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -1362,40 +1364,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "prevdoc_doctype", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Prevdoc Doctype", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_doctype", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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": "prevdoc_detail_docname", 
+   "fieldname": "purchase_order_item", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Purchase Order Item No", 
+   "label": "Purchase Order Item", 
    "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
@@ -1709,20 +1685,23 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-03-18 05:11:15.937267", 
+ "modified": "2016-07-11 03:28:05.657840", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 6414eb9..d39c6d9 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -1,1007 +1,1086 @@
 {
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:serial_no",
- "creation": "2013-05-16 10:59:15",
- "custom": 0,
- "description": "Distinct unit of an Item",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:serial_no", 
+ "creation": "2013-05-16 10:59:15", 
+ "custom": 0, 
+ "description": "Distinct unit of an Item", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "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,
-   "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_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "serial_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "serial_no",
-   "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": "serial_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "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": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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_hide_if_no_value": 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,
-   "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt",
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Warehouse",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "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": "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "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": 0,
-   "label": "Item 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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "description",
-   "fieldtype": "Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "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": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "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": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Item Group",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "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, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "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": 1, 
+   "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": 0,
-   "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": 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": "brand", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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": 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": "purchase_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Purchase / Manufacture Details",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "purchase_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purchase / Manufacture 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, 
+   "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,
-   "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_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "purchase_document_type",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Creation Document Type",
-   "length": 0,
-   "no_copy": 1,
-   "options": "DocType",
-   "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": "purchase_document_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Creation Document Type", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "DocType", 
+   "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": "purchase_document_no",
-   "fieldtype": "Dynamic Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Creation Document No",
-   "length": 0,
-   "no_copy": 1,
-   "options": "purchase_document_type",
-   "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": "purchase_document_no", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Creation Document No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "purchase_document_type", 
+   "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": "purchase_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Creation Date",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "purchase_date",
-   "oldfieldtype": "Date",
-   "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": "purchase_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Creation Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "purchase_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": "purchase_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Creation Time",
-   "length": 0,
-   "no_copy": 1,
-   "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": "purchase_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Creation Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "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": "purchase_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Incoming Rate",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "purchase_rate",
-   "oldfieldtype": "Currency",
-   "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": "purchase_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Incoming Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "purchase_rate", 
+   "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, 
+   "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,
-   "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, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Supplier",
-   "length": 0,
-   "no_copy": 1,
-   "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, 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Supplier", 
+   "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": "supplier_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Supplier Name",
-   "length": 0,
-   "no_copy": 1,
-   "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": 1, 
+   "collapsible": 0, 
+   "fieldname": "supplier_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Supplier Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "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": "delivery_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Delivery Details",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivery_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivery Details", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "delivery_document_type",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Delivery Document Type",
-   "length": 0,
-   "no_copy": 1,
-   "options": "DocType",
-   "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": "delivery_document_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Delivery Document Type", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "DocType", 
+   "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": "delivery_document_no",
-   "fieldtype": "Dynamic Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Delivery Document No",
-   "length": 0,
-   "no_copy": 1,
-   "options": "delivery_document_type",
-   "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": "delivery_document_no", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Delivery Document No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "delivery_document_type", 
+   "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": "delivery_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Delivery Date",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "delivery_date",
-   "oldfieldtype": "Date",
-   "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": "delivery_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivery Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "delivery_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": "delivery_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Delivery Time",
-   "length": 0,
-   "no_copy": 1,
-   "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": "delivery_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivery Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "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": "is_cancelled",
-   "fieldtype": "Select",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Is Cancelled",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "is_cancelled",
-   "oldfieldtype": "Select",
-   "options": "\nYes\nNo",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "is_cancelled", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Cancelled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_cancelled", 
+   "oldfieldtype": "Select", 
+   "options": "\nYes\nNo", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "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": "column_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": "column_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Customer",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "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": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "print_hide": 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": "customer_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Customer Name",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "customer_name",
-   "oldfieldtype": "Data",
-   "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": 1, 
+   "collapsible": 0, 
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Customer Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "customer_name", 
+   "oldfieldtype": "Data", 
+   "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": "warranty_amc_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Warranty / AMC Details",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "warranty_amc_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warranty / AMC 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break6",
-   "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": "column_break6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "maintenance_status",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Maintenance Status",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "maintenance_status",
-   "oldfieldtype": "Select",
-   "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC",
-   "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": "maintenance_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Maintenance Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "maintenance_status", 
+   "oldfieldtype": "Select", 
+   "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "warranty_period",
-   "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Warranty Period (Days)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "warranty_period",
-   "oldfieldtype": "Int",
-   "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": "warranty_period", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warranty Period (Days)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warranty_period", 
+   "oldfieldtype": "Int", 
+   "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, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break7",
-   "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": "column_break7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "warranty_expiry_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Warranty Expiry Date",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "warranty_expiry_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, 
+   "fieldname": "warranty_expiry_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Warranty Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warranty_expiry_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, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "amc_expiry_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "AMC Expiry Date",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "amc_expiry_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, 
+   "fieldname": "amc_expiry_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "AMC Expiry Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amc_expiry_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, 
    "width": "150px"
-  },
+  }, 
   {
-   "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,
-   "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, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "More Information", 
+   "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": "serial_no_details",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Serial No Details",
-   "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,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "serial_no_details", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Serial No 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, 
+   "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": 1,
-   "in_list_view": 0,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "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": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-barcode",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2015-12-14 15:53:57.486475",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Serial No",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-barcode", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2016-04-06 05:39:46.427967", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Serial No", 
+ "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": "Item 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": "Item Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "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": "Stock 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": "Stock 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": "Stock 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": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_code",
- "sort_field": "modified",
- "sort_order": "DESC"
-}
+ ], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "item_code", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 42e8d1b..71ce0f8 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -303,7 +303,8 @@
 	if not stock_ledger_entries: return
 
 	for d in controller.get(parentfield):
-		update_rejected_serial_nos = True if (controller.doctype=="Purchase Receipt" and d.rejected_qty) else False
+		update_rejected_serial_nos = True if (controller.doctype in ("Purchase Receipt", "Purchase Invoice") 
+			and d.rejected_qty) else False
 		accepted_serial_nos_updated = False
 		warehouse = d.t_warehouse if controller.doctype == "Stock Entry" else d.warehouse
 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index ef1f728..6c2a14b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -1,7 +1,5 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/controllers/stock_controller.js");
-frappe.require("assets/erpnext/js/utils.js");
 frappe.provide("erpnext.stock");
 
 erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
@@ -51,16 +49,27 @@
 				};
 			});
 		}
+
+		this.frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 3},
+			{fieldname: 'qty', columns: 3},
+			{fieldname: 's_warehouse', columns: 2},
+			{fieldname: 't_warehouse', columns: 2}
+		];
+
 	},
 
 	onload_post_render: function() {
 		var me = this;
-		cur_frm.get_field("items").grid.set_multiple_add("item_code", "qty");
 		this.set_default_account(function() {
 			if(me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
 				cur_frm.script_manager.trigger("company");
 			}
 		});
+
+		if(!this.item_selector && false) {
+			this.item_selector = new erpnext.ItemSelector({frm: this.frm});
+		}
 	},
 
 	refresh: function() {
@@ -72,6 +81,7 @@
 		if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 			this.show_general_ledger();
 		}
+		erpnext.hide_company();
 	},
 
 	on_submit: function() {
@@ -180,7 +190,7 @@
 				var excise = frappe.model.make_new_doc_and_get_name('Journal Entry');
 				excise = locals['Journal Entry'][excise];
 				excise.voucher_type = 'Excise Entry';
-				loaddoc('Journal Entry', excise.name);
+				frappe.set_route('Form', 'Journal Entry', excise.name);
 			}, __("Make"));
 			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 	},
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 2697fd0..b5efc90 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -51,7 +51,7 @@
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -89,7 +89,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "default": "Material Issue", 
    "fieldname": "purpose", 
@@ -119,6 +119,33 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "depends_on": "eval:in_list([\"Material Transfer for Manufacture\", \"Manufacture\"], doc.purpose)", 
    "fieldname": "production_order", 
    "fieldtype": "Link", 
@@ -269,7 +296,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -659,7 +686,7 @@
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -706,7 +733,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -732,7 +759,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -782,7 +809,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
@@ -809,7 +836,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
+   "print_hide_if_no_value": 1, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -914,7 +941,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
+   "print_hide_if_no_value": 1, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -977,7 +1004,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Subcontract\"", 
    "fieldname": "supplier_name", 
@@ -1083,7 +1110,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "eval:doc.purpose==\"Sales Return\"", 
    "fieldname": "customer_name", 
@@ -1344,33 +1371,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1431,7 +1431,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-18 08:37:08.747493", 
+ "modified": "2016-04-07 06:40:03.284036", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
@@ -1523,5 +1523,6 @@
  "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 5655258..e35f3d2 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -5,7 +5,7 @@
 import frappe
 import frappe.defaults
 from frappe import _
-from frappe.utils import cstr, cint, flt, comma_or, getdate, nowdate
+from frappe.utils import cstr, cint, flt, comma_or, getdate, nowdate, formatdate, format_time
 from erpnext.stock.utils import get_incoming_rate
 from erpnext.stock.stock_ledger import get_previous_sle, NegativeStockError
 from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor
@@ -178,7 +178,7 @@
 			self.production_order = None
 
 	def check_if_operations_completed(self):
-		"""Check if Time Logs are completed against before manufacturing to capture operating costs."""
+		"""Check if Time Sheets are completed against before manufacturing to capture operating costs."""
 		prod_order = frappe.get_doc("Production Order", self.production_order)
 
 		for d in prod_order.get("operations"):
@@ -225,9 +225,12 @@
 
 			# validate qty during submit
 			if d.docstatus==1 and d.s_warehouse and not allow_negative_stock and d.actual_qty < d.transfer_qty:
-				frappe.throw(_("""Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
-					Available Qty: {4}, Transfer Qty: {5}""").format(d.idx, d.s_warehouse,
-					self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty), NegativeStockError)
+				frappe.throw(_("Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3})".format(d.idx,
+					frappe.bold(d.s_warehouse), formatdate(self.posting_date),
+					format_time(self.posting_time), frappe.bold(d.item_code)))
+					+ '<br><br>' + _("Available qty is {0}, you need {1}").format(frappe.bold(d.actual_qty),
+						frappe.bold(d.transfer_qty)),
+					NegativeStockError, title=_('Insufficient Stock'))
 
 	def get_stock_and_rate(self):
 		self.set_transfer_qty()
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
new file mode 100644
index 0000000..b75eeea
--- /dev/null
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -0,0 +1,81 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import frappe, erpnext
+from frappe.utils import cint, flt
+
+@frappe.whitelist()
+def make_stock_entry(**args):
+	s = frappe.new_doc("Stock Entry")
+	args = frappe._dict(args)
+
+	if args.posting_date:
+		s.posting_date = args.posting_date
+	if args.posting_time:
+		s.posting_time = args.posting_time
+
+	# map names
+	if args.from_warehouse:
+		args.source = args.from_warehouse
+	if args.to_warehouse:
+		args.target = args.to_warehouse
+	if args.item_code:
+		args.item = args.item_code
+
+	if isinstance(args.qty, basestring):
+		if '.' in args.qty:
+			args.qty = flt(args.qty)
+		else:
+			args.qty = cint(args.qty)
+
+	# purpose
+	if not args.purpose:
+		if args.source and args.target:
+			s.purpose = "Material Transfer"
+		elif args.source:
+			s.purpose = "Material Issue"
+		else:
+			s.purpose = "Material Receipt"
+	else:
+		s.purpose = args.purpose
+
+	# company
+	if not args.company:
+		if args.source:
+			args.company = frappe.db.get_value('Warehouse', args.source, 'company')
+		elif args.target:
+			args.company = frappe.db.get_value('Warehouse', args.target, 'company')
+
+	# set vales from test
+	if frappe.flags.in_test:
+		if not args.company:
+			args.company = '_Test Company'
+		if not args.item:
+			args.item = '_Test Item'
+
+	s.company = args.company or erpnext.get_default_company()
+	s.purchase_receipt_no = args.purchase_receipt_no
+	s.delivery_note_no = args.delivery_note_no
+	s.sales_invoice_no = args.sales_invoice_no
+	if args.difference_account:
+		s.difference_account = args.difference_account
+	if not args.cost_center:
+		args.cost_center = frappe.get_value('Company', s.company, 'cost_center')
+
+	s.append("items", {
+		"item_code": args.item,
+		"s_warehouse": args.source,
+		"t_warehouse": args.target,
+		"qty": args.qty,
+		"basic_rate": args.rate or args.basic_rate,
+		"conversion_factor": 1.0,
+		"serial_no": args.serial_no,
+		'cost_center': args.cost_center,
+		'expense_account': args.expense_account
+	})
+
+	if not args.do_not_save:
+		s.insert()
+		if not args.do_not_submit:
+			s.submit()
+	return s
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 78c1dd2..30f2a06 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -12,6 +12,7 @@
 from erpnext.stock.stock_ledger import get_previous_sle
 from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
 from frappe.tests.test_permissions import set_user_permission_doctypes
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 
 def get_sle(**args):
 	condition, values = "", []
@@ -78,8 +79,11 @@
 
 	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, material_request_type="Purchase"):
+	
+	def test_auto_material_request_for_warehouse_group(self):
+		self._test_auto_material_request("_Test Item Warehouse Group Wise Reorder", warehouse="_Test Warehouse Group-C1 - _TC")
+		
+	def _test_auto_material_request(self, item_code, material_request_type="Purchase", warehouse="_Test Warehouse - _TC"):
 		item = frappe.get_doc("Item", item_code)
 
 		if item.variant_of:
@@ -88,14 +92,14 @@
 			template = item
 
 		projected_qty, actual_qty = frappe.db.get_value("Bin", {"item_code": item_code,
-			"warehouse": "_Test Warehouse - _TC"}, ["projected_qty", "actual_qty"]) or [0, 0]
+			"warehouse": warehouse}, ["projected_qty", "actual_qty"]) or [0, 0]
 
 		# stock entry reqd for auto-reorder
-		create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC",
+		create_stock_reconciliation(item_code=item_code, warehouse=warehouse,
 			qty = actual_qty + abs(projected_qty) + 10, rate=100)
 
 		projected_qty = frappe.db.get_value("Bin", {"item_code": item_code,
-			"warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0
+			"warehouse": warehouse}, "projected_qty") or 0
 
 		frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
 
@@ -121,9 +125,9 @@
 		set_perpetual_inventory()
 
 		mr = make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
-			qty=50, basic_rate=100)
-
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Warehouse",
+			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
+					
+		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
 			"warehouse": mr.get("items")[0].t_warehouse})
 
 		self.check_stock_ledger_entries("Stock Entry", mr.name,
@@ -148,14 +152,15 @@
 		set_perpetual_inventory()
 
 		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
-			qty=50, basic_rate=100)
+			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
 
-		mi = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC", qty=40)
+		mi = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC", 
+			qty=40, expense_account="Stock Adjustment - _TC")
 
 		self.check_stock_ledger_entries("Stock Entry", mi.name,
 			[["_Test Item", "_Test Warehouse - _TC", -40.0]])
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Warehouse",
+		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
 			"warehouse": "_Test Warehouse - _TC"})
 
 		stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
@@ -187,10 +192,10 @@
 		self.check_stock_ledger_entries("Stock Entry", mtn.name,
 			[["_Test Item", "_Test Warehouse - _TC", -45.0], ["_Test Item", "_Test Warehouse 1 - _TC", 45.0]])
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Warehouse",
+		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
 			"warehouse": mtn.get("items")[0].s_warehouse})
 
-		fixed_asset_account = frappe.db.get_value("Account", {"account_type": "Warehouse",
+		fixed_asset_account = frappe.db.get_value("Account", {"account_type": "Stock",
 			"warehouse": mtn.get("items")[0].t_warehouse})
 
 		stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
@@ -255,7 +260,7 @@
 		repack.insert()
 		repack.submit()
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Warehouse",
+		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
 			"warehouse": repack.get("items")[1].t_warehouse})
 
 		rm_stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
@@ -604,48 +609,6 @@
 	se.submit()
 	return se
 
-def make_stock_entry(**args):
-	s = frappe.new_doc("Stock Entry")
-	args = frappe._dict(args)
-	if args.posting_date:
-		s.posting_date = args.posting_date
-	if args.posting_time:
-		s.posting_time = args.posting_time
-
-	if not args.purpose:
-		if args.source and args.target:
-			s.purpose = "Material Transfer"
-		elif args.source:
-			s.purpose = "Material Issue"
-		else:
-			s.purpose = "Material Receipt"
-	else:
-		s.purpose = args.purpose
-
-	s.company = args.company or "_Test Company"
-	s.purchase_receipt_no = args.purchase_receipt_no
-	s.delivery_note_no = args.delivery_note_no
-	s.sales_invoice_no = args.sales_invoice_no
-	s.difference_account = args.difference_account or "Stock Adjustment - _TC"
-
-	s.append("items", {
-		"item_code": args.item or args.item_code or "_Test Item",
-		"s_warehouse": args.from_warehouse or args.source,
-		"t_warehouse": args.to_warehouse or args.target,
-		"qty": args.qty,
-		"basic_rate": args.basic_rate,
-		"expense_account": args.expense_account or "Stock Adjustment - _TC",
-		"conversion_factor": 1.0,
-		"cost_center": "_Test Cost Center - _TC",
-		"serial_no": args.serial_no
-	})
-
-	if not args.do_not_save:
-		s.insert()
-		if not args.do_not_submit:
-			s.submit()
-	return s
-
 def get_qty_after_transaction(**args):
 	args = frappe._dict(args)
 
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 dd680f3..2438b07 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-03-29 18:22:12", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
@@ -24,6 +27,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +43,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -46,6 +51,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -61,6 +67,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Source Warehouse", 
@@ -71,6 +78,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -86,12 +94,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -107,6 +117,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Target Warehouse", 
@@ -117,6 +128,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -132,12 +144,14 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -153,6 +167,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -163,6 +178,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -178,12 +194,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -199,6 +217,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
@@ -206,6 +225,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -221,6 +241,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -229,6 +250,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -244,6 +266,7 @@
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -253,6 +276,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -270,6 +294,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -277,6 +302,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -292,6 +318,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
@@ -300,6 +327,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -315,6 +343,7 @@
    "fieldtype": "Image", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
@@ -324,6 +353,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -339,6 +369,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
@@ -346,6 +377,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -361,6 +393,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
@@ -370,6 +403,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -385,6 +419,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Rate (as per Stock UOM)", 
@@ -395,6 +430,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -410,6 +446,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Amount", 
@@ -418,7 +455,8 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -434,6 +472,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Cost", 
@@ -443,6 +482,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -458,6 +498,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
@@ -468,6 +509,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -483,6 +525,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
@@ -492,6 +535,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -507,12 +551,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -528,6 +574,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
@@ -538,6 +585,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -553,6 +601,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
@@ -562,6 +611,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -577,6 +627,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
@@ -587,6 +638,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -602,6 +654,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty as per Stock UOM", 
@@ -611,6 +664,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -626,6 +680,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No / Batch", 
@@ -633,6 +688,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -648,6 +704,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
@@ -657,6 +714,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -672,12 +730,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -693,6 +753,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
@@ -703,6 +764,7 @@
    "options": "Batch", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -718,6 +780,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting", 
@@ -725,6 +788,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -741,6 +805,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference Account", 
@@ -749,6 +814,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -764,12 +830,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -787,6 +855,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
@@ -795,6 +864,7 @@
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -810,6 +880,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -817,6 +888,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -832,6 +904,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Qty (at source/target)", 
@@ -841,6 +914,7 @@
    "oldfieldtype": "Read Only", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -857,6 +931,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "BOM No", 
@@ -865,6 +940,7 @@
    "options": "BOM", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -880,12 +956,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -902,6 +980,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Request", 
@@ -910,6 +989,7 @@
    "options": "Material Request", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -925,6 +1005,7 @@
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Request Item", 
@@ -933,6 +1014,7 @@
    "options": "Material Request Item", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -944,18 +1026,22 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:58.140173", 
+ "modified": "2016-07-11 03:28:08.710800", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
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 180f114..32beb1a 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -17,6 +17,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -27,6 +28,7 @@
    "options": "Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -44,6 +46,7 @@
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Serial No", 
@@ -51,6 +54,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -68,6 +72,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
@@ -77,6 +82,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -92,6 +98,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Warehouse", 
@@ -102,6 +109,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -119,6 +127,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Posting Date", 
@@ -128,6 +137,7 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -145,6 +155,7 @@
    "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
@@ -154,6 +165,7 @@
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -171,6 +183,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher Type", 
@@ -181,6 +194,7 @@
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -198,6 +212,7 @@
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher No", 
@@ -208,6 +223,7 @@
    "options": "voucher_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -225,6 +241,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Voucher Detail No", 
@@ -234,6 +251,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -251,6 +269,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Quantity", 
@@ -260,6 +279,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -277,6 +297,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Incoming Rate", 
@@ -287,6 +308,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -302,6 +324,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Outgoing Rate", 
@@ -311,6 +334,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -326,6 +350,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
@@ -336,6 +361,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -353,6 +379,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Qty After Transaction", 
@@ -362,6 +389,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -379,6 +407,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
@@ -389,6 +418,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -406,6 +436,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value", 
@@ -416,6 +447,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -431,6 +463,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value Difference", 
@@ -439,6 +472,7 @@
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -454,6 +488,7 @@
    "fieldtype": "Text", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Queue (FIFO)", 
@@ -463,6 +498,7 @@
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -478,6 +514,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Project", 
@@ -486,6 +523,7 @@
    "options": "Project", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -501,6 +539,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -511,6 +550,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -528,6 +568,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
@@ -537,6 +578,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -554,6 +596,7 @@
    "fieldtype": "Select", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Cancelled", 
@@ -562,6 +605,7 @@
    "options": "\nNo\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -580,7 +624,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:58.277731", 
+ "modified": "2016-03-29 13:26:08.241138", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger Entry", 
@@ -597,7 +641,7 @@
    "if_owner": 0, 
    "import": 0, 
    "permlevel": 0, 
-   "print": 0, 
+   "print": 1, 
    "read": 1, 
    "report": 1, 
    "role": "Stock User", 
@@ -630,5 +674,6 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 9931ffa..2caabee 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -25,6 +25,7 @@
 		validate_warehouse_company(self.warehouse, self.company)
 		self.scrub_posting_time()
 		self.validate_and_set_fiscal_year()
+		self.block_transactions_against_group_warehouse()
 
 		from erpnext.accounts.utils import validate_fiscal_year
 		validate_fiscal_year(self.posting_date, self.fiscal_year, self.meta.get_label("posting_date"), self)
@@ -117,6 +118,9 @@
 		if not self.fiscal_year:
 			self.fiscal_year = get_fiscal_year(self.posting_date, company=self.company)[0]
 
+	def block_transactions_against_group_warehouse(self):
+		from erpnext.stock.utils import is_group_warehouse
+		is_group_warehouse(self.warehouse)
 
 def on_doctype_update():
 	if not frappe.db.sql("""show index from `tabStock Ledger Entry`
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index f5f4e03..e7ba1ba 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -1,12 +1,12 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/controllers/stock_controller.js");
-frappe.require("assets/erpnext/js/utils.js");
 frappe.provide("erpnext.stock");
 
 frappe.ui.form.on("Stock Reconciliation", {
 	onload: function(frm) {
+		frm.add_fetch("item_code", "item_name", "item_name");
+
 		// end of life
 		frm.set_query("item_code", "items", function(doc, cdt, cdn) {
 			return {
@@ -17,6 +17,12 @@
 				}
 			}
 		});
+
+		if (frm.doc.company) {
+			erpnext.queries.setup_queries(frm, "Warehouse", function() {
+				return erpnext.queries.warehouse(frm.doc);
+			});
+		}
 	},
 
 	refresh: function(frm) {
@@ -134,6 +140,13 @@
 				}
 			}
 		}
+
+		this.frm.get_field('items').grid.editable_fields = [
+			{fieldname: 'item_code', columns: 3},
+			{fieldname: 'warehouse', columns: 3},
+			{fieldname: 'qty', columns: 2},
+			{fieldname: 'valuation_rate', columns: 2}
+		];
 	},
 
 	refresh: function() {
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index c5992c2..82b7e11 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -246,6 +246,18 @@
 		for item in get_items(warehouse, self.posting_date, self.posting_time):
 			self.append("items", item)
 
+	def submit(self):
+		if len(self.items) > 100:
+			self.queue_action('submit')
+		else:
+			self._submit()
+
+	def cancel(self):
+		if len(self.items) > 100:
+			self.queue_action('cancel')
+		else:
+			self._cancel()
+
 @frappe.whitelist()
 def get_items(warehouse, posting_date, posting_time):
 	items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index f0eea5a..f9629a1 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -116,10 +116,11 @@
 def set_valuation_method(item_code, valuation_method):
 	frappe.db.set_value("Item", item_code, "valuation_method", valuation_method)
 
-	for warehouse in frappe.get_all("Warehouse", filters={"company": "_Test Company"}):
-		update_entries_after({
-			"item_code": item_code,
-			"warehouse": warehouse.name
-		}, allow_negative_stock=1)
+	for warehouse in frappe.get_all("Warehouse", filters={"company": "_Test Company"}, fields=["name", "is_group"]):
+		if not warehouse.is_group:
+			update_entries_after({
+				"item_code": item_code,
+				"warehouse": warehouse.name
+			}, allow_negative_stock=1)
 
 test_dependencies = ["Item", "Warehouse"]
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 f9d8b3d..3d04487 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -2,11 +2,13 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2015-02-17 01:06:05.072764", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
@@ -37,10 +40,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "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": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
@@ -62,10 +91,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "section_break_3", 
-   "fieldtype": "Section Break", 
+   "fieldname": "column_break_6", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -90,6 +120,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
@@ -115,6 +146,7 @@
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Valuation Rate", 
@@ -135,10 +167,11 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
+   "fieldname": "section_break_3", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -163,6 +196,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Qty", 
@@ -183,11 +217,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "description": "Before reconciliation", 
    "fieldname": "current_valuation_rate", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Valuation Rate", 
@@ -208,6 +267,7 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
@@ -215,15 +275,17 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-01-27 16:04:42.325454", 
+ "modified": "2016-07-11 03:28:08.918029", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation Item", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
- "sort_order": "DESC"
-}
+ "sort_order": "DESC", 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js
new file mode 100644
index 0000000..49ce3d8
--- /dev/null
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Stock Settings', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 2d6e2b4..4a6e6e9 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -2,6 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-24 16:37:54", 
  "custom": 0, 
  "description": "Settings", 
@@ -17,13 +18,16 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Naming By", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Code\nNaming Series", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,13 +44,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,13 +69,42 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Stock 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "default_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Default 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": 0, 
@@ -84,11 +120,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -104,13 +143,16 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Valuation Method", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "FIFO\nMoving Average", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -127,12 +169,41 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allowance Percent", 
+   "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, 
+   "default": "1", 
+   "fieldname": "show_barcode_field", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Show Barcode Field", 
+   "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, 
@@ -148,12 +219,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -169,13 +243,16 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Auto insert Price List rate if missing", 
+   "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, 
@@ -191,12 +268,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow Negative Stock", 
+   "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,12 +292,15 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -234,13 +317,16 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Automatically Set Serial Nos based on FIFO", 
+   "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, 
@@ -256,12 +342,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Auto Material Request", 
+   "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,12 +366,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raise Material Request when stock reaches re-order level", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -298,12 +390,15 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notify by Email on creation of automatic Material Request", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -319,12 +414,15 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Freeze Stock 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, 
@@ -340,12 +438,15 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Frozen Upto", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -361,12 +462,15 @@
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Freeze Stocks Older Than [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, 
@@ -382,13 +486,16 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Role Allowed to edit frozen stock", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Role", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -406,7 +513,8 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-09-03 00:42:16.833424", 
+ "max_attachments": 0, 
+ "modified": "2016-05-12 12:28:29.374452", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Settings", 
@@ -433,6 +541,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index bd71d46..7c67a65 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -6,11 +6,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import cint
 from frappe.model.document import Document
 
 class StockSettings(Document):
-
 	def validate(self):
 		for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock"]:
 			frappe.db.set_default(key, self.get(key, ""))
@@ -25,4 +23,6 @@
 			self.stock_frozen_upto_days = stock_frozen_limit
 			frappe.msgprint (_("`Freeze Stocks Older Than` should be smaller than %d days.") %stock_frozen_limit)
 
-
+		# show/hide barcode field
+		frappe.make_property_setter({'fieldname': 'barcode', 'property': 'hidden',
+			'value': 0 if self.show_barcode_field else 1})
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 97d4128..a17cc2d 100644
--- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
+++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
@@ -3,10 +3,12 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
+ "beta": 0, 
  "creation": "2013-02-22 01:28:04", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 1, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
@@ -26,6 +29,7 @@
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,6 +45,7 @@
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Conversion Factor", 
@@ -50,6 +55,7 @@
    "oldfieldtype": "Float", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -61,18 +67,21 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.778053", 
+ "modified": "2016-07-11 03:28:09.626948", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "UOM Conversion Detail", 
  "owner": "Administrator", 
  "permissions": [], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/test_records.json b/erpnext/stock/doctype/warehouse/test_records.json
index d5df175..4dd9f6b 100644
--- a/erpnext/stock/doctype/warehouse/test_records.json
+++ b/erpnext/stock/doctype/warehouse/test_records.json
@@ -3,29 +3,68 @@
   "company": "_Test Company",
   "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
-  "warehouse_name": "_Test Warehouse"
- },
- {
-  "company": "_Test Company",
-  "create_account_under": "Fixed Assets - _TC",
-  "doctype": "Warehouse",
-  "warehouse_name": "_Test Warehouse 1"
+  "warehouse_name": "_Test Warehouse",
+  "is_group": 0
  },
  {
   "company": "_Test Company",
   "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
-  "warehouse_name": "_Test Rejected Warehouse"
+  "warehouse_name": "_Test Warehouse",
+  "is_group": 0
+ },
+ {
+  "company": "_Test Company",
+  "create_account_under": "Fixed Assets - _TC",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Warehouse 1",
+  "is_group": 0
+ },
+ {
+  "company": "_Test Company",
+  "create_account_under": "Fixed Assets - _TC",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Warehouse 2",
+  "is_group": 0
+ },
+ {
+  "company": "_Test Company",
+  "create_account_under": "Stock Assets - _TC",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Rejected Warehouse",
+  "is_group": 0
  },
  {
   "company": "_Test Company 1",
   "create_account_under": "Stock Assets - _TC1",
   "doctype": "Warehouse",
-  "warehouse_name": "_Test Warehouse 2"
+  "warehouse_name": "_Test Warehouse 2",
+  "is_group": 0
  },
  {
   "company": "_Test Company",
   "doctype": "Warehouse",
-  "warehouse_name": "_Test Warehouse No Account"
+  "warehouse_name": "_Test Warehouse No Account",
+  "is_group": 0
+ },
+ {
+  "company": "_Test Company",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Warehouse Group",
+  "is_group": 1
+ },
+ {
+  "company": "_Test Company",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Warehouse Group-C1",
+  "is_group": 0,
+  "parent_warehouse": "_Test Warehouse Group - _TC"
+ },
+ {
+  "company": "_Test Company",
+  "doctype": "Warehouse",
+  "warehouse_name": "_Test Warehouse Group-C2",
+  "is_group": 0,
+  "parent_warehouse": "_Test Warehouse Group - _TC"
  }
 ]
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index ca80ca7..2232584 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -4,4 +4,22 @@
 
 
 import frappe
-test_records = frappe.get_test_records('Warehouse')
\ No newline at end of file
+import unittest
+test_records = frappe.get_test_records('Warehouse')
+
+class TestWarehouse(unittest.TestCase):
+	def test_parent_warehouse(self):
+		parent_warehouse = frappe.get_doc("Warehouse", "_Test Warehouse Group - _TC")
+		self.assertEquals(parent_warehouse.is_group, 1)
+		
+	def test_warehouse_hierarchy(self):
+		p_warehouse = frappe.get_doc("Warehouse", "_Test Warehouse Group - _TC")
+		
+		child_warehouses =  frappe.db.sql("""select name, is_group, parent_warehouse from `tabWarehouse` wh
+			where wh.lft > %s and wh.rgt < %s""", (p_warehouse.lft, p_warehouse.rgt), as_dict=1)
+		
+		for child_warehouse in child_warehouses:
+			self.assertEquals(p_warehouse.name, child_warehouse.parent_warehouse)
+			self.assertEquals(child_warehouse.is_group, 0)
+		
+		
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 22396b7..8b1b679 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -1,9 +1,44 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.cscript.refresh = function(doc) {
-	cur_frm.toggle_display('warehouse_name', doc.__islocal);
-}
+
+frappe.ui.form.on("Warehouse", {
+	refresh: function(frm) {
+		frm.toggle_display('warehouse_name', frm.doc.__islocal);
+
+		frm.add_custom_button(__("Stock Balance"), function() {
+			frappe.set_route("query-report", "Stock Balance", {"warehouse": frm.doc.name});
+		});
+
+		if (cint(frm.doc.is_group) == 1) {
+			frm.add_custom_button(__('Group to Non-Group'),
+				function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+		} else if (cint(frm.doc.is_group) == 0) {
+			if(frm.doc.__onload && frm.doc.__onload.account) {
+				frm.add_custom_button(__("General Ledger"), function() {
+					frappe.route_options = {
+						"account": frm.doc.__onload.account,
+						"company": frm.doc.company
+					}
+					frappe.set_route("query-report", "General Ledger");
+				});
+			}
+
+			frm.add_custom_button(__('Non-Group to Group'),
+				function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+		}
+		
+		cur_frm.toggle_enable(['is_group', 'company'], false);
+
+		frm.fields_dict['parent_warehouse'].get_query = function(doc) {
+			return {
+				filters: {
+					"is_group": 1,
+				}
+			}
+		}
+	}
+});
 
 cur_frm.set_query("create_account_under", function() {
 	return {
@@ -13,3 +48,17 @@
 		}
 	}
 })
+
+function convert_to_group_or_ledger(frm){
+	frappe.call({
+		method:"erpnext.stock.doctype.warehouse.warehouse.convert_to_group_or_ledger",
+		args: {
+			docname: frm.doc.name,
+			is_group: frm.doc.is_group
+		},
+		callback: function(){
+			frm.refresh();
+		}
+		
+	})
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index e2867eb..192afbb 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -2,12 +2,14 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
+ "beta": 0, 
  "creation": "2013-03-07 18:50:32", 
  "custom": 0, 
  "description": "A logical Warehouse against which stock entries are made.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Detail", 
@@ -25,6 +28,34 @@
    "oldfieldtype": "Section Break", 
    "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, 
+   "default": "0", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -40,6 +71,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Name", 
@@ -49,6 +81,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -64,8 +97,9 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -74,6 +108,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -85,12 +120,61 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Disabled", 
+   "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": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "depends_on": "eval:sys_defaults.auto_accounting_for_stock", 
    "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.", 
    "fieldname": "create_account_under", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Account", 
@@ -99,6 +183,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -109,34 +194,13 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "disabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Disabled", 
-   "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": "For Reference Only.", 
+   "collapsible": 1, 
+   "description": "", 
    "fieldname": "warehouse_contact_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Contact Info", 
@@ -144,6 +208,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -159,6 +224,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Id", 
@@ -168,6 +234,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -183,6 +250,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Phone No", 
@@ -193,6 +261,7 @@
    "options": "Phone", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -208,6 +277,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
@@ -218,6 +288,7 @@
    "options": "Phone", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -233,6 +304,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -240,6 +312,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -255,6 +328,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 1", 
@@ -264,6 +338,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -279,6 +354,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 2", 
@@ -288,6 +364,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,6 +380,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "City", 
@@ -312,6 +390,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -327,6 +406,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "State", 
@@ -336,6 +416,7 @@
    "oldfieldtype": "Select", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,9 +429,10 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "pin", 
-   "fieldtype": "Int", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "PIN", 
@@ -360,25 +442,154 @@
    "oldfieldtype": "Int", 
    "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": 1, 
+   "fieldname": "tree_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Tree 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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "parent_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Parent 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": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "lft", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "rgt", 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Old Parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "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
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-building", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:30:00.080548", 
+ "modified": "2016-07-08 06:00:36.113988", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 
@@ -505,6 +716,10 @@
    "write": 0
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "title_field": "warehouse_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 610c7b8..938e73c 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -5,14 +5,26 @@
 import frappe
 from frappe.utils import cint, validate_email_add
 from frappe import throw, msgprint, _
+from frappe.utils.nestedset import NestedSet
 
-from frappe.model.document import Document
+class Warehouse(NestedSet):
+	nsm_parent_field = 'parent_warehouse'
 
-class Warehouse(Document):
 	def autoname(self):
-		suffix = " - " + frappe.db.get_value("Company", self.company, "abbr")
-		if not self.warehouse_name.endswith(suffix):
-			self.name = self.warehouse_name + suffix
+		if self.company:
+			suffix = " - " + frappe.db.get_value("Company", self.company, "abbr")
+			if not self.warehouse_name.endswith(suffix):
+				self.name = self.warehouse_name + suffix
+		else:
+			self.name = self.warehouse_name
+
+	def onload(self):
+		'''load account name for General Ledger Report'''
+		account = frappe.db.get_value("Account", {
+			"account_type": "Stock", "company": self.company, "warehouse": self.name, "is_group": 0})
+
+		if account:
+			self.set_onload('account', account)
 
 	def validate(self):
 		if self.email_id:
@@ -22,12 +34,13 @@
 
 	def update_parent_account(self):
 		if not getattr(self, "__islocal", None) \
+			and cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) \
 			and (self.create_account_under != frappe.db.get_value("Warehouse", self.name, "create_account_under")):
 
 				self.validate_parent_account()
 
 				warehouse_account = frappe.db.get_value("Account",
-					{"account_type": "Warehouse", "company": self.company, "warehouse": self.name},
+					{"account_type": "Stock", "company": self.company, "warehouse": self.name, "is_group": 0},
 					["name", "parent_account"])
 
 				if warehouse_account and warehouse_account[1] != self.create_account_under:
@@ -37,43 +50,55 @@
 
 	def on_update(self):
 		self.create_account_head()
+		self.update_nsm_model()
 
 	def create_account_head(self):
 		if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
-			if not self.get_account(self.name):
+			if not self.get_account():
 				if self.get("__islocal") or not frappe.db.get_value(
 						"Stock Ledger Entry", {"warehouse": self.name}):
+
 					self.validate_parent_account()
 					ac_doc = frappe.get_doc({
 						"doctype": "Account",
 						'account_name': self.warehouse_name,
-						'parent_account': self.create_account_under,
-						'is_group':0,
+						'parent_account': self.parent_warehouse if self.parent_warehouse \
+							else self.create_account_under,
+						'is_group': self.is_group,
 						'company':self.company,
-						"account_type": "Warehouse",
+						"account_type": "Stock",
 						"warehouse": self.name,
 						"freeze_account": "No"
 					})
 					ac_doc.flags.ignore_permissions = True
-					ac_doc.insert()
-					msgprint(_("Account head {0} created").format(ac_doc.name))
+
+					try:
+						ac_doc.insert()
+						msgprint(_("Account head {0} created").format(ac_doc.name))
+
+					except frappe.DuplicateEntryError, e:
+						if not (e.args and e.args[0]=='Account'):
+							# if this is not due to creation of Account
+							raise
 
 	def validate_parent_account(self):
 		if not self.company:
 			frappe.throw(_("Warehouse {0}: Company is mandatory").format(self.name))
 
 		if not self.create_account_under:
-			parent_account = frappe.db.get_value("Account",
-				{"account_name": "Stock Assets", "company": self.company})
+			parent_account = frappe.db.sql("""select name from tabAccount
+				where account_type='Stock' and company=%s and is_group=1
+				and (warehouse is null or warehouse = '')""", self.company)
 
 			if parent_account:
-				self.create_account_under = parent_account
-			else:
-				frappe.throw(_("Please enter parent account group for warehouse {0}").format(self.name))
+				frappe.db.set_value("Warehouse", self.name, "create_account_under", parent_account[0][0])
+				self.create_account_under = parent_account[0][0]
 		elif frappe.db.get_value("Account", self.create_account_under, "company") != self.company:
 			frappe.throw(_("Warehouse {0}: Parent account {1} does not bolong to the company {2}")
 				.format(self.name, self.create_account_under, self.company))
 
+	def update_nsm_model(self):
+		frappe.utils.nestedset.update_nsm(self)
 
 	def on_trash(self):
 		# delete bin
@@ -90,10 +115,22 @@
 		if warehouse_account:
 			frappe.delete_doc("Account", warehouse_account)
 
-		if frappe.db.sql("""select name from `tabStock Ledger Entry`
-				where warehouse = %s""", self.name):
+		if self.check_if_sle_exists():
 			throw(_("Warehouse can not be deleted as stock ledger entry exists for this warehouse."))
 
+		if self.check_if_child_exists():
+			throw(_("Child warehouse exists for this warehouse. You can not delete this warehouse."))
+
+		self.update_nsm_model()
+
+	def check_if_sle_exists(self):
+		return frappe.db.sql("""select name from `tabStock Ledger Entry`
+			where warehouse = %s""", self.name)
+
+	def check_if_child_exists(self):
+		return frappe.db.sql("""select name from `tabWarehouse`
+			where parent_warehouse = %s""", self.name)
+
 	def before_rename(self, olddn, newdn, merge=False):
 		# Add company abbr if not provided
 		from erpnext.setup.doctype.company.company import get_name_with_abbr
@@ -131,9 +168,19 @@
 		from erpnext.setup.doctype.company.company import get_name_with_abbr
 		return get_name_with_abbr(dn, self.company)
 
-	def get_account(self, warehouse):
-		return frappe.db.get_value("Account", {"account_type": "Warehouse",
-			"warehouse": warehouse, "company": self.company})
+	def get_account(self, warehouse=None):
+		filters = {
+			"account_type": "Stock",
+			"company": self.company,
+			"is_group": self.is_group
+		}
+
+		if warehouse:
+			filters.update({"warehouse": warehouse})
+		else:
+			filters.update({"account_name": self.warehouse_name})
+
+		return frappe.db.get_value("Account", filters)
 
 	def after_rename(self, olddn, newdn, merge=False):
 		if merge:
@@ -153,3 +200,93 @@
 
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
 		frappe.db.auto_commit_on_many_writes = 0
+
+	def convert_to_group_or_ledger(self):
+		if self.is_group:
+			self.convert_to_ledger()
+		else:
+			self.convert_to_group()
+
+	def convert_to_ledger(self):
+		if self.check_if_child_exists():
+			frappe.throw(_("Warehouses with child nodes cannot be converted to ledger"))
+		elif self.check_if_sle_exists():
+			throw(_("Warehouses with existing transaction can not be converted to ledger."))
+		else:
+			account_name = self.get_account()
+			if account_name:
+				doc = frappe.get_doc("Account", account_name)
+				doc.warehouse = self.name
+				doc.convert_group_to_ledger()
+
+			self.is_group = 0
+			self.save()
+			return 1
+
+	def convert_to_group(self):
+		if self.check_if_sle_exists():
+			throw(_("Warehouses with existing transaction can not be converted to group."))
+		else:
+			account_name = self.get_account(self.name)
+			if account_name:
+				doc = frappe.get_doc("Account", account_name)
+				doc.flags.exclude_account_type_check = True
+				doc.convert_ledger_to_group()
+
+			self.is_group = 1
+			self.save()
+			return 1
+
+@frappe.whitelist()
+def get_children():
+	from erpnext.stock.utils import get_stock_value_on
+	doctype = frappe.local.form_dict.get('doctype')
+	company = frappe.local.form_dict.get('company')
+
+	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
+	parent = frappe.form_dict.get("parent") or ""
+
+	if parent == "Warehouses":
+		parent = ""
+
+	warehouses = frappe.db.sql("""select name as value,
+		is_group as expandable
+		from `tab{doctype}`
+		where docstatus < 2
+		and ifnull(`{parent_field}`,'') = %s
+		and (`company` = %s or company is null or company = '')
+		order by name""".format(doctype=frappe.db.escape(doctype),
+		parent_field=frappe.db.escape(parent_field)), (parent, company), as_dict=1)
+
+	# return warehouses
+	for wh in warehouses:
+		wh["balance"] = get_stock_value_on(warehouse=wh.value)
+	return warehouses
+
+@frappe.whitelist()
+def add_node():
+	doctype = frappe.form_dict.get('doctype')
+	company = frappe.form_dict.get('company')
+	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
+	name_field = doctype.lower().replace(' ', '_') + '_name'
+
+	doc = frappe.new_doc(doctype)
+
+	parent = frappe.form_dict['parent']
+
+	if cint(frappe.form_dict['is_root']):
+		parent = None
+
+	doc.update({
+		name_field: frappe.form_dict['name_field'],
+		parent_field: parent,
+		"is_group": frappe.form_dict['is_group'],
+		"company": company
+	})
+
+	doc.save()
+
+@frappe.whitelist()
+def convert_to_group_or_ledger():
+	args = frappe.form_dict
+	return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
diff --git a/erpnext/stock/doctype/warehouse/warehouse_tree.js b/erpnext/stock/doctype/warehouse/warehouse_tree.js
new file mode 100644
index 0000000..0baed4d
--- /dev/null
+++ b/erpnext/stock/doctype/warehouse/warehouse_tree.js
@@ -0,0 +1,26 @@
+frappe.treeview_settings['Warehouse'] = {
+	get_tree_nodes: "erpnext.stock.doctype.warehouse.warehouse.get_children",
+	add_tree_node: "erpnext.stock.doctype.warehouse.warehouse.add_node",
+	get_tree_root: false,
+	root_label: "Warehouses",
+	filters: [{
+		fieldname: "company",
+		fieldtype:"Select",
+		options: $.map(locals[':Company'], function(c) { return c.name; }).sort(),
+		label: __("Company"),
+		default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
+	}],
+	fields:[
+		{fieldtype:'Data', fieldname: 'name_field',
+			label:__('New Warehouse Name'), reqd:true},
+		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
+			description: __("Child nodes can be only created under 'Group' type nodes")}
+	],
+	onrender: function(node) {
+		if (node.data && node.data.balance!==undefined) {
+			$('<span class="balance-area pull-right text-muted small">'
+			+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+			+ '</span>').insertBefore(node.$ul);
+		}
+	}
+}
\ No newline at end of file
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 7808e50..1e3bd8a 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -48,7 +48,7 @@
 	if frappe.db.exists("Product Bundle", args.item_code):
 		valuation_rate = 0.0
 		bundled_items = frappe.get_doc("Product Bundle", args.item_code)
-		
+
 		for bundle_item in bundled_items.items:
 			valuation_rate += \
 				flt(get_valuation_rate(bundle_item.item_code, out.get("warehouse")).get("valuation_rate") \
@@ -83,7 +83,7 @@
 
 	if args.get("is_subcontracted") == "Yes":
 		out.bom = get_default_bom(args.item_code)
-		
+
 	get_gross_profit(out)
 
 	return out
@@ -103,7 +103,6 @@
 		args.item_code = get_item_code(serial_no=args.serial_no)
 
 	set_transaction_type(args)
-
 	return args
 
 @frappe.whitelist()
@@ -126,19 +125,10 @@
 	from erpnext.stock.doctype.item.item import validate_end_of_life
 	validate_end_of_life(item.name, item.end_of_life, item.disabled)
 
-	if args.transaction_type=="selling":
-		# validate if sales item or service item
-		if item.is_sales_item != 1:
-			throw(_("Item {0} must be a Sales Item").format(item.name))
-
-		if cint(item.has_variants):
-			throw(_("Item {0} is a template, please select one of its variants").format(item.name))
+	if args.transaction_type=="selling" and cint(item.has_variants):
+		throw(_("Item {0} is a template, please select one of its variants").format(item.name))
 
 	elif args.transaction_type=="buying" and args.doctype != "Material Request":
-		# validate if purchase item or subcontracted item
-		if item.is_purchase_item != 1:
-			throw(_("Item {0} must be a Purchase Item").format(item.name))
-
 		if args.get("is_subcontracted") == "Yes" and item.is_sub_contracted_item != 1:
 			throw(_("Item {0} must be a Sub-contracted Item").format(item.name))
 
@@ -153,7 +143,7 @@
 	user_default_warehouse_list = get_user_default_as_list('Warehouse')
 	user_default_warehouse = user_default_warehouse_list[0] \
 		if len(user_default_warehouse_list)==1 else ""
-	
+
 	warehouse = user_default_warehouse or args.warehouse or item.default_warehouse
 
 	out = frappe._dict({
@@ -183,12 +173,13 @@
 		"net_amount": 0.0,
 		"discount_percentage": 0.0,
 		"supplier": item.default_supplier,
-		"delivered_by_supplier": item.delivered_by_supplier
+		"delivered_by_supplier": item.delivered_by_supplier,
+		"is_fixed_asset": item.is_fixed_asset
 	})
 
 	# if default specified in item is for another company, fetch from company
-	for d in [["Account", "income_account", "default_income_account"], 
-		["Account", "expense_account", "default_expense_account"], 
+	for d in [["Account", "income_account", "default_income_account"],
+		["Account", "expense_account", "default_expense_account"],
 		["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]:
 			company = frappe.db.get_value(d[0], out.get(d[1]), "company")
 			if not out[d[1]] or (company and args.company != company):
@@ -247,10 +238,9 @@
 	if frappe.db.get_value("Price List", args.price_list, "currency") == args.currency \
 		and cint(frappe.db.get_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing")):
 		if frappe.has_permission("Item Price", "write"):
-
 			price_list_rate = args.rate / args.conversion_factor \
 				if args.get("conversion_factor") else args.rate
-
+		
 			item_price = frappe.get_doc({
 				"doctype": "Item Price",
 				"price_list": args.price_list,
@@ -258,9 +248,19 @@
 				"currency": args.currency,
 				"price_list_rate": price_list_rate
 			})
-			item_price.insert()
-			frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
-				args.price_list))
+			
+			name = frappe.db.get_value('Item Price', {'item_code': args.item_code, 'price_list': args.price_list, 'currency': args.currency}, 'name')
+			
+			if name:
+				item_price = frappe.get_doc('Item Price', name)
+				item_price.price_list_rate = price_list_rate
+				item_price.save()	
+				frappe.msgprint(_("Item Price updated for {0} in Price List {1}").format(args.item_code,
+					args.price_list))
+			else:	
+				item_price.insert()
+				frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
+					args.price_list))
 
 def get_price_list_rate_for(price_list, item_code):
 	return frappe.db.get_value("Item Price",
@@ -375,7 +375,7 @@
 def get_bin_details(item_code, warehouse):
 	return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
 		["projected_qty", "actual_qty"], as_dict=True) \
-		or {"projected_qty": 0, "actual_qty": 0, "valuation_rate": 0}
+		or {"projected_qty": 0, "actual_qty": 0}
 
 @frappe.whitelist()
 def get_batch_qty(batch_no,warehouse,item_code):
@@ -433,7 +433,6 @@
 					# update the value
 					if fieldname in item and fieldname not in ("name", "doctype"):
 						item[fieldname] = children[i][fieldname]
-
 		return args
 	else:
 		return {
@@ -484,31 +483,31 @@
 			return bom
 		else:
 			frappe.throw(_("No default BOM exists for Item {0}").format(item_code))
-			
+
 def get_valuation_rate(item_code, warehouse=None):
 	item = frappe.get_doc("Item", item_code)
 	if item.is_stock_item:
 		if not warehouse:
 			warehouse = item.default_warehouse
-			
-		return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, 
+
+		return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
 			["valuation_rate"], as_dict=True) or {"valuation_rate": 0}
-			
+
 	elif not item.is_stock_item:
-		valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty) 
-			from `tabPurchase Invoice Item` 
+		valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty)
+			from `tabPurchase Invoice Item`
 			where item_code = %s and docstatus=1""", item_code)
-		
+
 		if valuation_rate:
 			return {"valuation_rate": valuation_rate[0][0] or 0.0}
 	else:
 		return {"valuation_rate": 0.0}
-		
+
 def get_gross_profit(out):
 	if out.valuation_rate:
 		out.update({
 			"gross_profit": ((out.base_rate - out.valuation_rate) * out.qty)
 		})
-	
+
 	return out
-	
\ No newline at end of file
+
diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.js b/erpnext/stock/page/stock_analytics/stock_analytics.js
index bd2d9f6..6deeb7a 100644
--- a/erpnext/stock/page/stock_analytics/stock_analytics.js
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.js
@@ -1,19 +1,16 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-
 frappe.pages['stock-analytics'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Stock Analytics'),
 		single_column: true
 	});
-
-	new erpnext.StockAnalytics(wrapper);
-
-
-	frappe.breadcrumbs.add("Stock")
-
+	
+	frappe.require(["assets/erpnext/js/stock_grid_report.js",
+		"assets/erpnext/js/stock_analytics.js"], function() {
+		new erpnext.StockAnalytics(wrapper);
+		frappe.breadcrumbs.add("Stock")
+	});
 };
-
-frappe.require("assets/erpnext/js/stock_analytics.js");
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/stock/page/stock_balance/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/stock/page/stock_balance/__init__.py
diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js
new file mode 100644
index 0000000..9494045
--- /dev/null
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -0,0 +1,84 @@
+frappe.pages['stock-balance'].on_page_load = function(wrapper) {
+	var page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: 'Stock Summary',
+		single_column: true
+	});
+	page.start = 0;
+
+	page.warehouse_field = page.add_field({
+		fieldname: 'warehouse',
+		label: __('Warehouse'),
+		fieldtype:'Link',
+		options:'Warehouse',
+		change: function() {
+			page.item_dashboard.start = 0;
+			page.item_dashboard.refresh();
+		}
+	});
+
+	page.item_field = page.add_field({
+		fieldname: 'item_code',
+		label: __('Item'),
+		fieldtype:'Link',
+		options:'Item',
+		change: function() {
+			page.item_dashboard.start = 0;
+			page.item_dashboard.refresh();
+		}
+	});
+
+	page.sort_selector = new frappe.ui.SortSelector({
+		parent: page.wrapper.find('.page-form'),
+		args: {
+			sort_by: 'projected_qty',
+			sort_order: 'asc',
+			options: [
+				{fieldname: 'projected_qty', label: __('Projected qty')},
+				{fieldname: 'reserved_qty', label: __('Reserved for sale')},
+				{fieldname: 'reserved_qty_for_production', label: __('Reserved for manufacturing')},
+				{fieldname: 'actual_qty', label: __('Acutal qty in stock')},
+			]
+		},
+		change: function(sort_by, sort_order) {
+			page.item_dashboard.sort_by = sort_by;
+			page.item_dashboard.sort_order = sort_order;
+			page.item_dashboard.start = 0;
+			page.item_dashboard.refresh();
+		}
+	});
+
+	page.sort_selector.wrapper.css({'margin-right': '15px', 'margin-top': '4px'});
+
+	frappe.require('assets/js/item-dashboard.min.js', function() {
+		page.item_dashboard = new erpnext.stock.ItemDashboard({
+			parent: page.main,
+		})
+
+		page.item_dashboard.before_refresh = function() {
+			this.item_code = page.item_field.get_value();
+			this.warehouse = page.warehouse_field.get_value();
+		}
+
+		page.item_dashboard.refresh();
+
+		// item click
+		var setup_click = function(doctype) {
+			page.main.on('click', 'a[data-type="'+ doctype.toLowerCase() +'"]', function() {
+				var name = $(this).attr('data-name');
+				var field = page[doctype.toLowerCase() + '_field'];
+				if(field.get_value()===name) {
+					frappe.set_route('Form', doctype, name)
+				} else {
+					field.set_input(name);
+					page.item_dashboard.refresh();
+				}
+			});
+		}
+
+		setup_click('Item');
+		setup_click('Warehouse');
+	});
+
+
+}
\ No newline at end of file
diff --git a/erpnext/stock/page/stock_balance/stock_balance.json b/erpnext/stock/page/stock_balance/stock_balance.json
new file mode 100644
index 0000000..05039da
--- /dev/null
+++ b/erpnext/stock/page/stock_balance/stock_balance.json
@@ -0,0 +1,22 @@
+{
+ "content": null, 
+ "creation": "2016-04-21 04:59:00.141546", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "idx": 0, 
+ "modified": "2016-07-14 06:39:09.096256", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "stock-balance", 
+ "owner": "Administrator", 
+ "page_name": "stock-balance", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }
+ ], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "title": "Stock Summary"
+}
\ No newline at end of file
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index c637a12..ad810a9 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -2,6 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
+import erpnext
 from frappe.utils import flt, nowdate, add_days, cint
 from frappe import _
 
@@ -18,12 +19,11 @@
 	material_requests = {"Purchase": {}, "Transfer": {}}
 	warehouse_company = frappe._dict(frappe.db.sql("""select name, company from `tabWarehouse`
 		where disabled=0"""))
-	default_company = (frappe.defaults.get_defaults().get("company") or
+	default_company = (erpnext.get_default_company() or
 		frappe.db.sql("""select name from tabCompany limit 1""")[0][0])
 
 	items_to_consider = frappe.db.sql_list("""select name from `tabItem` item
 		where is_stock_item=1 and has_variants=0
-			and (is_purchase_item=1 or is_sub_contracted_item=1)
 			and disabled=0
 			and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %(today)s)
 			and (exists (select name from `tabItem Reorder` ir where ir.parent=item.name)
@@ -37,7 +37,7 @@
 
 	item_warehouse_projected_qty = get_item_warehouse_projected_qty(items_to_consider)
 
-	def add_to_material_request(item_code, warehouse, reorder_level, reorder_qty, material_request_type):
+	def add_to_material_request(item_code, warehouse, reorder_level, reorder_qty, material_request_type, warehouse_group=None):
 		if warehouse not in warehouse_company:
 			# a disabled warehouse
 			return
@@ -46,7 +46,10 @@
 		reorder_qty = flt(reorder_qty)
 
 		# projected_qty will be 0 if Bin does not exist
-		projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
+		if warehouse_group:
+			projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse_group))
+		else:
+			projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
 
 		if (reorder_level or reorder_qty) and projected_qty < reorder_level:
 			deficiency = reorder_level - projected_qty
@@ -70,7 +73,7 @@
 		if item.get("reorder_levels"):
 			for d in item.get("reorder_levels"):
 				add_to_material_request(item_code, d.warehouse, d.warehouse_reorder_level,
-					d.warehouse_reorder_qty, d.material_request_type)
+					d.warehouse_reorder_qty, d.material_request_type, warehouse_group=d.warehouse_group)
 
 	if material_requests:
 		return create_material_request(material_requests)
@@ -82,9 +85,17 @@
 		from tabBin where item_code in ({0})
 			and (warehouse != "" and warehouse is not null)"""\
 		.format(", ".join(["%s"] * len(items_to_consider))), items_to_consider):
-
+		
 		item_warehouse_projected_qty.setdefault(item_code, {})[warehouse] = flt(projected_qty)
-
+		
+		warehouse_doc = frappe.get_doc("Warehouse", warehouse)
+		
+		if warehouse_doc.parent_warehouse:
+			if not item_warehouse_projected_qty.get(item_code, {}).get(warehouse_doc.parent_warehouse):
+				item_warehouse_projected_qty.setdefault(item_code, {})[warehouse_doc.parent_warehouse] = flt(projected_qty)
+			else:
+				item_warehouse_projected_qty[item_code][warehouse_doc.parent_warehouse] += flt(projected_qty)
+				
 	return item_warehouse_projected_qty
 
 def create_material_request(material_requests):
diff --git a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
index 45955fb..0e12907 100644
--- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
@@ -1,8 +1,9 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/sales_trends_filters.js");
+frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
+	frappe.query_reports["Delivery Note Trends"] = {
+		filters: get_filters()
+	}
+});
 
-frappe.query_reports["Delivery Note Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
diff --git a/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json b/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
index 92072a8..616eae1 100644
--- a/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
+++ b/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
@@ -7,13 +7,13 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2016-04-01 08:27:14.436178", 
+ "modified": "2016-06-29 17:39:54.122679", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Items To Be Requested", 
  "owner": "Administrator", 
- "query": "SELECT\n    tabBin.item_code as \"Item:Link/Item:120\",\n    tabBin.warehouse as \"Warehouse:Link/Warehouse:120\",\n    tabBin.actual_qty as \"Actual:Float:90\",\n    tabBin.indented_qty as \"Requested:Float:90\",\n    tabBin.reserved_qty as \"Reserved:Float:90\",\n    tabBin.ordered_qty as \"Ordered:Float:90\",\n    tabBin.projected_qty as \"Projected:Float:90\"\nFROM\n    tabBin, tabItem\nWHERE\n    tabBin.item_code = tabItem.name\n    AND tabItem.is_purchase_item = 1\n    AND tabBin.projected_qty < 0\nORDER BY\n    tabBin.projected_qty ASC", 
- "ref_doctype": "Item", 
+ "query": "SELECT\n    tabBin.item_code as \"Item:Link/Item:120\",\n    tabBin.warehouse as \"Warehouse:Link/Warehouse:120\",\n    tabBin.actual_qty as \"Actual:Float:90\",\n    tabBin.indented_qty as \"Requested:Float:90\",\n    tabBin.reserved_qty as \"Reserved:Float:90\",\n    tabBin.ordered_qty as \"Ordered:Float:90\",\n    tabBin.projected_qty as \"Projected:Float:90\"\nFROM\n    tabBin, tabItem\nWHERE\n    tabBin.item_code = tabItem.name\n   AND tabBin.projected_qty < 0\nORDER BY\n    tabBin.projected_qty ASC", 
+ "ref_doctype": "Material Request", 
  "report_name": "Items To Be Requested", 
  "report_type": "Query Report"
 }
\ No newline at end of file
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 eb202b1..fdf4442 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
@@ -27,9 +27,9 @@
 
 		total_outgoing = consumed_item_map.get(item.name, 0)+delivered_item_map.get(item.name,0)
 		avg_daily_outgoing = flt(total_outgoing/diff, float_preceision)
-		reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.min_order_qty)
+		reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
 
-		data.append([item.name, item.item_name, item.description, item.min_order_qty, item.lead_time_days,
+		data.append([item.name, item.item_name, item.description, item.safety_stock, item.lead_time_days,
 			consumed_item_map.get(item.name, 0), delivered_item_map.get(item.name,0), total_outgoing,
 			avg_daily_outgoing, reorder_level])
 
@@ -38,13 +38,13 @@
 def get_columns():
 	return[
 			_("Item") + ":Link/Item:120", _("Item Name") + ":Data:120", _("Description") + "::160",
-			_("Minimum Inventory Level") + ":Float:160", _("Lead Time Days") + ":Float:120", _("Consumed") + ":Float:120",
+			_("Safety Stock") + ":Float:160", _("Lead Time Days") + ":Float:120", _("Consumed") + ":Float:120",
 			_("Delivered") + ":Float:120", _("Total Outgoing") + ":Float:120", _("Avg Daily Outgoing") + ":Float:160",
 			_("Reorder Level") + ":Float:120"
 	]
 
 def get_item_info():
-	return frappe.db.sql("""select name, item_name, description, min_order_qty,
+	return frappe.db.sql("""select name, item_name, description, safety_stock,
 		lead_time_days	from tabItem""", as_dict=1)
 
 def get_consumed_items(condition):
diff --git a/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
index 55583a9..8615684 100644
--- a/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
+++ b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
@@ -1,17 +1,19 @@
 {
- "apply_user_permissions": 1, 
- "creation": "2013-08-09 12:20:58", 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2015-03-30 05:46:11.917037", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Material Requests for which Supplier Quotations are not created", 
- "owner": "Administrator", 
- "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n    mr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand not exists(select name from `tabSupplier Quotation Item` where prevdoc_docname=mr.name)\norder by mr.transaction_date asc", 
- "ref_doctype": "Material Request", 
- "report_name": "Material Requests for which Supplier Quotations are not created", 
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2013-08-09 12:20:58",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "modified": "2016-07-08 05:43:10.236943",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Material Requests for which Supplier Quotations are not created",
+ "owner": "Administrator",
+ "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n    mr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand not exists(select name from `tabSupplier Quotation Item` where material_request=mr.name)\norder by mr.transaction_date asc",
+ "ref_doctype": "Material Request",
+ "report_name": "Material Requests for which Supplier Quotations are not created",
  "report_type": "Query Report"
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
index 19a58ef..d94b49e 100644
--- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
@@ -1,8 +1,9 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.require("assets/erpnext/js/purchase_trends_filters.js");
+frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
+	frappe.query_reports["Purchase Receipt Trends"] = {
+		filters: get_filters()
+	}
+});
 
-frappe.query_reports["Purchase Receipt Trends"] = {
-	filters: get_filters()
- }
\ No newline at end of file
diff --git a/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json b/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
index d4b6a40..a361ffb 100644
--- a/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
+++ b/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
@@ -2,16 +2,17 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-13 16:23:05", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:47:31.113927", 
+ "modified": "2016-06-08 16:40:17.254701", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Requested Items To Be Transferred", 
  "owner": "Administrator", 
- "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.ordered_qty as \"Transferred Qty:Float:100\", \n\t(mr_item.qty - ifnull(mr_item.ordered_qty, 0)) as \"Qty to Transfer:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Transfer\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand ifnull(mr_item.ordered_qty, 0) < ifnull(mr_item.qty, 0)\norder by mr.transaction_date asc", 
+ "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.ordered_qty as \"Transferred Qty:Float:100\", \n\t(mr_item.qty - ifnull(mr_item.ordered_qty, 0)) as \"Qty to Transfer:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type in (\"Material Transfer\", \"Material Issue\")\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand ifnull(mr_item.ordered_qty, 0) < ifnull(mr_item.qty, 0)\norder by mr.transaction_date asc", 
  "ref_doctype": "Stock Entry", 
  "report_name": "Requested Items To Be Transferred", 
  "report_type": "Query Report"
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 43b6b9a..2777d3d 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -8,7 +8,7 @@
 
 def execute(filters=None):
 	if not filters: filters = {}
-	
+
 	validate_filters(filters)
 
 	columns = get_columns()
@@ -71,7 +71,9 @@
 		conditions += " and item_code = '%s'" % frappe.db.escape(filters.get("item_code"), percent=False)
 
 	if filters.get("warehouse"):
-		conditions += " and warehouse = '%s'" % frappe.db.escape(filters.get("warehouse"), percent=False)
+		lft, rgt = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"])
+		conditions += " and exists (select name from `tabWarehouse` wh \
+			where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(lft, rgt)
 
 	return conditions
 
@@ -79,7 +81,7 @@
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select item_code, warehouse, posting_date, actual_qty, valuation_rate,
 			company, voucher_type, qty_after_transaction, stock_value_difference
-		from `tabStock Ledger Entry` force index (posting_sort_index)
+		from `tabStock Ledger Entry` sle force index (posting_sort_index)
 		where docstatus < 2 %s order by posting_date, posting_time, name""" %
 		conditions, as_dict=1)
 
@@ -145,4 +147,3 @@
 		sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0])
 		if sle_count > 500000:
 			frappe.throw(_("Please set filter based on Item or Warehouse"))
-	
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index ac4cbbd..b2e4670 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -41,7 +41,7 @@
 	return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
 			item_code, warehouse, actual_qty, qty_after_transaction, incoming_rate, valuation_rate,
 			stock_value, voucher_type, voucher_no, batch_no, serial_no, company
-		from `tabStock Ledger Entry`
+		from `tabStock Ledger Entry` sle
 		where company = %(company)s and
 			posting_date between %(from_date)s and %(to_date)s
 			{sle_conditions}
@@ -73,7 +73,7 @@
 		conditions.append("""item_code in (select name from tabItem
 			{item_conditions})""".format(item_conditions=item_conditions))
 	if filters.get("warehouse"):
-		conditions.append("warehouse=%(warehouse)s")
+		conditions.append(get_warehouse_condition(filters.get("warehouse")))
 	if filters.get("voucher_no"):
 		conditions.append("voucher_no=%(voucher_no)s")
 
@@ -86,7 +86,7 @@
 	from erpnext.stock.stock_ledger import get_previous_sle
 	last_entry = get_previous_sle({
 		"item_code": filters.item_code,
-		"warehouse": filters.warehouse,
+		"warehouse": get_warehouse_condition(filters.warehouse),
 		"posting_date": filters.from_date,
 		"posting_time": "00:00:00"
 	})
@@ -96,4 +96,11 @@
 	for i, v in ((9, 'qty_after_transaction'), (11, 'valuation_rate'), (12, 'stock_value')):
 			row[i] = last_entry.get(v, 0)
 		
-	return row
\ No newline at end of file
+	return row
+	
+def get_warehouse_condition(warehouse):
+	lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
+	
+	return " exists (select name from `tabWarehouse` wh \
+		where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(lft, rgt)
+	
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
index b21b402..f90fb49 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -14,7 +14,8 @@
 	return [_("Item Code") + ":Link/Item:140", _("Item Name") + "::100", _("Description") + "::200",
 		_("Item Group") + ":Link/Item Group:100", _("Brand") + ":Link/Brand:100", _("Warehouse") + ":Link/Warehouse:120",
 		_("UOM") + ":Link/UOM:100", _("Actual Qty") + ":Float:100", _("Planned Qty") + ":Float:100",
-		_("Requested Qty") + ":Float:110", _("Ordered Qty") + ":Float:100", _("Reserved Qty") + ":Float:100",
+		_("Requested Qty") + ":Float:110", _("Ordered Qty") + ":Float:100",
+		_("Reserved Qty") + ":Float:100", _("Reserved Qty for Production") + ":Float:100",
 		_("Projected Qty") + ":Float:100", _("Reorder Level") + ":Float:100", _("Reorder Qty") + ":Float:100",
 		_("Shortage Qty") + ":Float:100"]
 
@@ -51,20 +52,26 @@
 
 		data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
 			item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty,
-			bin.reserved_qty, bin.projected_qty, re_order_level, re_order_qty, shortage_qty])
+			bin.reserved_qty, bin.reserved_qty_for_production, bin.projected_qty, re_order_level, re_order_qty, shortage_qty])
 
 	return data
 
 def get_bin_list(filters):
-	bin_filters = frappe._dict()
+	conditions = []
+	
 	if filters.item_code:
-		bin_filters.item_code = filters.item_code
+		conditions.append("item_code = '%s' "%filters.item_code)
+		
 	if filters.warehouse:
-		bin_filters.warehouse = filters.warehouse
+		lft, rgt = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"])
+	
+		conditions.append(" exists (select name from `tabWarehouse` wh \
+			where wh.lft >= %s and wh.rgt <= %s and bin.warehouse = wh.name)"%(lft, rgt))
 
-	bin_list = frappe.get_all("Bin", fields=["item_code", "warehouse",
-		"actual_qty", "planned_qty", "indented_qty", "ordered_qty", "reserved_qty", "projected_qty"],
-		filters=bin_filters, order_by="item_code, warehouse")
+	bin_list = frappe.db.sql("""select item_code, warehouse, actual_qty, planned_qty, indented_qty,
+		ordered_qty, reserved_qty, reserved_qty_for_production, projected_qty
+		from tabBin bin {conditions} order by item_code, warehouse
+		""".format(conditions=" where " + " and ".join(conditions) if conditions else ""), as_dict=1)
 
 	return bin_list
 
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index 7247d9e..22fa12a 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -148,8 +148,9 @@
 			mismatch = True
 
 	if mismatch:
-		bin.projected_qty = flt(bin.actual_qty) + flt(bin.ordered_qty) + \
+		bin.projected_qty = (flt(bin.actual_qty) + flt(bin.ordered_qty) +
 			flt(bin.indented_qty) + flt(bin.planned_qty) - flt(bin.reserved_qty)
+			- flt(bin.reserved_qty_for_production))
 
 		bin.save()
 
@@ -230,7 +231,8 @@
 
 def repost_all_stock_vouchers():
 	warehouses_with_account = frappe.db.sql_list("""select master_name from tabAccount
-		where ifnull(account_type, '') = 'Warehouse'""")
+		where ifnull(account_type, '') = 'Stock' and (warehouse is not null and warehouse != '')
+		and is_group=0""")
 
 	vouchers = frappe.db.sql("""select distinct voucher_type, voucher_no
 		from `tabStock Ledger Entry` sle
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 0231708..03f2ee1 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -141,7 +141,7 @@
 			"stock_value": self.stock_value
 		})
 		bin_doc.flags.via_stock_ledger_entry = True
-		
+
 		bin_doc.save(ignore_permissions=True)
 
 	def process_sle(self, sle):
@@ -211,7 +211,7 @@
 		if incoming_rate < 0:
 			# wrong incoming rate
 			incoming_rate = self.valuation_rate
-			
+
 		stock_value_change = 0
 		if incoming_rate:
 			stock_value_change = actual_qty * incoming_rate
@@ -229,7 +229,7 @@
 				# calculate new valuation rate only if stock value is positive
 				# else it remains the same as that of previous entry
 				self.valuation_rate = new_stock_value / new_stock_qty
-		
+
 	def get_moving_average_values(self, sle):
 		actual_qty = flt(sle.actual_qty)
 		new_stock_qty = flt(self.qty_after_transaction) + actual_qty
@@ -303,7 +303,7 @@
 						break
 				else:
 					index = 0
-					
+
 				# select first batch or the batch with same rate
 				batch = self.stock_queue[index]
 				if qty_to_pop >= batch[0]:
@@ -327,7 +327,7 @@
 
 		if stock_qty:
 			self.valuation_rate = stock_value / flt(stock_qty)
-		
+
 		if not self.stock_queue:
 			self.stock_queue.append([0, sle.incoming_rate or sle.outgoing_rate or self.valuation_rate])
 
@@ -343,11 +343,22 @@
 
 	def raise_exceptions(self):
 		deficiency = min(e["diff"] for e in self.exceptions)
-		msg = _("Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5}").format(self.item_code,
-			self.warehouse, self.exceptions[0]["posting_date"], self.exceptions[0]["posting_time"],
-			_(self.exceptions[0]["voucher_type"]), self.exceptions[0]["voucher_no"], deficiency)
+
+		if ((self.exceptions[0]["voucher_type"], self.exceptions[0]["voucher_no"]) in
+			frappe.local.flags.currently_saving):
+
+			msg = _("{0} units of {1} needed in {2} to complete this transaction.").format(
+				abs(deficiency), frappe.get_desk_link('Item', self.item_code),
+				frappe.get_desk_link('Warehouse', self.warehouse))
+		else:
+			msg = _("{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.").format(
+				abs(deficiency), frappe.get_desk_link('Item', self.item_code),
+				frappe.get_desk_link('Warehouse', self.warehouse),
+				self.exceptions[0]["posting_date"], self.exceptions[0]["posting_time"],
+				frappe.get_desk_link(self.exceptions[0]["voucher_type"], self.exceptions[0]["voucher_no"]))
+
 		if self.verbose:
-			frappe.throw(msg, NegativeStockError)
+			frappe.throw(msg, NegativeStockError, title='Insufficent Stock')
 		else:
 			raise NegativeStockError, msg
 
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 3f9de86..6797f8e 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -15,24 +15,34 @@
 	values, condition = [posting_date], ""
 
 	if warehouse:
-		values.append(warehouse)
-		condition += " AND warehouse = %s"
+		
+		lft, rgt, is_group = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt", "is_group"])
+		
+		if is_group:
+			values.extend([lft, rgt])
+			condition += "and exists (\
+				select name from `tabWarehouse` wh where wh.name = sle.warehouse\
+				and wh.lft >= %s and wh.rgt <= %s)"
+		
+		else:
+			values.append(warehouse)
+			condition += " AND warehouse = %s"
 
 	if item_code:
 		values.append(item_code)
 		condition.append(" AND item_code = %s")
 
 	stock_ledger_entries = frappe.db.sql("""
-		SELECT item_code, stock_value
-		FROM `tabStock Ledger Entry`
+		SELECT item_code, stock_value, name, warehouse
+		FROM `tabStock Ledger Entry` sle
 		WHERE posting_date <= %s {0}
 		ORDER BY timestamp(posting_date, posting_time) DESC, name DESC
 	""".format(condition), values, as_dict=1)
 
 	sle_map = {}
 	for sle in stock_ledger_entries:
-		sle_map.setdefault(sle.item_code, flt(sle.stock_value))
-
+		sle_map[sle.item_code] = sle_map.get(sle.item_code, 0.0) + flt(sle.stock_value)
+		
 	return sum(sle_map.values())
 
 def get_stock_balance(item_code, warehouse, posting_date=None, posting_time=None, with_valuation_rate=False):
@@ -177,3 +187,8 @@
 	if warehouse_company and warehouse_company != company:
 		frappe.throw(_("Warehouse {0} does not belong to company {1}").format(warehouse, company),
 			InvalidWarehouseCompany)
+
+def is_group_warehouse(warehouse):
+	if frappe.db.get_value("Warehouse", warehouse, "is_group"):
+		frappe.throw(_("Group node warehouse is not allowed to select for transactions"))
+	
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 15029a0..21ef5b8 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -8,12 +8,12 @@
 			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
 				frm.save();
-			}, __("Status"));
+			});
 		} else {
 			frm.add_custom_button(__("Reopen"), function() {
 				frm.set_value("status", "Open");
 				frm.save();
-			}, __("Status"));
+			});
 		}
 	}
 });
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 1f40a21..b922dd4 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -3,10 +3,12 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
+ "beta": 0, 
  "creation": "2013-02-01 10:36:25", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Setup", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Subject", 
@@ -40,6 +43,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
@@ -58,12 +62,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "subject", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Subject", 
@@ -81,12 +86,38 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "mins_to_first_response", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mins to First Response", 
+   "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, 
+   "search_index": 0, 
+   "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, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -110,6 +141,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
@@ -130,13 +162,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "eval:doc.__islocal", 
    "fieldname": "raised_by", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Raised By (Email)", 
@@ -159,34 +192,41 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "fold", 
-   "fieldtype": "Fold", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
-   "in_filter": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
    "in_list_view": 0, 
+   "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "label": "Details", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -202,13 +242,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
@@ -234,6 +275,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -258,6 +300,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution Date", 
@@ -283,6 +326,7 @@
    "fieldtype": "Datetime", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "First Responded On", 
@@ -301,14 +345,15 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "fieldname": "additional_info", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "", 
+   "label": "Contact", 
    "length": 0, 
    "no_copy": 0, 
    "options": "icon-pushpin", 
@@ -330,6 +375,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead", 
@@ -354,6 +400,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
@@ -378,6 +425,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -395,38 +443,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Name", 
@@ -448,12 +471,40 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "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, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "fieldname": "section_break_19", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "label": "Resolution", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -476,6 +527,7 @@
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution Details", 
@@ -502,6 +554,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -526,6 +579,7 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opening Date", 
@@ -551,6 +605,7 @@
    "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opening Time", 
@@ -576,6 +631,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
@@ -600,6 +656,7 @@
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Content Type", 
@@ -623,6 +680,7 @@
    "fieldtype": "Attach", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Attachment", 
@@ -643,14 +701,15 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-ticket", 
- "idx": 1, 
+ "idx": 7, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-02-03 01:08:48.180242", 
+ "modified": "2016-06-14 16:29:21.439025", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
@@ -658,26 +717,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 1, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Customer", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
@@ -697,10 +736,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,customer,subject,raised_by", 
  "sort_order": "ASC", 
  "timeline_field": "customer", 
- "title_field": "subject"
+ "title_field": "subject", 
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index b6ee0b6..36d0876 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -55,13 +55,16 @@
 
 def get_list_context(context=None):
 	return {
-		"title": _("My Issues"),
+		"title": _("Issues"),
 		"get_list": get_issue_list,
-		"row_template": "templates/includes/issue_row.html"
+		"row_template": "templates/includes/issue_row.html",
+		"show_sidebar": True,
+		"show_search": True,
+		'no_breadcrumbs': True
 	}
 
 def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	from frappe.templates.pages.list import get_list
+	from frappe.www.list import get_list
 	user = frappe.session.user
 	ignore_permissions = False
 	if is_website_user():
diff --git a/erpnext/support/doctype/maintenance_schedule/__init__.py b/erpnext/support/doctype/maintenance_schedule/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/support/doctype/maintenance_schedule/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
deleted file mode 100644
index b1cd3e2..0000000
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.provide("erpnext.support");
-
-frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) {
-	erpnext.utils.get_party_details(frm) });
-frappe.ui.form.on_change("Maintenance Schedule", "customer_address", function(){
-	erpnext.utils.get_address_display(cur_frm, 'customer_address', 'address_display');
-});
-frappe.ui.form.on_change("Maintenance Schedule", "contact_person", function(){
-  erpnext.utils.get_contact_details(cur_frm);	
-});
-
-// TODO commonify this code
-erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
-	refresh: function() {
-		var me = this;
-
-		if (this.frm.doc.docstatus === 0) {
-			this.frm.add_custom_button(__('Sales Order'),
-				function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
-						source_doctype: "Sales Order",
-						get_query_filters: {
-							docstatus: 1,
-							order_type: me.frm.doc.order_type,
-							customer: me.frm.doc.customer || undefined,
-							company: me.frm.doc.company
-						}
-					});
-				}, __("Get items from"));
-		} else if (this.frm.doc.docstatus === 1) {
-			this.frm.add_custom_button(__("Make Maintenance Visit"), function() {
-				frappe.model.open_mapped_doc({
-					method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
-					source_name: me.frm.doc.name,
-					frm: me.frm
-				})
-			}, __("Make"));
-		}
-	},
-
-	start_date: function(doc, cdt, cdn) {
-		this.set_no_of_visits(doc, cdt, cdn);
-	},
-
-	end_date: function(doc, cdt, cdn) {
-		this.set_no_of_visits(doc, cdt, cdn);
-	},
-
-	periodicity: function(doc, cdt, cdn) {
-		this.set_no_of_visits(doc, cdt, cdn);
-	},
-
-	set_no_of_visits: function(doc, cdt, cdn) {
-		var item = frappe.get_doc(cdt, cdn);
-
-		if (item.start_date && item.end_date && item.periodicity) {
-			if(item.start_date > item.end_date) {
-				msgprint(__("Row {0}:Start Date must be before End Date", [item.idx]));
-				return;
-			}
-
-			var date_diff = frappe.datetime.get_diff(item.end_date, item.start_date) + 1;
-
-			var days_in_period = {
-				"Weekly": 7,
-				"Monthly": 30,
-				"Quarterly": 91,
-				"Half Yearly": 182,
-				"Yearly": 365
-			}
-
-			var no_of_visits = cint(date_diff / days_in_period[item.periodicity]);
-			frappe.model.set_value(item.doctype, item.name, "no_of_visits", no_of_visits);
-		}
-	},
-});
-
-$.extend(cur_frm.cscript, new erpnext.support.MaintenanceSchedule({frm: cur_frm}));
-
-cur_frm.cscript.onload = function(doc, dt, dn) {
-	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
-
-	if(doc.__islocal){
-		set_multiple(dt,dn,{transaction_date:get_today()});
-	}
-
-	// set add fetch for item_code's item_name and description
-	cur_frm.add_fetch('item_code', 'item_name', 'item_name');
-	cur_frm.add_fetch('item_code', 'description', 'description');
-
-}
-
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{ 'customer': doc.customer }
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{ 'customer': doc.customer }
-	}
-}
-
-
-cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{ 'is_sales_item': 1 }
-	}
-}
-
-cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
-	if (!doc.__islocal) {
-		return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
-			function(r, rt) {
-				refresh_field('schedules');
-			});
-	} else {
-		msgprint(__("Please save the document before generating maintenance schedule"));
-	}
-}
-
-cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
-	return { query: "erpnext.controllers.queries.customer_query" }
-}
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
deleted file mode 100644
index 1f49cae..0000000
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
+++ /dev/null
@@ -1,625 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "MS.#####", 
- "creation": "2013-01-10 16:34:30", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "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, 
-   "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, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nCancelled", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "transaction_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Transaction 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "items_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_maintenance_detail", 
-   "oldfieldtype": "Table", 
-   "options": "Maintenance Schedule Item", 
-   "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": "schedule", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-time", 
-   "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": "generate_schedule", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Generate Schedule", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "schedules", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Schedules", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "schedules", 
-   "oldfieldtype": "Table", 
-   "options": "Maintenance Schedule Detail", 
-   "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": "contact_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Info", 
-   "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, 
-   "depends_on": "customer", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Customer Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_name", 
-   "oldfieldtype": "Data", 
-   "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, 
-   "depends_on": "customer", 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "customer", 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "customer", 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_17", 
-   "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, 
-   "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, 
-   "depends_on": "customer", 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "territory", 
-   "oldfieldtype": "Link", 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "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": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Maintenance Schedule", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-calendar", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-02-03 01:09:50.703964", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Schedule", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "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": 1, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "status,customer,customer_name", 
- "sort_order": "DESC", 
- "timeline_field": "customer"
-}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
deleted file mode 100644
index 5fab1ac..0000000
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ /dev/null
@@ -1,260 +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 add_days, getdate, cint, cstr
-
-from frappe import throw, _
-from erpnext.utilities.transaction_base import TransactionBase, delete_events
-from erpnext.stock.utils import get_valid_serial_nos
-from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
-
-class MaintenanceSchedule(TransactionBase):
-	def generate_schedule(self):
-		self.set('schedules', [])
-		frappe.db.sql("""delete from `tabMaintenance Schedule Detail`
-			where parent=%s""", (self.name))
-		count = 1
-		for d in self.get('items'):
-			self.validate_maintenance_detail()
-			s_list = []
-			s_list = self.create_schedule_list(d.start_date, d.end_date, d.no_of_visits, d.sales_person)
-			for i in range(d.no_of_visits):
-				child = self.append('schedules')
-				child.item_code = d.item_code
-				child.item_name = d.item_name
-				child.scheduled_date = s_list[i].strftime('%Y-%m-%d')
-				if d.serial_no:
-					child.serial_no = d.serial_no
-				child.idx = count
-				count = count + 1
-				child.sales_person = d.sales_person
-
-		self.save()
-
-	def on_submit(self):
-		if not self.get('schedules'):
-			throw(_("Please click on 'Generate Schedule' to get schedule"))
-		self.check_serial_no_added()
-		self.validate_schedule()
-
-		email_map = {}
-		for d in self.get('items'):
-			if d.serial_no:
-				serial_nos = get_valid_serial_nos(d.serial_no)
-				self.validate_serial_no(serial_nos, d.start_date)
-				self.update_amc_date(serial_nos, d.end_date)
-
-			if d.sales_person not in email_map:
-				sp = frappe.get_doc("Sales Person", d.sales_person)
-				email_map[d.sales_person] = sp.get_email_id()
-
-			scheduled_date = frappe.db.sql("""select scheduled_date from
-				`tabMaintenance Schedule Detail` where sales_person=%s and item_code=%s and
-				parent=%s""", (d.sales_person, d.item_code, self.name), as_dict=1)
-
-			for key in scheduled_date:
-				if email_map[d.sales_person]:
-					description = "Reference: %s, Item Code: %s and Customer: %s" % \
-						(self.name, d.item_code, self.customer)
-					frappe.get_doc({
-						"doctype": "Event",
-						"owner": email_map[d.sales_person] or self.owner,
-						"subject": description,
-						"description": description,
-						"starts_on": cstr(key["scheduled_date"]) + " 10:00:00",
-						"event_type": "Private",
-						"ref_type": self.doctype,
-						"ref_name": self.name
-					}).insert(ignore_permissions=1)
-
-		frappe.db.set(self, 'status', 'Submitted')
-
-	def create_schedule_list(self, start_date, end_date, no_of_visit, sales_person):
-		schedule_list = []
-		start_date_copy = start_date
-		date_diff = (getdate(end_date) - getdate(start_date)).days
-		add_by = date_diff / no_of_visit
-
-		for visit in range(cint(no_of_visit)):
-			if (getdate(start_date_copy) < getdate(end_date)):
-				start_date_copy = add_days(start_date_copy, add_by)
-				if len(schedule_list) < no_of_visit:
-					schedule_date = self.validate_schedule_date_for_holiday_list(getdate(start_date_copy),
-						sales_person)
-					if schedule_date > getdate(end_date):
-						schedule_date = getdate(end_date)
-					schedule_list.append(schedule_date)
-
-		return schedule_list
-
-	def validate_schedule_date_for_holiday_list(self, schedule_date, sales_person):
-		validated = False
-
-		employee = frappe.db.get_value("Sales Person", sales_person, "employee")
-		if employee:
-			holiday_list = get_holiday_list_for_employee(employee)
-		else:
-			holiday_list = frappe.db.get_value("Company", self.company, "default_holiday_list")
-
-		holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
-
-		if not validated and holidays:
-
-			# max iterations = len(holidays)
-			for i in xrange(len(holidays)):
-				if schedule_date in holidays:
-					schedule_date = add_days(schedule_date, -1)
-				else:
-					validated = True
-					break
-
-		return schedule_date
-
-	def validate_dates_with_periodicity(self):
-		for d in self.get("items"):
-			if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random":
-				date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1
-				days_in_period = {
-					"Weekly": 7,
-					"Monthly": 30,
-					"Quarterly": 90,
-					"Half Yearly": 180,
-					"Yearly": 365
-				}
-
-				if date_diff < days_in_period[d.periodicity]:
-					throw(_("Row {0}: To set {1} periodicity, difference between from and to date \
-						must be greater than or equal to {2}")
-						.format(d.idx, d.periodicity, days_in_period[d.periodicity]))
-
-	def validate_maintenance_detail(self):
-		if not self.get('items'):
-			throw(_("Please enter Maintaince Details first"))
-
-		for d in self.get('items'):
-			if not d.item_code:
-				throw(_("Please select item code"))
-			elif not d.start_date or not d.end_date:
-				throw(_("Please select Start Date and End Date for Item {0}".format(d.item_code)))
-			elif not d.no_of_visits:
-				throw(_("Please mention no of visits required"))
-			elif not d.sales_person:
-				throw(_("Please select Incharge Person's name"))
-
-			if getdate(d.start_date) >= getdate(d.end_date):
-				throw(_("Start date should be less than end date for Item {0}").format(d.item_code))
-
-	def validate_sales_order(self):
-		for d in self.get('items'):
-			if d.sales_order:
-				chk = frappe.db.sql("""select ms.name from `tabMaintenance Schedule` ms,
-					`tabMaintenance Schedule Item` msi where msi.parent=ms.name and
-					msi.sales_order=%s and ms.docstatus=1""", d.sales_order)
-				if chk:
-					throw(_("Maintenance Schedule {0} exists against {0}").format(chk[0][0], d.sales_order))
-
-	def validate(self):
-		self.validate_maintenance_detail()
-		self.validate_dates_with_periodicity()
-		self.validate_sales_order()
-
-	def on_update(self):
-		frappe.db.set(self, 'status', 'Draft')
-
-	def update_amc_date(self, serial_nos, amc_expiry_date=None):
-		for serial_no in serial_nos:
-			serial_no_doc = frappe.get_doc("Serial No", serial_no)
-			serial_no_doc.amc_expiry_date = amc_expiry_date
-			serial_no_doc.save()
-
-	def validate_serial_no(self, serial_nos, amc_start_date):
-		for serial_no in serial_nos:
-			sr_details = frappe.db.get_value("Serial No", serial_no,
-				["warranty_expiry_date", "amc_expiry_date", "warehouse", "delivery_date"], as_dict=1)
-
-			if not sr_details:
-				frappe.throw(_("Serial No {0} not found").format(serial_no))
-
-			if sr_details.warranty_expiry_date and sr_details.warranty_expiry_date>=amc_start_date:
-				throw(_("Serial No {0} is under warranty upto {1}").format(serial_no, sr_details.warranty_expiry_date))
-
-			if sr_details.amc_expiry_date and sr_details.amc_expiry_date >= amc_start_date:
-				throw(_("Serial No {0} is under maintenance contract upto {1}").format(serial_no, sr_details.amc_start_date))
-
-			if not sr_details.warehouse and sr_details.delivery_date and \
-				sr_details.delivery_date >= amc_start_date:
-					throw(_("Maintenance start date can not be before delivery date for Serial No {0}")
-						.format(serial_no))
-
-	def validate_schedule(self):
-		item_lst1 =[]
-		item_lst2 =[]
-		for d in self.get('items'):
-			if d.item_code not in item_lst1:
-				item_lst1.append(d.item_code)
-
-		for m in self.get('schedules'):
-			if m.item_code not in item_lst2:
-				item_lst2.append(m.item_code)
-
-		if len(item_lst1) != len(item_lst2):
-			throw(_("Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule'"))
-		else:
-			for x in item_lst1:
-				if x not in item_lst2:
-					throw(_("Please click on 'Generate Schedule'"))
-
-	def check_serial_no_added(self):
-		serial_present =[]
-		for d in self.get('items'):
-			if d.serial_no:
-				serial_present.append(d.item_code)
-
-		for m in self.get('schedules'):
-			if serial_present:
-				if m.item_code in serial_present and not m.serial_no:
-					throw(_("Please click on 'Generate Schedule' to fetch Serial No added for Item {0}").format(m.item_code))
-
-	def on_cancel(self):
-		for d in self.get('items'):
-			if d.serial_no:
-				serial_nos = get_valid_serial_nos(d.serial_no)
-				self.update_amc_date(serial_nos)
-		frappe.db.set(self, 'status', 'Cancelled')
-		delete_events(self.doctype, self.name)
-
-	def on_trash(self):
-		delete_events(self.doctype, self.name)
-
-@frappe.whitelist()
-def make_maintenance_visit(source_name, target_doc=None):
-	from frappe.model.mapper import get_mapped_doc
-
-	def update_status(source, target, parent):
-		target.maintenance_type = "Scheduled"
-
-	doclist = get_mapped_doc("Maintenance Schedule", source_name, {
-		"Maintenance Schedule": {
-			"doctype": "Maintenance Visit",
-			"field_map": {
-				"name": "maintenance_schedule"
-			},
-			"validation": {
-				"docstatus": ["=", 1]
-			},
-			"postprocess": update_status
-		},
-		"Maintenance Schedule Item": {
-			"doctype": "Maintenance Visit Purpose",
-			"field_map": {
-				"parent": "prevdoc_docname",
-				"parenttype": "prevdoc_doctype",
-				"sales_person": "service_person"
-			}
-		}
-	}, target_doc)
-
-	return doclist
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/__init__.py b/erpnext/support/doctype/maintenance_schedule_detail/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/support/doctype/maintenance_schedule_detail/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
deleted file mode 100644
index af252c1..0000000
--- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-02-22 01:28:05", 
- "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": 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": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "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": 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": "scheduled_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Scheduled Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "scheduled_date", 
-   "oldfieldtype": "Date", 
-   "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": "actual_date", 
-   "fieldtype": "Date", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Actual Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "actual_date", 
-   "oldfieldtype": "Date", 
-   "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": "sales_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Sales Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "incharge_name", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Person", 
-   "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": "serial_no", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "160px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "160px"
-  }
- ], 
- "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.853613", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Schedule Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
deleted file mode 100644
index 16013b5..0000000
--- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py
+++ /dev/null
@@ -1,10 +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.model.document import Document
-
-class MaintenanceScheduleDetail(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule_item/__init__.py b/erpnext/support/doctype/maintenance_schedule_item/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/support/doctype/maintenance_schedule_item/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json
deleted file mode 100644
index 6879f06..0000000
--- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ /dev/null
@@ -1,333 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-02-22 01:28:05", 
- "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": 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_hide_if_no_value": 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": "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": 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": "description", 
-   "fieldtype": "Data", 
-   "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_hide_if_no_value": 0, 
-   "print_width": "300px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "300px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "schedule_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "start_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "end_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "periodicity", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Periodicity", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "periodicity", 
-   "oldfieldtype": "Select", 
-   "options": "\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom", 
-   "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": "no_of_visits", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "No of Visits", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "no_of_visits", 
-   "oldfieldtype": "Int", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "sales_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Sales Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "incharge_name", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Person", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "reference", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "serial_no", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "sales_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Sales Order", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Data", 
-   "options": "Sales Order", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "150px"
-  }
- ], 
- "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": "2016-02-23 04:59:32.924534", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Schedule Item", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py
deleted file mode 100644
index 22feec3..0000000
--- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py
+++ /dev/null
@@ -1,10 +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.model.document import Document
-
-class MaintenanceScheduleItem(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_visit/__init__.py b/erpnext/support/doctype/maintenance_visit/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/support/doctype/maintenance_visit/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
deleted file mode 100644
index c748bae..0000000
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.provide("erpnext.support");
-frappe.require("assets/erpnext/js/utils.js");
-
-frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) {
-	erpnext.utils.get_party_details(frm) });
-frappe.ui.form.on_change("Maintenance Visit", "customer_address", function(frm){
-	erpnext.utils.get_address_display(frm, 'customer_address', 'address_display')
-});
-frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){
-	erpnext.utils.get_contact_details(frm)
-});
-
-// TODO commonify this code
-erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
-	refresh: function() {
-		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('Maintenance Schedule'),
-				function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
-						source_doctype: "Maintenance Schedule",
-						get_query_filters: {
-							docstatus: 1,
-							customer: cur_frm.doc.customer || undefined,
-							company: cur_frm.doc.company
-						}
-					})
-				}, __("Get items from"));
-			cur_frm.add_custom_button(__('Warranty Claim'),
-				function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit",
-						source_doctype: "Warranty Claim",
-						get_query_filters: {
-							status: ["in", "Open, Work in Progress"],
-							customer: cur_frm.doc.customer || undefined,
-							company: cur_frm.doc.company
-						}
-					})
-				}, __("Get items from"));
-			cur_frm.add_custom_button(__('Sales Order'),
-				function() {
-					frappe.model.map_current_doc({
-						method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
-						source_doctype: "Sales Order",
-						get_query_filters: {
-							docstatus: 1,
-							order_type: cur_frm.doc.order_type,
-							customer: cur_frm.doc.customer || undefined,
-							company: cur_frm.doc.company
-						}
-					})
-				}, __("Get items from"));
-		}
-	},
-});
-
-$.extend(cur_frm.cscript, new erpnext.support.MaintenanceVisit({frm: cur_frm}));
-
-cur_frm.cscript.onload = function(doc, dt, dn) {
-	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
-	if(doc.__islocal) set_multiple(dt,dn,{mntc_date:get_today()});
-
-	// set add fetch for item_code's item_name and description
-	cur_frm.add_fetch('item_code', 'item_name', 'item_name');
-	cur_frm.add_fetch('item_code', 'description', 'description');
-}
-
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-	return{
-    	filters:{'customer': doc.customer}
-  	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-  	return{
-    	filters:{'customer': doc.customer}
-  	}
-}
-
-cur_frm.fields_dict['purposes'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
-	return{
-    	filters:{ 'is_sales_item': 1}
-  	}
-}
-
-cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
-	return {query: "erpnext.controllers.queries.customer_query" }
-}
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
deleted file mode 100644
index fdeb39c..0000000
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
+++ /dev/null
@@ -1,796 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "MV.#####", 
- "creation": "2013-01-10 16:34:31", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_email", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Today", 
-   "fieldname": "mntc_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Maintenance Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "mntc_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "mntc_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Maintenance Time", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "mntc_time", 
-   "oldfieldtype": "Time", 
-   "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": "maintenance_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-wrench", 
-   "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": "completion_status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Completion Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "completion_status", 
-   "oldfieldtype": "Select", 
-   "options": "\nPartially Completed\nFully Completed", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Unscheduled", 
-   "fieldname": "maintenance_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Maintenance Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "maintenance_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nScheduled\nUnscheduled\nBreakdown", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "section_break0", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-wrench", 
-   "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": "purposes", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Purposes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "maintenance_visit_details", 
-   "oldfieldtype": "Table", 
-   "options": "Maintenance Visit Purpose", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "more_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "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": "customer_feedback", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Feedback", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_feedback", 
-   "oldfieldtype": "Small Text", 
-   "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": "col_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Draft", 
-   "fieldname": "status", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Data", 
-   "options": "\nDraft\nCancelled\nSubmitted", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Data", 
-   "options": "Maintenance Visit", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "150px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Select", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "customer", 
-   "fieldname": "contact_info_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Info", 
-   "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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "customer_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer 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, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "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, 
-   "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, 
-   "ignore_xss_filter": 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, 
-   "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, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 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, 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
- "hide_toolbar": 0, 
- "icon": "icon-file-text", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-03-03 05:46:55.140348", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Visit", 
- "owner": "ashwini@webnotestech.com", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "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": 1, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "customer", 
- "title_field": "customer_name"
-}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_visit_purpose/__init__.py b/erpnext/support/doctype/maintenance_visit_purpose/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/support/doctype/maintenance_visit_purpose/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
deleted file mode 100644
index c89453a..0000000
--- a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
+++ /dev/null
@@ -1,279 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "creation": "2013-02-22 01:28:06", 
- "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", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "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": "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": 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": "serial_no", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small 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": "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": "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": "work_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "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": "service_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Sales Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "service_person", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Person", 
-   "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": "work_done", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Work Done", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "work_done", 
-   "oldfieldtype": "Small Text", 
-   "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": "prevdoc_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Document Type", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_doctype", 
-   "oldfieldtype": "Data", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "150px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_docname", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Against Document No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Data", 
-   "options": "prevdoc_doctype", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "160px", 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "160px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "prevdoc_detail_docname", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Against Document Detail No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_detail_docname", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_width": "160px", 
-   "read_only": 1, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "160px"
-  }
- ], 
- "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:50.082976", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Visit Purpose", 
- "owner": "ashwini@webnotestech.com", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
deleted file mode 100644
index cb0c519..0000000
--- a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py
+++ /dev/null
@@ -1,10 +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.model.document import Document
-
-class MaintenanceVisitPurpose(Document):
-	pass
\ No newline at end of file
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 3928577..cf9d806 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -2,7 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext.support");
-frappe.require("assets/erpnext/js/utils.js");
 
 frappe.ui.form.on("Warranty Claim", {
 	customer: function(frm) {
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index dd20fae..f6fcc87 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -559,7 +559,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "customer", 
    "fieldname": "customer_name", 
@@ -1007,7 +1007,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-03 05:42:57.634257", 
+ "modified": "2016-04-06 03:15:18.376985", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim", 
@@ -1040,5 +1040,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
- "title_field": "customer_name"
+ "title_field": "customer_name", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index 93f5245..b4427be 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import session, _
-from frappe.utils import today
+from frappe.utils import today, now_datetime
 
 
 
@@ -21,7 +21,7 @@
 
 		if self.status=="Closed" and \
 			frappe.db.get_value("Warranty Claim", self.name, "status")!="Closed":
-			self.resolution_date = today()
+			self.resolution_date = now_datetime()
 
 	def on_cancel(self):
 		lst = frappe.db.sql("""select t1.name
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 4a3376c..562a169 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -32,8 +32,13 @@
 		{fieldtype:"Date", label: __("From Date")},
 		{fieldtype:"Date", label: __("To Date")},
 		{fieldtype:"Select", label: __("Range"),
-			options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}
+			options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"], default_value: "Monthly"}
 	],
+	
+	init_filter_values: function() {
+		this._super();
+		this.filter_inputs.range.val('Monthly');
+	},
 
 	setup_columns: function() {
 		var std_columns = [
@@ -100,11 +105,5 @@
 		})
 
 		this.data = [total_tickets, days_to_close, hours_to_close, hours_to_respond];
-	},
-
-	get_plot_points: function(item, col, idx) {
-		return [[dateutil.str_to_obj(col.id).getTime(), item[col.field]],
-			[dateutil.user_to_obj(col.name).getTime(), item[col.field]]];
 	}
-
 });
diff --git a/erpnext/support/report/maintenance_schedules/maintenance_schedules.json b/erpnext/support/report/maintenance_schedules/maintenance_schedules.json
deleted file mode 100644
index 2be7446..0000000
--- a/erpnext/support/report/maintenance_schedules/maintenance_schedules.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "apply_user_permissions": 1, 
- "creation": "2013-05-06 14:25:21", 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.144598", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Maintenance Schedules", 
- "owner": "Administrator", 
- "query": "SELECT\n    ms_sch.scheduled_date as \"Schedule Date:Date:120\",\n\tms_sch.item_code as \"Item Code:Link/Item:120\",\n\tms_sch.item_name as \"Item Name::120\",\n\tms_sch.serial_no as \"Serial No::120\",\n\tms_sch.sales_person as \"Sales Person::120\",\n\tms.customer_name as \"Customer:Link/Customer:120\",\n\tms.address_display as \"Customer Address::120\",\n\tms_item.prevdoc_docname as \"Sales Order:Link/Sales Order:120\",\n\tms.company as \"Company:Link/Company:120\"\n\t\nFROM\n\t`tabMaintenance Schedule` ms, \n    `tabMaintenance Schedule Detail` ms_sch, \n    `tabMaintenance Schedule Item` ms_item\nWHERE\n\tms.name = ms_sch.parent and ms.name = ms_item.parent and ms.docstatus = 1\nORDER BY\n\tms_sch.scheduled_date asc, ms_sch.item_code asc", 
- "ref_doctype": "Maintenance Schedule", 
- "report_name": "Maintenance Schedules", 
- "report_type": "Query Report"
-}
\ No newline at end of file
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/support/report/minutes_to_first_response_for_issues/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/support/report/minutes_to_first_response_for_issues/__init__.py
diff --git a/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.js b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.js
new file mode 100644
index 0000000..e84b13c
--- /dev/null
+++ b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.js
@@ -0,0 +1,40 @@
+frappe.query_reports["Minutes to First Response for Issues"] = {
+	"filters": [
+		{
+			"fieldname":"from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			'reqd': 1,
+			"default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			'reqd': 1,
+			"default":frappe.datetime.nowdate()
+		},
+	],
+	get_chart_data: function(columns, result) {
+		return {
+			data: {
+				x: 'Date',
+				columns: [
+					['Date'].concat($.map(result, function(d) { return d[0]; })),
+					['Mins to first response'].concat($.map(result, function(d) { return d[1]; }))
+				]
+				// rows: [['Date', 'Mins to first response']].concat(result)
+			},
+			axis: {
+				x: {
+					type: 'timeseries',
+					tick: {
+						format: frappe.ui.py_date_format
+					}
+				}
+			},
+			chart_type: 'line',
+
+		}
+	}
+}
diff --git a/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json
new file mode 100644
index 0000000..e6dc383
--- /dev/null
+++ b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json
@@ -0,0 +1,19 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-06-14 17:44:26.034112", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2016-06-14 17:50:28.082090", 
+ "modified_by": "Administrator", 
+ "module": "Support", 
+ "name": "Minutes to First Response for Issues", 
+ "owner": "Administrator", 
+ "query": "select date(creation) as creation_date, avg(mins_to_first_response) from tabIssue where creation > '2016-05-01' group by date(creation) order by creation_date;", 
+ "ref_doctype": "Issue", 
+ "report_name": "Minutes to First Response for Issues", 
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.py b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.py
new file mode 100644
index 0000000..57c2d44
--- /dev/null
+++ b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute(filters=None):
+	columns = [
+		{
+			'fieldname': 'creation_date',
+			'label': 'Date',
+			'fieldtype': 'Date'
+		},
+		{
+			'fieldname': 'mins',
+			'fieldtype': 'Float',
+			'label': 'Mins to First Response'
+		},
+	]
+
+	data = frappe.db.sql('''select date(creation) as creation_date,
+		avg(mins_to_first_response) as mins
+		from tabIssue
+			where date(creation) between %s and %s
+			and mins_to_first_response > 0
+		group by creation_date order by creation_date desc''', (filters.from_date, filters.to_date))
+
+	return columns, data
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/support/web_form/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/support/web_form/__init__.py
diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/support/web_form/issues/__init__.py
similarity index 100%
copy from erpnext/support/report/maintenance_schedules/__init__.py
copy to erpnext/support/web_form/issues/__init__.py
diff --git a/erpnext/support/web_form/issues/issues.js b/erpnext/support/web_form/issues/issues.js
new file mode 100644
index 0000000..699703c
--- /dev/null
+++ b/erpnext/support/web_form/issues/issues.js
@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+})
\ No newline at end of file
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
new file mode 100644
index 0000000..4b7c70c
--- /dev/null
+++ b/erpnext/support/web_form/issues/issues.json
@@ -0,0 +1,60 @@
+{
+ "allow_comments": 1, 
+ "allow_delete": 1, 
+ "allow_edit": 1, 
+ "allow_multiple": 1, 
+ "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", 
+ "creation": "2016-06-24 15:50:33.186483", 
+ "doc_type": "Issue", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "modified": "2016-06-24 15:52:24.768558", 
+ "modified_by": "Administrator", 
+ "module": "Support", 
+ "name": "issues", 
+ "owner": "Administrator", 
+ "published": 1, 
+ "route": "issues", 
+ "success_message": "", 
+ "success_url": "/issues", 
+ "title": "Issue", 
+ "web_form_fields": [
+  {
+   "fieldname": "subject", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Subject", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "default": "Open", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Status", 
+   "options": "Open\nReplied\nHold\nClosed", 
+   "read_only": 1, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "label": "Description", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "attachment", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "label": "Attachment", 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/support/web_form/issues/issues.py b/erpnext/support/web_form/issues/issues.py
new file mode 100644
index 0000000..2334f8b
--- /dev/null
+++ b/erpnext/support/web_form/issues/issues.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass
diff --git a/erpnext/tasks.py b/erpnext/tasks.py
deleted file mode 100644
index cef0ac9..0000000
--- a/erpnext/tasks.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.celery_app import celery_task, task_logger
-from frappe.utils.scheduler import log
-
-@celery_task()
-def send_newsletter(site, newsletter, event):
-	# hack! pass event="bulk_long" to queue in longjob queue
-	try:
-		frappe.connect(site=site)
-		doc = frappe.get_doc("Newsletter", newsletter)
-		doc.send_bulk()
-
-	except:
-		frappe.db.rollback()
-
-		task_logger.error(site)
-		task_logger.error(frappe.get_traceback())
-
-		# wasn't able to send emails :(
-		doc.db_set("email_sent", 0)
-		frappe.db.commit()
-
-		log("send_newsletter")
-
-		raise
-
-	else:
-		frappe.db.commit()
-
-	finally:
-		frappe.destroy()
diff --git a/erpnext/templates/emails/request_for_quotation.html b/erpnext/templates/emails/request_for_quotation.html
new file mode 100644
index 0000000..aedd8e2
--- /dev/null
+++ b/erpnext/templates/emails/request_for_quotation.html
@@ -0,0 +1,11 @@
+<h3>{{_("Request for Quotation")}}</h3>
+<p>{{ message }}</p>
+{% if update_password_link %}
+<p>{{_("Please click on the following link to set your new password")}}:</p>
+<p><a href="{{ update_password_link }}">{{ update_password_link }}</a></p>
+{% else %}
+<p>{{_("Request for quotation can be access by clicking following link")}}:</p>
+<p><a href="{{ rfq_link }}">Submit your Quotation</a></p>
+{% endif %}
+<p>{{_("Thank you")}},<br>
+{{ user_fullname }}</p>
\ No newline at end of file
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index 1c50e15..c596890 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -13,7 +13,7 @@
 	<div class="row">
 		<div class="col-sm-6 col-xs-8">
 			{% if(doc.warehouse) {
-				var label_class = "label-default",
+				var color = "grey",
 					title = "Warehouse",
 					actual_qty = (frm.doc.doctype==="Sales Order"
 						? doc.projected_qty : doc.actual_qty);
@@ -21,16 +21,16 @@
                     && in_list(["Sales Order Item", "Delivery Note Item"], doc.doctype)) {
     				if(actual_qty != undefined) {
     					if(actual_qty >= doc.qty) {
-    						var label_class = "label-success";
+    						var color = "green";
     						var title = "In Stock"
     					} else {
-    						var label_class = "label-danger";
+    						var color = "red";
     						var title = "Not In Stock"
     					}
     				}
                 } %}
-				<span class="pull-right" title="{%= title %}">
-					<span class="label {%= label_class %}">
+				<span class="pull-right" title="{%= title %}" style="margin-left: 10px;">
+					<span class="indicator {{ color }}">
 						{%= doc.warehouse %}
 					</span>
 				</span>
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html
deleted file mode 100644
index 866c06e..0000000
--- a/erpnext/templates/form_grid/material_request_grid.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% var visible_columns = row.get_visible_columns(["item_code", "warehouse",
-	"item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
-
-{% if(!doc) { %}
-	<div class="row">
-		<div class="col-sm-4">{%= __("Item") %}</div>
-		<div class="col-sm-3">{%= __("Required On") %}</div>
-		<div class="col-sm-3">{%= __("Warehouse") %}</div>
-		<div class="col-sm-2 text-right">{%= __("Qty") %}</div>
-	</div>
-{% } else { %}
-	<div class="row">
-		<div class="col-sm-4">
-            <span class="indicator {%= (doc.qty<=doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
-			{% if(doc.item_name != doc.item_code) { %}
-				<br>{%= doc.item_name %}{% } %}
-            <!-- {% if(doc.item_name != doc.description) { %}
-                <p>{%= doc.description %}</p>{% } %} -->
-			{% include "templates/form_grid/includes/visible_cols.html" %}
-		</div>
-
-
-		<div class="col-sm-3">
-			{% if(doc.schedule_date) { %}
-                <span title="{%= __("Reqd By Date") %}" class="{%=
-				(frappe.datetime.get_diff(doc.schedule_date, frappe.datetime.get_today()) < 0
-					&& doc.ordered_qty < doc.qty)
-					? "text-danger" : "text-muted" %}">
-					{%= doc.get_formatted("schedule_date") %}</span>
-			{% } %}
-        </div>
-
-        <!-- warehouse -->
-		<div class="col-sm-3">
-			{% if(doc.warehouse) { %}
-				<span class="label label-default" title="{%= __("For Warehouse") %}"
-                    style="margin-right: 10px;">
-					{%= doc.warehouse %}
-				</span>
-			{% } %}
-        </div>
-
-		<!-- qty -->
-		<div class="col-sm-2 text-right">
-			{%= doc.get_formatted("qty") %}
-			<span class="small">{%= doc.uom || doc.stock_uom %}</span>
-		</div>
-	</div>
-{% } %}
diff --git a/erpnext/templates/form_grid/stock_entry_grid.html b/erpnext/templates/form_grid/stock_entry_grid.html
index a2bf1df..8604881 100644
--- a/erpnext/templates/form_grid/stock_entry_grid.html
+++ b/erpnext/templates/form_grid/stock_entry_grid.html
@@ -16,21 +16,27 @@
 			{% if(doc.item_name != doc.item_code) { %}
 				<br>{%= doc.item_name %}{% } %}
 			{% include "templates/form_grid/includes/visible_cols.html" %}
-			{% if(frm.doc.docstatus==0 && doc.s_warehouse && doc.actual_qty < doc.qty) { %}
-                <span class="text-danger small" style="margin-left: 15px;">
-                    Not in Stock
-                </span>
-            {% } %}
 		</div>
 
         <!-- warehouse -->
 		<div class="col-sm-3 col-xs-4">
-			{% if(doc.s_warehouse) { %}
-                <span class="label label-default grid-label" title="{% __("Source" )%}">
-				{%= doc.s_warehouse || "" %}</span>
-            {% } %}
-			{% if(doc.t_warehouse) { %}<span class="label label-primary grid-label" title="{% __("Target" )%}">
-				{%= doc.t_warehouse || "" %}</span>{% } %}
+			{% if(doc.s_warehouse) {
+					if(frm.doc.docstatus==0) {
+						var color = (doc.s_warehouse && doc.actual_qty < doc.qty) ? "red" : "green";
+						var title = color === "red" ? __("Not in Stock") : __("In Stock");
+					} else {
+						var color = "grey";
+						var title = __("Source");
+					}
+				%}
+				 <span class="indicator {{ color }}" title="{{ title }}">
+					 {%= doc.s_warehouse %}</span>
+            {% }; %}
+			{% if(doc.t_warehouse) { %}
+				<div><span class="indicator {{ doc.docstatus==1 ? "blue" : "grey" }}" title="{{ __("Target" ) }}">
+					{%= doc.t_warehouse %}</span>
+				</div>
+            {% }; %}
 		</div>
 
 		<!-- qty -->
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index 34d345f..cf6f89b 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -2,33 +2,25 @@
 
 {% block title %} {{ title }} {% endblock %}
 
-{% block header %}<h2>{{ title }}</h2>{% endblock %}
-
-{% block header_actions %}
-{% include 'templates/includes/product_search_box.html' %}
-{% endblock %}
-
 {% block breadcrumbs %}
     {% include "templates/includes/breadcrumbs.html" %}
 {% endblock %}
 
 {% block page_content %}
 {% from "erpnext/templates/includes/macros.html" import product_image %}
-<div class="item-content">
+<div class="item-content" style="margin-top:20px;">
 	<div class="product-page-content" itemscope itemtype="http://schema.org/Product">
 		<div class="row">
-			<div class="col-sm-5">
+			<div class="col-sm-6">
 				{% if slideshow %}
 					{% include "templates/includes/slideshow.html" %}
 				{% else %}
 					{{ product_image(website_image, "product-full-image") }}
 				{% endif %}
 			</div>
-			<div class="col-sm-7">
-				<!-- <h3 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h3> -->
-				<div itemprop="description">
-				{{ web_long_description or description or _("No description given") }}
-				</div>
+			<div class="col-sm-6" style="padding-left:20px;">
+				 <h2 itemprop="name" style="margin-top: 0px;">{{ item_name }}</h2>
+
 				<p class="text-muted">
 					{{ _("Item Code") }}: <span itemprop="productID">{{ variant and variant.name or name }}</span></p>
 				<br>
@@ -60,8 +52,10 @@
 				</div>
 				<br>
 				<div style="min-height: 100px; margin: 10px 0;">
-					<h4 class="item-price" itemprop="price"></h4>
-					<div class="item-stock" itemprop="availablity"></div>
+					<div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+						<h4 class="item-price" itemprop="price"></h4>
+						<div class="item-stock" itemprop="availability"></div>
+					</div>
                     <div class="item-cart hide">
     					<div id="item-add-to-cart">
     						<button class="btn btn-primary btn-sm">
@@ -77,15 +71,24 @@
 				</div>
 			</div>
 		</div>
-		{% if website_specifications -%}
-		<div class="row item-website-specification" style="margin-top: 20px">
+		<div class="row item-website-description" style="margin-top:30px; margin-bottom:20px">
 			<div class="col-md-12">
-				<h4>{{ _("Specifications") }}</h4>
+		<div class="h6 text-uppercase">{{ _("Description") }}</div>
+		<div itemprop="description" class="item-desc">
+		{{ web_long_description or description or _("No description given") }}
+		</div>
+		</div>
+		</div>
 
-				<table class="table table-bordered" style="width: 100%">
+		{% if website_specifications -%}
+		<div class="row item-website-specification" style="margin-top: 40px">
+			<div class="col-md-12">
+				<div class="h6 text-uppercase">{{ _("Specifications") }}</div>
+
+				<table class="table borderless" style="width: 100%">
 				{% for d in website_specifications -%}
 					<tr>
-						<td style="width: 30%;">{{ d.label }}</td>
+						<td class="product-label text-muted" style="width: 30%;">{{ d.label }}</td>
 						<td>{{ d.description }}</td>
 					</tr>
 				{%- endfor %}
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 7e68bc7..b9926d6 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -1,15 +1,19 @@
 {% extends "templates/web.html" %}
 
-{% block header_actions %}
-{% include 'templates/includes/product_search_box.html' %}
-{% endblock %}
-
+{% block header %}<h1>{{ _("Products") }}</h1>{% endblock %}
 {% block breadcrumbs %}
-    {% include "templates/includes/breadcrumbs.html" %}
+ <div class="page-breadcrumbs" data-html-block="breadcrumbs">
+ 	<ul class="breadcrumb">
+ 		<li>
+ 			<span class="icon icon-angle-left"></span>
+ 			<a href="/me">My Account</a>
+ 		</li>
+ 	</ul>
+ </div>
 {% endblock %}
 
 {% block page_content %}
-<div class="item-group-content">
+<div class="item-group-content" itemscope itemtype="http://schema.org/Product">
 	<div>
 		{% if slideshow %}<!-- slideshow -->
 		{% include "templates/includes/slideshow.html" %}
@@ -20,34 +24,22 @@
 	</div>
 	<div>
 		{% if items %}
-		<div id="search-list" class="row">
+		<div id="search-list" {% if not products_as_list -%} class="row" {%- endif %}>
 			{% for item in items %}
 				{{ item }}
 			{% endfor %}
 		</div>
-			<div class="text-center">
-				{% if frappe.form_dict.start|int > 0 %}
-				<a class="btn btn-default" href="{{ pathname }}?start={{ frappe.form_dict.start|int - 24 }}">Prev</a>
-				{% endif %}
-				{% if items|length == 24 %}
-				<a class="btn btn-default" href="{{ pathname }}?start={{ frappe.form_dict.start|int + 24 }}">Next</a>
-				{% endif %}
-			</div>
+		<div class="text-center item-group-nav-buttons">
+			{% if frappe.form_dict.start|int > 0 %}
+			<a class="btn btn-default" href="{{ pathname }}?start={{ frappe.form_dict.start|int - 24 }}">Prev</a>
+			{% endif %}
+			{% if items|length == 24 %}
+			<a class="btn btn-default" href="{{ pathname }}?start={{ frappe.form_dict.start|int + 24 }}">Next</a>
+			{% endif %}
+		</div>
 		{% else %}
 			<div class="text-muted">No items listed.</div>
 		{% endif %}
 	</div>
 </div>
-{% endblock %}
-
-{% block style %}
-<style>
-	.product-image.missing-image {
-		border: 1px dashed {{ theme.border_color or "#d1d8dd" }};
-	}
-
-	.product-image.missing-image .octicon {
-		color: {{ theme.border_color or "#d1d8dd" }};
-	}
-</style>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/generators/job_opening.html b/erpnext/templates/generators/job_opening.html
index 9cfa888..ad7f942 100644
--- a/erpnext/templates/generators/job_opening.html
+++ b/erpnext/templates/generators/job_opening.html
@@ -10,10 +10,13 @@
 
 {% block page_content %}
 
+{%- if description -%}
 <div>{{ description }}</div>
-
-<a class='btn btn-primary'
-	href='/job_application?job_title={{ doc.job_title }}'>
+{% endif %}
+<p>
+	<a class='btn btn-primary'
+	href='/job_application?job_title={{ doc.name }}'>
 	{{ _("Apply Now") }}</a>
+</p>
 
 {% endblock %}
diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
index 15dcb95..2c5056a 100644
--- a/erpnext/templates/includes/address_row.html
+++ b/erpnext/templates/includes/address_row.html
@@ -1,8 +1,14 @@
 <div class="web-list-item">
     <a href="/addresses?name={{ doc.name | urlencode }}" class="no-decoration">
-        <h4 class="strong">{{ doc.address_title }}</h4>
-        <p class="text-muted small">
-            {{ frappe.get_doc(doc).get_display() }}
-        </p>
+	    <div class="row">
+	        <div class="col-xs-3">
+	                 <span class="indicator {{ "red" if doc.address_type=="Office" else "green" if doc.address_type=="Billing" else "blue" if doc.address_type=="Shipping" else "darkgrey" }}">{{ doc.address_title }}</span>
+			</div>
+			<div class="col-xs-2"> {{ doc.address_type }} </div>
+			<div class="col-xs-2"> {{ doc.city }} </div>
+			<div class="col-xs-5 text-right small text-muted">
+	            {{ frappe.get_doc(doc).get_display() }}
+	        </div>
+	    </div>
     </a>
 </div>
diff --git a/erpnext/templates/includes/announcement/announcement_row.html b/erpnext/templates/includes/announcement/announcement_row.html
new file mode 100644
index 0000000..d807bfc
--- /dev/null
+++ b/erpnext/templates/includes/announcement/announcement_row.html
@@ -0,0 +1,34 @@
+<div class="web-list-item blog-list-item">
+	<a href="/announcements?announcement={{doc.name}}">
+		<div class="row">
+			<a href="/announcements?announcement={{doc.name}}">
+				<div class="col-xs-12">
+					<h1 class="blog-header">{{ doc.subject }}</h1>
+					<p class="post-description more">{{ doc.description }}</p>
+					<p class="post-by text-muted small">
+						<i>{{ doc.posted_by }}</i>
+						<i class="blog-dot"></i> {{ frappe.format_date(doc.modified) }}
+						<i class="blog-dot"></i> {{ doc.num_attachments }} attachments
+					</p>
+				</div>
+			</a>
+		</div>
+	</a>
+</div>
+
+<script type="text/javascript">
+	frappe.ready(function() {
+		var show_char = 150;
+		$('.more').each(function() {
+			var content = $(this).text();
+			if(content.length > show_char) {
+
+				var c = content.substr(0, show_char)
+				var h = content.substr(show_char, content.length - show_char);
+
+				html = c + '&nbsp;&nbsp;...'
+				$(this).html(html);
+			}
+		});
+	});
+</script>
diff --git a/erpnext/templates/includes/cart.css b/erpnext/templates/includes/cart.css
index 7a18530..e69de29 100644
--- a/erpnext/templates/includes/cart.css
+++ b/erpnext/templates/includes/cart.css
@@ -1,25 +0,0 @@
-.cart-content {
-	min-height: 400px;
-	margin-top: 60px;
-}
-
-.cart-header, .cart-footer {
-	margin-bottom: 60px;
-}
-
-.cart-item-header {
-	padding-bottom: 10px;
-	margin-bottom: 10px;
-	border-bottom: 1px solid #d1d8dd;
-}
-
-.tax-grand-total-row {
-	font-size: 14px;
-	margin-top: 30px;
-	font-weight: bold;
-}
-
-.cart-addresses {
-	margin-top: 80px;
-	margin-bottom: 60px;
-}
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index 0c29569..dbb93a9 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -16,9 +16,9 @@
 		shopping_cart.bind_address_select();
 		shopping_cart.bind_place_order();
 		shopping_cart.bind_change_qty();
-
+		shopping_cart.bind_dropdown_cart_buttons();
 	},
-
+	
 	bind_address_select: function() {
 		$(".cart-addresses").find('input[data-address-name]').on("click", function() {
 			if($(this).prop("checked")) {
@@ -54,24 +54,29 @@
 		// bind update button
 		$(".cart-items").on("change", ".cart-qty", function() {
 			var item_code = $(this).attr("data-item-code");
-			frappe.freeze();
-			shopping_cart.update_cart({
-				item_code: item_code,
-				qty: $(this).val(),
-				with_items: 1,
-				btn: this,
-				callback: function(r) {
-					frappe.unfreeze();
-					if(!r.exc) {
-						$(".cart-items").html(r.message.items);
-						$(".cart-tax-items").html(r.message.taxes);
-						$(".cart-icon").hide();
-					}
-				},
-			});
+			var newVal = $(this).val();
+			shopping_cart.shopping_cart_update(item_code, newVal);
+		});
+		
+		$(".cart-items").on('click', '.number-spinner button', function () {  
+			var btn = $(this),
+				input = btn.closest('.number-spinner').find('input'),
+				oldValue = input.val().trim(),
+				newVal = 0;
+	
+			if (btn.attr('data-dir') == 'up') {
+				newVal = parseInt(oldValue) + 1;
+			} else {
+				if (oldValue > 1) {
+					newVal = parseInt(oldValue) - 1;
+				}
+			}
+			input.val(newVal);
+			var item_code = input.attr("data-item-code"); 
+			shopping_cart.shopping_cart_update(item_code, newVal);
 		});
 	},
-
+	
 	render_tax_row: function($cart_taxes, doc, shipping_rules) {
 		var shipping_selector;
 		if(shipping_rules) {
@@ -143,7 +148,12 @@
 	}
 });
 
-$(document).ready(function() {
+frappe.ready(function() {
 	$(".cart-icon").hide();
 	shopping_cart.bind_events();
 });
+
+function show_terms() {
+  var html = $(".cart-terms").html();
+    frappe.msgprint(html);
+}
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index 1af8f0b..29d4f4b 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -1,11 +1,10 @@
-{% from "erpnext/templates/includes/cart/cart_macros.html"
-    import show_address %}
+{% from "erpnext/templates/includes/cart/cart_macros.html" import show_address %}
 <div class="row">
 	{% if addresses|length == 1%}
 		{% set select_address = True %}
 	{% endif %}
 	<div class="col-sm-6">
-		<h4>{{ _("Shipping Address") }}</h4>
+		<div class="h6 text-uppercase">{{ _("Shipping Address") }}</div>
 		<div id="cart-shipping-address" class="panel-group"
 			data-fieldname="shipping_address_name">
             {% for address in addresses %}
@@ -16,7 +15,7 @@
 			{{ _("Manage Addresses") }}</a>
 	</div>
 	<div class="col-sm-6">
-		<h4>Billing Address</h4>
+		<div class="h6 text-uppercase">Billing Address</div>
 		<div id="cart-billing-address" class="panel-group"
 			data-fieldname="customer_address">
             {% for address in addresses %}
diff --git a/erpnext/templates/includes/cart/cart_dropdown.html b/erpnext/templates/includes/cart/cart_dropdown.html
new file mode 100644
index 0000000..071b281
--- /dev/null
+++ b/erpnext/templates/includes/cart/cart_dropdown.html
@@ -0,0 +1,23 @@
+<div class="cart-dropdown-container">
+	<div id="cart-error" class="alert alert-danger"
+	style="display: none;"></div>
+	<div class="row cart-items-dropdown cart-item-header text-muted">
+		<div class="col-sm-6 col-xs-6 h6 text-uppercase">
+		{{ _("Item") }}
+		</div>
+		<div class="col-sm-6 col-xs-6 text-right h6 text-uppercase">
+		{{ _("Price") }}
+		</div>
+	</div>
+	
+	{% if doc.items %}
+	<div class="cart-items-dropdown">
+		{% include "templates/includes/cart/cart_items_dropdown.html" %}
+	</div>
+	<div class="checkout-btn">
+	<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
+	</div>
+	{% else %}
+	<p>{{ _("Cart is Empty") }}</p>
+	{% endif %}
+</div>
diff --git a/erpnext/templates/includes/cart/cart_items.html b/erpnext/templates/includes/cart/cart_items.html
index f7efa78..b2e6858 100644
--- a/erpnext/templates/includes/cart/cart_items.html
+++ b/erpnext/templates/includes/cart/cart_items.html
@@ -1,23 +1,32 @@
 {% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
+{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description_cart %}
 
 {% for d in doc.items %}
-<div class="cart-item">
-    <div class="row">
-        <div class="col-sm-8 col-xs-6" style="margin-bottom: 10px;">
-            {{ item_name_and_description(d) }}
-        </div>
-        <div class="col-sm-2 col-xs-3 text-right">
-            <span style="max-width: 50px; display: inline-block">
-                <input class="form-control text-right cart-qty"
-                value = "{{ d.get_formatted('qty') }}"
-                data-item-code="{{ d.item_code }}"></span>
-    		<p class="text-muted small" style="margin-top: 10px;">
-                {{ _("Rate") + ': ' + d.get_formatted("rate") }}
-            </p>
-    	</div>
-        <div class="col-sm-2 col-xs-3 text-right">
-            {{ d.get_formatted("amount") }}
-        </div>
+<div class="row checkout">
+    <div class="col-sm-8 col-xs-6 col-name-description">
+        {{ item_name_and_description(d) }}
+    </div>
+    <div class="col-sm-2 col-xs-3 text-right col-qty">
+        <span style="display: inline-block">
+			<div class="input-group number-spinner">
+                <span class="input-group-btn">
+                    <button class="btn btn-default cart-btn" data-dir="dwn">
+                        –</button>
+                </span>
+            <input class="form-control text-right cart-qty"
+            value = "{{ d.get_formatted('qty') }}"
+            data-item-code="{{ d.item_code }}">
+                <span class="input-group-btn">
+                    <button class="btn btn-default cart-btn" data-dir="up" style="margin-left:-2px;">
+                        +</button>
+                </span>
+			</div>
+		</span>    	
+	</div>
+    <div class="col-sm-2 col-xs-3 text-right col-amount">
+        {{ d.get_formatted("amount") }}
+        <p class="text-muted small item-rate">{{
+            _("Rate: {0}").format(d.get_formatted("rate")) }}</p>
     </div>
 </div>
-{% endfor %}
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/cart/cart_items_dropdown.html b/erpnext/templates/includes/cart/cart_items_dropdown.html
new file mode 100644
index 0000000..9a3dbf8
--- /dev/null
+++ b/erpnext/templates/includes/cart/cart_items_dropdown.html
@@ -0,0 +1,13 @@
+{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description_cart %}
+
+{% for d in doc.items %}
+<div class="row cart-dropdown">
+    <div class="col-sm-8 col-xs-8 col-name-description">
+        {{ item_name_and_description_cart(d) }}
+    </div>
+    <div class="col-sm-4 col-xs-4 text-right col-amount">
+        {{ d.get_formatted("amount") }}
+
+    </div>
+</div>
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/course/course_row.html b/erpnext/templates/includes/course/course_row.html
new file mode 100644
index 0000000..9b9317b
--- /dev/null
+++ b/erpnext/templates/includes/course/course_row.html
@@ -0,0 +1,18 @@
+<div class="web-list-item">
+	<a href="/courses?course={{ doc.course }}">
+		<div class="row">
+			<div class="col-xs-5">
+				{{ doc.course }}
+			</div>
+			<div class="col-xs-3">
+				{{ doc.group_name }}
+			</div>
+			<div class="col-xs-2">
+				{{doc.academic_term }}
+			</div>
+			<div class="col-xs-2">
+				{{ doc.academic_year }}
+			</div>
+		</div>
+	</a>
+</div>
diff --git a/erpnext/templates/includes/course/macros.html b/erpnext/templates/includes/course/macros.html
new file mode 100644
index 0000000..c80dca4
--- /dev/null
+++ b/erpnext/templates/includes/course/macros.html
@@ -0,0 +1 @@
+{% macro back_link(doc) %}&back-to=/courses?course={{ doc.name }}&back-to-title={{ doc.course_name }}{% endmacro %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/discussion/discussion_row.html b/erpnext/templates/includes/discussion/discussion_row.html
new file mode 100644
index 0000000..7bec3cc
--- /dev/null
+++ b/erpnext/templates/includes/discussion/discussion_row.html
@@ -0,0 +1,9 @@
+<div class="web-list-item">
+	<div class="row">
+		<a href="/discussions?discussion={{doc.name}}">
+			<div class="col-xs-12">
+				{{ doc.subject }}
+			</div>
+		</a>
+	</div>
+</div>
diff --git a/erpnext/templates/includes/examination/examination_row.html b/erpnext/templates/includes/examination/examination_row.html
new file mode 100644
index 0000000..a33ccff
--- /dev/null
+++ b/erpnext/templates/includes/examination/examination_row.html
@@ -0,0 +1,19 @@
+<div class="web-list-item">
+	<div class="row">
+		<div class="col-xs-4">
+			{{ doc.course }}
+		</div>
+		<div class="col-xs-2">
+			{{ doc.room }}
+		</div>
+		<div class="col-xs-2">
+			{{doc.schedule_date }}
+		</div>
+		<div class="col-xs-2">
+			{{ doc.from_time }}
+		</div>
+		<div class="col-xs-2">
+			{{ doc.to_time }}
+		</div>
+	</div>
+</div>
diff --git a/erpnext/templates/includes/fee/fee_row.html b/erpnext/templates/includes/fee/fee_row.html
new file mode 100644
index 0000000..ac2b100
--- /dev/null
+++ b/erpnext/templates/includes/fee/fee_row.html
@@ -0,0 +1,18 @@
+<div class="web-list-item">
+	<a href = "/fees/{{doc.name}}/">
+		<div class="row">
+			<div class="col-xs-6">
+				{{ doc.program }}
+			</div>
+			<div class="col-xs-2">
+				{{ doc.get_formatted("total_amount") }}
+			</div>
+			<div class="col-xs-2">
+				{{ doc.get_formatted("paid_amount") }}
+			</div>
+			<div class="col-xs-2">
+				{{ doc.get_formatted("outstanding_amount") }}
+			</div>
+		</div>
+	</a>
+</div>
diff --git a/erpnext/templates/includes/footer/footer_extension.html b/erpnext/templates/includes/footer/footer_extension.html
index e24b862..897a804 100644
--- a/erpnext/templates/includes/footer/footer_extension.html
+++ b/erpnext/templates/includes/footer/footer_extension.html
@@ -1,19 +1,13 @@
 {% if not hide_footer_signup %}
-<div class="container">
-	<div class="row">
-		<div class="col-sm-6 col-sm-offset-3 text-center" style="margin-top: 15px;">
-				<input class="form-control" type="text" id="footer-subscribe-email"
-                    style="display: inline-block; max-width: 50%; margin-right: 10px;"
-					placeholder="{{ _('Your email address') }}...">
-				<button class="btn btn-default btn-sm" type="button"
-					id="footer-subscribe-button">{{ _("Get Updates") }}</button>
-		</div>
-	</div>
-    <div class="text-center text-muted small" style="padding: 30px;">
-        <a href="https://erpnext.com?source=website_footer" target="_blank" class="text-extra-muted">
-            Powered by ERPNext</a>
-    </div>
+<div class='input-group input-group-sm pull-right footer-subscribe'>
+	<input class="form-control" type="text" id="footer-subscribe-email"
+		placeholder="{{ _('Your email address') }}...">
+	<span class='input-group-btn'>
+		<button class="btn btn-default" type="button"
+			id="footer-subscribe-button">{{ _("Get Updates") }}</button>
+	</span>
 </div>
+
 <script>
 frappe.ready(function() {
 	$("#footer-subscribe-button").click(function() {
@@ -41,4 +35,5 @@
 	});
 });
 </script>
+
 {% endif %}
diff --git a/erpnext/templates/includes/footer/footer_powered.html b/erpnext/templates/includes/footer/footer_powered.html
index c44c342..e9d5f56 100644
--- a/erpnext/templates/includes/footer/footer_powered.html
+++ b/erpnext/templates/includes/footer/footer_powered.html
@@ -1 +1,2 @@
-<!-- blank -->
+<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-muted">
+		Powered by ERPNext</a>
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
index c090f93..f19ea85 100644
--- a/erpnext/templates/includes/issue_row.html
+++ b/erpnext/templates/includes/issue_row.html
@@ -1,13 +1,14 @@
-<div class="web-list-item">
-    <a class="no-decoration" href="/issues?name={{ doc.name }}">
+<div class="web-list-item transaction-list-item">
+    <a href="/issues?name={{ doc.name }}">
     <div class="row">
-        <div class="col-xs-8">
+        <div class="col-xs-3">
             <span class="indicator {{ "red" if doc.status=="Open" else "darkgrey"   }}">
                 {{ doc.name }}</span>
-                <span style="margin-left: 15px;">
-                    {{ doc.subject }}</span>
-        </div>
-        <div class="col-xs-4 text-right small text-muted">
+				   </div>
+                <div class="col-xs-6 items-preview text-ellipsis">
+                    {{ doc.subject }}</div>
+     
+        <div class="col-xs-3 text-right small text-muted">
             {{ frappe.format_date(doc.modified) }}
         </div>
     </div>
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 81a10c2..da21748 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -1,17 +1,14 @@
 {% macro product_image_square(website_image, css_class="") %}
+{% if website_image -%} <meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>{%- endif %}
 <div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
 	{% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');" {%- endif %}>
-	{% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %}
 </div>
 {% endmacro %}
 
 {% macro product_image(website_image, css_class="") %}
     <div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
     	{% if website_image -%}
-    		<img src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
-    	{%- else -%}
-    		<i class="centered octicon octicon-device-camera"></i>
+    		<img itemprop="image" src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
     	{%- endif %}
     </div>
 {% endmacro %}
-
diff --git a/erpnext/templates/includes/navbar/navbar_items.html b/erpnext/templates/includes/navbar/navbar_items.html
new file mode 100644
index 0000000..c7af2fd
--- /dev/null
+++ b/erpnext/templates/includes/navbar/navbar_items.html
@@ -0,0 +1,12 @@
+{% extends 'frappe/templates/includes/navbar/navbar_items.html' %}
+
+{% block navbar_right_extension %}
+	<li class="shopping-cart">
+		<div class="cart-icon small">
+			<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
+				Cart <span class="badge-wrapper" id="cart-count"></span>
+			</a>
+			<div id="cart-overlay" class="dropdown-menu shopping-cart-menu"></div>
+		</div>
+	 </li>
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/order/order.css b/erpnext/templates/includes/order/order.css
deleted file mode 100644
index 54c8d0f..0000000
--- a/erpnext/templates/includes/order/order.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.order-container {
-	margin: 50px 0px;
-}
-
-.order-items {
-	margin: 20px 0px;
-}
-
-.order-item-table {
-	margin: 0px -15px;
-}
-
-.order-item-header {
-	border-bottom: 1px solid #d1d8dd;
-}
-
-.order-image-col {
-	padding-right: 0px;
-}
-
-.order-image {
-	max-width: 55px;
-	max-height: 55px;
-	margin-top: -5px;
-}
diff --git a/erpnext/templates/includes/order/order_macros.html b/erpnext/templates/includes/order/order_macros.html
index af974aa..41be449 100644
--- a/erpnext/templates/includes/order/order_macros.html
+++ b/erpnext/templates/includes/order/order_macros.html
@@ -1,7 +1,7 @@
 {% from "erpnext/templates/includes/macros.html" import product_image_square %}
 
 {% macro item_name_and_description(d) %}
-    <div class="row">
+    <div class="row item_name_and_description">
         <div class="col-xs-4 col-sm-2 order-image-col">
             <div class="order-image">
                 {{ product_image_square(d.image) }}
@@ -9,7 +9,32 @@
         </div>
         <div class="col-xs-8 col-sm-10">
             {{ d.item_code }}
-            <p class="text-muted small">{{ d.description }}</p>
+            <div class="text-muted small item-description">{{ d.description }}</div>
         </div>
     </div>
 {% endmacro %}
+{% macro item_name_and_description_cart(d) %}
+    <div class="row item_name_dropdown">
+        <div class="col-xs-4 col-sm-4 order-image-col">
+            <div class="order-image">
+             {{ product_image_square(d.image) }}
+            </div>
+        </div>
+        <div class="col-xs-8 col-sm-8">
+           {{ d.item_code|truncate(25) }}			
+			<div class="input-group number-spinner">
+                <span class="input-group-btn">
+                    <button class="btn btn-default cart-btn" data-dir="dwn">
+                        –</button>
+                </span>
+            <input class="form-control text-right cart-qty"
+            value = "{{ d.get_formatted('qty') }}"
+            data-item-code="{{ d.item_code }}">
+                <span class="input-group-btn">
+                    <button class="btn btn-default cart-btn" data-dir="up">
+                        +</button>
+                </span>
+			</div>
+        </div>
+    </div>
+{% endmacro %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/order/order_taxes.html b/erpnext/templates/includes/order/order_taxes.html
index 8c8e886..24ae088 100644
--- a/erpnext/templates/includes/order/order_taxes.html
+++ b/erpnext/templates/includes/order/order_taxes.html
@@ -1,21 +1,21 @@
 {% if doc.taxes %}
 <div class="row tax-net-total-row">
-    <div class="col-xs-6 text-right">{{ _("Net Total") }}</div>
-    <div class="col-xs-6 text-right">
+    <div class="col-xs-8 text-right">{{ _("Net Total") }}</div>
+    <div class="col-xs-4 text-right">
         {{ doc.get_formatted("net_total") }}</div>
 </div>
 {% endif %}
 {% for d in doc.taxes %}
-<div class="row  tax-row">
-    <div class="col-xs-6 text-right">{{ d.description }}</div>
-    <div class="col-xs-6 text-right">
+<div class="row tax-row">
+    <div class="col-xs-8 text-right">{{ d.description }}</div>
+    <div class="col-xs-4 text-right">
         {{ d.get_formatted("base_tax_amount") }}</div>
 </div>
 {% endfor %}
 <div class="row tax-grand-total-row">
-    <div class="col-xs-6 text-right">{{ _("Grand Total") }}</div>
-    <div class="col-xs-6 text-right">
-        <span class="tax-grand-total">
+    <div class="col-xs-8 text-right text-uppercase h6 text-muted">{{ _("Grand Total") }}</div>
+    <div class="col-xs-4 text-right">
+        <span class="tax-grand-total bold">
             {{ doc.get_formatted("grand_total") }}
         </span>
     </div>
diff --git a/erpnext/templates/includes/product_in_grid.html b/erpnext/templates/includes/product_in_grid.html
deleted file mode 100644
index ff39f1f..0000000
--- a/erpnext/templates/includes/product_in_grid.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% from "erpnext/templates/includes/macros.html" import product_image_square %}
-
-<a class="product-link" href="{{ (route or page_name)|abs_url }}">
-	<div class="col-sm-2 col-xs-4 product-image-wrapper">
-		{{ product_image_square(thumbnail or website_image) }}
-		<div class="text-ellipsis inline-block small product-text">{{ item_name }}</div>
-	</div>
-</a>
diff --git a/erpnext/templates/includes/product_in_list.html b/erpnext/templates/includes/product_in_list.html
deleted file mode 100644
index 8a4bdf6..0000000
--- a/erpnext/templates/includes/product_in_list.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- TODO product listing -->
-<div class="container content">
-	<div style="height: 120px; overflow: hidden;">
-		<a href="{{ (route or page_name)|abs_url }}">
-		{%- if website_image -%}
-		<img class="product-image" style="width: 80%; margin: auto;" src="{{
-            (thumbnail or website_image)|abs_url }}">
-		{%- else -%}
-        <div style="width: 80%; height: 120px; background-color: #F7FAFC;"></div>
-		{%- endif -%}
-		</a>
-	</div>
-	<div style="height: 100px; overflow: hidden; font-size: 80%;">
-		<div><a href="{{ (route or page_name)|abs_url }}">{{ item_name }}</a></div>
-	</div>
-</div>
diff --git a/erpnext/templates/includes/product_list.js b/erpnext/templates/includes/product_list.js
index f618f9a..28c626f 100644
--- a/erpnext/templates/includes/product_list.js
+++ b/erpnext/templates/includes/product_list.js
@@ -22,14 +22,14 @@
 		},
 		dataType: "json",
 		success: function(data) {
-			window.render_product_list(data.message);
+			window.render_product_list(data.message || []);
 		}
 	})
 }
 
 window.render_product_list = function(data) {
+	var table = $("#search-list .table");
 	if(data.length) {
-		var table = $("#search-list .table");
 		if(!table.length)
 			var table = $("<table class='table'>").appendTo("#search-list");
 
diff --git a/erpnext/templates/includes/product_search_box.html b/erpnext/templates/includes/product_search_box.html
deleted file mode 100644
index a135396..0000000
--- a/erpnext/templates/includes/product_search_box.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="product-search pull-right">
-	<form class="form-inline form-search">
-    	<div class="input-group">
-    		<input class="form-control" type="text" id="product-search"
-                placeholder="Product Search...">
-    		<span class="input-group-btn">
-    			<button class="btn btn-default" type="button" id="btn-product-search">
-    				<i class="icon-search"></i></button>
-    		</span>
-    	</div>
-    </form>
-</div>
-<script>
-frappe.ready(function() {
-	$("#btn-product-search").click(function() {
-		var txt = $("#product-search").val();
-		if(txt) {
-			window.location.href="/product_search?q=" + txt;
-		}
-		return false;
-	});
-	$("#product-search").keypress(function(e) {
-		if(e.which==13) $("#btn-product-search").click();
-	});
-	$(".form-search").on("submit", function() { return false; });
-
-});
-</script>
diff --git a/erpnext/templates/includes/products_as_grid.html b/erpnext/templates/includes/products_as_grid.html
new file mode 100644
index 0000000..7a15c1f
--- /dev/null
+++ b/erpnext/templates/includes/products_as_grid.html
@@ -0,0 +1,10 @@
+{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+
+<a class="product-link" href="{{ route|abs_url }}">
+	<div class="col-sm-4 col-xs-4 product-image-wrapper">
+		<div class="product-image-img">
+		{{ product_image_square(thumbnail or website_image) }}
+		<div class="product-text" itemprop="name">{{ item_name }}</div>
+		</div>
+	</div>
+</a>
diff --git a/erpnext/templates/includes/products_as_list.html b/erpnext/templates/includes/products_as_list.html
new file mode 100644
index 0000000..b2069e4
--- /dev/null
+++ b/erpnext/templates/includes/products_as_list.html
@@ -0,0 +1,18 @@
+{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+
+<a class="product-link product-list-link" href="{{ route|abs_url }}">
+	<div class='row'>
+		<div class='col-xs-3 col-sm-2 product-image-wrapper'>
+			{{ product_image_square(thumbnail or website_image) }}
+		</div>
+		<div class='col-xs-9 col-sm-10 text-left'>
+			<div class="text-ellipsis product-text strong">{{ item_name }}</div>
+			{% set website_description = website_description or description %}
+			{% if website_description != item_name %}
+				<div class="text-ellipsis text-muted">{{ website_description or description }}</div>
+			{% elif item_code != item_name %}
+				<div class="text-ellipsis text-muted">{{ _('Item Code') }}: {{ item_code }}</div>
+			{% endif %}
+		</div>
+	</div>
+</a>
diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css
new file mode 100644
index 0000000..5a717fc
--- /dev/null
+++ b/erpnext/templates/includes/projects.css
@@ -0,0 +1,89 @@
+/* CSS used here will be applied after bootstrap.css */
+
+.underline {
+	text-decoration: underline;
+}
+
+.project-item:hover {
+  background-color: #f7f7f7;
+}
+
+.project-item {
+  color: #6c7680;
+  font-size: 14px;
+}
+
+.task-subject
+{
+	margin: 0px;
+}
+
+.item-timestamp
+{
+	font-size: 10px;
+	margin-left: 15px;
+}
+.page-container .project-item {
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+
+#project-search {
+	position: relative;
+	outline:none;
+	border:none;
+}
+
+.task-link, .timelog-link {
+	font-weight: bold;
+}
+
+.task-link.seen, .timelog-link.seen {
+	font-weight: normal;
+}
+
+.row-header {
+    font-size: 14px;
+    font-weight: 500;
+    padding-bottom: 8px;
+    border-bottom: 2px solid #d1d8dd;
+    margin: 0!important;
+}
+
+.content_display{
+  padding: 5px;
+  font-weight: normal;
+  font-size: 12px;
+  vertical-align: middle;
+  color: #6c7680;
+}
+
+.close-btn{
+  display: none;
+}
+
+.content_display:hover .close-btn{
+	display : block;
+}
+
+.btn-link{
+	padding: 0 10px 0 0;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+
+.task-btn, .issue-btn, .timelog-btn{
+	padding: 8px;
+}
+
+.gravatar-top{
+	margin-top:8px;
+}
+
+.progress-hg{
+	margin-bottom: 30!important;
+	height:2px;
+}
\ No newline at end of file
diff --git a/erpnext/templates/includes/projects/project_row.html b/erpnext/templates/includes/projects/project_row.html
new file mode 100644
index 0000000..55b02e2
--- /dev/null
+++ b/erpnext/templates/includes/projects/project_row.html
@@ -0,0 +1,28 @@
+{% if doc.status=="Open" %}
+<div class="web-list-item">
+	<a class="no-decoration" href="/projects?project={{ doc.name }}">
+		<div class="row">
+			<div class="col-xs-6">
+
+				{{ doc.name }}
+			</div>
+			<div class="col-xs-3">
+				{% if doc.percent_complete %}
+					<div class="progress" style="margin-bottom: 0!important; margin-top: 10px!important; height:5px;">
+					  <div class="progress-bar progress-bar-{{ "warning" if doc.percent_complete|round < 100 else "success"}}" role="progressbar"
+					  	aria-valuenow="{{ doc.percent_complete|round|int }}"
+					  	aria-valuemin="0" aria-valuemax="100" style="width:{{ doc.percent_complete|round|int }}%;">
+					  </div>
+					</div>
+				{% else %}
+					<span class="indicator {{ "red" if doc.status=="Open" else "darkgrey"  }}">
+						{{ doc.status }}</span>
+				{% endif %}
+			</div>
+			<div class="col-xs-3 text-right small text-muted">
+				{{ frappe.utils.pretty_date(doc.modified) }}
+			</div>
+		</div>
+	</a>
+</div>
+{% endif %}
diff --git a/erpnext/templates/includes/projects/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html
new file mode 100644
index 0000000..ab02f0c
--- /dev/null
+++ b/erpnext/templates/includes/projects/project_search_box.html
@@ -0,0 +1,30 @@
+<div class="project-search text-muted pull-right">
+	<input type="text" id="project-search" placeholder="Quick Search">	
+	<i class="octicon octicon-search"></i> 	
+</div>
+<div class="clearfix pull-right" style="width:300px;">
+	<h4 class="project-search-results pull-left"></h4> 
+	<p class="pull-right"> 
+		<a style="display: none; padding-left:5px;" href="/projects?project={{doc.name}}" class="octicon octicon-x 			text-extra-muted clear" title="Clear Search" ></a> 
+	</p> 
+</div>
+
+<script>
+frappe.ready(function() {
+	if(get_url_arg("q")){
+	var txt = get_url_arg("q");
+	$(".project-search-results").html("Search results for : " + txt);
+	$(".clear").toggle(true);
+	}
+	var thread = null;
+	function findResult(t) {
+		window.location.href="/projects?project={{doc.name}}&q=" + t;
+	}
+
+	$("#project-search").keyup(function() {
+		clearTimeout(thread);
+		var $this = $(this); thread = setTimeout(function(){findResult($this.val())}, 1000);
+	});
+	$(".form-search").on("submit", function() { return false; });
+});
+</script>
\ No newline at end of file
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
new file mode 100644
index 0000000..e978a7d
--- /dev/null
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -0,0 +1,32 @@
+{% for task in doc.tasks %}
+	<div class='task'>
+		<a class="no-decoration task-link {{ task.css_seen }}" href="/tasks?name={{ task.name }}">
+		<div class='row project-item'>
+			<div class='col-xs-9'>
+				<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}"  > {{ task.subject }}</span> 
+	 				<div class="small text-muted item-timestamp"
+	 					title="{{ frappe.utils.pretty_date(task.modified) }}">
+	 					modified {{ frappe.utils.pretty_date(task.modified) }}
+	 				</div>
+			</div>
+			<div class='col-xs-1'>{% if task.todo %}
+					{% if task.todo.user_image %}
+						<span class="avatar avatar-small" title="{{ task.todo.owner }}">
+							<img src="{{ task.todo.user_image }}">
+						</span>
+					{% else %}
+						<span class="avatar avatar-small standard-image" title="Assigned to {{ task.todo.owner }}">
+							
+						</span>
+					{% endif %}		
+				{% endif %}	 </div>
+			<div class='col-xs-2'>
+				<span class="pull-right list-comment-count small {{ "text-extra-muted" if task.comment_count==0 else "text-muted" }}">
+					<i class="octicon octicon-comment-discussion"></i>
+						{{ task.comment_count }}
+				</span>
+			</div>
+		</div>
+		</a>
+	</div>
+{% endfor %}
diff --git a/erpnext/templates/includes/projects/project_timesheets.html b/erpnext/templates/includes/projects/project_timesheets.html
new file mode 100644
index 0000000..fb44017
--- /dev/null
+++ b/erpnext/templates/includes/projects/project_timesheets.html
@@ -0,0 +1,23 @@
+{% for timesheet in doc.timesheets %}
+<div class='timesheet'>
+	<a class="no-decoration timesheet-link {{ timesheet.css_seen }}" href="/timesheet/{{ timesheet.info.name}}">
+		<div class='row project-item'>
+			<div class='col-xs-9'>
+				<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}"  > {{ timesheet.info.name }} </span> 
+				<div class="small text-muted item-timestamp">
+				From {{ frappe.format_date(timesheet.from_time) }} to {{ frappe.format_date(timesheet.to_time) }}
+			</div>
+			</div>
+				<div class='col-xs-1 gravatar-top'>
+				<span class="avatar avatar-small" title="{{ timesheet.info.modified_by }}"> <img src="{{ timesheet.info.user_image }}"></span>
+			</div> 
+			<div class='col-xs-2'>
+				<span class="pull-right list-comment-count small {{ "text-extra-muted" if timesheet.comment_count==0 else "text-muted" }}">
+				<i class="octicon octicon-comment-discussion"></i>
+				{{ timesheet.info.comment_count }}
+				</span> 
+			</div>
+		</div>
+	</a>
+</div>
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/rfq.js b/erpnext/templates/includes/rfq.js
new file mode 100644
index 0000000..3e9c261
--- /dev/null
+++ b/erpnext/templates/includes/rfq.js
@@ -0,0 +1,88 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+window.doc={{ doc.as_json() }};
+
+$(document).ready(function() {
+	new rfq();
+	doc.supplier = "{{ doc.supplier }}"
+	doc.currency = "{{ doc.currency }}"
+	doc.number_format = "{{ doc.number_format }}"
+	doc.buying_price_list = "{{ doc.buying_price_list }}"
+});
+
+rfq = Class.extend({
+	init: function(){
+		this.onfocus_select_all();
+		this.change_qty();
+		this.change_rate();
+		this.terms();
+		this.submit_rfq();
+	},
+
+	onfocus_select_all: function(){
+		$("input").click(function(){
+			$(this).select();
+		})
+	},
+
+	change_qty: function(){
+		var me = this;
+		$('.rfq-items').on("change", ".rfq-qty", function(){
+			me.idx = parseFloat($(this).attr('data-idx'));
+			me.qty = parseFloat($(this).val());
+			me.rate = parseFloat($(repl('.rfq-rate[data-idx=%(idx)s]',{'idx': me.idx})).val());
+			me.update_qty_rate();
+		})
+	},
+
+	change_rate: function(){
+		var me = this;
+		$(".rfq-items").on("change", ".rfq-rate", function(){
+			me.idx = parseFloat($(this).attr('data-idx'));
+			me.rate = parseFloat($(this).val());
+			me.qty = parseFloat($(repl('.rfq-qty[data-idx=%(idx)s]',{'idx': me.idx})).val());
+			me.update_qty_rate();
+		})
+	},
+
+	terms: function(){
+		$(".terms").on("change", ".terms-feedback", function(){
+			doc.terms = $(this).val();
+		})
+	},
+
+	update_qty_rate: function(){
+		var me = this;
+		doc.grand_total = 0.0;
+		$.each(doc.items, function(idx, data){
+			if(data.idx == me.idx){
+				data.qty = me.qty;
+				data.rate = me.rate;
+				data.amount = (me.rate * me.qty) || 0.0;
+				$(repl('.rfq-amount[data-idx=%(idx)s]',{'idx': me.idx})).text(format_number(data.amount, doc.number_format, 2));
+			}
+
+			doc.grand_total += flt(data.amount);
+			$('.tax-grand-total').text(format_number(doc.grand_total, doc.number_format, 2));
+		})
+	},
+
+	submit_rfq: function(){
+		$('.btn-sm').click(function(){
+			frappe.freeze();
+			frappe.call({
+				type: "POST",
+				method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.create_supplier_quotation",
+				args: {
+					doc: doc
+				},
+				btn: this,
+				callback: function(r){
+					$('.btn-sm').hide()
+					frappe.unfreeze();
+				}
+			})
+		})
+	}
+})
diff --git a/erpnext/templates/includes/rfq/rfq_items.html b/erpnext/templates/includes/rfq/rfq_items.html
new file mode 100644
index 0000000..1e99a76
--- /dev/null
+++ b/erpnext/templates/includes/rfq/rfq_items.html
@@ -0,0 +1,30 @@
+{% from "erpnext/templates/includes/rfq/rfq_macros.html" import item_name_and_description %}
+
+{% for d in doc.items %}
+<div class="rfq-item">
+	<div class="row">
+		<div class="col-sm-6 col-xs-6" style="margin-bottom: 10px;margin-top: 5px;">
+			{{ item_name_and_description(d, doc) }}
+		</div>
+		<!-- <div class="col-sm-2 col-xs-2" style="margin-bottom: 10px;">
+			<textarea type="text" style="margin-top: 5px;" class="input-with-feedback form-control rfq-offer_detail" ></textarea>
+		</div> -->
+		<div class="col-sm-2 col-xs-2 text-right">
+				<input type="number" class="form-control text-right rfq-qty" style="margin-top: 5px; max-width: 70px;display: inline-block"
+				value = "{{ d.get_formatted('qty') }}"
+				data-idx="{{ d.idx }}">
+				<p class="text-muted small" style="margin-top: 10px;">
+					{{_("UOM") + ": "+ d.uom}}
+				</p>
+		</div>
+		<div class="col-sm-2 col-xs-2 text-right">
+			{{doc.currency_symbol}}	<input type="number" class="form-control text-right rfq-rate"
+				style="margin-top: 5px; max-width: 70px;display: inline-block" value="0.00"
+				data-idx="{{ d.idx }}">
+		</div>
+        <div class="col-sm-2 col-xs-2 text-right" style="padding-top: 9px;">
+           {{doc.currency_symbol}} <span class="rfq-amount" data-idx="{{ d.idx }}">0.00</span>
+        </div>
+		</div>
+	</div>
+{% endfor %}
\ No newline at end of file
diff --git a/erpnext/templates/includes/rfq/rfq_macros.html b/erpnext/templates/includes/rfq/rfq_macros.html
new file mode 100644
index 0000000..95bbcfe
--- /dev/null
+++ b/erpnext/templates/includes/rfq/rfq_macros.html
@@ -0,0 +1,21 @@
+{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+
+{% macro item_name_and_description(d, doc) %}
+    <div class="row">
+        <div class="col-xs-4 col-sm-2 order-image-col">
+            <div class="order-image">
+                {{ product_image_square(d.image) }}
+            </div>
+        </div>
+        <div class="col-xs-8 col-sm-10">
+            {{ d.item_code }}
+            <p class="text-muted small">{{ d.description }}</p>
+			{% set supplier_part_no = frappe.db.get_value("Item Supplier", {'parent': d.item_code, 'supplier': doc.supplier}, "supplier_part_no") %}
+			<p class="text-muted small supplier-part-no">
+				{% if supplier_part_no %}
+					{{_("Supplier Part No") + ": "+ supplier_part_no}}
+				{% endif %}
+			</p>
+        </div>
+    </div>
+{% endmacro %}
diff --git a/erpnext/templates/includes/topic/topic_row.html b/erpnext/templates/includes/topic/topic_row.html
new file mode 100644
index 0000000..3401bd3
--- /dev/null
+++ b/erpnext/templates/includes/topic/topic_row.html
@@ -0,0 +1,9 @@
+<div class="web-list-item">	
+	<div class="row">
+		<a href = "/topics?topic={{ doc.name }}">
+			<div class="col-xs-12">
+				{{ doc.topic_name }}
+			</div>
+		</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index 7c03579..f0fee97 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,24 +1,23 @@
-<div class="web-list-item">
-<a href="/{{ pathname }}/{{ doc.name }}">
-<div class="row">
-	<div class="col-sm-8 col-xs-7">
+<div class="web-list-item transaction-list-item">
+	<a href="/{{ pathname }}/{{ doc.name }}">
 		<div class="row">
-			<div class="col-sm-9">
-                <div>{{ doc.name }}</div>
-                <div class="small text-muted">{{ doc.items_preview }}</div>
-            </div>
-			<div class="col-sm-3">
-                <span class="indicator {{ doc.indicator_color or "darkgrey" }}">
-                    {{ doc.indicator_title or doc.status or "Submitted" }}
-                </span>
+			<div class="col-sm-5">
+				<span class="indicator small {{ doc.indicator_color or "darkgrey" }}">
+				{{ doc.name }}</span>
+				<div class="small text-muted transaction-time"
+					title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
+					{{ frappe.utils.format_datetime(doc.modified, "medium") }}
+				</div>
 			</div>
+			<div class="col-sm-4 items-preview text-ellipsis small">
+				{{ doc.items_preview }}
+			</div>
+			<div class="col-sm-3 text-right bold">
+				{{ doc.get_formatted("grand_total") }}
+			</div>
+			<!-- <div class="col-sm-3 text-right">
+
+			</div> -->
 		</div>
-	</div>
-	<div class="col-sm-2 col-xs-5 text-right">
-		{{ doc.get_formatted("grand_total") }}
-	</div>
-	<div class="col-sm-2 small text-muted text-right" title="{{ frappe.utils.format_datetime(doc.creation, "medium") }}">
-		{{ frappe.utils.pretty_date(doc.creation) }}</div>
-</div>
-</a>
+	</a>
 </div>
diff --git a/erpnext/templates/pages/announcements.html b/erpnext/templates/pages/announcements.html
new file mode 100644
index 0000000..d6e0d73
--- /dev/null
+++ b/erpnext/templates/pages/announcements.html
@@ -0,0 +1,20 @@
+{% extends "templates/web.html" %}
+
+{% block header %}
+	<h1> {{doc.subject}} </h1>
+{% endblock %}
+
+{% block page_content %}
+
+<p class="post-description"> {{doc.description}} </p>
+<p class="post-by text-muted small">
+	{% for file in attached_files%}
+		<a href="{{file.file_url}}" target="_new">{{file.file_name}}</a>
+		<br>
+	{% endfor %}
+	<br>
+	<i>{{ doc.posted_by }}</i>
+	<i class="blog-dot"></i> {{ frappe.format_date(doc.modified) }}
+</p>
+
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/announcements.py b/erpnext/templates/pages/announcements.py
new file mode 100644
index 0000000..4a61fc8
--- /dev/null
+++ b/erpnext/templates/pages/announcements.py
@@ -0,0 +1,18 @@
+# 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
+
+def get_context(context):
+	announcement = frappe.get_doc('Announcement', frappe.form_dict.announcement)
+	context.no_cache = 1
+	context.show_sidebar = True
+	announcement.has_permission('read')
+	context.doc = announcement
+	attachments = frappe.db.sql("""select file_url, file_name from tabFile as file
+								where file.attached_to_name=%s """,(announcement.name), as_dict = True)
+
+	context.attached_files = attachments
+
+
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index 6891bce..7f6bf01 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -8,12 +8,6 @@
 <script>{% include "templates/includes/cart.js" %}</script>
 {% endblock %}
 
-{% block style %}
-<style>
-    {% include "templates/includes/cart.css" %}
-</style>
-{% endblock %}
-
 
 {% block header_actions %}
 {% if doc.items %}
@@ -27,49 +21,59 @@
 
 {% from "templates/includes/macros.html" import item_name_and_description %}
 
-<div class="cart-content">
+<div class="cart-container">
 	<div id="cart-container">
-		<div id="cart-error" class="alert alert-danger"
-            style="display: none;"></div>
-    	<div id="cart-items">
-            <div class="row cart-item-header">
-                <div class="col-sm-8 col-xs-6">
-                    Items
-                </div>
-                <div class="col-sm-2 col-xs-3 text-right">
-                    Qty
-            	</div>
-                <div class="col-sm-2 col-xs-3 text-right">
-                    Amount
-            	</div>
-            </div>
-            {% if doc.items %}
-            <div class="cart-items">
-            {% include "templates/includes/cart/cart_items.html" %}
-            </div>
-            {% else %}
-            <p>{{ _("Cart is Empty") }}</p>
-            {% endif %}
-    	</div>
-        {% if doc.items %}
-        <!-- taxes -->
-        <div class="cart-taxes row small">
-            <div class="col-sm-8"><!-- empty --></div>
-            <div class="col-sm-4 cart-tax-items">
-                {% include "templates/includes/order/order_taxes.html" %}
-            </div>
-        </div>
-    	<div id="cart-totals">
-    	</div>
-    	<div class="cart-addresses">
-            {% include "templates/includes/cart/cart_address.html" %}
-    	</div>
-    	<p class="cart-footer text-right">
-            <button class="btn btn-primary btn-place-order btn-sm" type="button">
-    		{{ _("Place Order") }}</button></p>
-        {% endif %}
-    </div>
+			<div id="cart-error" class="alert alert-danger"
+		style="display: none;"></div>
+		<div id="cart-items">
+			<div class="row cart-item-header text-muted">
+				<div class="col-sm-8 col-xs-6 h6 text-uppercase">
+				{{ _("Item") }}
+				</div>
+				<div class="col-sm-2 col-xs-3 text-center h6 text-uppercase">
+				{{ _("Qty") }}
+				</div>
+				<div class="col-sm-2 col-xs-3 text-right h6 text-uppercase">
+				{{ _("Subtotal") }}
+				</div>
+			</div>
+			{% if doc.items %}
+				<div class="cart-items">
+					{% include "templates/includes/cart/cart_items.html" %}
+				</div>
+			{% else %}
+				<p class="empty-cart">{{ _("Cart is Empty") }}</p>
+			{% endif %}
+		</div>
+		{% if doc.items %}
+		<!-- taxes -->
+		<div class="row cart-taxes">
+			<div class="col-sm-6"><!-- empty --></div>
+			<div class="col-sm-6 text-right cart-tax-items">
+			{% include "templates/includes/order/order_taxes.html" %}
+			</div>
+		</div>
+
+		{% if doc.tc_name %}
+			<div class="cart-terms" style="display: none;" title={{doc.tc_name}}>
+				{{doc.tc_name}}
+				{{doc.terms}}
+			</div>
+			<div class="cart-link">
+				<a href="#" onclick="show_terms();return false;">*Terms and Conditions</a>
+			</div>
+		{% endif %}
+
+		<div class="cart-addresses">
+		{% include "templates/includes/cart/cart_address.html" %}
+		</div>
+
+		<p class="cart-footer text-right">
+		<button class="btn btn-primary btn-place-order btn-sm" type="button">
+		{{ _("Place Order") }}</button></p>
+		{% endif %}
+	</div>
 </div>
 
-<!-- no-sidebar -->
+
 {% endblock %}
diff --git a/erpnext/templates/pages/cart_terms.html b/erpnext/templates/pages/cart_terms.html
new file mode 100644
index 0000000..521c583
--- /dev/null
+++ b/erpnext/templates/pages/cart_terms.html
@@ -0,0 +1,2 @@
+
+<div>{{doc.terms}}</div>
\ No newline at end of file
diff --git a/erpnext/templates/pages/courses.html b/erpnext/templates/pages/courses.html
new file mode 100644
index 0000000..42e7f3e
--- /dev/null
+++ b/erpnext/templates/pages/courses.html
@@ -0,0 +1,11 @@
+{% extends "templates/web.html" %}
+
+{% block header %}
+	<h1> About </h1>
+{% endblock %}
+
+{% block page_content %}
+
+<p class="post-description"> {{ intro }} </p>
+
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/courses.py b/erpnext/templates/pages/courses.py
new file mode 100644
index 0000000..5b1410e
--- /dev/null
+++ b/erpnext/templates/pages/courses.py
@@ -0,0 +1,28 @@
+# 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
+
+
+
+def get_context(context):
+	course = frappe.get_doc('Course', frappe.form_dict.course)
+	sidebar_title = course.name
+
+	context.no_cache = 1
+	context.show_sidebar = True
+	course = frappe.get_doc('Course', frappe.form_dict.course)
+	course.has_permission('read')
+	context.doc = course
+	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course.name), 'show_always': 0L, 'title': u'Topics'},
+				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course.name), 'show_always': 0L, 'title': u'Discussions'},
+
+	]
+
+	context.sidebar_items = portal_items
+
+	context.sidebar_title = sidebar_title
+
+	context.intro = course.course_intro
+
diff --git a/erpnext/templates/pages/demo.html b/erpnext/templates/pages/demo.html
new file mode 100644
index 0000000..e1d98a1
--- /dev/null
+++ b/erpnext/templates/pages/demo.html
@@ -0,0 +1,70 @@
+{% extends "templates/web.html" %}
+
+{% block script %}
+<script>
+$(document).ready(function() {
+    $("#login_btn").click(function() {
+        var me = this;
+        $(this).html("Logging In...").prop("disabled", true);
+        frappe.call({
+            "method": "login",
+            args: {
+                usr: "demo@erpnext.com",
+                pwd: "demo",
+                lead_email: $("#lead-email").val(),
+            },
+            callback: function(r) {
+                $(me).prop("disabled", false);
+                if(r.exc) {
+                    alert("Error, please contact support@erpnext.com");
+                } else {
+                    console.log("Logged In");
+                    window.location.href = "desk";
+                }
+            }
+        })
+        return false;
+    })
+    .prop("disabled", false);
+})
+
+</script>
+{% endblock %}
+
+{% block style %}
+<style>
+	footer, .navbar {
+		display: none;
+	}
+	.page-content {
+		right: 0%;
+		width: 100%;
+	}
+</style>
+{% endblock %}
+
+{% block title %}
+{{ _("Login") }}
+{% endblock %}
+
+{% block page_content %}
+
+<!-- no-header -->
+<div class="page-hero text-center">
+	<img src="/assets/erpnext_demo/images/erp-icon-box.svg" style="max-width: 100px; max-height: 100px;">
+	<h1>ERPNext Demo</h1>
+	<p style="margin-top: 60px;">
+		<input id="lead-email" type="email"
+			class="form-control" placeholder="Your Email Id (optional)"
+			style="width: 75%; max-width: 400px; margin: auto;">
+	</p>
+
+	<button type="submit" id="login_btn" class="btn btn-default">Launch Demo</button>
+
+	<hr style="margin: 60px 0px;">
+	<p class="text-muted small">Some functionality is disabled for the demo app. The demo data will be cleared regulary.
+		<br class="hidden-xs">
+		To start your free ERPNext account, <a href="https://erpnext.com/signup?plan=Free-Solo">click here</a></p>
+</div>
+
+{% endblock %}
diff --git a/erpnext/templates/pages/discussions.html b/erpnext/templates/pages/discussions.html
new file mode 100644
index 0000000..28eb01f
--- /dev/null
+++ b/erpnext/templates/pages/discussions.html
@@ -0,0 +1,15 @@
+{% extends "templates/web.html" %}
+
+{% block header %}
+	<h2> {{doc.subject}} </h2>
+	<p> {{doc.description}} </p>
+	<p class="text-muted small">Started by: {{doc.owner}} </p>
+{% endblock %}
+
+{% block page_content %}
+
+<div>
+	{% include 'templates/includes/comments/comments.html' %}
+</div>
+
+{% endblock %}
diff --git a/erpnext/templates/pages/discussions.py b/erpnext/templates/pages/discussions.py
new file mode 100644
index 0000000..22a1bef
--- /dev/null
+++ b/erpnext/templates/pages/discussions.py
@@ -0,0 +1,21 @@
+# 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.website.utils import get_comment_list
+
+def get_context(context):
+	context.doc = frappe.get_doc('Discussion', frappe.form_dict.discussion)
+	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(context.doc.course), 'show_always': 0L, 'title': u'Topics'},
+				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(context.doc.course), 'show_always': 0L, 'title': u'Discussions'},
+
+	]
+	context.show_sidebar = True
+	context.sidebar_items = portal_items
+	context.no_cache = 1
+	context.doc.has_permission('read')
+	context.sidebar_title = context.doc.course
+	context.reference_doctype = "Discussion"
+	context.reference_name = context.doc.name
+	context.comment_list = get_comment_list(context.doc.doctype,context.doc.name)
\ No newline at end of file
diff --git a/erpnext/templates/pages/edit-profile.html b/erpnext/templates/pages/edit-profile.html
deleted file mode 100644
index f10e0a3..0000000
--- a/erpnext/templates/pages/edit-profile.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block title %} {{ "My Profile" }} {% endblock %}
-
-{% block header %}<h2>My Profile</h2>{% endblock %}
-
-{% block page_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>
-frappe.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/edit_profile.py b/erpnext/templates/pages/edit_profile.py
deleted file mode 100644
index 5ab5545..0000000
--- a/erpnext/templates/pages/edit_profile.py
+++ /dev/null
@@ -1,35 +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 cstr
-from erpnext.shopping_cart.cart import get_customer
-
-no_cache = 1
-no_sitemap = 1
-
-def get_context(context):
-	party = get_customer()
-	mobile_no, phone = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
-		"customer": party.name}, ["mobile_no", "phone"])
-
-	return {
-		"company_name": cstr(party.customer_name if party.doctype == "Customer" else party.company_name),
-		"mobile_no": cstr(mobile_no),
-		"phone": cstr(phone)
-	}
-
-@frappe.whitelist()
-def update_user(fullname, password=None, company_name=None, mobile_no=None, phone=None):
-	from erpnext.shopping_cart.cart import update_party
-	update_party(fullname, company_name, mobile_no, phone)
-
-	if not fullname:
-		return _("Name is required")
-
-	frappe.db.set_value("User", frappe.session.user, "first_name", fullname)
-	frappe.local.cookie_manager.set_cookie("full_name", fullname)
-
-	return _("Updated")
diff --git a/erpnext/templates/pages/home.html b/erpnext/templates/pages/home.html
new file mode 100644
index 0000000..790a430
--- /dev/null
+++ b/erpnext/templates/pages/home.html
@@ -0,0 +1,75 @@
+{% extends "templates/web.html" %}
+{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+
+{% block page_content %}
+
+<div class="row">
+	<div class="col-sm-12">
+		<div class="hero">
+			<h1 class="text-center">{{ homepage.tag_line or '' }}</h1>
+			<p class="text-center">{{ homepage.description or '' }}</p>
+		</div>
+		{% if homepage.products %}
+		<div class='featured-products-section' itemscope itemtype="http://schema.org/Product">
+			<h5 class='featured-product-heading'>{{ _("Featured Products") }}</h5>
+			<div class="featured-products">
+				<div id="search-list" class="row" style="margin-top:40px;">
+					{% for item in homepage.products %}
+					<a class="product-link" href="{{ item.route|abs_url }}">
+						<div class="col-sm-4 col-xs-4 product-image-wrapper">
+							<div class="product-image-img">
+							{{ product_image_square(item.thumbnail or item.image) }}
+							<div class="product-text" itemprop="name">{{ item.item_name }}</div>
+							</div>
+						</div>
+					</a>
+					{% endfor %}
+				</div>
+			</div>
+			<!-- TODO: remove hardcoding of /products -->
+			<div class="text-center padding">
+				<a href="/products" class="btn btn-primary all-products">
+					{{ _("View All Products") }}</a></div>
+		</div>
+		{% endif %}
+	</div>
+</div>
+{% endblock %}
+
+{% block style %}
+<style>
+	.hero {
+		padding-top: 50px;
+		padding-bottom: 100px;
+	}
+
+	.hero h1 {
+		font-size: 40px;
+		font-weight: 200;
+	}
+
+	.home-login {
+		margin-top: 30px;
+	}
+	.btn-login {
+		width: 80px;
+	}
+
+	.featured-product-heading, .all-products {
+		 text-transform: uppercase;
+		 letter-spacing: 0.5px;
+		 font-size: 12px;
+		 font-weight: 500;
+	}
+
+	.all-products {
+		 font-weight: 300;
+		 padding-left: 25px;
+		 padding-right: 25px;
+		 padding-top: 10px;
+		 padding-bottom: 10px;
+	}
+
+
+</style>
+{% endblock %}
diff --git a/erpnext/templates/pages/home.py b/erpnext/templates/pages/home.py
new file mode 100644
index 0000000..00cd3a9
--- /dev/null
+++ b/erpnext/templates/pages/home.py
@@ -0,0 +1,29 @@
+# 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
+
+no_cache = 1
+no_sitemap = 1
+
+def get_context(context):
+	homepage = frappe.get_doc('Homepage')
+
+	for item in homepage.products:
+		route = frappe.db.get_value('Item', item.item_code, 'route')
+		if route:
+			item.route = '/' + route
+
+	# show atleast 3 products
+	if len(homepage.products) < 3:
+		for i in xrange(3 - len(homepage.products)):
+			homepage.append('products', {
+				'item_code': 'product-{0}'.format(i),
+				'item_name': frappe._('Product {0}').format(i),
+				'route': '#'
+			})
+
+	return {
+		'homepage': homepage
+	}
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 03e625d..7129178 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -1,32 +1,24 @@
-t{% extends "templates/web.html" %}
-
-{% block header %}
-<h1>{{ doc.name }}</h1>
-<!-- <h6 class="text-muted">{{ doc._title or doc.doctype }}</h6> -->
-{% endblock %}
+{% extends "templates/web.html" %}
+{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
 
 {% block breadcrumbs %}
 	{% include "templates/includes/breadcrumbs.html" %}
 {% endblock %}
 
-{% block style %}
-<style>
-    {% include "templates/includes/order/order.css" %}
-</style>
-{% endblock %}
+{% block title %}{{ doc.name }}{% endblock %}
+
+{% block header %}<h1>{{ doc.name }}</h1>{% endblock %}
 
 {% block page_content %}
 
-{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
-
-<div class="row">
+<div class="row transaction-subheading">
     <div class="col-xs-6">
         <span class="indicator {{ doc.indicator_color or "darkgrey" }}">
             {{ doc.indicator_title or doc.status or "Submitted" }}
         </span>
 	</div>
-    <div class="col-xs-6 text-muted text-right h6">
-        {{ doc.get_formatted("transaction_date") }}
+    <div class="col-xs-6 text-muted text-right small">
+        {{ frappe.utils.formatdate(doc.transaction_date, 'medium') }}
     </div>
 </div>
 
@@ -38,14 +30,14 @@
 
     <!-- items -->
     <div class="order-item-table">
-        <div class="row order-items order-item-header">
-            <div class="col-sm-8 col-xs-6 h6">
+        <div class="row order-items order-item-header text-muted">
+            <div class="col-sm-8 col-xs-6 h6 text-uppercase">
                 {{ _("Item") }}
             </div>
-            <div class="col-sm-2 col-xs-3 text-right h6">
+            <div class="col-sm-2 col-xs-3 text-right h6 text-uppercase">
                 {{ _("Quantity") }}
             </div>
-            <div class="col-sm-2 col-xs-3 text-right h6">
+            <div class="col-sm-2 col-xs-3 text-right h6 text-uppercase">
                 {{ _("Amount") }}
             </div>
         </div>
@@ -64,16 +56,16 @@
             <div class="col-sm-2 col-xs-3 text-right">
                 {{ d.get_formatted("amount")	 }}
                 <p class="text-muted small">{{
-                    _("Rate: {0}").format(d.get_formatted("rate")) }}</p>
+                    _("@ {0}").format(d.get_formatted("rate")) }}</p>
             </div>
         </div>
         {% endfor %}
     </div>
 
     <!-- taxes -->
-    <div class="order-taxes row small">
-        <div class="col-sm-8"><!-- empty --></div>
-        <div class="col-sm-4">
+    <div class="order-taxes row">
+        <div class="col-sm-6"><!-- empty --></div>
+        <div class="col-sm-6 text-right">
             {% include "erpnext/templates/includes/order/order_taxes.html" %}
         </div>
     </div>
@@ -87,7 +79,7 @@
 				or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0) %}
 			<div class="page-header-actions-block" data-html-block="header-actions">
 				<p>
-				    <a href="/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request?dn={{ doc.name }}&dt={{ doc.doctype }}&submit_doc=1&mute_email=1&cart=1"
+				    <a href="/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request?dn={{ doc.name }}&dt={{ doc.doctype }}&submit_doc=1"
 				        class="btn btn-primary btn-sm">Pay {{ doc.get_formatted("grand_total") }} </a>
 				</p>
 			</div>
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index bf1514a..d390ebf 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -8,6 +8,7 @@
 
 def get_context(context):
 	context.no_cache = 1
+	context.show_sidebar = True
 	context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
 	if hasattr(context.doc, "set_indicator"):
 		context.doc.set_indicator()
diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html
index 132c06b..72d6a64 100644
--- a/erpnext/templates/pages/partners.html
+++ b/erpnext/templates/pages/partners.html
@@ -10,7 +10,7 @@
 	<div class="row">
 		<div class="col-md-3">
 			{% if partner_info.logo -%}
-			<a href="{{ partner_info.page_name }}">
+			<a href="{{ partner_info.route }}">
 				<img itemprop="brand" src="{{ partner_info.logo }}" class="partner-logo"
 					alt="{{ partner_info.partner_name }}" title="{{ partner_info.partner_name }}" />
 			</a>
diff --git a/erpnext/templates/pages/partners.py b/erpnext/templates/pages/partners.py
index 508ea71..6725a3e 100644
--- a/erpnext/templates/pages/partners.py
+++ b/erpnext/templates/pages/partners.py
@@ -11,9 +11,6 @@
 	partners = frappe.db.sql("""select * from `tabSales Partner`
 			where show_in_website=1 order by name asc""", as_dict=True)
 
-	for p in partners:
-		p.route = frappe.get_doc("Sales Partner", p.name).get_route()
-
 	return {
 		"partners": partners,
 		"title": page_title
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index 2d80cf4..6875ba5 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -4,16 +4,12 @@
 
 {% block header %}<h2>Product Search</h2>{% endblock %}
 
-{% block header_actions %}
-{% include 'templates/includes/product_search_box.html' %}
-{% endblock %}
-
 {% block page_content %}
 <script>{% include "templates/includes/product_list.js" %}</script>
 
 <script>
 frappe.ready(function() {
-	var txt = get_url_arg("q");
+	var txt = get_url_arg("search");
 	$(".search-results").html("Search results for: " + txt);
 	window.search = txt;
 	window.start = 0;
diff --git a/erpnext/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
index bdfac4f..c0c39cf 100644
--- a/erpnext/templates/pages/product_search.py
+++ b/erpnext/templates/pages/product_search.py
@@ -9,13 +9,16 @@
 no_cache = 1
 no_sitemap = 1
 
+def get_context(context):
+	context.show_search = True
+
 @frappe.whitelist(allow_guest=True)
 def get_product_list(search=None, start=0, limit=12):
 	# limit = 12 because we show 12 items in the grid view
 
 	# base query
-	query = """select name, item_name, page_name, website_image, thumbnail, item_group,
-			web_long_description as website_description, parent_website_route
+	query = """select name, item_name, item_code, route, website_image, thumbnail, item_group,
+			description, web_long_description as website_description
 		from `tabItem`
 		where show_in_website = 1
 			and disabled=0
@@ -38,9 +41,5 @@
 		"today": nowdate()
 	}, as_dict=1)
 
-	for d in data:
-		d.route = ((d.parent_website_route + "/") if d.parent_website_route else "") \
-			+ (d.page_name or "")
-
 	return [get_item_for_list_in_html(r) for r in data]
 
diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html
new file mode 100644
index 0000000..aeee602
--- /dev/null
+++ b/erpnext/templates/pages/projects.html
@@ -0,0 +1,66 @@
+{% extends "templates/web.html" %}
+
+{% block title %}{{ doc.project_name }}{% endblock %}
+
+{% block header %}
+	<h1>{{ doc.project_name }}</h1>
+{% endblock %}
+
+{% block style %}
+	<style>
+		{% include "templates/includes/projects.css" %}
+	</style>
+{% endblock %}
+
+
+{% block page_content %}
+{% if doc.percent_complete %}
+<div class="progress progress-hg">
+	<div class="progress-bar progress-bar-{{ "warning" if doc.percent_complete|round < 100 else "success" }} active" 				role="progressbar" aria-valuenow="{{ doc.percent_complete|round|int }}"
+	aria-valuemin="0" aria-valuemax="100" style="width:{{ doc.percent_complete|round|int }}%;">
+	</div>
+</div>
+{% endif %}		
+
+<div class="clearfix">
+  <h4 style="float: left;">{{ _("Tasks") }}</h4>
+  <a class="btn btn-secondary btn-default btn-sm" style="float: right; position: relative; top: 10px;" href='/tasks?new=1&project={{ doc.project_name }}'>New task</a>
+</div>
+
+<p>
+<!-- <a class='small underline task-status-switch' data-status='Open'>{{ _("Show closed") }}</a> -->
+</p>
+
+{% if doc.tasks %}
+	<div class='project-task-section'>
+		<div class='project-task'>
+		{% include "erpnext/templates/includes/projects/project_tasks.html" %}
+		</div>
+		<p><a id= 'more-task' style='display: none;' class='more-tasks small underline'>{{ _("More") }}</a><p>
+	</div>
+{% else %}
+	<p class="text-muted">No tasks</p>
+{% endif %}
+
+
+<div class='padding'></div>
+
+<h4>{{ _("Timesheets") }}</h4>
+
+{% if doc.timesheets %}
+	<div class='project-timelogs'>
+	{% include "erpnext/templates/includes/projects/project_timesheets.html" %}
+	</div>
+	{% if doc.timesheets|length > 9 %}
+		<p><a class='more-timelogs small underline'>{{ _("More") }}</a><p>
+	{% endif %}
+{% else %}
+	<p class="text-muted">No time sheets</p>
+{% endif %}
+</div>
+
+<script>
+	{% include "erpnext/templates/pages/projects.js" %}
+</script>
+
+{% endblock %}
diff --git a/erpnext/templates/pages/projects.js b/erpnext/templates/pages/projects.js
new file mode 100644
index 0000000..ecacc34
--- /dev/null
+++ b/erpnext/templates/pages/projects.js
@@ -0,0 +1,119 @@
+frappe.ready(function() {
+
+	$('.task-status-switch').on('click', function() {
+		var $btn = $(this);
+		if($btn.attr('data-status')==='Open') {
+			reload_items('closed', 'task', $btn);
+		} else {
+			reload_items('open', 'task', $btn);
+		}
+	})
+
+
+	$('.issue-status-switch').on('click', function() {
+		var $btn = $(this);
+		if($btn.attr('data-status')==='Open') {
+			reload_items('closed', 'issue', $btn);
+		} else {
+			reload_items('open', 'issue', $btn);
+		}
+	})
+
+	var start = 10;
+	$(".more-tasks").click(function() {
+		more_items('task', true);
+	});
+
+	$(".more-issues").click(function() {
+		more_items('issue', true);
+	});
+
+	$(".more-timelogs").click(function() {
+		more_items('timelog', false);
+	});
+
+	$(".more-timelines").click(function() {
+		more_items('timeline', false);
+	});
+
+
+	var reload_items = function(item_status, item, $btn) {
+		$.ajax({
+			method: "GET",
+			url: "/",
+			dataType: "json",
+			data: {
+				cmd: "erpnext.templates.pages.projects.get_"+ item +"_html",
+				project: '{{ doc.name }}',
+				item_status: item_status,
+			},
+			dataType: "json",
+			success: function(data) {
+				if(typeof data.message == 'undefined') {
+					$('.project-'+ item).html("No "+ item_status +" "+ item);
+					$(".more-"+ item).toggle(false);
+				}
+				$('.project-'+ item).html(data.message);
+				$(".more-"+ item).toggle(true);
+
+				// update status
+				if(item_status==='open') {
+					$btn.html(__('Show closed')).attr('data-status', 'Open');
+				} else {
+					$btn.html(__('Show open')).attr('data-status', 'Closed');
+				}
+			}
+		});
+
+	}
+
+	var more_items = function(item, item_status){
+		if(item_status)
+		{
+			var item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-closed-'+ item)
+				? 'closed' : 'open';
+		}
+		$.ajax({
+			method: "GET",
+			url: "/",
+			dataType: "json",
+			data: {
+				cmd: "erpnext.templates.pages.projects.get_"+ item +"_html",
+				project: '{{ doc.name }}',
+				start: start,
+				item_status: item_status,
+			},
+			dataType: "json",
+			success: function(data) {
+
+				$(data.message).appendTo('.project-'+ item);
+				if(typeof data.message == 'undefined') {
+					$(".more-"+ item).toggle(false);
+				}
+			start = start+10;
+			}
+		});
+	}
+
+	var close_item = function(item, item_name){
+		var args = {
+			project: '{{ doc.name }}',
+			item_name: item_name,
+		}
+		frappe.call({
+			btn: this,
+			type: "POST",
+			method: "erpnext.templates.pages.projects.set_"+ item +"_status",
+			args: args,
+			callback: function(r) {
+				if(r.exc) {
+					if(r._server_messages)
+						frappe.msgprint(r._server_messages);
+				} else {
+					$(this).remove();
+				}
+			}
+		})
+		return false;
+	}
+});
\ No newline at end of file
diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py
new file mode 100644
index 0000000..d68770d
--- /dev/null
+++ b/erpnext/templates/pages/projects.py
@@ -0,0 +1,94 @@
+# 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
+import json
+
+def get_context(context):
+	project_user = frappe.db.get_value("Project User", {"parent": frappe.form_dict.project, "user": frappe.session.user} , "user")
+	if not project_user or frappe.session.user == 'Guest': 
+		raise frappe.PermissionError
+		
+	context.no_cache = 1
+	context.show_sidebar = True
+	project = frappe.get_doc('Project', frappe.form_dict.project)
+
+	project.has_permission('read')
+	
+	project.tasks = get_tasks(project.name, start=0, item_status='open',
+		search=frappe.form_dict.get("search"))
+
+	project.timesheets = get_timesheets(project.name, start=0,
+		search=frappe.form_dict.get("search"))
+
+
+	context.doc = project
+
+
+def get_tasks(project, start=0, search=None, item_status=None):
+	filters = {"project": project}
+	if search:
+		filters["subject"] = ("like", "%{0}%".format(search))
+	# if item_status:
+# 		filters["status"] = item_status
+	tasks = frappe.get_all("Task", filters=filters,
+		fields=["name", "subject", "status", "_seen", "_comments", "modified", "description"],
+		limit_start=start, limit_page_length=10)
+
+	for task in tasks:
+		task.todo = frappe.get_all('ToDo',filters={'reference_name':task.name, 'reference_type':'Task'},
+		fields=["assigned_by", "owner", "modified", "modified_by"])
+
+		if task.todo:
+			task.todo=task.todo[0]
+			task.todo.user_image = frappe.db.get_value('User', task.todo.owner, 'user_image')
+
+		
+		task.comment_count = len(json.loads(task._comments or "[]"))
+
+		task.css_seen = ''
+		if task._seen:
+			if frappe.session.user in json.loads(task._seen):
+				task.css_seen = 'seen'
+
+	return tasks
+
+@frappe.whitelist()
+def get_task_html(project, start=0, item_status=None):
+	return frappe.render_template("erpnext/templates/includes/projects/project_tasks.html",
+		{"doc": {
+			"name": project,
+			"project_name": project,
+			"tasks": get_tasks(project, start, item_status=item_status)}
+		}, is_path=True)
+
+def get_timesheets(project, start=0, search=None):
+	filters = {"project": project}
+	if search:
+		filters["activity_type"] = ("like", "%{0}%".format(search))
+
+	timesheets = frappe.get_all('Timesheet Detail', filters=filters,
+	fields=['project','activity_type','from_time','to_time','parent'],
+	limit_start=start, limit_page_length=10)
+	for timesheet in timesheets:
+		timesheet.infos = frappe.get_all('Timesheet', filters={"name": timesheet.parent},
+			fields=['name','_comments','_seen','status','modified','modified_by'],
+			limit_start=start, limit_page_length=10)
+
+		for timesheet.info in timesheet.infos:
+			timesheet.info.user_image = frappe.db.get_value('User', timesheet.info.modified_by, 'user_image')
+
+			timesheet.info.comment_count = len(json.loads(timesheet.info._comments or "[]"))
+
+			timesheet.info.css_seen = ''
+			if timesheet.info._seen:
+				if frappe.session.user in json.loads(timesheet.info._seen):
+					timesheet.info.css_seen = 'seen'		
+	return timesheets
+
+@frappe.whitelist()
+def get_timesheet_html(project, start=0):
+	return frappe.render_template("erpnext/templates/includes/projects/project_timesheets.html",
+		{"doc": {"timesheets": get_timesheets(project, start)}}, is_path=True)
+
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
new file mode 100644
index 0000000..5729e89
--- /dev/null
+++ b/erpnext/templates/pages/rfq.html
@@ -0,0 +1,75 @@
+{% extends "templates/web.html" %}
+
+{% block header %}
+<h1>{{ doc.name }}</h1>
+{% endblock %}
+
+{% block script %}
+<script>{% include "templates/includes/rfq.js" %}</script>
+{% endblock %}
+
+{% block breadcrumbs %}
+	{% include "templates/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block header_actions %}
+{% if doc.items %}
+<button class="btn btn-primary btn-sm"
+    type="button">
+    {{ _("Submit") }}</button>
+{% endif %}
+{% endblock %}
+
+{% block page_content %}
+<div class="row">
+    <div class="col-xs-6">
+        <div class="rfq-supplier">{{ doc.supplier }}</div>
+	</div>
+    <div class="col-xs-6 text-muted text-right h6">
+        {{ doc.get_formatted("transaction_date") }}
+    </div>
+</div>
+<div class="rfq-content" style="margin-top:15px">
+	<div id="order-container">
+			<div id="rfq-items">
+				<div class="row cart-item-header">
+					<div class="col-sm-6 col-xs-6">
+						Items
+					</div>
+					<div class="col-sm-2 col-xs-2 text-right">
+						Qty
+					</div>
+					<div class="col-sm-2 col-xs-2 text-right">
+						Rate
+					</div>
+					<div class="col-sm-2 col-xs-2 text-right">
+						Amount
+					</div>
+				</div>
+				<hr>
+            {% if doc.items %}
+            <div class="rfq-items">
+				{% include "templates/includes/rfq/rfq_items.html" %}
+            </div>
+            {% endif %}
+		</div>
+        {% if doc.items %}
+		<div class="row grand-total-row">
+			<div class="col-xs-10 text-right">{{ _("Grand Total") }}</div>
+			<div class="col-xs-2 text-right">
+			{{doc.currency_symbol}}  <span class="tax-grand-total">0.0</span>
+			</div>
+		</div>
+        {% endif %}
+		<div class="row terms">
+			<div class="col-xs-6">
+				<br><br>
+				<p class="text-muted small">{{ _("Notes: ") }}</p>
+				<textarea class="form-control terms-feedback" style="height: 100px;"></textarea>
+			</div>
+		</div>
+    </div>
+</div>
+
+
+{% endblock %}
diff --git a/erpnext/templates/pages/rfq.py b/erpnext/templates/pages/rfq.py
new file mode 100644
index 0000000..decae41
--- /dev/null
+++ b/erpnext/templates/pages/rfq.py
@@ -0,0 +1,44 @@
+# 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 erpnext.controllers.website_list_for_contact import (get_customers_suppliers,
+					get_party_details)
+
+def get_context(context):
+	context.no_cache = 1
+	context.show_sidebar = True
+	context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
+	context.parents = frappe.form_dict.parents
+	context.doc.supplier = get_supplier()
+	unauthorized_user(context.doc.supplier)
+	update_supplier_details(context)
+	context["title"] = frappe.form_dict.name
+
+def get_supplier():
+	doctype = frappe.form_dict.doctype
+	parties_doctype = 'Request for Quotation Supplier' if doctype == 'Request for Quotation' else doctype
+	customers, suppliers = get_customers_suppliers(parties_doctype, frappe.session.user)
+	key, parties = get_party_details(customers, suppliers)
+	return parties[0] if key == 'supplier' else ''
+
+def check_supplier_has_docname_access(supplier):
+	status = True
+	if frappe.form_dict.name not in frappe.db.sql_list("""select parent from `tabRequest for Quotation Supplier`
+		where supplier = '{supplier}'""".format(supplier=supplier)):
+		status = False
+	return status
+
+def unauthorized_user(supplier):
+	status = check_supplier_has_docname_access(supplier) or False
+	if status == False:
+		frappe.throw(_("Not Permitted"), frappe.PermissionError)
+
+def update_supplier_details(context):
+	supplier_doc = frappe.get_doc("Supplier", context.doc.supplier)
+	context.doc.currency = supplier_doc.default_currency or frappe.db.get_value("Company", context.doc.company, "default_currency")
+	context.doc.currency_symbol = frappe.db.get_value("Currency", context.doc.currency, "symbol")
+	context.doc.number_format = frappe.db.get_value("Currency", context.doc.currency, "number_format")
+	context.doc.buying_price_list = supplier_doc.default_price_list or ''
\ No newline at end of file
diff --git a/erpnext/templates/pages/task_info.html b/erpnext/templates/pages/task_info.html
new file mode 100644
index 0000000..1d6574b
--- /dev/null
+++ b/erpnext/templates/pages/task_info.html
@@ -0,0 +1,149 @@
+{% extends "templates/web.html" %}
+{% block title %} {{ doc.name }} {% endblock %}
+{% block breadcrumbs %}
+<div class="page-breadcrumbs" data-html-block="breadcrumbs">
+	<ul class="breadcrumb">
+		<li>
+			<span class="icon icon-angle-left"></span>
+			<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
+		</li>
+	</ul>
+</div>
+{% endblock %}
+{% block page_content %}
+<div class="row">
+	<div class=" col-sm-8 ">
+		<h1> {{ doc.subject }} </h1>
+    </div>
+
+	<div class="col-sm-4">
+		<div class="page-header-actions-block" data-html-block="header-actions">
+			<button type="submit" class="btn btn-primary btn-sm btn-form-submit">
+	    		Update</button>
+	    		<a href="tasks" class="btn btn-default btn-sm">
+	    		Cancel</a>
+		</div>
+    </div>
+</div>
+
+<div class="page-content-block">
+	<form role="form" data-web-form="tasks">
+
+		<input type="hidden" name="web_form" value="tasks">
+		<input type="hidden" name="doctype" value="Task">
+		<input type="hidden" name="name" value="TASK00056">
+
+		<div class="row">
+			<div class="col-sm-12" style="max-width: 500px;">
+				<div class="form-group">
+					<label for="project" class="control-label text-muted small">Project</label>
+						<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
+				</div>
+
+				<div class="form-group">
+					<label for="subject" class="control-label text-muted small">Subject</label>
+					<input type="text" class="form-control" name="subject" readonly value="{{ doc.subject }}">
+				</div>
+
+				<div class="form-group">
+					<label for="description" class="control-label text-muted small">Details</label>
+					<textarea class="form-control" style="height: 200px;" name="description">{{ doc.description }}</textarea>
+				</div>
+
+				<div class="form-group">
+					<label for="priority" class="control-label text-muted small">Priority</label>
+					<input type="text" class="form-control" name="priority" readonly value="{{ doc.priority }}">
+				</div>
+
+				<div class="form-group">
+					<label for="exp_start_date" class="control-label text-muted small">Expected Start Date</label>
+					<input type="text" class="form-control hasDatepicker" name="exp_start_date" readonly value="{{ doc.exp_start_date }}">
+				</div>
+
+				<div class="form-group">
+					<label for="exp_end_date" class="control-label text-muted small">Expected End Date</label>
+					<input type="text" class="form-control hasDatepicker" name="exp_end_date" readonly value="{{ doc.exp_end_date }}">
+				</div>
+
+				<div class="form-group">
+					<label for="status" class="control-label text-muted small">Status</label>
+					<select class="form-control" name="status" id="status" data-label="Status" data-fieldtype="Select">
+						<option value="Open" selected="selected">
+							Open</option><option value="Working">
+							Working</option><option value="Pending Review">
+							Pending Review</option><option value="Overdue">
+							Overdue</option><option value="Closed">
+							Closed</option><option value="Cancelled">
+							Cancelled</option>
+					</select>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
+
+<div class="comments">
+	<h3>Comments</h3>
+	<div class="no-comment">
+		{% for comment in comments %}
+			<p class="text-muted">{{comment.sender_full_name}} : {{comment.subject}} on 									   									{{comment.communication_date.strftime('%Y-%m-%d')}}</p>
+		{% endfor %}
+	</div>
+	<div class="comment-form-wrapper">
+		<a class="add-comment btn btn-default btn-sm">Add Comment</a>
+		<div style="display: none;" id="comment-form">
+			<p>Add Comment</p>
+			<form>
+				<fieldset>
+					<textarea class="form-control" name="comment" rows="5" placeholder="Comment"></textarea>
+					<p>
+						<button class="btn btn-primary btn-sm" id="submit-comment">Submit</button>
+					</p>
+				</fieldset>
+			</form>
+		</div>
+	</div>
+</div>
+				<script>
+					frappe.ready(function() {
+						var n_comments = $(".comment-row").length;
+						$(".add-comment").click(function() {
+							$(this).toggle(false);
+							$("#comment-form").toggle();
+							$("#comment-form textarea").val("");
+						})
+						$("#submit-comment").click(function() {
+							var args = {
+								comment_by_fullname: "test",
+								comment_by: "admin@localhost.com",
+								comment: $("[name='comment']").val(),
+								reference_doctype: "Task",
+								reference_name: "TASK00069",
+								comment_type: "Comment",
+								route: "tasks",
+							}
+
+							frappe.call({
+								btn: this,
+								type: "POST",
+								method: "frappe.templates.includes.comments.comments.add_comment",
+								args: args,
+								callback: function(r) {
+									if(r.exc) {
+										if(r._server_messages)
+											frappe.msgprint(r._server_messages);
+									} else {
+										$(r.message).appendTo("#comment-list");
+										$(".no-comment, .add-comment").toggle(false);
+										$("#comment-form")
+											.replaceWith('<div class="text-muted">Thank you for your comment!</div>')
+									}
+								}
+							})
+
+							return false;
+						})
+					});
+				</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/task_info.py b/erpnext/templates/pages/task_info.py
new file mode 100644
index 0000000..b832b88
--- /dev/null
+++ b/erpnext/templates/pages/task_info.py
@@ -0,0 +1,14 @@
+from __future__ import unicode_literals
+import frappe
+
+from frappe import _
+
+def get_context(context):
+	context.no_cache = 1
+
+	task = frappe.get_doc('Task', frappe.form_dict.task)
+	
+	context.comments = frappe.get_all('Communication', filters={'reference_name': task.name, 'comment_type': 'comment'},
+	fields=['subject', 'sender_full_name', 'communication_date'])
+	
+	context.doc = task
\ No newline at end of file
diff --git a/erpnext/templates/pages/timelog_info.html b/erpnext/templates/pages/timelog_info.html
new file mode 100644
index 0000000..76dbc32
--- /dev/null
+++ b/erpnext/templates/pages/timelog_info.html
@@ -0,0 +1,48 @@
+{% extends "templates/web.html" %}
+{% block title %} {{ doc.name }} {% endblock %}
+{% block breadcrumbs %}
+<div class="page-breadcrumbs" data-html-block="breadcrumbs">	                    
+	<ul class="breadcrumb">
+		<li>
+			<span class="icon icon-angle-left"></span>
+			<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
+		</li>	
+</ul>
+</div>
+{% endblock %}
+
+{% block page_content %}
+	<div class=" col-sm-8 ">
+		<h1> {{ doc.name }} </h1>
+	</div>
+
+	<div class="page-content-block">
+		<div class="row">
+			<div class="col-sm-12" style="max-width: 500px;">							
+				<label for="project" class="control-label text-muted small">Project</label>
+				<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">	
+				
+				<label for="activity_type" class="control-label text-muted small">Activity Type</label>
+				<input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">	
+
+				<label for="task" class="control-label text-muted small">Task</label>
+				<input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">	
+
+				<label for="from_time" class="control-label text-muted small">From Time</label>
+				<input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">	
+				
+				<label for="to_time" class="control-label text-muted small">To Time</label>
+				<input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">	
+				
+				<label for="to_time" class="control-label text-muted small">Hours</label>
+				<input type="text" class="form-control" name="Hours" readonly value= "{{ doc.hours }}">
+
+				<label for="status" class="control-label text-muted small">Status</label>
+				<input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">	
+				
+				<label for="Note" class="control-label text-muted small">Note</label>
+				<textarea class="form-control" name="Hours" readonly> {{ doc.note }} </textarea>
+			</div>
+		</div>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/timelog_info.py b/erpnext/templates/pages/timelog_info.py
new file mode 100644
index 0000000..7a3361c
--- /dev/null
+++ b/erpnext/templates/pages/timelog_info.py
@@ -0,0 +1,11 @@
+from __future__ import unicode_literals
+import frappe
+
+from frappe import _
+
+def get_context(context):
+	context.no_cache = 1
+
+	timelog = frappe.get_doc('Time Log', frappe.form_dict.timelog)
+	
+	context.doc = timelog
\ No newline at end of file
diff --git a/erpnext/templates/pages/topics.html b/erpnext/templates/pages/topics.html
new file mode 100644
index 0000000..94d7a17
--- /dev/null
+++ b/erpnext/templates/pages/topics.html
@@ -0,0 +1,12 @@
+{% extends "templates/web.html" %}
+
+
+{% block header %}
+	<h2> {{ doc.introduction }} </h1>
+{% endblock %}
+
+{% block page_content %}
+
+<p class="post-description"> {{ doc.content }} </p>
+
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/topics.py b/erpnext/templates/pages/topics.py
new file mode 100644
index 0000000..8a55b64
--- /dev/null
+++ b/erpnext/templates/pages/topics.py
@@ -0,0 +1,15 @@
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+
+def get_context(context):
+	topic = frappe.get_doc('Topic', frappe.form_dict.topic)
+	context.no_cache = 1
+	context.show_sidebar = True
+	context.doc = topic
+	attachments = frappe.db.sql("""select file_url, file_name from tabFile as file
+								where file.attached_to_name=%s """,(topic.name), as_dict = True)
+
+	context.attached_files = attachments
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index 99215e8..e8a98f0 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -2,8 +2,9 @@
 {%- set compact_fields = doc.flags.compact_item_fields -%}
 
 {% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
-<div class="pull-left" style="max-width: 38.2%; margin-right: 10px;">
-	<img src="{{ doc.image }}" class="img-responsive">
+<div class="pull-left" style="width: 20%; margin-right: 10px;">
+	<div class="square-image" style="background-image: url('{{ doc.image }}')">
+	</div>
 </div>
 {%- endif %}
 
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index 6f4f4ee..f33e647 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -9,7 +9,7 @@
 
 @frappe.whitelist(allow_guest=True)
 def send_message(subject="Website Query", message="", sender="", status="Open"):
-	from frappe.templates.pages.contact import send_message as website_send_message
+	from frappe.www.contact import send_message as website_send_message
 
 	website_send_message(subject, message, sender)
 
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index db95157..9a6e5c5 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1,4 +1,4 @@
-DocType: Employee,Salary Mode,وضع الراتب
+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 +81,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
@@ -13,15 +13,15 @@
 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: SMS Center,All Sales Partner Contact,بيانات الإتصال لكل الوكلاء و الموزعين
 DocType: Employee,Leave Approvers,الموافقون علي الاجازة
 DocType: Sales Partner,Dealer,تاجر
 DocType: Employee,Rented,مؤجر
 DocType: POS Profile,Applicable for User,ينطبق على العضو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,هل تريد حقا أن التخلي عن هذه الأصول؟
 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.,* سيتم احتسابه في المعاملة.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Purchase Order,Customer Contact,العملاء الاتصال
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,ترك اسم نوع
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,عرض مفتوح
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,يتوقع نهاية التاريخ لا يمكن أن يكون أقل من تاريخ بدء المتوقعة
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,إجازة جديدة التطبيق
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,مسودة بنك
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,مشاهدة المتغيرات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,كمية
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,جدول حسابات لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,اجتياز سنة
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
 DocType: Designation,Designation,تعيين
@@ -64,7 +66,7 @@
 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 +642,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},الجديد {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},الجديد {0} # {1}
 ,Sales Partners Commission,مبيعات اللجنة الشركاء
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
 DocType: Payment Request,Payment Request,طلب الدفع
@@ -102,14 +104,14 @@
 DocType: Employee,Married,متزوج
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,الحصول على البنود من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 DocType: Process Payroll,Make Bank Entry,جعل الدخول البنك
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
-DocType: SMS Center,All Sales Person,كل رجال البيع
+DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
 DocType: Account,Credit,ائتمان
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,:سجل النشاط
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,المستحضرات الصيدلانية
+DocType: Item,Is Fixed Asset,هو الأصول الثابتة
 DocType: Expense Claim Detail,Claim Amount,المطالبة المبلغ
 DocType: Employee,Mr,السيد
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,المورد نوع / المورد
@@ -156,7 +159,8 @@
 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,مصاريف الأسهم
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} غير المجمدة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,مصاريف الأسهم
 DocType: Newsletter,Email Sent?,ارسال البريد الالكترونى ؟
 DocType: Journal Entry,Contra Entry,الدخول كونترا
 DocType: Production Order Operation,Show Time Logs,عرض الوقت سجلات
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,تثبيت الحالة
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز SMS
 DocType: BOM Replace Tool,New BOM,BOM جديدة
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},الحساب {0} لا ينتمي إلى شركة {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},مبلغ السلفة لا يمكن أن يكون أكبر من {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,يرجى إدخال الشركة
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,صافي النقد من التمويل
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
 ,Contact Name,اسم جهة الاتصال
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
@@ -236,9 +240,9 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Payment Tool,Reference No,المرجع لا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,مقالات البنك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,حركات البنك
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,إعلام التحكم
 DocType: Lead,Suggestions,اقتراحات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,تعيين مجموعة من الحكمة الإغلاق الميزانيات على هذا الإقليم. يمكنك أيضا تضمين الموسمية عن طريق تعيين التوزيع.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},الرجاء إدخال مجموعة حساب الأصل لمستودع {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},الرجاء إدخال مجموعة حساب الأصل لمستودع {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
 DocType: Supplier,Address HTML,عنوان HTML
 DocType: Lead,Mobile No.,رقم الجوال
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,5 أحرف كحد أقصى
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
 apps/erpnext/erpnext/config/desktop.py +83,Learn,تعلم
+DocType: Asset,Next Depreciation Date,الاستهلاك المقبل التاريخ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,النشاط التكلفة لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},المورد فاتورة لا يوجد في شراء الفاتورة {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,إدارة المبيعات الشخص شجرة .
 DocType: Job Applicant,Cover Letter,غطاء الرسالة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,الشيكات المعلقة والودائع لمسح
 DocType: Item,Synced With Hub,مزامن مع المحور
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"الانتهاء الكمية لا يمكن أن يكون أكبر من ""الكمية لتصنيع"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"الانتهاء الكمية لا يمكن أن يكون أكبر من ""الكمية لتصنيع"""
 DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
 DocType: Employee,External Work History,التاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} وحدات من [{1}] (# نموذج / البند / {1}) وجدت في [{2}] (# نموذج / مستودع / {2})
 DocType: Lead,Industry,صناعة
 DocType: Employee,Job Profile,ملف الوظيفة
 DocType: 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,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ملاحظة التسليم
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب يعتبر
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} مخصصة أصلا للموظف {1} للفترة من {2} إلى {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,اختر البند
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
@@ -337,17 +344,18 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},المسلسل لا {0} لا تنتمي إلى التسليم ملاحظة {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,معلمة البند التفتيش الجودة
 DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
-,Schedule Date,جدول التسجيل
+DocType: Depreciation Schedule,Schedule Date,جدول التسجيل
 DocType: Packed Item,Packed Item,ملاحظة التوصيل التغليف
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,الإعدادات الافتراضية ل شراء صفقة.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,الإعدادات الافتراضية ل شراء صفقة.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},وجود النشاط التكلفة للموظف {0} ضد نوع النشاط - {1}
 apps/erpnext/erpnext/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),الموافقة العضو (أعلى قيمة أذن)
+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; النظر في جميع المخازن على أساس الكمية المتوقعة والحد الأدنى الكمية ترتيب
+DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
 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.",إذا استمرت قوانين التسعير متعددة أن تسود، ويطلب من المستخدمين لتعيين الأولوية يدويا لحل الصراع.
@@ -361,7 +369,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,الفرص
 DocType: Employee,Single,وحيد
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,الميزانية لا يمكن تعيين لمركز التكلفة المجموعة
+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 +229,Please enter Cost Center,الرجاء إدخال مركز التكلفة
@@ -375,7 +383,7 @@
 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,تعيين تلقائيا المسلسل رقم استنادا FIFO
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,FIFO تحديد تلقائى للأرقام المسلسلة بناءا على
 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.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,غير الربح
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,إعدادات العالمية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,عطلة الرئيسي.
-DocType: Material Request Item,Required Date,تاريخ المطلوبة
+DocType: Request for Quotation Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,رسالة لمزود
 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,غير مدفوع
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
@@ -437,10 +446,11 @@
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,إدارة التعاقد من الباطن
+DocType: Project,Project will be accessible on the website to these users,والمشروع أن تكون متاحة على الموقع الإلكتروني لهؤلاء المستخدمين
 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 +53,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,اختصار استخدمت بالفعل لشركة أخرى
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,هذا الاختصار تم استخدامه بالفعل لشركة أخرى
 DocType: Selling Settings,Default Customer Group,المجموعة الافتراضية العملاء
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",إذا تعطيل، &#39;مدور المشاركات &quot;سيتم الميدان لا تكون مرئية في أي صفقة
 DocType: BOM,Operating Cost,تكاليف التشغيل
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,البند {0} لم يتم شراء السلعة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,البند {0} لم يتم شراء السلعة
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,في انتظار الكمية
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
 DocType: Pricing Rule,Valid From,صالحة من
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك مبيعات
@@ -469,13 +479,13 @@
 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 +126,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 +230,Financial / accounting year.,المالية / المحاسبة العام.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",آسف ، المسلسل نص لا يمكن دمج
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,لا ينبغي أن تكون السنة المالية تاريخ بدء السنة المالية أكبر من تاريخ الانتهاء
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,لا ينبغي أن تكون السنة المالية تاريخ بدء السنة المالية أكبر من تاريخ الانتهاء
 DocType: Warranty Claim,Resolution,قرار
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},تسليم: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,حساب المستحق
@@ -483,7 +493,7 @@
 DocType: Job Applicant,Resume Attachment,السيرة الذاتية مرفق
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تكرار العملاء
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,مبيعات العودة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,مبيعات العودة
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,الراتب المكونات.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات من العملاء المحتملين.
@@ -492,7 +502,7 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,مستودع منطقي لقاء ما تم إدخاله من مخزون.
@@ -520,27 +530,27 @@
 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,افتراضي تكلف سعر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,صيانة جدول
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيتها من قوانين التسعير على أساس العملاء، مجموعة العملاء، الأرض، مورد، مورد نوع، حملة، شريك المبيعات الخ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,صافي التغير في المخزون
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدير
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,أهداف المبيعات شخص
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,يرجى تحديد قائمة عطلة إما للموظف أو للشركة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 DocType: Selling Settings,Customer Naming By,العملاء تسمية بواسطة
+DocType: Depreciation Schedule,Depreciation Amount,انخفاض قيمة المبلغ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,يوم الثابتة
 DocType: Quotation Item,Item Balance,البند الميزان
 DocType: Sales Invoice,Packing List,قائمة التعبئة
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,أوامر الشراء نظرا للموردين.
+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,مستهلك
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,عملية الوقت
 DocType: Pricing Rule,Sales Manager,مدير المبيعات
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,مجموعة إلى مجموعة
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,بلدي المشاريع
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
 DocType: Journal Entry,Bill No,رقم الفاتورة
+DocType: Company,Gain/Loss Account on Asset Disposal,حساب الربح / الخسارة على التخلص من الأصول
 DocType: Purchase Invoice,Quarterly,فصلي
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم المطلوبة
 DocType: Sales Order Item,Basic Rate (Company Currency),المعدل الأساسي (عملة الشركة)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,يتم إنشاء دفع الاشتراك بالفعل
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصول {1} لا ترتبط البند {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,مجموع الفواتير هذا العام
 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 +529,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,الأسهم القيمة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع الشجرة
@@ -597,13 +610,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} ليس من نوع المخزون
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعية
 DocType: Production Order Operation,Planned End Time,تنظيم وقت الانتهاء
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,لا يمكن تحويل حساب جرت عليه أي عملية إلى دفتر حسابات (دفتر أستاذ)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +92,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 +166,Auto Material Requests Generated,طلبات السيارات المواد المتولدة
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,تم إنشاء طلب مواد أوتوماتيكى
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
 DocType: Item Group,Website Specifications,موقع المواصفات
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},يوجد خطأ في قالب العناوين {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,حساب جديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,حساب جديد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0} من {0} من نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قواعد الأسعار متعددة موجود مع نفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قواعد السعر: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قواعد الأسعار متعددة موجود مع نفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قواعد السعر: {0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -629,7 +643,7 @@
 
 #### Description of Columns
 
-1. Calculation Type: 
+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).
@@ -640,19 +654,19 @@
 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.","قالب الضرائب القياسية التي يمكن تطبيقها على جميع عمليات البيع. يمكن أن يحتوي هذا القالب قائمة رؤساء الضريبية، وكذلك غيرهم من رؤساء حساب / الدخل مثل ""شحن""، ""التأمين""، ""معالجة""، وغيرها 
+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.","قالب الضرائب القياسية التي يمكن تطبيقها على جميع عمليات البيع. يمكن أن يحتوي هذا القالب قائمة رؤساء الضريبية، وكذلك غيرهم من رؤساء حساب / الدخل مثل ""شحن""، ""التأمين""، ""معالجة""، وغيرها
 
- #### ملاحظة 
+ #### ملاحظة
 
  معدل الضريبة لك تعريف هنا سوف يكون معدل الضريبة موحد لجميع الأصناف ** **. إذا كانت هناك بنود ** ** التي لها أسعار مختلفة، وأنها يجب أن يضاف في * الضرائب البند ** الجدول في البند ** ** الرئيسي.
 
- #### وصف الأعمدة 
+ #### وصف الأعمدة
 
- 1. نوع الحساب: 
+ 1. نوع الحساب:
  - وهذا يمكن أن يكون على ** صافي إجمالي ** (وهذا هو مجموع المبلغ الأساسي).
  - ** في الصف السابق الكل / المكونات ** (للضرائب أو رسوم التراكمية). إذا قمت بتحديد هذا الخيار، سيتم تطبيق الضريبة كنسبة مئوية من الصف السابق (في الجدول الضرائب) كمية أو المجموع.
  - ** ** الفعلية (كما ذكر).
- 2. رئيس الحساب: حساب دفتر الأستاذ والتي بموجبها سيتم حجز هذه الضريبة 
+ 2. رئيس الحساب: حساب دفتر الأستاذ والتي بموجبها سيتم حجز هذه الضريبة
  3. مركز التكلفة: إذا الضرائب / الرسوم هو الدخل (مثل الشحن) أو حساب فإنه يحتاج إلى أن يتم الحجز مقابل مركز التكلفة.
  4. الوصف: وصف الضريبية (التي ستتم طباعتها في الفواتير / الاقتباس).
  5. معدل: معدل الضريبة.
@@ -666,17 +680,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ويرتبط مجلة الدخول {0} ضد بالدفع {1}، والتحقق ما إذا كان ينبغي سحبها كما تقدم في هذه الفاتورة.
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,مصاريف صيانة المكاتب
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,الرجاء إدخال العنصر الأول
 DocType: Account,Liability,مسئولية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,المبلغ عقوبات لا يمكن أن يكون أكبر من مبلغ المطالبة في صف {0}.
 DocType: Company,Default Cost of Goods Sold Account,التكلفة الافتراضية لحساب السلع المباعة
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,قائمة الأسعار غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 DocType: Process Payroll,Send Email,إرسال البريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",لتصفية استنادا الحزب، حدد حزب النوع الأول
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,بلدي الفواتير
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,بلدي الفواتير
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصول {1} يجب أن تقدم
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,لا توجد موظف
 DocType: Supplier Quotation,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,تحميل المال عن طريق التوازن CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,أرسل الآن
 ,Support Analytics,دعم تحليلات
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,خطأ منطقي: يجب أن تجد تداخل
 DocType: Item,Website Warehouse,مستودع الموقع
 DocType: Payment Reconciliation,Minimum Invoice Amount,الحد الأدنى للمبلغ الفاتورة
 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 +267,C-Form records,سجلات النموذج - س
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,سجلات النموذج - س
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,العملاء والموردين
 DocType: Email Digest,Email Digest Settings,البريد الإلكتروني إعدادات دايجست
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,دعم الاستفسارات من العملاء.
@@ -712,7 +728,7 @@
 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 +34,Net Profit / Loss,صافي الربح / الخسارة
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,أرسل رسالة أوتوماتيكيا عند ترحيل الحركة
 DocType: Production Order,Item To Manufacture,البند لتصنيع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
 DocType: Shopping Cart Settings,Enable Checkout,تمكين الخروج
@@ -720,7 +736,7 @@
 DocType: Quotation Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,نفقات
@@ -757,14 +773,15 @@
 DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,رأي المشتركين
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ايصال شراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
 DocType: Employee,Ms,MS
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,شركاء المبيعات والأرض
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
+DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,انتقل الى السلة
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الزيارات {0} قبل إلغاء هذه الصيانة زيارة
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
@@ -793,10 +810,10 @@
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,العلامة التجارية
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
-DocType: Journal Entry Account,Purchase Invoice,فاتورة شراء
+DocType: Asset,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,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
@@ -806,21 +823,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; الجدول.
 DocType: Job Opening,Publish on website,نشر على الموقع الإلكتروني
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,الشحنات للعملاء.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
 DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,الدخل غير المباشرة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,اختر البند لنقل
 DocType: Purchase Invoice,Additional Discount Percentage,نسبة خصم إضافي
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,ماكس الكمية
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",صف {0}: فاتورة {1} غير صالح، قد يتم إلغاء / لا وجود لها. \ الرجاء إدخال الفاتورة صحيحة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
@@ -829,14 +849,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل تذكير يوم ميلاد الموظف
 ,Employee Holiday Attendance,موظف عطلة الحضور
 DocType: Opportunity,Walk In,عميل غير مسجل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,الأسهم مقالات
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,الأسهم مقالات
 DocType: Item,Inspection Criteria,التفتيش معايير
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,نقلها
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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: SMS Center,All Lead (Open),جميع العملاء المحتملين (فتح)
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,جعل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,سلتي
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,عطلة اسم قائمة
 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 +180,Qty for {0},الكمية ل{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
+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 +80,Leave Allocation Tool,اداة توزيع الاجازات
 DocType: Leave Block List,Leave Block List Dates,ترك التواريخ قائمة الحظر
@@ -859,7 +880,7 @@
 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 +547,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,خصم
@@ -874,20 +895,21 @@
 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 +69,Selling Amount,كمية البيع
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,سجلات الوقت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,سجلات الوقت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
+DocType: Asset,Scrapped,ألغت
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,الحساب لا يتطابق مع الشركة
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,تجنيد
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,مصاريف المبيعات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,مصاريف المبيعات
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
@@ -904,7 +926,7 @@
 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 +18,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
+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,متوسط العمر
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,العملة الافتراضية
 DocType: Contact,Enter designation of this Contact,أدخل تسمية هذا الاتصال
 DocType: Expense Claim,From Employee,من موظف
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,مفتاح الأداء المنطقة
@@ -921,7 +943,7 @@
 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 +130,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,المساهمة٪
@@ -930,22 +952,23 @@
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,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,افتراضيات العالمية
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,مشروع التعاون دعوة
 DocType: Salary Slip,Deductions,الخصومات
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,وتوصف هذه الدفعة دخول الوقت.
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,خطأ القدرة على التخطيط
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,خطأ القدرة على التخطيط
 ,Trial Balance for Party,ميزان المراجعة للحزب
 DocType: Lead,Consultant,مستشار
 DocType: Salary Slip,Earnings,أرباح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,الانتهاء من البند {0} يجب إدخال لنوع صناعة دخول
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,فتح ميزان المحاسبة
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,شيء أن تطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,شيء أن تطلب
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,إدارة
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,أنواع الأنشطة لجداول زمنية
@@ -956,18 +979,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,الرجاء تعيين ID البريد الإلكتروني
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,الرجاء تعيين ID البريد الإلكتروني
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,UOM تحويل عامل
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,مزود قاعدة البيانات.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,الميزانية العمومية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,الضرائب والاقتطاعات من الراتب أخرى.
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
@@ -981,6 +1004,7 @@
 DocType: Holiday,Holiday,عطلة
 DocType: Leave Control Panel,Leave blank if considered for all branches,ترك فارغا إذا نظرت لجميع الفروع
 ,Daily Time Log Summary,الوقت الملخص اليومي دخول
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-النموذج لا ينطبق على الفاتورة: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,لم تتم تسويتها تفاصيل الدفع
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
@@ -994,19 +1018,20 @@
 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,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
 DocType: Contact,User ID,المستخدم ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,عرض ليدجر
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,عرض ليدجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
-,Budget Variance Report,تقرير الفرق الميزانية
+,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,الأرباح المحتجزة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,الأرباح المحتجزة
 DocType: BOM Item,Item Description,وصف السلعة
 DocType: Payment Tool,Payment Mode,طريقة الدفع
 DocType: Purchase Invoice,Is Recurring,غير متكرر
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,افتتاح مؤقت
 ,Employee Leave Balance,رصيد اجازات الموظف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},التقييم المعدل المطلوب لعنصر في الصف {0}
@@ -1029,8 +1054,8 @@
 ,Accounts Payable Summary,ملخص الحسابات الدائنة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 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 +165,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,ترتيب المبيعات {0} غير صالح
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,صغير
@@ -1038,20 +1063,20 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,الحساب الرئيسى  {0} تم انشأه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,أخضر
-DocType: Item,Auto re-order,السيارات إعادة ترتيب
+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/stock/doctype/stock_entry/stock_entry.py +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
 DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
@@ -1061,19 +1086,20 @@
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,معدات العاصمة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد الأسعار على أساس القاعدة الأولى 'تطبيق في' الميدان، التي يمكن أن تكون مادة، مادة أو مجموعة العلامة التجارية.
 DocType: Hub Settings,Seller Website,البائع موقع
 apps/erpnext/erpnext/controllers/selling_controller.py +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},مركز الإنتاج للطلب هو {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,ل مزود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,ل مزود
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},لم تجد أي بند يسمى {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,مجموع المنتهية ولايته
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","يمكن أن يكون هناك واحد فقط الشحن القاعدة الحالة مع 0 أو قيمة فارغة ل "" إلى القيمة """
 DocType: Authorization Rule,Transaction,صفقة
@@ -1081,10 +1107,10 @@
 DocType: Item,Website Item Groups,مجموعات الأصناف للموقع
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شركة العملات)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,الرقم التسلسلي {0} دخلت أكثر من مرة
-DocType: Journal Entry,Journal Entry,إدخال دفتر اليومية
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
 DocType: Naming Series,This is the number of the last created transaction with this prefix,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة
@@ -1093,6 +1119,7 @@
 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,محطة العمل
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,طلب تسعيرة مزود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,خردوات
 DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Attendance,HR Manager,مدير الموارد البشرية
@@ -1103,6 +1130,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,تقييم قالب الهدف
 DocType: Salary Slip,Earning,كسب
 DocType: Payment Tool,Party Account Currency,حزب حساب العملات
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},القيمة الحالية بعد الاستهلاك يجب أن يكون أقل من يساوي {0}
 ,BOM Browser,BOM متصفح
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
 DocType: Company,If Yearly Budget Exceeded (for expense account),إذا كانت الميزانية السنوية تجاوزت (لحساب المصاريف)
@@ -1110,28 +1138,29 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +167,Against Journal Entry {0} is already adjusted against some other voucher,مقابل مجلة الدخول {0} يتم ضبط بالفعل ضد بعض قسيمة أخرى
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع قيمة الطلب
 apps/erpnext/erpnext/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/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,العمر مدى 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد أمر إنتاج مسجل
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
 apps/erpnext/erpnext/config/crm.py +68,"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}
 DocType: Project,Start and End Dates,تواريخ البدء والانتهاء
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,ميزات الإعداد
+DocType: Asset,Depreciation Schedules,جداول الاستهلاك
 DocType: Item,Is Service Item,هو البند خدمة
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن يكون خارج فترةالاجزات المخصصة
 DocType: Activity Cost,Projects,مشاريع
 DocType: Payment Request,Transaction Currency,عملية العملات
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},من {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},من {0} | {1} {2}
 DocType: BOM Operation,Operation Description,وصف العملية
 DocType: Item,Will also apply to variants,سوف تنطبق أيضا على متغيرات
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,لا يمكن تغيير السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء مرة واحدة يتم حفظ السنة المالية.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,حملة
@@ -1145,8 +1174,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},الحد الأقصى: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,لشركة
 apps/erpnext/erpnext/config/support.py +17,Communication log.,سجل الاتصالات.
@@ -1154,8 +1183,8 @@
 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 +472,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1177,11 +1206,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
 DocType: Rename Tool,Type of document to rename.,نوع الوثيقة إلى إعادة تسمية.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,نشتري هذه القطعة
 DocType: Address,Billing,الفواتير
@@ -1191,12 +1220,15 @@
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,الجمعيات الفرعية
+DocType: Asset,Asset Name,اسم الأصول
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Supplier,Stock Manager,الأسهم مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,زلة التعبئة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,مكتب للإيجار
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,مكتب للإيجار
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,إعدادات العبارة الإعداد SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,طلب للحصول على الاقتباس يمكن أن يكون الوصول عن طريق النقر الرابط التالي
+DocType: Asset,Number of Months in a Period,عدد من شهرين في الفترة
 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,محطة العمل ساعة العمل
@@ -1213,29 +1245,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حكومة
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
 DocType: Sales Invoice,Source,مصدر
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,مشاهدة مغلقة
 DocType: Leave Type,Is Leave Without Pay,وإجازة بدون راتب
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,لا توجد في جدول الدفع السجلات
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,تدفق النقد من الاستثمار
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,الشحن و التخليص الرسوم
 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 +86,Transfer Materials for Manufacture,المواد نقل لصناعة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,المواد نقل لصناعة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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),مقدار الخصم الاضافي (العملة الشركة)
+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.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,صيانة زيارة
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,تتوفر الكمية دفعة في مستودع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,صيانة زيارة
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,الكمية المتاحة من الباتش فى المخزن
 DocType: Time Log Batch Detail,Time Log Batch Detail,وقت دخول دفعة التفاصيل
 DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعدة
 DocType: Purchase Invoice,Select Shipping Address,حدد عنوان الشحن
@@ -1248,7 +1281,6 @@
 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 +196,Brand master.,العلامة التجارية الرئيسية.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,صندوق
@@ -1276,7 +1308,7 @@
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +131,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,المطلوبات الأسهم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,المطلوبات الأسهم
 DocType: Purchase Receipt,Supplier Warehouse,المورد مستودع
 DocType: Opportunity,Contact Mobile No,الاتصال المحمول لا
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
@@ -1285,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال البريد الإلكتروني الدفع
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,تقارير أخرى
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,توقف عيد ميلاد تذكير
@@ -1295,26 +1327,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} مشاهدة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,صافي التغير في النقد
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},دفع طلب بالفعل {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,لم يتم إغلاق سابقة المالية السنة
 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 +40,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 +38,Supplier Type master.,المورد الرئيسي نوع .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,المورد رقم الجزء
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,معدل التحويل لا يمكن أن يكون 0 أو 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,معدل التحويل لا يمكن أن يكون 0 أو 1
 DocType: Purchase Invoice,Reference Document,وثيقة مرجعية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0} فوترت٪
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
@@ -1330,14 +1363,15 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 DocType: Payment Reconciliation,Payments,المدفوعات
-DocType: Budget Detail,Budget Allocated,الميزانية المخصصة
+DocType: Budget Detail,Budget Allocated,الموازنة المخصصة
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد العملاء
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,صافي التغير في الحسابات الدائنة
 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',العميل المطلوبة ل ' Customerwise الخصم '
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
 DocType: Quotation,Term Details,مصطلح تفاصيل
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} يجب أن تكون أكبر من 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),القدرة على التخطيط لل(أيام)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,المطالبة الضمان
@@ -1355,7 +1389,7 @@
 DocType: Employee,Permanent Address,العنوان الدائم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",المدفوعة مسبقا مقابل {0} {1} لا يمكن أن يكون أكبر \ من المجموع الكلي {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,الرجاء اختيار رمز العنصر
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,الرجاء اختيار رمز العنصر
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),تخفيض خصم لإجازة بدون أجر (LWP)
 DocType: Territory,Territory Manager,مدير إقليم
 DocType: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
@@ -1365,15 +1399,15 @@
 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,مصاريف التسويق
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,واحد وحدة من عنصر.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على قالب
@@ -1390,33 +1424,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,مبيعات البند الحكيم سجل
+DocType: Asset,Gross Purchase Amount,الإجمالي المبلغ شراء
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","على سبيل المثال ""البنك الوطني XYZ """
+DocType: Asset,Depreciation Method,طريقة الاستهلاك
 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 +29,Shopping Cart is enabled,يتم تمكين سلة التسوق
 DocType: Job Applicant,Applicant for a Job,المتقدم للحصول على وظيفة
 DocType: Production Plan Material Request,Production Plan Material Request,إنتاج خطة المواد طلب
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,لا أوامر الإنتاج التي تم إنشاؤها
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,لا أوامر الإنتاج التي تم إنشاؤها
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,رئيسي
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,ترك صرفها؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,جعل أمر الشراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,جعل أمر الشراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1424,31 +1460,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,المتقدم للحصول على الوظيفة.
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,عناوين
+apps/erpnext/erpnext/hooks.py +91,Addresses,عناوين
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه أي لا مثيل لها {1} دخول
-apps/erpnext/erpnext/config/hr.py +141,Appraisals,تقييم
+apps/erpnext/erpnext/config/hr.py +141,Appraisals,تقييم الأداء
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,شرط للحصول على قانون الشحن
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,لا يسمح البند لأمر الإنتاج.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,لا يسمح البند لأمر الإنتاج.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,الرجاء تعيين مرشح بناء على البند أو مستودع
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن صافي من هذه الحزمة. (تحسب تلقائيا مجموع الوزن الصافي للسلعة)
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: GL Entry,Credit Amount in Account Currency,مبلغ القرض في حساب العملات
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,سجلات الوقت للتصنيع.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,وقت دخول للمهام.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,علامة تجارية
 DocType: Item,Will also apply for variants,سوف تنطبق أيضا على متغيرات
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Quotation Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
@@ -1459,6 +1496,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
+DocType: Request for Quotation Supplier,Send Email to Supplier,إرسال بالبريد الإلكتروني إلى مزود
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 DocType: Packing Slip,To Package No.,لحزم رقم
 DocType: Production Planning Tool,Material Requests,الطلبات المادية
@@ -1476,7 +1514,7 @@
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
 DocType: Stock Settings,Allowance Percent,بدل النسبة
 DocType: SMS Settings,Message Parameter,رسالة معلمة
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,شجرة من مراكز التكلفة المالية.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,شجرة من مراكز التكلفة المالية.
 DocType: Serial No,Delivery Document No,الوثيقة لا تسليم
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,الحصول على أصناف من إيصالات الشراء
 DocType: Serial No,Creation Date,تاريخ الإنشاء
@@ -1495,7 +1533,7 @@
 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/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/public/js/setup_wizard.js +201,e.g. 5,على سبيل المثال 5
@@ -1508,41 +1546,43 @@
 ,Amount to Deliver,المبلغ تسليم
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,منتج أو خدمة
 DocType: Naming Series,Current Value,القيمة الحالية
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} تم إنشاء
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد السنوات المالية متعددة للتاريخ {0}. يرجى وضع الشركة في السنة المالية
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} تم إنشاء
 DocType: Delivery Note Item,Against Sales Order,مقابل أمر المبيعات
 ,Serial No Status,المسلسل لا الحالة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","صف {0} لضبط {1} دورية، يجب أن يكون الفرق بين من وإلى تاريخ \
  أكبر من أو يساوي {2}"
 DocType: Pricing Rule,Selling,بيع
 DocType: Employee,Salary Information,معلومات الراتب
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,الرسوم والضرائب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,لم يتم تكوين بوابة الدفع حساب
 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: Production Order,Material Request Item,طلب المواد الإغلاق
+DocType: Request for Quotation Item,Material Request Item,طلب المواد الإغلاق
 apps/erpnext/erpnext/config/stock.py +85,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,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
+DocType: Asset,Sold,تم البيع
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر مفتوحة الانتاج
 DocType: Installation Note,Installation Time,تثبيت الزمن
 DocType: Sales Invoice,Accounting Details,تفاصيل المحاسبة
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,حذف جميع المعاملات لهذه الشركة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,الاستثمارات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,المخصصات
 DocType: Quality Inspection Reading,Acceptance Criteria,معايير القبول
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,الرجاء إدخال طلبات المواد في الجدول أعلاه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,الرجاء إدخال طلبات المواد في الجدول أعلاه
 DocType: Item Attribute,Attribute Name,السمة اسم
 DocType: Item Group,Show In Website,تظهر في الموقع
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,مجموعة
@@ -1550,6 +1590,7 @@
 ,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",لتتبع اسم العلامة التجارية في الوثائق التالية تسليم مذكرة، فرصة، طلب المواد، البند، طلب شراء، شراء قسيمة، المشتري استلام، الاقتباس، فاتورة المبيعات، حزمة المنتج، ترتيب المبيعات، المسلسل لا
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,مخطط جانت لجميع المهام.
+DocType: Pricing Rule,Margin Type,نوع الهامش
 DocType: Appraisal,For Employee Name,لاسم الموظف
 DocType: Holiday List,Clear Table,الجدول واضح
 DocType: Features Setup,Brands,العلامات التجارية
@@ -1557,20 +1598,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,العناوين العملاء واتصالات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,الصف # {0}: الأصول إلزامي ضد الثابتة البند الأصول
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى الإعداد عددهم سلسلة لحضور عبر الإعداد&gt; ترقيم السلسلة
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (إعتماد النفقات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,زوج
+DocType: Asset,Depreciation Schedule,جدول الاستهلاك
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
 DocType: Item,Has Batch No,ودفعة واحدة لا
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
+DocType: Asset,Purchase Date,تاريخ الشراء
 DocType: Employee,Personal Details,تفاصيل شخصية
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},الرجاء تعيين &quot;الأصول مركز الاستهلاك الكلفة&quot; في شركة {0}
 ,Maintenance Schedules,جداول الصيانة
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
@@ -1584,23 +1630,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات التوفيق
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,يجب أن يكون نوع الحساب {0} 'أصول ثابتة' حيث أن الصنف {1} من ضمن الأصول
 DocType: HR Settings,HR Settings,إعدادات HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,مجموعة لغير المجموعه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,الإجمالي الفعلي
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,وحدة
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,يرجى تحديد شركة
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,مطالبات حساب
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,مطالبات حساب
 DocType: Issue,Support,دعم
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
@@ -1609,29 +1654,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
 DocType: Salary Slip,Deduction,اقتطاع
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},وأضاف البند سعر {0} في قائمة الأسعار {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},وأضاف البند سعر {0} في قائمة الأسعار {1}
 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 +137,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,محسوب التوازن بيان البنك
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,المستخدم معطل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,تسعيرة
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 DocType: Quotation,Maintenance User,الصيانة العضو
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,تكلفة تحديث
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,تكلفة تحديث
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
@@ -1643,8 +1689,8 @@
 ,SO Qty,SO الكمية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},المسلسل لا {0} هو تحت الضمان لغاية {1}
+DocType: Request for Quotation,Manufacturing Manager,مدير التصنيع
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},المسلسل لا {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
 apps/erpnext/erpnext/hooks.py +71,Shipments,شحنات
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
@@ -1652,12 +1698,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,الصف #
 DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
-DocType: Pricing Rule,Supplier,مزود
+DocType: Asset,Supplier,مزود
 DocType: C-Form,Quarter,ربع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,المصروفات المتنوعة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,المصروفات المتنوعة
 DocType: Global Defaults,Default Company,افتراضي شركة
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة الأسهم الإجمالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,المستخدم {0} تم تعطيل
@@ -1666,7 +1712,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",أنواع العمل (دائمة أو عقد الخ متدربة ) .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Currency Exchange,From Currency,من العملات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
@@ -1676,11 +1722,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",الصف # {0}: يجب أن يكون العدد 1، كما يرتبط بأصل البند
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,طفل البند لا ينبغي أن يكون حزمة المنتج. الرجاء إزالة البند `{0}` وحفظ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,مركز تكلفة جديد
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; والقيام نذكر معدل الضريبة.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,مركز تكلفة جديد
 DocType: Bin,Ordered Quantity,أمرت الكمية
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
 DocType: Quality Inspection,In Process,في عملية
@@ -1693,10 +1739,11 @@
 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,حساب المستحق
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصول {1} هو بالفعل {2}
 DocType: Quotation Item,Stock Balance,الأسهم الرصيد
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ترتيب مبيعات لدفع
 DocType: Expense Claim Detail,Expense Claim Detail,حساب المطالبة التفاصيل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,الوقت سجلات خلق:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,الوقت سجلات خلق:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,يرجى تحديد الحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Employee,Blood Group,فصيلة الدم
@@ -1714,13 +1761,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,مطلوب الخصم ل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,مطلوب الخصم ل
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,شراء قائمة الأسعار
 DocType: Offer Letter Term,Offer Term,عرض الأجل
 DocType: Quality Inspection,Quality Manager,مدير الجودة
 DocType: Job Applicant,Job Opening,افتتاح العمل
 DocType: Payment Reconciliation,Payment Reconciliation,دفع المصالحة
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,خطاب عرض
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,.وأوامر الإنتاج (MRP) إنشاء طلبات المواد
@@ -1728,22 +1775,22 @@
 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 +103,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
 DocType: Production Order Operation,Completed Qty,الكمية الانتهاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,معدل التقييم الحالي
 DocType: Item,Customer Item Codes,رموز العملاء البند
 DocType: Opportunity,Lost Reason,فقد السبب
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,انشاء مدخلات الدفع ضد أوامر أو فواتير.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,انشاء مدخلات الدفع ضد أوامر أو فواتير.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,المستخدمين وأذونات
@@ -1752,10 +1799,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,العملاء
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
 DocType: Leave Block List Date,Block Date,منع تاريخ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,قدم الآن
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,قدم الآن
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
 ,Bank Clearance Summary,ملخص التخليص البنكى
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",إنشاء وإدارة البريد الإلكتروني يوميا هضم وأسبوعية وشهرية .
@@ -1779,7 +1827,7 @@
 DocType: Employee,Employment Details,تفاصيل العمل
 DocType: Employee,New Workplace,مكان العمل الجديد
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,على النحو مغلق
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},أي عنصر مع الباركود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},أي عنصر مع الباركود {0}
 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,تظهر الشرائح في أعلى الصفحة
@@ -1787,7 +1835,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +86,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,بناء على شيخوخة
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,العمر بناءا على
 DocType: Item,End of Life,نهاية الحياة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
@@ -1797,10 +1845,10 @@
 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 +608,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,نقل المواد
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},البند {0} يجب أن يكون البند المبيعات في {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -1814,12 +1862,13 @@
 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: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),مصدر الأموال ( المطلوبات )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,موظف
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,استيراد البريد الإلكتروني من
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,دعوة كمستخدم
-DocType: Features Setup,After Sale Installations,بعد التثبيت بيع
+DocType: Features Setup,After Sale Installations,التركيب بعد البيع
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},الرجاء تعيين {0} في شركة {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Workstation Working Hour,End Time,نهاية الوقت
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية ل مبيعات أو شراء .
@@ -1828,9 +1877,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,الأدوية
@@ -1847,37 +1896,37 @@
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع غير صالح {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث الأسهم، فاتورة تحتوي انخفاض الشحن البند.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث الأسهم، فاتورة تحتوي انخفاض الشحن البند.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 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.",القيود المحاسبية المجمدةلهذا التاريخ، لا يمكن لأحد أجراء /  تعديل مدخل باستثناء المحددة أدناه.
+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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,النشرة الإخبارية القائمة البريدية
 DocType: Delivery Note,Transporter Name,نقل اسم
-DocType: Authorization Rule,Authorized Value,القيمة أذن
+DocType: Authorization Rule,Authorized Value,قيمة السماح
 DocType: Contact,Enter department to which this Contact belongs,أدخل الدائرة التي ينتمي هذا الاتصال
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,إجمالي غائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
@@ -1889,24 +1938,25 @@
 ,Completed Production Orders,أوامر الإنتاج الانتهاء
 DocType: Operation,Default Workstation,محطة العمل الافتراضية
 DocType: Notification Control,Expense Claim Approved Message,المطالبة حساب المعتمدة رسالة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} غير مغلقة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} مغلقة
 DocType: Email Digest,How frequently?,كيف كثير من الأحيان؟
 DocType: Purchase Receipt,Get Current Stock,الحصول على المخزون الحالي
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة تطبيق صناديق&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (عن طريق النقر على اضافة الطفل) من نوع &quot;البنك&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,شجرة من مواد مشروع القانون
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,حضر علامة
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,غرض
+DocType: Company,Fixed Asset Depreciation Settings,إعدادات استهلاك الأصول الثابتة
 DocType: Item,Will also apply for variants unless overrridden,سوف تنطبق أيضا على متغيرات ما لم overrridden
-DocType: Purchase Invoice,Advances,السلف
+DocType: Purchase Invoice,Advances,الدفعات المقدمة
 DocType: Production Order,Manufacture against Material Request,تصنيع ضد طلب مواد
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,الموافقة العضو لا يمكن أن يكون نفس المستخدم القاعدة تنطبق على
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),أسعار الأساسي (كما في الأوراق المالية UOM)
 DocType: SMS Log,No of Requested SMS,لا للSMS مطلوب
 DocType: Campaign,Campaign-.####,حملة # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,وعقدة الطفل
@@ -1914,7 +1964,7 @@
 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/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/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,العمر مدى 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1923,7 +1973,7 @@
 
 #### Description of Columns
 
-1. Calculation Type: 
+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).
@@ -1935,19 +1985,19 @@
 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.","قالب الضرائب القياسية التي يمكن تطبيقها على جميع المعاملات شراء. يمكن أن يحتوي هذا القالب قائمة رؤساء الضريبية، وكذلك غيرهم من رؤساء حساب مثل ""شحن""، ""التأمين""، ""معالجة""، وغيرها 
+10. Add or Deduct: Whether you want to add or deduct the tax.","قالب الضرائب القياسية التي يمكن تطبيقها على جميع المعاملات شراء. يمكن أن يحتوي هذا القالب قائمة رؤساء الضريبية، وكذلك غيرهم من رؤساء حساب مثل ""شحن""، ""التأمين""، ""معالجة""، وغيرها
 
- #### ملاحظة 
+ #### ملاحظة
 
  معدل الضريبة التي تحدد هنا سوف يكون معدل الضريبة موحد لجميع الأصناف ** **. إذا كانت هناك بنود ** ** التي لها أسعار مختلفة، وأنها يجب أن يضاف في * الضرائب البند ** الجدول في البند ** ** الرئيسي.
 
- #### وصف الأعمدة 
+ #### وصف الأعمدة
 
- 1. نوع الحساب: 
+ 1. نوع الحساب:
  - وهذا يمكن أن يكون على ** صافي إجمالي ** (وهذا هو مجموع المبلغ الأساسي).
  - ** في الصف السابق الكل / المكونات ** (للضرائب أو رسوم التراكمية). إذا قمت بتحديد هذا الخيار، سيتم تطبيق الضريبة كنسبة مئوية من الصف السابق (في الجدول الضرائب) كمية أو المجموع.
  - ** ** الفعلية (كما ذكر).
- 2. رئيس الحساب: حساب دفتر الأستاذ والتي بموجبها سيتم حجز هذه الضريبة 
+ 2. رئيس الحساب: حساب دفتر الأستاذ والتي بموجبها سيتم حجز هذه الضريبة
  3. مركز التكلفة: إذا الضرائب / الرسوم هو الدخل (مثل الشحن) أو حساب فإنه يحتاج إلى أن يتم الحجز مقابل مركز التكلفة.
  4. الوصف: وصف الضريبية (التي ستتم طباعتها في الفواتير / الاقتباس).
  5. معدل: معدل الضريبة.
@@ -1957,12 +2007,14 @@
  9. النظر في ضريبة أو رسم ل: في هذا القسم يمكنك تحديد ما إذا كان الضرائب / الرسوم هو فقط للتقييم (وليس جزءا من الكل) أو فقط للمجموع (لا يضيف قيمة إلى العنصر) أو لكليهما.
  10. إضافة أو اقتطاع: إذا كنت ترغب في إضافة أو خصم الضرائب."
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
+DocType: Asset Category Account,Asset Category Account,حساب الأصول الفئة
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",على سبيل المثال البنك، نقدا، بطاقة الائتمان
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",على سبيل المثال البنك، نقدا، بطاقة الائتمان
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة تطبيق صناديق&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (عن طريق النقر على اضافة الطفل) من نوع &quot;البنك&quot;
 DocType: Journal Entry,Credit Note,ملاحظة الائتمان
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},الانتهاء الكمية لا يمكن أن يكون أكثر من {0} لتشغيل {1}
 DocType: Features Setup,Quality,جودة
@@ -1986,9 +2038,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,بلدي العناوين
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,فرع المؤسسة الرئيسية .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,الافتراضي شراء قائمة الأسعار
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,أي موظف للمعايير المحدد أعلاه أو قسيمة الراتب تم إنشاؤها مسبقا
@@ -2015,7 +2067,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/config/hr.py +93,Payroll,كشف رواتب
 apps/erpnext/erpnext/accounts/doctype/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} يجب أيضا أن يدرج الصفوف
@@ -2025,8 +2077,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,نماذج التخصيص
 DocType: Account,Income Account,دخل الحساب
-DocType: Payment Request,Amount in customer's currency,المبلغ بالعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,تسليم
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,لم يتم العثور على قالب عنوان افتراضي. يرجى إنشاء واحدة جديدة من الإعداد&gt; الطباعة والعلامات التجارية&gt; قالب العناوين.
+DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,مفتاح مسؤولية المنطقة
@@ -2048,21 +2101,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات الأسهم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,اسم مركز تكلفة جديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,ترك لوحة التحكم
 DocType: Appraisal,HR User,HR العضو
 DocType: Purchase Invoice,Taxes and Charges Deducted,خصم الضرائب والرسوم
-apps/erpnext/erpnext/config/support.py +7,Issues,قضايا
+apps/erpnext/erpnext/hooks.py +90,Issues,قضايا
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},يجب أن تكون حالة واحدة من {0}
 DocType: Sales Invoice,Debit To,الخصم ل
 DocType: Delivery Note,Required only for sample item.,المطلوب فقط لمادة العينة.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
 ,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} معطل {1}
 DocType: Supplier,Billing Currency,الفواتير العملات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,كبير جدا
 ,Profit and Loss Statement,الأرباح والخسائر
@@ -2076,10 +2130,10 @@
 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 +139,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,إجمالي المبلغ المستحق
@@ -2114,7 +2168,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","الشروط والأحكام التي يمكن أن تضاف إلى المبيعات والمشتريات القياسية.
 
- أمثلة: 
+ أمثلة:
 
  1. صلاحية العرض.
  1. شروط الدفع (مقدما، وعلى الائتمان، وجزء مسبقا الخ).
@@ -2123,7 +2177,7 @@
  1. الضمان إن وجدت.
  1. عودة السياسة.
  1. شروط الشحن، إذا كان ذلك ممكنا.
- 1. سبل معالجة النزاعات، التعويض، والمسؤولية، الخ 
+ 1. سبل معالجة النزاعات، التعويض، والمسؤولية، الخ
  1. معالجة والاتصال من الشركة الخاصة بك."
 DocType: Attendance,Leave Type,ترك نوع
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
@@ -2147,13 +2201,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}، وتحطيم العملية في عمليات متعددة
 ,Requested,طلب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,لا ملاحظات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,المبيعات والمشتريات
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,يجب أن تكون ثابتة البند الأصول عنصر غير المخزون
 DocType: Supplier Quotation Item,Material Request No,طلب مواد لا
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
@@ -2174,7 +2229,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
 DocType: Payment Request,Recipient and Message,المتلقي والرسالة
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
@@ -2188,7 +2243,7 @@
 DocType: Purchase Invoice,Select Supplier Address,حدد مزود العناوين
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
@@ -2210,20 +2265,21 @@
 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/config/buying.py +18,Request for quotation.,طلب للحصول على الاقتباس.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",يرجى تحديد عنصر، حيث قال &quot;هل البند الأسهم&quot; هو &quot;لا&quot; و &quot;هل المبيعات البند&quot; هو &quot;نعم&quot; وليس هناك حزمة المنتجات الأخرى
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,تحديد التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,قائمة أسعار العملات غير محددة
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,مقابل الوثيقة رقم
+DocType: Installation Note Item,Against Document No,مقابل المستند رقم
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,إدارة المبيعات الشركاء.
 DocType: Quality Inspection,Inspection Type,نوع التفتيش
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},الرجاء اختيار {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,الحضور غير المراقب
@@ -2238,6 +2294,7 @@
 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,إعلان
+DocType: Asset Category Account,Depreciation Expense Account,حساب الاستهلاك النفقات
 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,حساب الموافق
@@ -2251,9 +2308,9 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,مؤكد
 DocType: Payment Gateway,Gateway,بوابة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
-apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,عنوان عنوانها إلزامية.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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,تحديد السنة المالية
@@ -2265,18 +2322,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,مستودع مقبول
 DocType: Bank Reconciliation Detail,Posting Date,تاريخ النشر
 DocType: Item,Valuation Method,تقييم الطريقة
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},تعذر العثور على سعر الصرف ل{0} إلى {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},تعذر العثور على سعر الصرف ل{0} إلى {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,يوم علامة نصف
 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 +410,[Error],[خطأ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),أوراق الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,المسلسل لا {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 DocType: Sales Invoice Item,Customer Warehouse (Optional),مستودع العميل (اختياري)
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
@@ -2302,32 +2360,34 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,طلبات المواد {0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,طلبات المواد {0} خلق
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,قالب من الشروط أو العقد.
 DocType: Purchase Invoice,Address and Contact,العناوين و التواصل
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Employee,Feedback,تعليقات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاستهلاك المتراكم
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
+DocType: Asset,Expected Value After Useful Life,القيمة المتوقعة بعد حياة مفيدة
 DocType: Item,Reorder level based on Warehouse,مستوى إعادة الطلب بناء على مستودع
 DocType: Activity Cost,Billing Rate,أسعار الفواتير
 ,Qty to Deliver,الكمية للتسليم
 DocType: Monthly Distribution Percentage,Month,شهر
 ,Stock Analytics,الأسهم تحليلات
-DocType: Installation Note Item,Against Document Detail No,تفاصيل الوثيقة رقم ضد
+DocType: Installation Note Item,Against Document Detail No,مقابل المستند التفصيلى رقم
 DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} تم إلغاء أو مغلقة
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,صافي النقد من الاستثمار
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,لا يمكن حذف حساب الجذر
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,الأصول {0} يجب أن تقدم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,إدارة العناوين
-DocType: Pricing Rule,Item Code,البند الرمز
+DocType: Asset,Item Code,البند الرمز
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
@@ -2346,8 +2406,10 @@
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
 DocType: Employee Education,School/University,مدرسة / جامعة
 DocType: Payment Request,Reference Details,إشارة تفاصيل
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
 DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
 ,Billed Amount,مبلغ الفاتورة
+DocType: Asset,Double Declining Balance,الرصيد المتناقص المزدوج
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,لا يمكن إلغاء النظام المغلق. فتح لإلغاء.
 DocType: Bank Reconciliation,Bank Reconciliation,تسوية البنك
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,الحصول على التحديثات
@@ -2366,6 +2428,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
+DocType: Asset,Fully Depreciated,استهلكت بالكامل
 ,Stock Projected Qty,الأسهم المتوقعة الكمية
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,الحضور الملحوظ HTML
@@ -2373,43 +2436,46 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,المسلسل لا دفعة و
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,القيمة أو الكمية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,دقيقة
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 ,Qty to Receive,الكمية للاستلام
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
 DocType: Sales Partner,Retailer,متاجر التجزئة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع  الموردين
 DocType: Global Defaults,Disable In Words,تعطيل في الكلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,القروض المضمونة
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},الرجاء ضبط الحسابات المتعلقة الاستهلاك في الفئة الأصول {0} أو شركة {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,افتتاح ميزان العدالة
 DocType: Appraisal,Appraisal,تقييم
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},البريد الإلكتروني المرسلة إلى المورد {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ويتكرر التاريخ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,المفوض بالتوقيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,رسالة المرسلة
-apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,لا يمكن جعل حساب ذو توابع كدفتر حسابات دفتر أستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,لا يمكن جعل حساب له حسابات فرعيه حساب أستاذ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ (شركة العملات)
 DocType: BOM Operation,Hour Rate,ساعة قيم
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
-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}
+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
@@ -2428,6 +2494,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,إجمالي الهامش
 DocType: Supplier,Supplier Details,تفاصيل المورد
 DocType: Expense Claim,Approval Status,حالة القبول
 DocType: Hub Settings,Publish Items to Hub,نشر عناصر إلى المحور
@@ -2441,7 +2508,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,المجموعة العملاء / الزبائن
 DocType: Payment Gateway Account,Default Payment Request Message,الافتراضي الدفع طلب رسالة
 DocType: Item Group,Check this if you want to show in website,التحقق من ذلك إذا كنت تريد أن تظهر في الموقع
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,البنوك والمدفوعات
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,البنوك والمدفوعات
 ,Welcome to ERPNext,مرحبا بكم في ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,قسيمة رقم التفاصيل
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,تؤدي إلى الاقتباس
@@ -2449,17 +2516,17 @@
 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 +199,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,أوراق الشجر وعطلة
 DocType: Sales Order,Not Billed,لا صفت
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,كلا مستودع يجب أن تنتمي إلى نفس الشركة
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,دفعات عن الفواتير
@@ -2475,48 +2542,54 @@
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
 DocType: Shopping Cart Settings,Quotation Series,اقتباس السلسلة
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
+DocType: Company,Asset Depreciation Cost Center,الأصول مركز الاستهلاك التكلفة
 DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
 DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,لا يتطابق تاريخ شراء الأصول {0} مع تاريخ شراء الفاتورة
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
 DocType: Journal Entry,Stock Entry,حركة مخزنية
 DocType: Account,Payable,المستحقة
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),المدينين ({0})
-DocType: Project,Margin,هامش
-DocType: Salary Slip,Arrear Amount,متأخرات المبلغ
+DocType: Pricing Rule,Margin,هامش
+DocType: Salary Slip,Arrear Amount,المبالغ المتأخرة
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,زبائن الجدد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,الربح الإجمالي٪
 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,تحقق مما إذا كنت ترغب في إرسال قسيمة الراتب في البريد إلى كل موظف أثناء قيامهم بتقديم قسيمة الراتب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,الإجمالي المبلغ شراء إلزامي
 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 +57,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
 DocType: Stock Entry Detail,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصول {1} لا تنتمي إلى شركة {2}
 DocType: Employee,Confirmation Date,تأكيد التسجيل
 DocType: C-Form,Total Invoiced Amount,إجمالي مبلغ بفاتورة
 DocType: Account,Sales User,مبيعات العضو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,دقيقة الكمية لا يمكن أن يكون أكبر من الكمية ماكس
+DocType: Account,Accumulated Depreciation,الاستهلاك المتراكم
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
 DocType: Payment Request,Email To,البريد الإلكتروني ل
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
 DocType: Bin,Requested Quantity,طلب الكمية
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,مطلوب مستودع
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,مطلوب مستودع
 DocType: Employee,Marital Status,الحالة الإجتماعية
-DocType: Stock Settings,Auto Material Request,السيارات مادة طلب
+DocType: Stock Settings,Auto Material Request,طلب مواد أوتوماتيكى
 DocType: Time Log,Will be updated when billed.,سيتم تحديث عندما توصف.
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,تتوفر الكمية دفعة من مستودع في
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,الكمية المتاحة من الباتش فى المخزن
 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 +115,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 +84,{0}% Delivered,{0} سلمت٪
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن يكون أقل من الحد الأدنى من الكمية ترتيب {2} (المحددة في البند).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
 DocType: Territory,Territory Targets,الأراضي الأهداف
 DocType: Delivery Note,Transporter Info,نقل معلومات
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون الشركة
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,رؤساء إلكتروني لقوالب الطباعة.
@@ -2526,13 +2599,14 @@
 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: Payment Request,Payment Details,تفاصيل الدفع
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM أسعار
+DocType: Asset,Journal Entry for Scrap,إدخال دفتر اليومية للخردة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.",سجل جميع الاتصالات من نوع البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
 DocType: Manufacturer,Manufacturers used in Items,المصنعين المستخدمة في وحدات
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
 DocType: Purchase Invoice,Terms,حيث
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,انشاء جديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,انشاء جديد
 DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
 ,Item-wise Sales History,البند الحكيم تاريخ المبيعات
 DocType: Expense Claim,Total Sanctioned Amount,المبلغ الكلي للعقوبات
@@ -2545,7 +2619,7 @@
 ,Stock Ledger,سجل المخزن
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},معدل: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,حدد عقدة المجموعة أولا.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,حدد عقدة المجموعة أولا.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,الموظف والحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",إزالة إشارة من العملاء، والمورد، شريك المبيعات والرصاص، كما هو عنوان لشركتك
@@ -2567,13 +2641,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} من {1}
 DocType: Task,depends_on,يعتمد على
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للعملاء والموردين
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للعملاء والموردين
 DocType: BOM Replace Tool,BOM Replace Tool,BOM استبدال أداة
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,قوالب بلد الحكمة العنوان الافتراضي
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,يجب أن يكون التاريخ القادم أكبر من تاريخ النشر
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,مشاهدة الضرائب تفكك
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# نموذج / البند / {0}) هو من المخزون
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,يجب أن يكون التاريخ القادم أكبر من تاريخ النشر
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/accounts/party.py +289,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',إذا كنت تنطوي في نشاط الصناعات التحويلية . تمكن السلعة ' يتم تصنيعها '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,الفاتورة تاريخ النشر
@@ -2588,7 +2663,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",ملاحظة: إذا لم يتم الدفع ضد أي إشارة، وجعل الدخول مجلة يدويا.
@@ -2602,7 +2677,7 @@
 DocType: Hub Settings,Publish Availability,نشر توافر
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
 ,Stock Ageing,الأسهم شيخوخة
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2612,7 +2687,7 @@
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,ال
 DocType: Sales Person,Sales Person Name,مبيعات الشخص اسم
@@ -2623,7 +2698,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
@@ -2632,11 +2707,12 @@
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
+DocType: Asset Category Account,Fixed Asset Account,حساب الأصول الثابتة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,المتدرب
@@ -2644,7 +2720,7 @@
 DocType: Stock Entry,From BOM,من BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,يتم تجميد المعاملات الاسهم قبل {0}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,إلى التسجيل يجب أن يكون نفس التاريخ من ل إجازة نصف يوم
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
@@ -2652,17 +2728,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,هيكل المرتبات
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,الاقتباسات
 DocType: Hub Settings,Access Token,رمز وصول
 DocType: Sales Invoice Item,Serial No,المسلسل لا
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,الرجاء إدخال تفاصيل أول من Maintaince
-DocType: Item,Is Fixed Asset Item,هي الأصول الثابتة الإغلاق
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,الرجاء إدخال تفاصيل أول من Maintaince
 DocType: Purchase Invoice,Print Language,طباعة اللغة
 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",إذا كان لديك طباعة الأشكال طويلة، يمكن استخدام هذه الميزة لتقسيم ليتم طباعة الصفحة على صفحات متعددة مع جميع الرؤوس والتذييلات على كل صفحة
+DocType: Asset,Number of Depreciations,عدد من التلفيات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 DocType: Fiscal Year,Year Name,اسم العام
@@ -2670,13 +2746,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
 DocType: Product Bundle Item,Product Bundle Item,المنتج حزمة البند
 DocType: Sales Partner,Sales Partner Name,مبيعات الشريك الاسم
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,طلب الاقتباسات
 DocType: Payment Reconciliation,Maximum Invoice Amount,الحد الأقصى للمبلغ الفاتورة
 DocType: Purchase Invoice Item,Image View,عرض الصورة
 apps/erpnext/erpnext/config/selling.py +23,Customers,الزبائن
+DocType: Asset,Partially Depreciated,انخفضت جزئيا
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
@@ -2692,13 +2770,13 @@
 DocType: Quotation,Maintenance Manager,مدير الصيانة
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,إجمالي لا يمكن أن يكون صفرا
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""عدد الأيام منذ آخر طلب "" يجب أن تكون أكبر من أو تساوي الصفر"
-DocType: C-Form,Amended From,عدل من
+DocType: Asset,Amended From,عدل من
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,المضي قدما
@@ -2708,24 +2786,25 @@
 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 +143,Attach Letterhead,نعلق رأسية
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,يرجى ذكر &quot;حساب / الخسارة ربح من التخلص من الأصول&quot; في الشركة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,المدفوعات مباراة مع الفواتير
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,المدفوعات مباراة مع الفواتير
 DocType: Journal Entry,Bank Entry,حركة بنكية
 DocType: Authorization Rule,Applicable To (Designation),تنطبق على (تعيين)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,إضافة إلى العربة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,المجموعة حسب
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,تمكين / تعطيل العملات .
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,تمكين / تعطيل العملات .
 DocType: Production Planning Tool,Get Material Request,الحصول على المواد طلب
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,المصروفات البريدية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,المصروفات البريدية
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (آمت)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,يجب إنقاص {0}  بـ{1} أو زيادة سماحية الفائض
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,إجمالي الحاضر
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,البيانات المحاسبية
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,القوائم المالية
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ساعة
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
@@ -2745,15 +2824,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),بداية في نقاط البيع (POS)
 apps/erpnext/erpnext/config/support.py +32,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,مجموعة العملاء
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
 DocType: Item,Website Description,وصف الموقع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,صافي التغير في حقوق المساهمين
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 ,Sales Register,سجل مبيعات
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
@@ -2761,12 +2841,13 @@
 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,العملاء اسم المجموعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,مقابل نوع قسيمة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},الخطأ: {0}&gt; {1}
 DocType: Item,Attributes,سمات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,الحصول على أصناف
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,الرجاء إدخال شطب الحساب
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,الحصول على أصناف
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,أمر آخر تاريخ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
 DocType: C-Form,C-Form,نموذج C-
@@ -2778,18 +2859,18 @@
 DocType: Purchase Invoice,Mobile No,رقم الجوال
 DocType: Payment Tool,Make Journal Entry,جعل إدخال دفتر اليومية
 DocType: Leave Allocation,New Leaves Allocated,الجديد يترك المخصصة
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,تجاري
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},الخطأ: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
 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 +52,All Products or Services.,جميع المنتجات أو الخدمات.
 DocType: Supplier Quotation,Supplier Address,العنوان المورد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',صف {0} يجب أن يكون # حساب من نوع &quot;الأصول الثابتة&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,من الكمية
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
+apps/erpnext/erpnext/config/accounts.py +259,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,الخدمات المالية
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3}
@@ -2800,10 +2881,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,كر
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
 DocType: Tax Rule,Billing State,الدولة الفواتير
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,نقل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,نقل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,يرجع تاريخ إلزامي
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
@@ -2823,20 +2904,22 @@
 DocType: GL Entry,Remarks,تصريحات
 DocType: Purchase Order Item Supplied,Raw Material Item Code,قانون المواد الخام المدينة
 DocType: Journal Entry,Write Off Based On,شطب بناء على
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
 DocType: Features Setup,POS View,عرض نقطة مبيعات
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,اليوم التالي التاريخ وكرر في يوم من شهر يجب أن يكون على قدم المساواة
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,اليوم التالي التاريخ وكرر في يوم من شهر يجب أن يكون على قدم المساواة
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,الرجاء تحديد
 DocType: Offer Letter,Awaiting Response,في انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,فوق
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,وقد وصفت وقت دخول
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Salary Slip,Earning & Deduction,وكسب الخصم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,الحساب {0} لا يمكن أن يكون مجموعة
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},الرجاء تعيين القيمة الافتراضية {0} في شركة {1}
@@ -2846,18 +2929,19 @@
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,العثور على أي سجل
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى الإعداد عددهم سلسلة لحضور عبر الإعداد&gt; ترقيم السلسلة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+DocType: Asset,Straight Line,خط مستقيم
+DocType: Project User,Project User,المشروع العضو
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
 DocType: Features Setup,Sales Discounts,مبيعات خصومات
 DocType: Hub Settings,Seller Country,البائع البلد
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,نشر عناصر على الموقع
-DocType: Authorization Rule,Authorization Rule,إذن القاعدة
+DocType: Authorization Rule,Authorization Rule,قاعدة السماح
 DocType: Sales Invoice,Terms and Conditions Details,شروط وتفاصيل الشروط
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,مواصفات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,الضرائب على المبيعات والرسوم قالب
@@ -2865,46 +2949,47 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,عدد بالدفع
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بانر التي سوف تظهر في الجزء العلوي من قائمة المنتجات.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,تحديد شروط لحساب كمية الشحن
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,إضافة الطفل
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,القيمة افتتاح
 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,عمولة على المبيعات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,عمولة على المبيعات
 DocType: Offer Letter Term,Value / Description,قيمة / الوصف
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الأصول {1} لا يمكن أن تقدم، هو بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 ,Customers Not Buying Since Long Time,الزبائن لا يشترون منذ وقت طويل
 DocType: Production Order,Expected Delivery Date,يتوقع تسليم تاريخ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,الخصم والائتمان لا يساوي ل{0} # {1}. الفرق هو {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,مصاريف الترفيه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,مصاريف الترفيه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,طلبات الحصول على إجازة.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,المصاريف القانونية
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,لا يمكن حذف حساب جرت عليه أي عملية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,المصاريف القانونية
 DocType: Sales Invoice,Posting Time,نشر التوقيت
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,مصاريف الهاتف
 DocType: Sales Partner,Logo,شعار
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,الإخطارات المفتوحة
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,المصاريف المباشرة
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,المصاريف المباشرة
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} هو عنوان بريد إلكتروني غير صالح في &quot;إعلام \ عنوان البريد الإلكتروني&quot;
 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,مصاريف السفر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,مصاريف السفر
 DocType: Maintenance Visit,Breakdown,انهيار
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: حسابه الرئيسي {1} لا ينتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/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/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,إدراج السيارات أسعار قائمة الأسعار إذا مفقود
+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,التنقل
@@ -2914,7 +2999,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),المبلغ الكلي الفواتير (عبر الزمن سجلات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,نبيع هذه القطعة
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,المورد رقم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,وينبغي أن تكون كمية أكبر من 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,وينبغي أن تكون كمية أكبر من 0
 DocType: Journal Entry,Cash Entry,الدخول النقدية
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع من الأوراق مثل غيرها، عارضة المرضى
@@ -2925,11 +3010,12 @@
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,جميع جهات الاتصال.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,المورد من الأصول {0} لا يتطابق مع المورد في شراء الفاتورة
 DocType: Newsletter,Test Email Id,اختبار البريد الإلكتروني معرف
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,المواد الخام لا يمكن أن يكون نفس البند الرئيسي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,قالب الراتب الرئيسي.
@@ -2945,12 +3031,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع مجموعات العملاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما أنه لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,يفضل عنوان الفواتير
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,يجب أن تكون العملة الفواتير تساوي العملة إما الافتراضي كومباني أو عملة الحساب payble الحزب
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,أمين
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",إذا تعطيل، &quot;في كلمة&quot; الحقل لن تكون مرئية في أي صفقة
@@ -2960,13 +3047,13 @@
 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,الدائنين
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,الدائنين
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,الصف # {0}: لا المسلسل إلزامي
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند ضريبة التفاصيل
 ,Item-wise Price List Rate,البند الحكيمة قائمة الأسعار قيم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
@@ -2982,20 +3069,19 @@
 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 +13,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 +456,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Hub Settings,Name Token,اسم رمز
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
-DocType: Project,Project Name,اسم المشروع
+DocType: Request for Quotation 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,ارقام البند دفعة
@@ -3025,6 +3111,7 @@
 DocType: Sales Invoice,End Date,نهاية التاريخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,المعاملات الأسهم
 DocType: Employee,Internal Work History,التاريخ العمل الداخلي
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,تراكمت كمية الاستهلاك
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
 DocType: Maintenance Visit,Customer Feedback,ملاحظات العملاء
 DocType: Account,Expense,نفقة
@@ -3032,7 +3119,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",الشركة هي إلزامية، كما هو عنوان لشركتك
 DocType: Item Attribute,From Range,من المدى
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,البند {0} تجاهلها لأنه ليس بند الأوراق المالية
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,يقدم هذا ترتيب الإنتاج لمزيد من المعالجة .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,يقدم هذا ترتيب الإنتاج لمزيد من المعالجة .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",للا ينطبق التسعير القاعدة في معاملة معينة، يجب تعطيل جميع قوانين التسعير المعمول بها.
 DocType: Company,Domain,مجال
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,وظائف
@@ -3044,6 +3131,7 @@
 DocType: Time Log,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
@@ -3060,6 +3148,7 @@
 DocType: Sales Order,Delivery Date,تاريخ التسليم
 DocType: Opportunity,Opportunity Date,تاريخ الفرصة
 DocType: Purchase Receipt,Return Against Purchase Receipt,العودة ضد شراء إيصال
+DocType: Request for Quotation Item,Request for Quotation Item,طلب تسعيرة البند
 DocType: Purchase Order,To Bill,لبيل
 DocType: Material Request,% Ordered,٪ تم طلبها
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
@@ -3074,11 +3163,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
 DocType: Accounts Settings,Accounts Settings,إعدادات الحسابات
 DocType: Customer,Sales Partner and Commission,مبيعات الشريك واللجنة
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},الرجاء تعيين &quot;الأصول حساب التخلص&quot; في شركة {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,حسابات مؤقتة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,BOM  Explosion Item
 DocType: Account,Auditor,مدقق حسابات
@@ -3087,21 +3177,22 @@
 DocType: Pricing Rule,Disable,تعطيل
 DocType: Project Task,Pending Review,في انتظار المراجعة
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,انقر هنا لدفع
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}",الأصول {0} لا يمكن تفكيكها، كما هو بالفعل {1}
 DocType: Task,Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,معرف العملاء
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,علامة غائب
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,إلى الوقت يجب أن تكون أكبر من من الوقت
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,إضافة عناصر من
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,إضافة عناصر من
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
 DocType: BOM,Last Purchase Rate,أخر سعر توريد
 DocType: Account,Asset,الأصول
 DocType: Project Task,Task ID,ID مهمة
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","على سبيل المثال "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,الأوراق المالية لا يمكن أن توجد القطعة ل{0} منذ ديه المتغيرات
 ,Sales Person-wise Transaction Summary,الشخص الحكيم مبيعات ملخص عملية
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,مستودع {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,العنصر المحدد لا يمكن أن يكون دفعة
@@ -3116,6 +3207,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,إدارة الجودة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,تم تعطيل البند {0}
 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,التاريخ الموظف العمل الخارجي
@@ -3127,7 +3219,7 @@
 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,التالي اتصل بنا
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,إعداد حسابات عبارة.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,إعداد حسابات عبارة.
 DocType: Employee,Employment Type,مجال العمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,الموجودات الثابتة
 ,Cash Flow,التدفق النقدي
@@ -3141,11 +3233,11 @@
 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 +132,Please find attached {0} #{1},تجدون طيه {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},تجدون طيه {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,بنك ميزان بيان وفقا لدفتر الأستاذ العام
 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**. 
+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"".
 
@@ -3157,19 +3249,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,الإعدادات الافتراضية لبيع صفقة.
 DocType: BOM Replace Tool,Current BOM,BOM الحالي
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,إضافة رقم تسلسلي
 apps/erpnext/erpnext/config/support.py +43,Warranty,ضمان
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,طباعة و قرطاسية
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,عقدة المجموعة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,تحديث السلع منتهية
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,تحديث السلع منتهية
 DocType: Workstation,per hour,كل ساعة
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,المشتريات
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع (الجرد الدائم) تحت هذا الحساب.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,المبلغ المدفوع
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
@@ -3199,7 +3290,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
 DocType: Leave Block List,Applies to Company,ينطبق على شركة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
 DocType: Purchase Invoice,In Words,في كلمات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Production Planning Tool,Material Request For Warehouse,طلب للحصول على المواد مستودع
@@ -3212,9 +3303,11 @@
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
+DocType: Pricing Rule,Margin Rate or Amount,نسبة الهامش أو المبلغ
 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,ترتيب المبيعات الإغلاق
@@ -3224,7 +3317,7 @@
 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 +782,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} وقد وردت بالفعل
@@ -3232,14 +3325,13 @@
 DocType: Customer,Sales Team Details,تفاصيل فريق المبيعات
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص محتملة للبيع.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},باطلة {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,المتاجر
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,حفظ المستند أولا.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,حفظ المستند أولا.
 DocType: Account,Chargeable,تحمل
 DocType: Company,Change Abbreviation,تغيير اختصار
 DocType: Expense Claim Detail,Expense Date,حساب تاريخ
@@ -3257,14 +3349,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,دفتر الأستاذ العام
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,مشاهدة العروض
 DocType: Item Attribute Value,Attribute Value,السمة القيمة
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",يجب أن يكون البريد الإلكتروني معرف فريد ، موجود بالفعل ل {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",يجب أن يكون البريد الإلكتروني معرف فريد ، موجود بالفعل ل {0}
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,الرجاء اختيار {0} الأولى
 DocType: Features Setup,To get Item Group in details table,للحصول على تفاصيل المجموعة في الجدول تفاصيل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},يرجى تحديد الافتراضي قائمة عطلة للموظف {0} أو شركة {0}
 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>
@@ -3277,17 +3370,17 @@
 {% 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/""> جينجا قالبي templating </A> وجميع مجالات عنوان ( بما في ذلك الحقول المخصصة إن وجدت) سوف تكون متاحة </ P> 
- <قبل> <كود> {{address_line1}} العلامة & lt؛ BR & GT؛ 
- {٪ إذا address_line2٪} {{address_line2}} العلامة & lt؛ BR & GT؛ { ENDIF٪ -٪} 
- {{مدينة}} العلامة & lt؛ BR & GT؛ 
- {٪ إذا الدولة٪} {{دولة}} العلامة & lt؛ BR & GT؛ {٪ ENDIF -٪} 
- {٪ إذا كان الرقم السري٪} PIN: {{الرقم السري}} العلامة & 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>","<H4> افتراضي قالب </ H4>
+ <p> ويستخدم <a href=""http://jinja.pocoo.org/docs/templates/""> جينجا قالبي templating </A> وجميع مجالات عنوان ( بما في ذلك الحقول المخصصة إن وجدت) سوف تكون متاحة </ P>
+ <قبل> <كود> {{address_line1}} العلامة & lt؛ BR & GT؛
+ {٪ إذا address_line2٪} {{address_line2}} العلامة & lt؛ BR & GT؛ { ENDIF٪ -٪}
+ {{مدينة}} العلامة & lt؛ BR & GT؛
+ {٪ إذا الدولة٪} {{دولة}} العلامة & lt؛ BR & GT؛ {٪ ENDIF -٪}
+ {٪ إذا كان الرقم السري٪} PIN: {{الرقم السري}} العلامة & lt؛ BR & GT؛ {٪ ENDIF -٪}
+ {{البلاد}} العلامة & lt؛ BR & GT؛
+ {٪ إذا كان الهاتف٪} الهاتف: {{هاتف}} العلامة & lt؛ BR & GT؛ { ٪ ENDIF -٪}
+ {٪ إذا الفاكس٪} فاكس: {{الفاكس}} العلامة & lt؛ BR & GT؛ {٪ ENDIF -٪}
+ {٪ إذا٪ email_id} البريد الإلكتروني: {{email_id}} العلامة & lt؛ BR & GT ؛ {٪ ENDIF -٪}
  </ الرمز> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,المبلغ الافتراضي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
@@ -3296,23 +3389,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي لل
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
 DocType: Payment Gateway,Payment Gateway,بوابة الدفع
 DocType: HR Settings,Payroll Settings,إعدادات الرواتب
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,طلب مكان
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,الجذر لا يمكن أن يكون مركز تكلفة الأصل
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,اختر الماركة ...
 DocType: Sales Invoice,C-Form Applicable,C-نموذج قابل للتطبيق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,مستودع إلزامي
 DocType: Supplier,Address and Contacts,عناوين واتصالات
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تحويل التفاصيل
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,حلها عن طريق
@@ -3330,7 +3423,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,تسلم
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
@@ -3338,14 +3431,14 @@
 DocType: Purchase Invoice,Submit on creation,إرسال على خلق
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير ماستر شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,بلدي أوامر
@@ -3366,10 +3459,10 @@
 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,من فضلك ادخل الرسالة قبل إرسالها
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,نقطة من بيع الشخصي
+apps/erpnext/erpnext/config/accounts.py +258,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} صفت بالفعل
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,القروض غير المضمونة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,القروض غير المضمونة
 DocType: Cost Center,Cost Center Name,اسم مركز تكلفة
 DocType: Maintenance Schedule Detail,Scheduled Date,المقرر تاريخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,مجموع المبالغ المدفوعة آمت
@@ -3381,11 +3474,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,الموردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. يرجى التأكد مكانتها ""غير فعال"" للمتابعة."
+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}. يرجى تغيير حالتها إلى ""غير فعال"" للمتابعة."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,المورد رقم الجزء
 DocType: Purchase Invoice,Contact,اتصل
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,مستلم من
 DocType: Features Setup,Exports,صادرات
@@ -3394,12 +3488,12 @@
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0} من {0} ب {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
 DocType: Issue,Content Type,نوع المحتوى
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
@@ -3408,7 +3502,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,رئيس حساب
@@ -3421,7 +3515,7 @@
 DocType: Item,Customer Code,قانون العملاء
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,منذ أيام طلب آخر
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,الموجودات الأسهم
@@ -3435,15 +3529,15 @@
 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 +576,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,مشروع النشاط / المهمة.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,إنشاء زلات الراتب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,تكرار في يوم من شهر
@@ -3463,24 +3557,25 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,عام تاريخ البدء أو تاريخ انتهاء ومتداخلة مع {0}. لتجنب الرجاء تعيين شركة
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,النشرة الإخبارية جديدة
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","مثال: ABCD ##### 
+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,ويلزم BOM والتصنيع الكمية
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,المدى شيخوخة 2
+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 +451,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 +91,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},تضارب القاعدة الضريبية مع {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,اسم الحساب الجديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,خدمة العملاء
@@ -3490,11 +3585,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,عرض المرشح على وظيفة.
 DocType: Notification Control,Prompt for Email on Submission of,المطالبة البريد الالكتروني على تقديم
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,مجموع الأوراق المخصصة هي أكثر من أيام في الفترة
+DocType: Pricing Rule,Percentage,النسبة المئوية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,الإعدادات الافتراضية ل معاملات المحاسبية.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,الإعدادات الافتراضية ل معاملات المحاسبية.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,إنصاف
 DocType: Sales Order,Printing Details,تفاصيل الطباعة
@@ -3502,14 +3598,15 @@
 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,جمعيات البحث الفرعية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,مقابل حساب المصاريف
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; والقيام نذكر معدل الضريبة.
 DocType: Production Order,Production Order,الإنتاج ترتيب
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
-DocType: Quotation Item,Against Docname,ضد Docname
+DocType: Quotation Item,Against Docname,مقابل المستند
 DocType: SMS Center,All Employee (Active),جميع الموظفين (فعالة)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
 DocType: BOM,Raw Material Cost,المواد الخام التكلفة
@@ -3525,18 +3622,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,قائمة صليب البند في مجموعات متعددة
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},يتم تعيين السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء بالفعل في السنة المالية {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,التوفيق بنجاح
 DocType: Production Order,Planned End Date,المخطط لها تاريخ الانتهاء
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,حيث يتم تخزين العناصر.
 DocType: Tax Rule,Validity,صحة
+DocType: Request for Quotation,Supplier Detail,المورد التفاصيل
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مبلغ بفاتورة
 DocType: Attendance,Attendance,الحضور
 apps/erpnext/erpnext/config/projects.py +55,Reports,تقارير
 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 +508,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,قالب الضرائب لشراء صفقة.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,قالب الضرائب لشراء صفقة.
 ,Item Prices,البند الأسعار
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
 DocType: Period Closing Voucher,Period Closing Voucher,فترة الإغلاق قسيمة
@@ -3546,10 +3644,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,تغيير
@@ -3557,6 +3655,7 @@
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
+DocType: Asset Category,Asset Category Name,الأصول اسم التصنيف
 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
@@ -3568,13 +3667,13 @@
 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 +559,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,دفعة
@@ -3588,7 +3687,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,مبيعات شخص
 DocType: Sales Invoice,Cold Calling,ووصف الباردة
 DocType: SMS Parameter,SMS Parameter,SMS معلمة
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,مركز التكلفة الميزانية و
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,الموازنة و مركز التكلفة
 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.,إنشاء قواعد لتقييد المعاملات على أساس القيم.
@@ -3619,9 +3718,9 @@
 DocType: Purchase Common,Purchase Common,شراء المشتركة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
@@ -3629,7 +3728,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,رفعت فواتير للعملاء.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,الأصل حساب
@@ -3645,9 +3744,9 @@
 DocType: Employee,Education,تعليم
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
 DocType: Address,Office,مكتب
-apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,المدخلات المحاسبية  لدفتر اليومية.
+apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,القيود المحاسبية
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
@@ -3660,6 +3759,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,دفعة الجرد
 DocType: Employee,Contract End Date,تاريخ نهاية العقد
 DocType: Sales Order,Track this Sales Order against any Project,تتبع هذا الأمر ضد أي مشروع المبيعات
+DocType: Sales Invoice Item,Discount and Margin,الخصم والهامش
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
@@ -3680,7 +3780,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,سجل الراتب الشهري
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
@@ -3688,22 +3788,23 @@
 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 الملف الشخصي
 DocType: Payment Gateway Account,Payment URL Message,دفع URL رسالة
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,صف {0}: دفع مبلغ لا يمكن أن يكون أكبر من المبلغ المستحق
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,عدد غير مدفوع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,دخول الوقت ليس للفوترة
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
+DocType: Asset,Asset Category,الأصول الفئة
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,الرجاء إدخال ضد قسائم يدويا
 DocType: SMS Settings,Static Parameters,ثابت معلمات
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,المواد للمورد ل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,المواد للمورد ل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,المكوس الفاتورة
 DocType: Expense Claim,Employees Email Id,موظف البريد الإلكتروني معرف
 DocType: Employee Attendance Tool,Marked Attendance,الحضور ملحوظ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,الخصوم الحالية
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,الخصوم الحالية
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
@@ -3724,17 +3825,16 @@
 DocType: Item Attribute,Numeric Values,قيم رقمية
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 DocType: Customer,Commission Rate,اللجنة قيم
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,جعل البديل
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,جعل البديل
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,تحليلات
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,السلة فارغة
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,لم يتم العثور على قالب عنوان افتراضي. يرجى إنشاء واحدة جديدة من الإعداد&gt; الطباعة والعلامات التجارية&gt; قالب العناوين.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,أسهم رأس المال
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,أسهم رأس المال
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب العبارة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,بعد دفع إنجاز إعادة توجيه المستخدم إلى الصفحة المحددة.
@@ -3743,20 +3843,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,الشروط والأحكام قالب
 DocType: Serial No,Delivery Details,الدفع تفاصيل
+DocType: Asset,Current Value (After Depreciation),القيمة الحالية (بعد الاستهلاك)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM الحصول على أصناف من
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,الرجاء إدخال أوامر البيع في الجدول أعلاه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,الرجاء إدخال أوامر البيع في الجدول أعلاه
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,فاتورة المواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,المرجع التسجيل
@@ -3764,6 +3865,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,يعاقب المبلغ
 DocType: GL Entry,Is Opening,وفتح
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,حساب {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,حساب {0} غير موجود
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة عن سيرة حياة لموقع الويب وغيرها من المطبوعات.
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index cd81339..49ccd58 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Търговец
 DocType: Employee,Rented,Отдаден
 DocType: POS Profile,Applicable for User,Приложимо за User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Наистина ли искате да се откаже от този актив?
 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.,* Ще се изчисли при транзакция.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 DocType: Purchase Order,Customer Contact,Клиента Контакти
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Оставете Тип Име
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Покажи отворен
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series успешно обновени
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,New Оставете Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Покажи Варианти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Сметки маса не може да бъде празно.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
 DocType: Designation,Designation,Предназначение
@@ -64,7 +66,7 @@
 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 +642,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е необходим
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},New {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Търговски партньори на Комисията
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Съкращение не може да има повече от 5 символа
 DocType: Payment Request,Payment Request,Payment Request
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Омъжена
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се разрешава {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Вземете елементи от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activity Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,Има дълготраен актив
 DocType: Expense Claim Detail,Claim Amount,Изискайте Сума
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Доставчик Type / Доставчик
@@ -156,7 +159,8 @@
 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,Сток Разходи
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} е замразен
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Сток Разходи
 DocType: Newsletter,Email Sent?,Email изпратени?
 DocType: Journal Entry,Contra Entry,Contra Влизане
 DocType: Production Order Operation,Show Time Logs,Покажи Час Logs
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Монтаж Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Точка {0} трябва да бъде покупка Точка
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Моля, въведете Company"
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Net Cash от Финансиране
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
 DocType: Newsletter List,Total Subscribers,Общо Абонати
 ,Contact Name,Име За Контакт
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Payment Tool,Reference No,Референтен номер по
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Банковите влизания
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Уведомление Control
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Задаване на елемент Група-мъдър бюджети на тази територия. Можете също така да включват сезон, като настроите разпределение."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Моля, въведете група майка сметка за склад {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Моля, въведете група майка сметка за склад {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Max 5 символа
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Уча
+DocType: Asset,Next Depreciation Date,Следваща Амортизация Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Разходите за дейността на служителите
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Доставчик на фактура не съществува в фактурата за покупка {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Управление на продажбите Person Tree.
 DocType: Job Applicant,Cover Letter,Мотивационно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Неуредени Чекове Депозити и за да изчистите
 DocType: Item,Synced With Hub,Синхронизирано С Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Грешна Парола
 DocType: Item,Variant Of,Вариант на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,По думите (износ) ще бъде видим след като запазите бележката за доставката.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единици [{1}] (# Форма / т / {1}) намерени в [{2}] (# Форма / Склад / {2})
 DocType: Lead,Industry,Промишленост
 DocType: Employee,Job Profile,Job профил
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматична Материал Искане
 DocType: Journal Entry,Multi Currency,Multi валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип Invoice
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Фактура
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Моля, изберете месец и година"
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Общо Поръчка Смятан
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Employee {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Изберете Точка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Пореден № {0} не принадлежи на доставка Забележка {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Позиция проверка на качеството на параметър
 DocType: Leave Application,Leave Approver Name,Оставете одобряващ Име
-,Schedule Date,График Дата
+DocType: Depreciation Schedule,Schedule Date,График Дата
 DocType: Packed Item,Packed Item,Опакован Точка
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Настройките по подразбиране за закупуване на сделки.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Настройките по подразбиране за закупуване на сделки.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Разход за дейността съществува за служител {0} срещу Вид дейност - {1}
 apps/erpnext/erpnext/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,Обмяна На Валута
@@ -346,6 +353,7 @@
 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; за това, всички складове на базата на прогнозни Количество и минимална Количество поръчка"
+DocType: Request for Quotation,Request for Quotation,Запитване за оферта
 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.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday майстор.
-DocType: Material Request Item,Required Date,Задължително Дата
+DocType: Request for Quotation Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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 размер"
+DocType: Request for Quotation,Message for Supplier,Съобщение за доставчик
 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,Неплатен
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не съществува
 DocType: Pricing Rule,Valid Upto,Валиден Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
 DocType: Payment Tool,Received Or Paid,Получени или заплатени
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 ,Serial No Warranty Expiry,Пореден № Warranty Изтичане
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходите и разходите
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Управление Подизпълнители
+DocType: Project,Project will be accessible on the website to these users,Проектът ще бъде достъпен на интернет страницата на тези потребители
 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 +53,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Точка {0} не е Закупете Точка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Точка {0} не е Закупете Точка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Отложена Количество
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Финансови / Счетоводство година.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Натрупаните стойности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Общо
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Началната дата не трябва да бъде по-голяма от фискална година Крайна дата
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Началната дата не трябва да бъде по-голяма от фискална година Крайна дата
 DocType: Warranty Claim,Resolution,Резолюция
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Доставени: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Платими Акаунт
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
 DocType: Leave Control Panel,Allocate,Разпределяйте
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Продажбите Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Продажбите Return
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Компоненти заплата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данни за потенциални клиенти.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,"Логически Склад, за които са направени стоковите разписки."
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Актуализация банка Дати Транзакционните
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Актуализация банка Дати Транзакционните
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,проследяване на времето
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Company
@@ -518,27 +528,27 @@
 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,Default Остойностяване Курсове
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,График за поддръжка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нетна промяна в Инвентаризация
 DocType: Employee,Passport Number,Номер на паспорт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Мениджър
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Търговец Цели
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Моля, задайте Holiday Списък нито за служител или на Дружеството"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
+DocType: Depreciation Schedule,Depreciation Amount,Амортизацията сума
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Фиксирани Days
 DocType: Quotation Item,Item Balance,точка Balance
 DocType: Sales Invoice,Packing List,Опаковъчен Лист
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Поръчки дадени доставчици.
+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,Консумирана
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Операция на времето
 DocType: Pricing Rule,Sales Manager,Мениджър Продажби
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Група за Group
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Моите проекти
 DocType: Journal Entry,Write Off Amount,Отпишат Сума
 DocType: Journal Entry,Bill No,Бил Не
+DocType: Company,Gain/Loss Account on Asset Disposal,Печалба / Загуба на профила за изхвърляне на активи
 DocType: Purchase Invoice,Quarterly,Тримесечно
 DocType: Selling Settings,Delivery Note Required,Бележка за доставка Задължително
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company валути)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Заплащане Влизане вече е създаден
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Общо за фактуриране през тази година
 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 +529,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Точка има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Точка {0} не е намерен
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} не е в наличност
 DocType: Mode of Payment Account,Default Account,Default Account
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Production Order Operation,Planned End Time,Планирания край на времето
 ,Sales Person Target Variance Item Group-Wise,Продажбите Person Target Вариацията т Group-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечно извлечение заплата.
 DocType: Item Group,Website Specifications,Сайт Спецификации
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Има грешка във вашата Адрес Шаблон {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,New Account
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: От {0} от вид {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Няколко правила за цените съществува по същите критерии, моля, разрешаване на конфликти чрез възлагане приоритет. Правила Цена: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Няколко правила за цените съществува по същите критерии, моля, разрешаване на конфликти чрез възлагане приоритет. Правила Цена: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
 DocType: Opportunity,Maintenance,Поддръжка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибута Value
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Вестник Влизане {0} е свързан срещу Заповед {1}, проверете дали това трябва да се изтегли като предварително по тази фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Office Поддръжка Разходи
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Account,Liability,Отговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default Себестойност на продадените стоки Акаунт
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ценова листа не избран
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Process Payroll,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Моят Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Моят Фактури
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Няма намерен служител
 DocType: Supplier Quotation,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Качване на склад баланс чрез CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Изпрати сега
 ,Support Analytics,Поддръжка Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Логическа грешка: трябва да намери припокриване
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
 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 +267,C-Form records,C-форма записи
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-форма записи
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Клиенти и доставчици
 DocType: Email Digest,Email Digest Settings,Имейл преглед Settings
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддръжка заявки от клиенти.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,Разходи
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Преотстъпват
 DocType: Item Attribute,Item Attribute Values,Точка на стойностите на атрибутите
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Вижте Абонати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които се таксуват"
 DocType: Employee,Ms,Госпожица
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Валута на валутния курс майстор.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Валута на валутния курс майстор.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Дистрибутори и територия
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} трябва да бъде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} трябва да бъде активен
+DocType: Journal Entry,Depreciation Entry,Амортизацията Влизане
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Иди Cart
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди анулира тази поддръжка посещение
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,Постоянен адрес е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция попълва за колко готова продукция?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Марката
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
-DocType: Journal Entry Account,Purchase Invoice,Покупка Invoice
+DocType: Asset,Purchase Invoice,Покупка Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробности Не
 DocType: Stock Entry,Total Outgoing Value,Общо Изходящ Value
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Lead Time Дата
 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 +110,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;Продукт Пакетни &quot;, склад, сериен номер и партидният няма да се счита от&quot; Опаковка Списък &quot;масата. Ако Warehouse и партиден № са едни и същи за всички опаковъчни артикули за т всеки &quot;Продукт Bundle&quot;, тези стойности могат да бъдат вписани в основния таблицата позиция, стойностите ще се копират в &quot;Опаковка Списък&quot; маса."
 DocType: Job Opening,Publish on website,Публикуване на интернет страницата
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Пратки към клиенти
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,"Дата Доставчик на фактура не може да бъде по-голяма, отколкото Публикуване Дата"
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Непряко подоходно
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Изберете точката за прехвърляне
 DocType: Purchase Invoice,Additional Discount Percentage,Допълнителна отстъпка Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Фактура {1} е невалиден, може да бъде отменено / не съществува. \ Моля въведете валиден фактура"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте Employee напомняне за рождени дни
 ,Employee Holiday Attendance,Служител Holiday Присъствие
 DocType: Opportunity,Walk In,Влизам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток влизания
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Сток влизания
 DocType: Item,Inspection Criteria,Критериите за инспекция
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Прехвърлят
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Правя
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,Моята количка
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Holiday Списък име
 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 +180,Qty for {0},Количество за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
+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 +80,Leave Allocation Tool,Оставете Tool Разпределение
 DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,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 +547,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Отстъпка
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Квитанция Точка
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажба Сума
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Час Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Час Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,Проблем
+DocType: Asset,Scrapped,Брак
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Сметка не съвпада с фирма
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Пореден № {0} е по силата на договор за техническо обслужване до запълването {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Пореден № {0} е по силата на договор за техническо обслужване до запълването {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,назначаване на работа
 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;получават от покупка Приходи&quot; бутона
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажби Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Продажби Разходи
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
@@ -883,7 +905,7 @@
 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,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,"Цитатите, получени от доставчици."
+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,актуализиран чрез Час Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Default валути
 DocType: Contact,Enter designation of this Contact,Въведете наименование за този контакт
 DocType: Expense Claim,From Employee,От Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да се покажат некоректно, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,Ключова област на ефективността
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Принос%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,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 и подадем да създадете нов фактурата за продажба.
 DocType: Global Defaults,Global Defaults,Глобални Defaults
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Проект Collaboration Покана
 DocType: Salary Slip,Deductions,Удръжки
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log партида се таксува.
 DocType: Salary Slip,Leave Without Pay,Оставете без заплащане
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Капацитет Error планиране
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Капацитет Error планиране
 ,Trial Balance for Party,Trial Везни за парти
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Печалба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Откриване Счетоводство Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Няма за какво да поиска
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Няма за какво да поиска
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Видове дейности за времето Sheets
@@ -935,18 +958,18 @@
 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;
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Моля, задайте Email ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Моля, задайте Email ID"
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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.,Код не може да се променя за 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,Мерна единица реализациите Factor
 DocType: Stock Settings,Default Item Group,По подразбиране Елемент Group
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Доставчик на база данни.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Доставчик на база данни.
 DocType: Account,Balance Sheet,Баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Данъчни и други облекчения за заплати.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Задължения
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Празник
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставете празно, ако считат за всички отрасли"
 ,Daily Time Log Summary,Daily Time Log Резюме
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-форма не е приложима за фактура: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неизравнени данни за плащане
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
@@ -973,19 +997,20 @@
 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,"Моля, посочете поне един атрибут в таблицата с атрибути"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,"Точка {0} трябва да е позиция, която не е в наличност"
 DocType: Contact,User ID,User ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Виж Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Виж Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
 ,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,"Дивидентите, изплащани"
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Счетоводство Ledger
 DocType: Stock Reconciliation,Difference Amount,Разлика Сума
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Неразпределена Печалба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Неразпределена Печалба
 DocType: BOM Item,Item Description,Елемент Описание
 DocType: Payment Tool,Payment Mode,Режимът на плащане
 DocType: Purchase Invoice,Is Recurring,Дали повтарящо
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Временно Откриване
 ,Employee Leave Balance,Служител Оставете Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Задължения Резюме
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 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 +165,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Малък
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Главна Сметка {0} е създадена
 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,Общо Постигнати
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 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,Склад Информация за контакт
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Точка {0} трябва да бъде подизпълнители Точка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
+apps/erpnext/erpnext/stock/get_item_details.py +142,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 или търговска марка."
 DocType: Hub Settings,Seller Website,Продавач 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},Състояние на поръчката е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Състояние на поръчката е {0}
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,За доставчик
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},"Дали не се намери някой елемент, наречен {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо 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,Транзакция
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Website стокови групи
 DocType: Purchase Invoice,Total (Company Currency),Общо (Company валути)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Сериен номер {0} влезли повече от веднъж
-DocType: Journal Entry,Journal Entry,Вестник Влизане
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запитване за оферта Доставчик
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Железария
 DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Attendance,HR Manager,HR мениджъра
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка Template Goal
 DocType: Salary Slip,Earning,Приходи
 DocType: Payment Tool,Party Account Currency,Party Account валути
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Current Value след амортизация трябва да бъде по-малко от равна на {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Добави или Приспадни
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако годишен бюджет Превишена (за сметка сметка)
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
 DocType: Project,Start and End Dates,Начална и крайна дата
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Средна отстъпка
 DocType: Address,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Счетоводство
 DocType: Features Setup,Features Setup,Удобства Setup
+DocType: Asset,Depreciation Schedules,Амортизационните Списъци
 DocType: Item,Is Service Item,Дали Service Точка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,транзакция валути
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},От {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},От {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Описание
 DocType: Item,Will also apply to variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискална година Начални дата и фискална година Крайна дата веднъж фискалната година се запазва.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Ср Daily Outgoing
 DocType: Pricing Rule,Campaign,Кампания
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Съобщение дневник.
@@ -1133,8 +1162,8 @@
 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,Условия Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,не може да бъде по-голяма от 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводство Entry за {0}: {1} може да се направи само в валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Данъчна Правило за сделки.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Данъчна Правило за сделки.
 DocType: Rename Tool,Type of document to rename.,Вид на документа за преименуване.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Ние купуваме този артикул
 DocType: Address,Billing,Billing
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Четения
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Възложени Изпълнения
+DocType: Asset,Asset Name,Наименование на активи
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Supplier,Stock Manager,Склад за мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Приемо-предавателен протокол
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Офис под наем
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Setup SMS Gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Запитване за оферта може да бъде достъп, като кликнете върху следния линк"
+DocType: Asset,Number of Months in a Period,"Броят на месеците, в срок"
 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 работен час
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правителство
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Общо ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Общо ({0})
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
 DocType: Sales Invoice,Source,Източник
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Покажи затворен
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не са намерени в таблицата за плащане записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични потоци от инвестиционна
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Item Group,Item Group Name,Име на артикул Group
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
 DocType: Pricing Rule,For Price List,За Ценовата листа
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} не е намерен, която се изисква, за да резервират счетоводство (разходи). Моля, посочете т цена срещу купуването ценоразпис."
@@ -1212,7 +1245,7 @@
 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.,Моля да създадете нов акаунт от сметкоплан.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Поддръжка посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Поддръжка посещение
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Свободно Batch Количество в склада
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Log Batch Подробности
 DocType: Landed Cost Voucher,Landed Cost Help,Поземлен Cost Помощ
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Brand майстор.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Transporter Детайли
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Кутия
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Искове за сметка на фирмата.
 DocType: Company,Default Holiday List,По подразбиране Holiday Списък
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Сток Задължения
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Сток Задължения
 DocType: Purchase Receipt,Supplier Warehouse,Доставчик Warehouse
 DocType: Opportunity,Contact Mobile No,Свържи Mobile Не
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно изпращане на плащане Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Други доклади
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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 напомняне за рождени дни
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Изглед
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нетна промяна в Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Вече съществува Payment Request {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 +184,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Предходната финансова година не е затворен
 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 +40,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 +38,Supplier Type master.,Доставчик Type майстор.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
 DocType: Purchase Invoice,Reference Document,Референтен документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Начислен
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нетна промяна в Задължения
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Моля, проверете електронната си поща ID"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Клиент, необходим за &quot;Customerwise Discount&quot;"
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
 DocType: Quotation,Term Details,Срочни Детайли
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} трябва да е по-голяма от 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планиране на капацитет за (дни)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Гаранционен иск
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Постоянен Адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Изплатения аванс срещу {0} {1} не може да бъде по-голям \ от Grand Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Моля изберете код артикул
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Моля изберете код артикул
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намаляване на приспадане тръгне без Pay (LWP)
 DocType: Territory,Territory Manager,Територия на мениджъра
 DocType: Packed Item,To Warehouse (Optional),За да Warehouse (по избор)
@@ -1343,15 +1377,15 @@
 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,Разходите за маркетинг
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Единична единица на дадена позиция.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,"Моля, въведете валиден Финансова година Начални и крайни дати"
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи Template
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,Точка-мъдър Продажби Регистрация
+DocType: Asset,Gross Purchase Amount,Брутна Сума на покупката
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",например &quot;XYZ National Bank&quot;
+DocType: Asset,Depreciation Method,Амортизацията Метод
 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,Общо Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Количка е активиран
 DocType: Job Applicant,Applicant for a Job,Заявител на Job
 DocType: Production Plan Material Request,Production Plan Material Request,Производство План Материал Заявка
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,"Не производствени поръчки, създадени"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Не производствени поръчки, създадени"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Основен
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители на HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1402,31 +1438,32 @@
 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,Работа в прогрес Warehouse се изисква преди Подайте
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Работа в прогрес Warehouse се изисква преди Подайте
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявител на Йов.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Адреси
+apps/erpnext/erpnext/hooks.py +91,Addresses,Адреси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,оценки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дублиране Пореден № влезе за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Артикул не е позволено да има производствена поръчка.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Артикул не е позволено да има производствена поръчка.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или Warehouse"
 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,Credit Сума в Account валути
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Час Logs за производство.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} трябва да бъде представено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Time Вход за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
 DocType: Quotation Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,"Value {0} за Умение {1}, не съществува в списъка с валиден т Умение Ценности"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Точка {0} не е сериализирани Точка
+DocType: Request for Quotation Supplier,Send Email to Supplier,Изпрати имейл на доставчик
 DocType: SMS Center,Create Receiver List,Създайте Списък Receiver
 DocType: Packing Slip,To Package No.,С пакета No.
 DocType: Production Planning Tool,Material Requests,Материал Заявки
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Доставка Warehouse
 DocType: Stock Settings,Allowance Percent,Помощи Percent
 DocType: SMS Settings,Message Parameter,Съобщението параметър
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Дърво на Центрове финансови разходи.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Дърво на Центрове финансови разходи.
 DocType: Serial No,Delivery Document No,Доставка документ №
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Получават от покупка Приходи
 DocType: Serial No,Creation Date,Дата на създаване
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Сума за Избави
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Продукт или Услуга
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} е създадена
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} е създадена
 DocType: Delivery Note Item,Against Sales Order,Срещу поръчка за продажба
 ,Serial No Status,Пореден № Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Точка на маса не може да бъде празно
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: Към комплектът {1} периодичност, разлика между от и към днешна дата \ трябва да бъде по-голямо от или равно на {2}"
 DocType: Pricing Rule,Selling,Продажба
 DocType: Employee,Salary Information,Заплата
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Мита и такси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Моля, въведете Референтна дата"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Плащане Портал Account не е конфигуриран
 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: Production Order,Material Request Item,Материал Заявка Точка
+DocType: Request for Quotation Item,Material Request Item,Материал Заявка Точка
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,продаден
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзнал
 ,Open Production Orders,Отворените нареждания за производство
 DocType: Installation Note,Installation Time,Монтаж на времето
 DocType: Sales Invoice,Accounting Details,Счетоводство Детайли
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Изтриване на всички сделки за тази фирма
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Разпределянето
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерии За Приемане
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Моля, въведете Материал Исканията в таблицата по-горе"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Моля, въведете Материал Исканията в таблицата по-горе"
 DocType: Item Attribute,Attribute Name,Име на атрибута
 DocType: Item Group,Show In Website,Покажи В Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Група
@@ -1527,6 +1567,7 @@
 ,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, продажба Поръчка, сериен номер"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Гант диаграма на всички задачи.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,За Име на служител
 DocType: Holiday List,Clear Table,Clear Таблица
 DocType: Features Setup,Brands,Brands
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,Адреси на клиенти и контакти
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row {0}: Asset е задължително срещу един дълготраен актив Точка
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Моля настройка номериране серия за организиране и обслужване чрез Setup&gt; номерационен Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Двойка
+DocType: Asset,Depreciation Schedule,амортизационен план
 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: Asset,Purchase Date,Дата на закупуване
 DocType: Employee,Personal Details,Лични Данни
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте &quot;Асет Амортизация Cost Center&quot; в компания {0}"
 ,Maintenance Schedules,Графици за поддръжка
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Включи примирени влизания
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив,"
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група за Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортен
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общо Край
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Моля, посочете Company"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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,Разходните Вземания
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Подкрепа
 ,BOM Search,BOM Търсене
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриване (откриване + Общо)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},"Account {0} е невалиден. Сметка на валути, трябва да {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Дата Клирънсът не може да бъде преди датата проверка в ред {0}
 DocType: Salary Slip,Deduction,Дедукция
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
 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 Служител на този търговец"
 DocType: Territory,Classification of Customers by region,Класификация на клиентите по регион
 DocType: Project,% Tasks Completed,% Завършени Задачи
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Моля, въведете Производство Точка първа"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Моля, въведете Производство Точка първа"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Изчислението Bank Изявление баланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ръководство за инвалиди
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 DocType: Quotation,Maintenance User,Поддържане на потребителя
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Разходите Обновено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Разходите Обновено
 DocType: Employee,Date of Birth,Дата на раждане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Количество
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
+DocType: Request for Quotation,Manufacturing Manager,Производство на мениджъра
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Пратки
 DocType: Purchase Order Item,To be delivered to customer,За да бъде доставен на клиент
@@ -1629,12 +1675,12 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),По думите (Company валути)
-DocType: Pricing Rule,Supplier,Доставчик
+DocType: Asset,Supplier,Доставчик
 DocType: C-Form,Quarter,Тримесечие
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Други разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Други разходи
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Потребителят {0} е деактивиран
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} е задължително за {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} е задължително за {1}
 DocType: Currency Exchange,From Currency,От Валута
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row {0}: Кол трябва да бъде 1, като елемент е свързан с актив"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Дете позиция не трябва да бъде продукт Bundle. Моля, премахнете т `{0}` и спести"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банково дело
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,New Cost Center
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; и направи спомена Данъчната ставка.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,New Cost Center
 DocType: Bin,Ordered Quantity,Поръчаното количество
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
 DocType: Quality Inspection,In Process,В Процес
@@ -1670,10 +1716,11 @@
 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,Вземания Акаунт
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
 DocType: Quotation Item,Stock Balance,Фондова Balance
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Продажбите Поръчка за плащане
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Време Logs създаден:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Време Logs създаден:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Employee,Blood Group,Blood Group
@@ -1691,13 +1738,13 @@
 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, изберете един и кликнете върху бутона по-долу."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Моля, посочете държава за тази доставка правило или проверете Worldwide Доставка"
 DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debit да се изисква
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debit да се изисква
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
 DocType: Offer Letter Term,Offer Term,Оферта Term
 DocType: Quality Inspection,Quality Manager,Мениджър по качеството
 DocType: Job Applicant,Job Opening,Откриване на работа
 DocType: Payment Reconciliation,Payment Reconciliation,Заплащане помирение
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Моля изберете име Incharge Лице
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Моля изберете име Incharge Лице
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Оферта Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генериране Материал Исканията (MRP) и производствени поръчки.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завършен Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ценоразпис {0} е деактивиран
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущата оценка Курсове
 DocType: Item,Customer Item Codes,Customer Елемент кодове
 DocType: Opportunity,Lost Reason,Загубил Причина
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Създаване на плащане влизания срещу заповеди или фактури.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Създаване на плащане влизания срещу заповеди или фактури.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Потребители и разрешения
@@ -1729,10 +1776,11 @@
 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,Например: Next Day Shipping
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Пореден № {0} не е намерен
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Пореден № {0} не е намерен
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Вашите клиенти
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
 DocType: Leave Block List Date,Block Date,Block Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Запиши се сега
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Запиши се сега
 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.","Създаване и управление на дневни, седмични и месечни имейл Фурнаджиев."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Детайли по заетостта
 DocType: Employee,New Workplace,New Workplace
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Задай като Затворен
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Не позиция с Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Не позиция с Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. не може да бъде 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,Ако имате екип по продажбите и продажбата Partners (партньорите) те могат да бъдат маркирани и поддържа техния принос в дейността на продажбите
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Материал
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Точка {0} трябва да бъде Продажби позиция в {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Създайте Заплата Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Източник на средства (пасиви)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Внос имейл от
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Покани като Потребител
 DocType: Features Setup,After Sale Installations,Следпродажбени инсталации
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Моля, задайте {0} в Company {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} е напълно таксуван
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартни договорни условия за покупко-продажба или покупка.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Лекарствена
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Gateway Account,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нетна промяна в Вземания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,Accepted,Приет
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалиден позоваване {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick вестник Влизане
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} не е подадена
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Създадени са следните производствени поръчки:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Създадени са следните производствени поръчки:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter мейлинг лист
 DocType: Delivery Note,Transporter Name,Превозвач Име
 DocType: Authorization Rule,Authorized Value,Оторизиран Value
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} е затворен
 DocType: Email Digest,How frequently?,Колко често?
 DocType: Purchase Receipt,Get Current Stock,Вземи Current Stock
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Отиди в подходящата група (обикновено Прилагане на фондове&gt; Текущи активи&gt; Банкови сметки и създаване на нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;банка&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дърво на Бил на материали
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Марк Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Старт поддръжка дата не може да бъде преди датата на доставка в сериен № {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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),Приложими по отношение на (Role)
 DocType: Stock Entry,Purpose,Предназначение
+DocType: Company,Fixed Asset Depreciation Settings,Дълготраен актив Настройки на амортизация
 DocType: Item,Will also apply for variants unless overrridden,"Ще се прилага и за варианти, освен ако overrridden"
 DocType: Purchase Invoice,Advances,Аванси
 DocType: Production Order,Manufacture against Material Request,Производство срещу Материал Заявка
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Не на запитаната SMS
 DocType: Campaign,Campaign-.####,Кампания -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,"Моля, доставка на определени елементи на възможно най-добрите цени"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Количество
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
+DocType: Asset Category Account,Asset Category Account,Asset Категория профил
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","напр Bank, в брой, с кредитна карта"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","напр Bank, в брой, с кредитна карта"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Отиди в подходящата група (обикновено Прилагане на фондове&gt; Текущи активи&gt; Банкови сметки и създаване на нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;банка&quot;
 DocType: Journal Entry,Credit Note,Кредитно Известие
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Завършен Количество не може да бъде повече от {0} за работа {1}
 DocType: Features Setup,Quality,Качество
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Моите адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Браншова организация майстор.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,Default Изкупуването Ценоразпис
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Вече е създаден Никой служител за над избрани критерии или заплата фиша
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да Произвежда
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ведомост
 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} трябва да се включат и"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка Квитанция артикули
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализиране Forms
 DocType: Account,Income Account,Дохода
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес за шаблони."
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track Изводи от Industry Type.
 DocType: Item Supplier,Item Supplier,Позиция доставчик
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Управление Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,New Cost Center Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,New Cost Center Име
 DocType: Leave Control Panel,Leave Control Panel,Оставете Control Panel
 DocType: Appraisal,HR User,HR потребителя
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Данъци и такси, удържани"
-apps/erpnext/erpnext/config/support.py +7,Issues,Въпроси
+apps/erpnext/erpnext/hooks.py +90,Issues,Въпроси
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус трябва да бъде един от {0}
 DocType: Sales Invoice,Debit To,Дебит към
 DocType: Delivery Note,Required only for sample item.,Изисква се само за проба т.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
 ,Pending SO Items For Purchase Request,До SO артикули за покупка Искане
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,Billing валути
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Много Голям
 ,Profit and Loss Statement,На печалбите и загубите
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Stock Settings,Default Valuation Method,Метод на оценка Default
 DocType: Production Order Operation,Planned Start Time,Планиран Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Посочете Валутен курс за конвертиране на една валута в друга
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Цитат {0} е отменен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общият размер
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, съборят операцията в множество операции"
 ,Requested,Заявени
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Без забележки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,Продажба и покупка
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Дълготраен актив позиция трябва да бъде елемент не-склад
 DocType: Supplier Quotation Item,Material Request No,Материал Заявка Не
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скоростта, с която на клиента валута се превръща в основна валута на компанията"
@@ -2119,7 +2174,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
 DocType: Payment Request,Recipient and Message,Получател и ЛС
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Изберете доставчик Адрес
 DocType: 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Запитване за оферта.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Моля изберете позиция, където &quot;е Фондова Позиция&quot; е &quot;Не&quot; и &quot;Е-продажба точка&quot; е &quot;Да&quot; и няма друг Bundle продукта"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ценоразпис на валута не е избрана
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Проект Начална дата
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Срещу документ №
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Управление на дистрибутори.
 DocType: Quality Inspection,Inspection Type,Тип Инспекция
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Моля изберете {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,C-Form Не
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Неотбелязана Присъствие
@@ -2183,6 +2239,7 @@
 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,Реклама
+DocType: Asset Category Account,Depreciation Expense Account,Амортизационните разходи на профила
 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 одобряващ
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потвърден
 DocType: Payment Gateway,Gateway,Врата
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Моля, въведете облекчаване дата."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Приет Склад
 DocType: Bank Reconciliation Detail,Posting Date,Публикуване Дата
 DocType: Item,Valuation Method,Метод на оценка
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},"Не може да се намери на валутния курс за {0} {1}, за да"
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},"Не може да се намери на валутния курс за {0} {1}, за да"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марк половин ден
 DocType: Sales Invoice,Sales Team,Търговски отдел
 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 +410,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По думите ще бъде видим след като спаси поръчка за продажба.
 ,Employee Birthday,Служител Birthday
 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 +49,Serial No {0} does not exist,Пореден № {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад на клиенти (по избор)
 DocType: Pricing Rule,Discount Percentage,Отстъпка Процент
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,"Материал Исканията {0}, създадени"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,"Материал Исканията {0}, създадени"
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Template на термини или договор.
 DocType: Purchase Invoice,Address and Contact,Адрес и контакти
 DocType: Supplier,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Employee,Feedback,Обратна връзка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отпуск не могат да бъдат разпределени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+DocType: Asset Category Account,Accumulated Depreciation Account,Натрупана амортизация
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
+DocType: Asset,Expected Value After Useful Life,Очакваната стойност След Полезна Life
 DocType: Item,Reorder level based on Warehouse,Пренареждане равнище въз основа на Warehouse
 DocType: Activity Cost,Billing Rate,Billing Курсове
 ,Qty to Deliver,Количество да Избави
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} е отменен или затворени
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Net Cash от Инвестиране
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root сметка не може да бъде изтрита
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} трябва да бъде подадено
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Управление на адреси
-DocType: Pricing Rule,Item Code,Код
+DocType: Asset,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
 DocType: Journal Entry,User Remark,Потребителят Забележка
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Създаване на материали Исканията
 DocType: Employee Education,School/University,Училище / Университет
 DocType: Payment Request,Reference Details,Референтен Детайли
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
 DocType: Sales Invoice Item,Available Qty at Warehouse,В наличност Количество в склада
 ,Billed Amount,Обявен Сума
+DocType: Asset,Double Declining Balance,Двойна неснижаем остатък
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,"Затворен за да не може да бъде отменена. Разтварям, за да отмените."
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получаване на актуализации
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"""От дата"" трябва да е преди ""До дата"""
+DocType: Asset,Fully Depreciated,напълно амортизирани
 ,Stock Projected Qty,Фондова Прогнозно Количество
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Маркирана Присъствие HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Пореден № и Batch
 DocType: Warranty Claim,From Company,От Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Стойност или Количество
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 ,Qty to Receive,Количество за да получат за
 DocType: Leave Block List,Leave Block List Allowed,Оставете Block List любимци
 DocType: Sales Partner,Retailer,Търговец на дребно
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
 DocType: Global Defaults,Disable In Words,Изключване с думи
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Овърдрафт Акаунт
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Обезпечени кредити
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Моля, задайте на амортизация, свързани акаунти в категория активи {0} или Фирма {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Началното салдо Equity
 DocType: Appraisal,Appraisal,Оценка
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Изпратен имейл доставчика {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Оторизиран подписалите
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
@@ -2344,7 +2410,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Workstation Working Hour,Start Time,Начален Час
 DocType: Item Price,Bulk Import Help,Bulk Import Помощ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,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,Отписване от този Email бюлетин
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Съобщение изпратено
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Общо Margin
 DocType: Supplier,Supplier Details,Доставчик Детайли
 DocType: Expense Claim,Approval Status,Одобрение Status
 DocType: Hub Settings,Publish Items to Hub,Публикуване продукти в Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Customer
 DocType: Payment Gateway Account,Default Payment Request Message,Default Payment Request Message
 DocType: Item Group,Check this if you want to show in website,"Проверете това, ако искате да се показват в сайт"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Банков и Плащания
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Банков и Плащания
 ,Welcome to ERPNext,Добре дошли в ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Подробности Номер
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Доведе до цитата
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,Листа и Holiday
 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/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,И двете Warehouse трябва да принадлежи към една и съща фирма
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,"Не са добавени контакти, все още."
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Поземлен Cost Ваучер Сума
 DocType: Time Log,Batched for Billing,Дозирани за фактуриране
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитат Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
+DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
 DocType: Sales Order Item,Sales Order Date,Продажбите Поръчка Дата
 DocType: Sales Invoice Item,Delivered Qty,Доставени Количество
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Покупка Дата на актив {0} не съвпада с дата за покупка на фактура
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
 ,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}
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Account,Payable,Платим
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Длъжници ({0})
-DocType: Project,Margin,марж
+DocType: Pricing Rule,Margin,марж
 DocType: Salary Slip,Arrear Amount,Просрочия Сума
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови Клиенти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Брутна Печалба%
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Клирънсът Дата
 DocType: Newsletter,Newsletter List,Newsletter Списък
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Проверете дали искате да изпратите заплата приплъзване в пощата на всеки служител, като представя заплата приплъзване"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължително
 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 +57,Where manufacturing operations are carried.,Когато се извършват производствени операции.
 DocType: Stock Entry Detail,Source Warehouse,Източник Warehouse
 DocType: Installation Note,Installation Date,Дата на инсталация
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
 DocType: Employee,Confirmation Date,Потвърждение Дата
 DocType: C-Form,Total Invoiced Amount,Общо Сума по фактура
 DocType: Account,Sales User,Продажбите на потребителя
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Количество не може да бъде по-голяма от Max Количество
+DocType: Account,Accumulated Depreciation,Натрупани амортизации
 DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик Детайли
 DocType: Payment Request,Email To,Email Да
 DocType: Lead,Lead Owner,Lead Собственик
 DocType: Bin,Requested Quantity,заявеното количество
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Се изисква Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Се изисква Warehouse
 DocType: Employee,Marital Status,Семейно Положение
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Time Log,Will be updated when billed.,"Ще бъде актуализиран, когато таксувани."
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Current BOM и Нова BOM не могат да бъдат едни и същи
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% Доставени
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентно разпределение
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Същото доставчика е била въведена на няколко пъти
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Поръчка за покупка приложените аксесоари
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,Фирма не може да бъде Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за шаблони за печат.
@@ -2470,13 +2543,14 @@
 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) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 DocType: Payment Request,Payment Details,Подробности на плащане
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курсове
+DocType: Asset,Journal Entry for Scrap,Вестник Влизане за скрап
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Запис на всички съобщения от тип имейл, телефон, чат, посещение и т.н."
 DocType: Manufacturer,Manufacturers used in Items,Производителите използват в артикули
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Моля, посочете закръглят Cost Center в Company"
 DocType: Purchase Invoice,Terms,Условия
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Създаване на нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Създаване на нова
 DocType: Buying Settings,Purchase Order Required,Поръчка за покупка Задължително
 ,Item-wise Sales History,Точка-мъдър Продажби История
 DocType: Expense Claim,Total Sanctioned Amount,Общо санкционирани Сума
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Фондова Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Оценка: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Заплата Slip Приспадане
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Изберете група възел на първо място.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Изберете група възел на първо място.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Служител и Присъствие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Цел трябва да бъде един от {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Премахване на препратка на клиент, доставчик, търговски партньор и олово, тъй като това е вашата фирма адрес"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
 DocType: Task,depends_on,зависи от
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Следващата дата трябва да е по-голяма от Публикуване Дата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Покажи данък разпадането
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Форма / т / {0}) е на изчерпване на запасите
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Следващата дата трябва да е по-голяма от Публикуване Дата
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Фактура Публикуване Дата
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Забележка: Ако плащането не е извършено срещу всяко позоваване, направи вестник Влизане ръчно."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажби лице Име
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Настройки за печат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
+DocType: Asset Category Account,Fixed Asset Account,Дълготраен актив профил
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Интерниран
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,От BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,"Към днешна дата трябва да бъде една и съща от датата, за половин ден отпуск"
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","напр кг, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Структура Заплата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Котировките
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Сериен Номер
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
-DocType: Item,Is Fixed Asset Item,Е фиксирана позиция в актива
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
 DocType: Purchase Invoice,Print Language,Print Език
 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","Ако имате дълги формати за печат, тази функция може да се използва за разделяне на страницата, за да бъдат отпечатани на няколко страници с всички горни и долни колонтитули на всяка страница"
+DocType: Asset,Number of Depreciations,Брой на амортизации
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Предмети
 DocType: Fiscal Year,Year Name,Година Име
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Продажбите Partner Име
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Заявка за Цитати
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимална сума на фактурата
 DocType: Purchase Invoice Item,Image View,Вижте изображението
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенти
+DocType: Asset,Partially Depreciated,Частично амортизиран
 DocType: Issue,Opening Time,Откриване на времето
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и до датите, изисквани"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Поддръжка на мениджъра
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Общо не може да е нула
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дни след последна поръчка"" трябва да бъдат по-големи или равни на нула"
-DocType: C-Form,Amended From,Изменен От
+DocType: Asset,Amended From,Изменен От
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Пренасяне
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Моля, спомена &quot;Печалба / Загуба на профила за изхвърляне на активи&quot; в компания"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Краен Плащания с фактури
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Краен Плащания с фактури
 DocType: Journal Entry,Bank Entry,Bank Влизане
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добави в кошницата
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група С
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Включване / Изключване на валути.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Включване / Изключване на валути.
 DocType: Production Planning Tool,Get Material Request,Вземете Материал Заявка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Пощенски разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Пощенски разходи
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Позиция Пореден №
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Общо Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Счетоводни отчети
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Счетоводни отчети
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
@@ -2687,15 +2766,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-на-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,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 единици. и си Allowance е 10% след което се оставя да се получи 110 единици.
 DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: Item,Website Description,Website Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нетна промяна в собствения капитал
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Моля анулира фактурата за покупка {0} първи
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 ,Sales Register,Продажбите Регистрация
 DocType: Quotation,Quotation Lost Reason,Цитат Загубени Причина
@@ -2703,12 +2783,13 @@
 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,Customer Group Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,Срещу ваучер Вид
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 DocType: Item,Attributes,Атрибутите
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Вземи артикули
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
 DocType: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile Не
 DocType: Payment Tool,Make Journal Entry,Направи вестник Влизане
 DocType: Leave Allocation,New Leaves Allocated,Нови листа Отпуснати
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Търговски
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител т {0} не трябва да бъде фондова Точка
 DocType: Cost Center,Distribution Id,Id Разпределение
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Всички продукти или услуги.
 DocType: Supplier Quotation,Supplier Address,Доставчик Адрес
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Количество
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Цена Умение {0} трябва да бъде в границите от {1} {2}, за да в инкрементите {3}"
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
 DocType: Tax Rule,Billing State,Billing членка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Прехвърляне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Прехвърляне
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Поради Дата е задължително
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Забележки
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Код
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Изпрати Доставчик имейли
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Монтаж рекорд за Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Време Log е Обявен
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 DocType: Salary Slip,Earning & Deduction,Приходи &amp; Приспадане
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Временна печалба / загуба (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Моля, задайте стойност по подразбиране {0} в Company {1}"
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Моля настройка номериране серия за организиране и обслужване чрез Setup&gt; номерационен Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Получават от продукта Bundle
+DocType: Asset,Straight Line,Права
+DocType: Project User,Project User,Потребителят Project
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
 DocType: Features Setup,Sales Discounts,Продажби Отстъпки
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Брой на Поръчка
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / банер, който ще се появи на върха на списъка с продукти."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Посочете условия, за да изчисли размера на корабоплаването"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Добави Поделемент
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Откриване Value
 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,Комисията за покупко-продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Комисията за покупко-продажба
 DocType: Offer Letter Term,Value / Description,Стойност / Описание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 ,Customers Not Buying Since Long Time,Клиентите не купуват от дълго време
 DocType: Production Order,Expected Delivery Date,Очаквана дата на доставка
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представителни Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Представителни Разходи
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Заявленията за отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Правни разноски
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни разноски
 DocType: Sales Invoice,Posting Time,Публикуване на времето
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Разходите за телефония
 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.,"Вижте това, ако искате да принуди потребителя да избере серия преди да запазите. Няма да има по подразбиране, ако проверите това."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Не позиция с Пореден № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Не позиция с Пореден № {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворени Известия
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Преки разходи
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Преки разходи
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} е невалиден имейл адрес в &quot;Уведомление \ имейл адрес&quot;
 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,Пътни Разходи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,"Успешно заличава всички транзакции, свързани с тази компания!"
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Общо Billing сума (чрез Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Ние продаваме този артикул
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id доставчик
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Количество трябва да бъде по-голяма от 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Количество трябва да бъде по-голяма от 0
 DocType: Journal Entry,Cash Entry,Cash Влизане
 DocType: Sales Partner,Contact Desc,Свържи Описание
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Вид на листа като случайни, болни и т.н."
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всички контакти.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Доставчик на актив {0} не съвпада с доставчика в фактурата за покупка
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Суровини не може да бъде същата като основен елемент
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Заплата шаблон майстор.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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 Адрес
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Таксуване валута трябва да бъде равна на валута или Comapany по подразбиране или валута payble предвид партия
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ако забраните, &quot;по думите на&quot; поле няма да се вижда в всяка сделка"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch е бил отменен.
 ,Reqd By Date,Reqd по дата
 DocType: Salary Slip Earning,Salary Slip Earning,Заплата Slip Приходи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Кредиторите
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Кредиторите
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Пореден № е задължително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция Wise Tax Подробности
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,От Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Hub Settings,Name Token,Име Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
-DocType: Project,Project Name,Име на проекта
+DocType: Request for Quotation 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,Позиция Batch Nos
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Крайна Дата
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,сделки с акции
 DocType: Employee,Internal Work History,Вътрешен Work История
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Натрупана амортизация сума
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка с клиент
 DocType: Account,Expense,Разход
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Фирмата е задължително, тъй като това е вашата фирма адрес"
 DocType: Item Attribute,From Range,От Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Точка {0} игнорирани, тъй като тя не е елемент от склад"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Изпратете този производствена поръчка за по-нататъшна обработка.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Изпратете този производствена поръчка за по-нататъшна обработка.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","За да не се прилага ценообразуване правило в дадена сделка, всички приложими правила за ценообразуване трябва да бъдат забранени."
 DocType: Company,Domain,Домейн
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Работни места
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Допълнителна Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)"
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Дата На Доставка
 DocType: Opportunity,Opportunity Date,Opportunity Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Върнете Срещу Покупка Разписка
+DocType: Request for Quotation Item,Request for Quotation Item,Запитване за оферта Точка
 DocType: Purchase Order,To Bill,За да Bill
 DocType: Material Request,% Ordered,Поръчано%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Работа заплащана на парче
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е настройка за серийни номера. Колоната трябва да бъде празно
 DocType: Accounts Settings,Accounts Settings,Настройки на Сметки
 DocType: Customer,Sales Partner and Commission,Продажбите Partner и Комисия
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},"Моля, задайте &quot;Асет Изхвърляне на профила&quot; в компания {0}"
 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 Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временни сметки
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Временни сметки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Точка
 DocType: Account,Auditor,Одитор
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Правя неспособен
 DocType: Project Task,Pending Review,До Review
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Кликнете тук, за да платите"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може да се бракува, тъй като вече е {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Customer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Отсъства
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,"На време трябва да бъде по-голяма, отколкото от време"
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Добавяне на елементи от
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Добавяне на елементи от
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: майка сметка {1} не Bolong на дружеството {2}
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
 DocType: Account,Asset,Придобивка
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",например &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,"Фондова не може да съществува за позиция {0}, тъй като има варианти"
 ,Sales Person-wise Transaction Summary,Продажбите Person-мъдър Transaction Резюме
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} не съществува
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,Управление на качеството
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Точка {0} е деактивиран
 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,Служител за външна работа
@@ -3068,7 +3160,7 @@
 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,Следваща Контакт
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Gateway сметки за настройка.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Gateway сметки за настройка.
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Дълготрайни активи
 ,Cash Flow,Паричен поток
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,"Bank Изявление баланс, както на General Ledger"
 DocType: Job Applicant,Applicant Name,Заявител Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Име на артикул
@@ -3098,19 +3190,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Настройките по подразбиране за продажба на сделки.
 DocType: BOM Replace Tool,Current BOM,Current BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Добави Сериен №
 apps/erpnext/erpnext/config/support.py +43,Warranty,Гаранция
 DocType: Production Order,Warehouses,Складове
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print и стационарни
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print и стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Актуализиране на готова продукция
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Актуализиране на готова продукция
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупуване
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,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 не може да се заличи, тъй като съществува влизане фондова книга за този склад."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,"Сума, платена"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
 DocType: Leave Block List,Applies to Company,Отнася се за Фирма
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се затвори, защото {0} съществува внесено фондова Влизане"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се затвори, защото {0} съществува внесено фондова Влизане"
 DocType: Purchase Invoice,In Words,По думите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Днес е {0} е рожден ден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Заявка за складова база
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделката не допуска срещу спря производството Поръчка {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Присъедините
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
+DocType: Pricing Rule,Margin Rate or Amount,Margin процент или сума
 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,Продажбите Поръчка Точка
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} вече е получил
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Продажбите Данни за отбора
 DocType: Expense Claim,Total Claimed Amount,Общо заявените Сума
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциалните възможности за продажби.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Невалиден {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универсални Магазини
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Не са счетоводни записвания за следните складове
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Записване на документа на първо място.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
 DocType: Company,Change Abbreviation,Промени Съкращение
 DocType: Expense Claim Detail,Expense Date,Expense Дата
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Главна книга
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Вижте Leads
 DocType: Item Attribute Value,Attribute Value,Атрибут Стойност
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID трябва да бъде уникален, вече съществува за {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email ID трябва да бъде уникален, вече съществува за {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Моля изберете {0} първия
 DocType: Features Setup,To get Item Group in details table,За да получите т Group в детайли маса
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Партида {0} на т {1} е изтекъл.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {0}"
 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>
@@ -3226,23 +3319,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Съществува план за поддръжка {0} срещу {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Съществува план за поддръжка {0} срещу {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Действително Количество (at source/target)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Записи на служителите.
 DocType: Payment Gateway,Payment Gateway,Плащане Gateway
 DocType: HR Settings,Payroll Settings,Настройки ТРЗ
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
 apps/erpnext/erpnext/templates/pages/cart.html +22,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-форма приложима
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse е задължително
 DocType: Supplier,Address and Contacts,Адрес и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Подробности мерна единица на реализациите
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Дръжте го уеб приятелски 900px (w) от 100px (з)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Разрешен от
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Валута на транзакция трябва да бъде същата като Плащане Портал валута
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Получавам
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Подаване на създаване
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за т {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за т {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Моите поръчки
@@ -3296,10 +3389,10 @@
 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,"Моля, въведете съобщение, преди да изпратите"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Точка на продажба на профил
+apps/erpnext/erpnext/config/accounts.py +258,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} вече таксува
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необезпечени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Стойност Име Center
 DocType: Maintenance Schedule Detail,Scheduled Date,Предвидена дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,"Общата сума, изплатена Amt"
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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;, за да продължите."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Доставчик Част Не
 DocType: Purchase Invoice,Contact,Контакт
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Получени от
 DocType: Features Setup,Exports,Износът
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: От {0} за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
 DocType: Payment Reconciliation,From Invoice Date,От Invoice Дата
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Главна Сметка
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Код Customer
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Birthday Reminder за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след Last Поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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 Име
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Сток Активи
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Дейността на проект / задача.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериране на заплатите фишове
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Изкупуването трябва да се провери, ако има такива се избира като {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпка трябва да е по-малко от 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Напиши Off Сума (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Повторете в Деня на Месец
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,"Година дата начална или крайна дата се припокрива с {0}. За да се избегне моля, задайте компания"
 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 +144,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### Ако серията е настроен и сериен номер не се споменава в сделки, ще бъде създаден след това автоматично пореден номер въз основа на тази серия. Ако искате винаги да споменава изрично серийни номера за тази позиция. оставите полето празно."
 DocType: Upload Attendance,Upload Attendance,Качи Присъствие
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Продажби Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Създаване на Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Моля, въведете подразбиране валута през Company магистър"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Моля, въведете подразбиране валута през Company магистър"
 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 +206,New Account Name,New Account Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Обслужване На Клиенти
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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,Общо отпуснати листа са повече от дните през периода
+DocType: Pricing Rule,Percentage,Процент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Точка {0} трябва да бъде Продажби Точка
+apps/erpnext/erpnext/stock/get_item_details.py +131,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 Детайли
@@ -3431,11 +3527,12 @@
 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,Търсене под Изпълнения
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Код изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Код изисква най Row Не {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Действителен
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; и направи спомена Данъчната ставка.
 DocType: Production Order,Production Order,Производство Поръчка
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
 DocType: Quotation Item,Against Docname,Срещу Документ
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Успешно Съгласувани
 DocType: Production Order,Planned End Date,Планиран Крайна дата
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Когато елементите са съхранени.
 DocType: Tax Rule,Validity,Валидност
+DocType: Request for Quotation,Supplier Detail,доставчик Подробности
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сума по фактура
 DocType: Attendance,Attendance,Посещаемост
 apps/erpnext/erpnext/config/projects.py +55,Reports,Доклади
 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 +508,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Данъчна шаблон за закупуване сделки.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Данъчна шаблон за закупуване сделки.
 ,Item Prices,Елемент Цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По думите ще бъде видим след като спаси Поръчката.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Закриване Ваучер
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи %s"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Административни разходи
 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 +455,Change,Промяна
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
+DocType: Asset Category,Asset Category Name,Asset Категория Име
 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,Бруто тегло мерна единица
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Партида
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продажбите Person
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS параметър
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Бюджет и Cost Center
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Бюджет и Cost Center
 DocType: Maintenance Schedule Item,Half Yearly,Полугодишна
 DocType: Lead,Blog Subscriber,Блог Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Създаване на правила за ограничаване на сделки, основани на ценности."
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Покупка Чести
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Доставчик цитата {0} е създаден
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведен Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, повдигнати на клиентите."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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} абонати
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Родител Акаунт
@@ -3574,7 +3673,7 @@
 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 +219,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
 DocType: Address,Office,Офис
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Счетоводни вписвания в дневник.
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Batch Инвентаризация
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
+DocType: Sales Invoice Item,Discount and Margin,Отстъпка и Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Месечна заплата Регистрация
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3617,22 +3717,23 @@
 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 профил
 DocType: Payment Gateway Account,Payment URL Message,Заплащане URL Съобщение
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Начин на плащане сума не може да бъде по-голяма от дължимата сума
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Общата сума на неплатените
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Време Влезте не е таксувана
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
+DocType: Asset,Asset Category,Asset Категория
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,"Моля, въведете с документите, ръчно"
 DocType: SMS Settings,Static Parameters,Статични параметри
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Акцизите Invoice
 DocType: Expense Claim,Employees Email Id,Служители Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Маркирана Присъствие
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Текущи задължения
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Текущи задължения
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Действително Количество е задължително
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Числови стойности
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Прикрепете Logo
 DocType: Customer,Commission Rate,Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Направи Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Заявленията за отпуск блок на отдел.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,анализ
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Количката е празна
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес за шаблони."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Пакет Тегло Детайли
 DocType: Payment Gateway Account,Payment Gateway Account,Плащане Портал Акаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,След плащане завършване пренасочи потребителското към избраната страница.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
+DocType: Asset,Current Value (After Depreciation),Current Value (след амортизация)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Бил на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Дата
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Сметка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Сметка {0} не съществува
 DocType: Account,Cash,Пари в брой
 DocType: Employee,Short biography for website and other publications.,Кратка биография на уебсайт и други публикации.
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index eb60c19..c28b692 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,ব্যাপারী
 DocType: Employee,Rented,ভাড়াটে
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,আপনি কি সত্যিই এই সম্পদ স্ক্র্যাপ করতে চান?
 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.,* লেনদেনে গণনা করা হবে.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,খোলা দেখাও
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,নিউ ছুটি আবেদন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,দেখান রুপভেদ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
 DocType: Designation,Designation,উপাধি
@@ -64,7 +66,7 @@
 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 +642,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},নতুন {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},নতুন {0}: # {1}
 ,Sales Partners Commission,সেলস পার্টনার্স কমিশন
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,অধিক 5 অক্ষর থাকতে পারে না সমাহার
 DocType: Payment Request,Payment Request,পরিশোধের অনুরোধ
@@ -102,7 +104,7 @@
 DocType: Employee,Married,বিবাহিত
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,থেকে আইটেম পান
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,টার্গেটের
 DocType: BOM,Total Cost,মোট খরচ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,কার্য বিবরণ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
+DocType: Item,Is Fixed Asset,পরিসম্পদ হয়
 DocType: Expense Claim Detail,Claim Amount,দাবি পরিমাণ
 DocType: Employee,Mr,জনাব
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
@@ -156,7 +159,8 @@
 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,স্টক খরচ
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} হিমায়িত হয়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,স্টক খরচ
 DocType: Newsletter,Email Sent?,ইমেইল পাঠানো?
 DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্রি
 DocType: Production Order Operation,Show Time Logs,সময় দেখান লগ
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,আইটেম {0} একটি ক্রয় আইটেমটি হতে হবে
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: BOM Replace Tool,New BOM,নতুন BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,কোম্পানী লিখুন দয়া করে
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
 DocType: Newsletter List,Total Subscribers,মোট গ্রাহক
 ,Contact Name,যোগাযোগের নাম
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,ব্যাংক দাখিলা
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,বিজ্ঞপ্তি নিয়ন্ত্রণ
 DocType: Lead,Suggestions,পরামর্শ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,এই অঞ্চলের উপর সেট আইটেমটি গ্রুপ-জ্ঞানী বাজেটের. এছাড়াও আপনি বন্টন সেট করে ঋতু অন্তর্ভুক্ত করতে পারে.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},গুদাম উর্ধ্বস্থ অ্যাকাউন্ট গ্রুপ লিখুন দয়া করে {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},গুদাম উর্ধ্বস্থ অ্যাকাউন্ট গ্রুপ লিখুন দয়া করে {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 apps/erpnext/erpnext/config/desktop.py +83,Learn,শেখা
+DocType: Asset,Next Depreciation Date,পরবর্তী অবচয় তারিখ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},সরবরাহকারী চালান কোন ক্রয় চালান মধ্যে বিদ্যমান {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,সেলস পারসন গাছ পরিচালনা.
 DocType: Job Applicant,Cover Letter,কাভার লেটার
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,বিশিষ্ট চেক এবং পরিষ্কার আমানত
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ভুল গুপ্তশব্দ
 DocType: Item,Variant Of,মধ্যে variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
 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.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] ইউনিট (# ফরম / আইটেম / {1}) [{2}] অন্তর্ভুক্ত (# ফরম / গুদাম / {2})
 DocType: Lead,Industry,শিল্প
 DocType: Employee,Job Profile,চাকরি বৃত্তান্ত
 DocType: 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,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,চালান পত্র
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,চালান পত্র
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,মাস এবং বছর নির্বাচন করুন
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,বিবেচিত মোট আদেশ
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,পছন্দ করো
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},সিরিয়াল কোন {0} হুণ্ডি অন্তর্গত নয় {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,আইটেম গুণ পরিদর্শন পরামিতি
 DocType: Leave Application,Leave Approver Name,রাজসাক্ষী নাম
-,Schedule Date,সূচি তারিখ
+DocType: Depreciation Schedule,Schedule Date,সূচি তারিখ
 DocType: Packed Item,Packed Item,বস্তাবন্দী আইটেম
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,লেনদেন কেনার জন্য ডিফল্ট সেটিংস.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,লেনদেন কেনার জন্য ডিফল্ট সেটিংস.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},কার্যকলাপ খরচ কার্যকলাপ টাইপ বিরুদ্ধে কর্মচারী {0} জন্য বিদ্যমান - {1}
 apps/erpnext/erpnext/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,টাকা অদলবদল
@@ -346,6 +353,7 @@
 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; হয় অনুরোধ করা
+DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
 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.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
-DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
+DocType: Request for Quotation Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,সরবরাহকারী জন্য বার্তা
 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,অবৈতনিক
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 ,Serial No Warranty Expiry,সিরিয়াল কোন পাটা মেয়াদ উত্তীর্ন
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,ম্যানেজিং প্রণীত
+DocType: Project,Project will be accessible on the website to these users,প্রকল্প এই ব্যবহারকারীর জন্য ওয়েবসাইটে অ্যাক্সেস করা যাবে
 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 +53,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,আইটেম {0} ক্রয় করা হয় না আইটেম
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,আইটেম {0} ক্রয় করা হয় না আইটেম
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,মুলতুবি Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
 DocType: Pricing Rule,Valid From,বৈধ হবে
 DocType: Sales Invoice,Total Commission,মোট কমিশন
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,সঞ্চিত মূল্যবোধ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,অর্থবছরের শুরুর তারিখ অর্থবছরের শেষ তারিখ তার চেয়ে অনেক বেশী করা উচিত হবে না
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,অর্থবছরের শুরুর তারিখ অর্থবছরের শেষ তারিখ তার চেয়ে অনেক বেশী করা উচিত হবে না
 DocType: Warranty Claim,Resolution,সমাধান
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},বিতরণ: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,প্রদেয় অ্যাকাউন্ট
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,পুনঃসূচনা সংযুক্তি
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,সেলস প্রত্যাবর্তন
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,বেতন উপাদান.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,সম্ভাব্য গ্রাহকদের ডাটাবেস.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,মাস্টার্স
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,আপডেট ব্যাংক লেনদেন তারিখগুলি
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,আপডেট ব্যাংক লেনদেন তারিখগুলি
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},নেতিবাচক শেয়ার ত্রুটি ({6}) আইটেম জন্য {0} গুদাম {1} উপর {2} {3} মধ্যে {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,সময় ট্র্যাকিং
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
@@ -518,27 +528,27 @@
 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,ডিফল্ট খোয়াতে হার
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,সেলস পারসন লক্ষ্যমাত্রা
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,হয় কর্মচারী বা কোম্পানির জন্য একটি হলিডে তালিকা নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
+DocType: Depreciation Schedule,Depreciation Amount,অবচয় পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,স্থায়ী দিন
 DocType: Quotation Item,Item Balance,আইটেম ব্যালান্স
 DocType: Sales Invoice,Packing List,প্যাকিং তালিকা
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ক্রয় আদেশ সরবরাহকারীদের দেওয়া.
+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,ক্ষয়প্রাপ্ত
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
 DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,গ্রুপ গ্রুপ
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,আমার প্রকল্প
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
 DocType: Journal Entry,Bill No,বিল কোন
+DocType: Company,Gain/Loss Account on Asset Disposal,অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির হিসাব
 DocType: Purchase Invoice,Quarterly,ত্রৈমাসিক
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
 DocType: Sales Order Item,Basic Rate (Company Currency),মৌলিক হার (কোম্পানি একক)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,এই বছর মোট বিলিং
 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 +529,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,বৃক্ষ ধরন
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
 DocType: Mode of Payment Account,Default Account,ডিফল্ট একাউন্ট
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
 ,Sales Person Target Variance Item Group-Wise,সেলস পারসন উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,মাসিক বেতন বিবৃতি.
 DocType: Item Group,Website Specifications,ওয়েবসাইট উল্লেখ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},আপনার ঠিকানা টেমপ্লেট মধ্যে একটি ত্রুটি আছে {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,নতুন একাউন্ট
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,নতুন একাউন্ট
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","একাধিক দাম বিধি একই মানদণ্ড সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ করে সংঘাত সমাধান করুন. দাম নিয়মাবলী: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","একাধিক দাম বিধি একই মানদণ্ড সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ করে সংঘাত সমাধান করুন. দাম নিয়মাবলী: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","জার্নাল এন্ট্রি {0} এটা এই চালান আগাম টানা উচিত যদি {1}, পরীক্ষা আদেশের বিরুদ্ধে সংযুক্ত করা হয়."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,অফিস রক্ষণাবেক্ষণ খরচ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Account,Liability,দায়
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
 DocType: Company,Default Cost of Goods Sold Account,জিনিষপত্র বিক্রি অ্যাকাউন্ট ডিফল্ট খরচ
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,মূল্যতালিকা নির্বাচিত না
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Process Payroll,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,আমার চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,আমার চালান
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,কোন কর্মচারী পাওয়া
 DocType: Supplier Quotation,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV মাধ্যমে স্টক ব্যালেন্স আপলোড করুন.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,এখন পাঠান
 ,Support Analytics,সাপোর্ট অ্যানালিটিক্স
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,লজিক্যাল ত্রুটি: ওভারল্যাপিং খুঁজে বের করতে হবে
 DocType: Item,Website Warehouse,ওয়েবসাইট ওয়্যারহাউস
 DocType: Payment Reconciliation,Minimum Invoice Amount,নূন্যতম চালান পরিমাণ
 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 +267,C-Form records,সি-ফরম রেকর্ড
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,সি-ফরম রেকর্ড
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,গ্রাহক এবং সরবরাহকারী
 DocType: Email Digest,Email Digest Settings,ইমেইল ডাইজেস্ট সেটিংস
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,গ্রাহকদের কাছ থেকে সমর্থন কোয়েরি.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,খরচ
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,আউটসোর্স হয়
 DocType: Item Attribute,Item Attribute Values,আইটেম বৈশিষ্ট্য মূল্যবোধ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,দেখুন সদস্যবৃন্দ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,কেনার রশিদ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
 DocType: Employee,Ms,শ্রীমতি
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+DocType: Journal Entry,Depreciation Entry,অবচয় এণ্ট্রি
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,এতে যান কার্ট
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,স্থায়ী ঠিকানা
 DocType: Production Order Operation,Operation completed for how many finished goods?,অপারেশন কতগুলি সমাপ্ত পণ্য জন্য সম্পন্ন?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ব্র্যান্ড
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
 DocType: Employee,Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
-DocType: Journal Entry Account,Purchase Invoice,ক্রয় চালান
+DocType: Asset,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,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;থেকে কপি করা হবে."
 DocType: Job Opening,Publish on website,ওয়েবসাইটে প্রকাশ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,গ্রাহকদের চালানে.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,সরবরাহকারী চালান তারিখ পোস্টিং তারিখ তার চেয়ে অনেক বেশী হতে পারে না
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,পরোক্ষ আয়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
 DocType: Purchase Invoice,Additional Discount Percentage,অতিরিক্ত ছাড় শতাংশ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","সারি {0}: চালান {1} অবৈধ, তা বাতিল করা যেতে পারে / অস্তিত্ব নেই. \ একটি বৈধ চালান লিখুন"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
 ,Employee Holiday Attendance,কর্মচারী হলিডে এ্যাটেনডেন্স
 DocType: Opportunity,Walk In,প্রবেশ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,শেয়ার সাজপোশাকটি
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,শেয়ার সাজপোশাকটি
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,স্থানান্তরিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,করা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,আমার ট্রলি
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
 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 +180,Qty for {0},জন্য Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
+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 +80,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
 DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ডিসকাউন্ট
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,বিক্রয় পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,সময় লগসমূহ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,সময় লগসমূহ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,ইস্যু
+DocType: Asset,Scrapped,বাতিল
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,অ্যাকাউন্ট কোম্পানি সঙ্গে মেলে না
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,সংগ্রহ
 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,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,সেলস খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,সেলস খরচ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
+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,গড় বয়স
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,ডিফল্ট মুদ্রা
 DocType: Contact,Enter designation of this Contact,এই যোগাযোগ উপাধি লিখুন
 DocType: Expense Claim,From Employee,কর্মী থেকে
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,কী পারফরমেন্স ফোন
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,অবদান%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,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,আন্তর্জাতিক ডিফল্ট
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
 DocType: Salary Slip,Deductions,Deductions
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,এই টাইম ইন ব্যাচ বিল হয়েছে.
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
 ,Trial Balance for Party,পার্টি জন্য ট্রায়াল ব্যালেন্স
 DocType: Lead,Consultant,পরামর্শকারী
 DocType: Salary Slip,Earnings,উপার্জন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,কিছুই অনুরোধ করতে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,কিছুই অনুরোধ করতে
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ম্যানেজমেন্ট
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,সময় শীট জন্য প্রকারভেদ
@@ -935,18 +958,18 @@
 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; টাইপ নোড অধীনে তৈরি করা যেতে পারে
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ইমেইল আইডি সেট করুন
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ইমেইল আইডি সেট করুন
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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},পিওএস প্রোফাইল {0} ইতিমধ্যে ব্যবহারকারীর জন্য তৈরি: {1} এবং কোম্পানি {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,সরবরাহকারী ডাটাবেস.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,সরবরাহকারী ডাটাবেস.
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,ট্যাক্স ও অন্যান্য বেতন কর্তন.
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,ছুটির দিন
 DocType: Leave Control Panel,Leave blank if considered for all branches,সব শাখার জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 ,Daily Time Log Summary,দৈনন্দিন সময় লগ সারাংশ
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},সি-ফর্ম চালান জন্য প্রযোজ্য নয়: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,অসমর্পিত পেমেন্ট বিবরণ
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
@@ -973,19 +997,20 @@
 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,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
 DocType: Contact,User ID,ব্যবহারকারী আইডি
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,দেখুন লেজার
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,দেখুন লেজার
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,লভ্যাংশ দেওয়া
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,ধরে রাখা উপার্জন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,ধরে রাখা উপার্জন
 DocType: BOM Item,Item Description,পন্নের বর্ণনা
 DocType: Payment Tool,Payment Mode,পরিশোধের মাধ্যম
 DocType: Purchase Invoice,Is Recurring,পুনরাবৃত্ত হয়
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,অস্থায়ী খোলা
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},মূল্যনির্ধারণ হার সারিতে আইটেম জন্য প্রয়োজনীয় {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,অ্যাকাউন্ট প্রদেয় সংক্ষিপ্ত
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 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 +165,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ছোট
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
 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,মোট অর্জন
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 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,ওয়ারহাউস যোগাযোগের তথ্য
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/stock/get_item_details.py +142,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;."
 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},উৎপাদন অর্ডার অবস্থা হয় {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},কোন আইটেম নামক খুঁজে পাওয়া যায় নি {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,মোট আউটগোয়িং
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",শুধুমাত্র &quot;মান&quot; 0 বা জন্য ফাঁকা মান সঙ্গে এক কোটি টাকার রুল শর্ত হতে পারে
 DocType: Authorization Rule,Transaction,লেনদেন
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,ওয়েবসাইট আইটেম গ্রুপ
 DocType: Purchase Invoice,Total (Company Currency),মোট (কোম্পানি একক)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} সিরিয়াল নম্বর একবারের বেশি প্রবেশ
-DocType: Journal Entry,Journal Entry,জার্নাল এন্ট্রি
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
 DocType: Salary Slip,Bank Account No.,ব্যাংক একাউন্ট নং
 DocType: Naming Series,This is the number of the last created transaction with this prefix,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা
@@ -1072,6 +1098,7 @@
 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,ওয়ার্কস্টেশন
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,উদ্ধৃতি সরবরাহকারী জন্য অনুরোধ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,হার্ডওয়্যারের
 DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,মূল্যায়ন টেমপ্লেট গোল
 DocType: Salary Slip,Earning,রোজগার
 DocType: Payment Tool,Party Account Currency,পক্ষের অ্যাকাউন্টে একক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},বর্তমান মূল্য অবচয় পর সমান চেয়ে কম হতে হবে {0}
 ,BOM Browser,BOM ব্রাউজার
 DocType: Purchase Taxes and Charges,Add or Deduct,করো অথবা বিয়োগ
 DocType: Company,If Yearly Budget Exceeded (for expense account),বাত্সরিক বাজেট (ব্যয় অ্যাকাউন্টের জন্য) অতিক্রম করেছে
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
 DocType: Project,Start and End Dates,শুরু এবং তারিখগুলি End
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,বৈশিষ্ট্য সেটআপ
+DocType: Asset,Depreciation Schedules,অবচয় সূচী
 DocType: Item,Is Service Item,পরিষেবা আইটেম
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
 DocType: Payment Request,Transaction Currency,লেনদেন মুদ্রা
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},থেকে {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},থেকে {0} | {1} {2}
 DocType: BOM Operation,Operation Description,অপারেশন বিবরণ
 DocType: Item,Will also apply to variants,এছাড়াও ভিন্নতা প্রয়োগ করা হবে
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ফিস্ক্যাল বছর একবার সংরক্ষিত হয় ফিস্ক্যাল বছর আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ পরিবর্তন করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,প্রচারাভিযান
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},সর্বোচ্চ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,কোম্পানি জন্য
 apps/erpnext/erpnext/config/support.py +17,Communication log.,যোগাযোগ লগ ইন করুন.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
 DocType: Rename Tool,Type of document to rename.,নথির ধরন নামান্তর.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,আমরা এই আইটেম কিনতে
 DocType: Address,Billing,বিলিং
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,রিডিং
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,উপ সমাহারগুলি
+DocType: Asset,Asset Name,অ্যাসেট নাম
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Supplier,Stock Manager,স্টক ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,প্যাকিং স্লিপ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,অফিস ভাড়া
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,উদ্ধৃতি জন্য অনুরোধ নিম্নলিখিত লিঙ্কে ক্লিক করে এক্সেস হতে পারে
+DocType: Asset,Number of Months in a Period,মাসের সংখ্যা একটি নির্দিষ্ট সময়ের মধ্যে
 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,ওয়ার্কস্টেশন কাজ ঘন্টা
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,সরকার
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),মোট ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),মোট ({0})
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
 DocType: Sales Invoice,Source,উত্স
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,দেখান বন্ধ
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 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 +86,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} পাওয়া যায়নি, অ্যাকাউন্টিং এন্ট্রি (ব্যয়) বই প্রয়োজন বোধ করা হয় যা. একটি ক্রয় মূল্য তালিকা বিরুদ্ধে আইটেমের মূল্য উল্লেখ করুন."
@@ -1212,7 +1245,7 @@
 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.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 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,ল্যান্ড খরচ সাহায্য
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,ব্র্যান্ড মাস্টার.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,বক্স
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +131,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,শেয়ার দায়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,শেয়ার দায়
 DocType: Purchase Receipt,Supplier Warehouse,সরবরাহকারী ওয়্যারহাউস
 DocType: Opportunity,Contact Mobile No,যোগাযোগ মোবাইল নম্বর
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,অন্যান্য রিপোর্ট
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,বন্ধ করুন জন্মদিনের রিমাইন্ডার
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} দেখুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,গত অর্থবছরের বন্ধ হয়নি
 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 +40,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 +38,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 DocType: Purchase Invoice,Reference Document,রেফারেন্স নথি
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% দেখানো হয়েছিল
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,হিসাবের পরিশোধযোগ্য অংশ মধ্যে নিট পরিবর্তন
 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 ছাড়&#39; জন্য প্রয়োজনীয় গ্রাহক
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
 DocType: Quotation,Term Details,টার্ম বিস্তারিত
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 অনেক বেশী হতে হবে
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,পাটা দাবি
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",সর্বমোট চেয়ে \ {0} {1} বেশী হতে পারবেন না বিরুদ্ধে পরিশোধিত আগাম {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,আইটেমটি কোড নির্বাচন করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,আইটেমটি কোড নির্বাচন করুন
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য সিদ্ধান্তগ্রহণ হ্রাস (LWP)
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
 DocType: Packed Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
@@ -1343,15 +1377,15 @@
 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,বিপণন খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,একটি আইটেম এর একক.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,আইটেম-জ্ঞানী সেলস নিবন্ধন
+DocType: Asset,Gross Purchase Amount,গ্রস ক্রয়ের পরিমাণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",যেমন &quot;xyz ন্যাশনাল ব্যাংক&quot;
+DocType: Asset,Depreciation Method,অবচয় পদ্ধতি
 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 +29,Shopping Cart is enabled,শপিং কার্ট সক্রিয় করা হয়
 DocType: Job Applicant,Applicant for a Job,একটি কাজের জন্য আবেদনকারী
 DocType: Production Plan Material Request,Production Plan Material Request,উৎপাদন পরিকল্পনা উপাদান অনুরোধ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,প্রধান
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,একটি কাজের জন্য আবেদনকারী.
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,ঠিকানা
+apps/erpnext/erpnext/hooks.py +91,Addresses,ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,আইটেম উৎপাদন অর্ডার আছে অনুমোদিত নয়.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,আইটেম উৎপাদন অর্ডার আছে অনুমোদিত নয়.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,দয়া করে আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),এই প্যাকেজের নিট ওজন. (আইটেম নিট ওজন যোগফল আকারে স্বয়ংক্রিয়ভাবে হিসাব)
 DocType: Sales Order,To Deliver and Bill,রক্ষা কর এবং বিল থেকে
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,উত্পাদন জন্য সময় লগসমূহ.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,কাজগুলো জন্য টাইম ইন.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ব্র্যান্ড
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
 DocType: Quotation Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
+DocType: Request for Quotation Supplier,Send Email to Supplier,সরবরাহকারী ইমেল পাঠান
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 DocType: Packing Slip,To Package No.,নং প্যাকেজে
 DocType: Production Planning Tool,Material Requests,উপাদান অনুরোধ
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ডেলিভারি ওয়্যারহাউস
 DocType: Stock Settings,Allowance Percent,ভাতা শতাংশ
 DocType: SMS Settings,Message Parameter,বার্তা পরামিতি
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,আর্থিক খরচ কেন্দ্রগুলি বৃক্ষ.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,আর্থিক খরচ কেন্দ্রগুলি বৃক্ষ.
 DocType: Serial No,Delivery Document No,ডেলিভারি ডকুমেন্ট
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ক্রয় রসিদ থেকে জানানোর পান
 DocType: Serial No,Creation Date,তৈরির তারিখ
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,পরিমাণ প্রদান করতে
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,একটি পণ্য বা পরিষেবা
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} তৈরি হয়েছে
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} তৈরি হয়েছে
 DocType: Delivery Note Item,Against Sales Order,সেলস আদেশের বিরুদ্ধে
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","সারি {0}: সেট করুন {1} পর্যায়কাল, থেকে এবং তারিখ \ করার মধ্যে পার্থক্য এর চেয়ে বড় বা সমান হবে {2}"
 DocType: Pricing Rule,Selling,বিক্রি
 DocType: Employee,Salary Information,বেতন তথ্য
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,কর্তব্য এবং কর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,পেমেন্ট গেটওয়ে অ্যাকাউন্ট কনফিগার করা না হয়
 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: Production Order,Material Request Item,উপাদানের জন্য অনুরোধ আইটেম
+DocType: Request for Quotation Item,Material Request Item,উপাদানের জন্য অনুরোধ আইটেম
 apps/erpnext/erpnext/config/stock.py +85,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,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
+DocType: Asset,Sold,বিক্রীত
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
 DocType: Sales Invoice,Accounting Details,অ্যাকাউন্টিং এর বর্ণনা
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,এই কোম্পানির জন্য সব লেনদেন মুছে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,বিনিয়োগ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,বরাে
 DocType: Quality Inspection Reading,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,উপরে টেবিল উপাদান অনুরোধ দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,উপরে টেবিল উপাদান অনুরোধ দয়া করে প্রবেশ করুন
 DocType: Item Attribute,Attribute Name,নাম গুন
 DocType: Item Group,Show In Website,ওয়েবসাইট দেখান
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,গ্রুপ
@@ -1527,6 +1567,7 @@
 ,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 +25,Gantt chart of all tasks.,সমস্ত কাজগুলো Gantt চার্ট.
+DocType: Pricing Rule,Margin Type,মার্জিন প্রকার
 DocType: Appraisal,For Employee Name,কর্মচারীর নাম জন্য
 DocType: Holiday List,Clear Table,সাফ ছক
 DocType: Features Setup,Brands,ব্র্যান্ড
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,গ্রাহক ঠিকানা এবং পরিচিতি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,সারি # {0}: অ্যাসেট পরিসম্পদ আইটেম বিরুদ্ধে বাধ্যতামূলক
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,জুড়ি
+DocType: Asset,Depreciation Schedule,অবচয় সূচি
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
 DocType: Delivery Note,Excise Page Number,আবগারি পৃষ্ঠা সংখ্যা
+DocType: Asset,Purchase Date,ক্রয় তারিখ
 DocType: Employee,Personal Details,ব্যক্তিগত বিবরণ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},কোম্পানি &#39;অ্যাসেট অবচয় খরচ কেন্দ্র&#39; নির্ধারণ করুন {0}
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,মীমাংসা দাখিলা অন্তর্ভুক্ত
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,প্রকৃত মোট
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,একক
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ব্যয় দাবি
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
 ,BOM Search,খোঁজো
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},পরিস্কারের তারিখ সারিতে চেক তারিখের আগে হতে পারে না {0}
 DocType: Salary Slip,Deduction,সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 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,Gross Margin,গ্রস মার্জিন
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,হিসাব ব্যাংক ব্যালেন্সের
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,প্রতিবন্ধী ব্যবহারকারী
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,উদ্ধৃতি
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 DocType: Quotation,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,খরচ আপডেট
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,খরচ আপডেট
 DocType: Employee,Date of Birth,জন্ম তারিখ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
@@ -1620,8 +1666,8 @@
 ,SO Qty,তাই Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
+DocType: Request for Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
 apps/erpnext/erpnext/hooks.py +71,Shipments,চালানে
 DocType: Purchase Order Item,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,সারি #
 DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক)
-DocType: Pricing Rule,Supplier,সরবরাহকারী
+DocType: Asset,Supplier,সরবরাহকারী
 DocType: C-Form,Quarter,সিকি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,বিবিধ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,বিবিধ খরচ
 DocType: Global Defaults,Default Company,ডিফল্ট কোম্পানি
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,ব্যবহারকারী {0} নিষ্ক্রিয় করা হয়
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি সম্পদ সাথে সংযুক্ত করা হয়"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,শিশু আইটেম একটি প্রোডাক্ট বান্ডেল করা উচিত হবে না. আইটেম অপসারণ `{0} &#39;এবং সংরক্ষণ করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ব্যাংকিং
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,নতুন খরচ কেন্দ্র
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; এর) শিশু যোগ করো-তে ক্লিক করে একটি নতুন অ্যাকাউন্ট তৈরি করতে এবং না ট্যাক্স হার উল্লেখ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,নতুন খরচ কেন্দ্র
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
 DocType: Quality Inspection,In Process,প্রক্রিয়াধীন
@@ -1670,10 +1716,11 @@
 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,গ্রহনযোগ্য অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
 DocType: Quotation Item,Stock Balance,স্টক ব্যালেন্স
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,সময় লগসমূহ নির্মিত:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,সময় লগসমূহ নির্মিত:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Employee,Blood Group,রক্তের গ্রুপ
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
 DocType: Offer Letter Term,Offer Term,অপরাধ টার্ম
 DocType: Quality Inspection,Quality Manager,গুনগতমান ব্যবস্থাপক
 DocType: Job Applicant,Job Opening,কর্মখালির
 DocType: Payment Reconciliation,Payment Reconciliation,পেমেন্ট রিকনসিলিয়েশন
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,প্রস্তাবপত্র
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,উপাদান অনুরোধ (এমআরপি) অ্যান্ড প্রোডাকশন আদেশ নির্মাণ করা হয়.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,বর্তমান মূল্যনির্ধারণ হার
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
 DocType: Opportunity,Lost Reason,লস্ট কারণ
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,আদেশ বা চালানে বিরুদ্ধে পেমেন্ট থেকে.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,আদেশ বা চালানে বিরুদ্ধে পেমেন্ট থেকে.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,ব্যবহারকারী এবং অনুমতি
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,তোমার গ্রাহকরা
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,এখন আবেদন কর
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,এখন আবেদন কর
 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 পরিচালনা."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,চাকুরীর বিস্তারিত তথ্য
 DocType: Employee,New Workplace,নতুন কর্মক্ষেত্রে
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,বন্ধ হিসাবে সেট করুন
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},বারকোড কোনো আইটেম {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},বারকোড কোনো আইটেম {0}
 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,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ট্রান্সফার উপাদান
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},আইটেম {0} একটি সেলস পেইজ হতে হবে {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,কর্মচারী
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,থেকে আমদানি ইমেইল
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,ব্যবহারকারী হিসেবে আমন্ত্রণ
 DocType: Features Setup,After Sale Installations,বিক্রয় ইনস্টলেশনের পরে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},অনুগ্রহ করে এখানে ক্লিক সেট {0} {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
 DocType: Workstation Working Hour,End Time,শেষ সময়
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,সেলস বা কেনার জন্য আদর্শ চুক্তি পদ.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ফার্মাসিউটিক্যাল
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Gateway Account,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,নিউজলেটার মেইলিং তালিকা
 DocType: Delivery Note,Transporter Name,স্থানান্তরকারী নাম
 DocType: Authorization Rule,Authorized Value,কঠিন মূল্য
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} বন্ধ হয়
 DocType: Email Digest,How frequently?,কত তারাতারি?
 DocType: Purchase Receipt,Get Current Stock,বর্তমান স্টক পান
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন&gt; বর্তমান সম্পদ&gt; ব্যাংক অ্যাকাউন্টে যান এবং (শিশু ধরনের যোগ) উপর ক্লিক করে একটি নতুন অ্যাকাউন্ট তৈরি করুন &quot;ব্যাংক&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,উপকরণ বিল বৃক্ষ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,মার্ক বর্তমান
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ আরম্ভের তারিখ সিরিয়াল কোন জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,উদ্দেশ্য
+DocType: Company,Fixed Asset Depreciation Settings,পরিসম্পদ অবচয় সেটিংস
 DocType: Item,Will also apply for variants unless overrridden,Overrridden তবে এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
 DocType: Purchase Invoice,Advances,উন্নতির
 DocType: Production Order,Manufacture against Material Request,উপাদান অনুরোধ বিরুদ্ধে তৈয়ার
@@ -1884,6 +1933,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,সন্তানের নোড আছে
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
+DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","যেমন ব্যাংক, ক্যাশ, ক্রেডিট কার্ড"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন&gt; বর্তমান সম্পদ&gt; ব্যাংক অ্যাকাউন্টে যান এবং (শিশু ধরনের যোগ) উপর ক্লিক করে একটি নতুন অ্যাকাউন্ট তৈরি করুন &quot;ব্যাংক&quot;
 DocType: Journal Entry,Credit Note,ক্রেডিট নোট
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},সমাপ্ত Qty বেশী হতে পারে না {0} অপারেশন জন্য {1}
 DocType: Features Setup,Quality,গুণ
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,আমার ঠিকানা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,সংস্থার শাখা মাস্টার.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,ডিফল্ট ক্রয় মূল্য তালিকা
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,উপরে নির্বাচিত মানদণ্ডের বা বেতন স্লিপ জন্য কোন কর্মচারী ইতিমধ্যে তৈরি
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/config/hr.py +93,Payroll,বেতনের
 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} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,কেনার রসিদ চলছে
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,কাস্টমাইজ ফরম
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,কী দায়িত্ব ফোন
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
 DocType: Purchase Invoice,Taxes and Charges Deducted,কর ও শুল্ক বাদ
-apps/erpnext/erpnext/config/support.py +7,Issues,সমস্যা
+apps/erpnext/erpnext/hooks.py +90,Issues,সমস্যা
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},স্থিতি এক হতে হবে {0}
 DocType: Sales Invoice,Debit To,ডেবিট
 DocType: Delivery Note,Required only for sample item.,শুধুমাত্র নমুনা আইটেমের জন্য প্রয়োজনীয়.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা হয়
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,অতি বৃহদাকার
 ,Profit and Loss Statement,লাভ এবং লোকসান বিবরণী
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,বিনিময় হার অন্য মধ্যে এক মুদ্রা রূপান্তর উল্লেখ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,মোট বকেয়া পরিমাণ
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
 ,Requested,অনুরোধ করা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,কোন মন্তব্য
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,ক্রয় এবং বিক্রয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,পরিসম্পদ আইটেম একটি অ স্টক আইটেমটি হতে হবে
 DocType: Supplier Quotation Item,Material Request No,উপাদানের জন্য অনুরোধ কোন
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,যা গ্রাহকের কারেন্সি হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
@@ -2119,7 +2174,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 DocType: Payment Request,Recipient and Message,প্রাপক এবং পাঠান
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,সরবরাহকারী ঠিকানা নির্বাচন
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,উদ্ধৃতি জন্য অনুরোধ.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;না&quot; এবং &quot;বিক্রয় আইটেম&quot; &quot;শেয়ার আইটেম&quot; যেখানে &quot;হ্যাঁ&quot; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,প্রজেক্ট আরম্ভের তারিখ
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,ডকুমেন্ট কোন বিরুদ্ধে
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,সেলস পার্টনার্স সেকেন্ড.
 DocType: Quality Inspection,Inspection Type,ইন্সপেকশন ধরন
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},দয়া করে নির্বাচন করুন {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,অচিহ্নিত এ্যাটেনডেন্স
@@ -2183,6 +2239,7 @@
 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,বিজ্ঞাপন
+DocType: Asset Category Account,Depreciation Expense Account,অবচয় ব্যায়ের অ্যাকাউন্ট
 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,ব্যয় রাজসাক্ষী
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,নিশ্চিতকৃত
 DocType: Payment Gateway,Gateway,প্রবেশপথ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,গৃহীত ওয়্যারহাউস
 DocType: Bank Reconciliation Detail,Posting Date,পোস্টিং তারিখ
 DocType: Item,Valuation Method,মূল্যনির্ধারণ পদ্ধতি
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} করার জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} করার জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,মার্ক অর্ধদিবস
 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 +410,[Error],[ত্রুটি]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Sales Invoice Item,Customer Warehouse (Optional),গ্রাহক ওয়্যারহাউস (ঐচ্ছিক)
 DocType: Pricing Rule,Discount Percentage,ডিসকাউন্ট শতাংশ
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,পদ বা চুক্তি টেমপ্লেট.
 DocType: Purchase Invoice,Address and Contact,ঠিকানা ও যোগাযোগ
 DocType: Supplier,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Employee,Feedback,প্রতিক্রিয়া
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","আগে বরাদ্দ করা না যাবে ছেড়ে {0}, ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
+DocType: Asset,Expected Value After Useful Life,প্রত্যাশিত মান দরকারী জীবন পর
 DocType: Item,Reorder level based on Warehouse,গুদাম উপর ভিত্তি রেকর্ডার স্তর
 DocType: Activity Cost,Billing Rate,বিলিং রেট
 ,Qty to Deliver,বিতরণ Qty
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা হয়
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,অ্যাসেট {0} দাখিল করতে হবে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,ঠিকানা ও পরিচালনা
-DocType: Pricing Rule,Item Code,পণ্য সংকেত
+DocType: Asset,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,উপাদান অনুরোধ করুন
 DocType: Employee Education,School/University,স্কুল / বিশ্ববিদ্যালয়
 DocType: Payment Request,Reference Details,রেফারেন্স বিস্তারিত
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
 DocType: Sales Invoice Item,Available Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ Qty
 ,Billed Amount,বিলের পরিমাণ
+DocType: Asset,Double Declining Balance,ডাবল পড়ন্ত ব্যালেন্স
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,বন্ধ অর্ডার বাতিল করা যাবে না. বাতিল করার অবারিত করা.
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,আপডেট পান
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
+DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
 ,Stock Projected Qty,স্টক Qty অনুমিত
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,ক্রমিক নং এবং ব্যাচ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,মূল্য বা স্টক
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,মিনিট
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 ,Qty to Receive,জখন Qty
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
 DocType: Global Defaults,Disable In Words,শব্দ অক্ষম
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,নিরাপদ ঋণ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},সম্পদ শ্রেণী {0} বা কোম্পানির অবচয় সম্পর্কিত হিসাব নির্ধারণ করুন {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},সরবরাহকারী পাঠানো ইমেল {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
@@ -2344,7 +2410,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,বার্তা পাঠানো
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,মোট মার্জিন
 DocType: Supplier,Supplier Details,সরবরাহকারী
 DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 DocType: Hub Settings,Publish Items to Hub,হাব আইটেম প্রকাশ
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
 DocType: Payment Gateway Account,Default Payment Request Message,ডিফল্ট পেমেন্ট অনুরোধ পাঠান
 DocType: Item Group,Check this if you want to show in website,আপনি ওয়েবসাইট প্রদর্শন করতে চান তাহলে এই পরীক্ষা
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,ব্যাংকিং ও পেমেন্টস্
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,ব্যাংকিং ও পেমেন্টস্
 ,Welcome to ERPNext,ERPNext স্বাগতম
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ভাউচার বিস্তারিত সংখ্যা
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,উদ্ধৃতি লিড
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,পত্রাদি এবং হলিডে
 DocType: Sales Order,Not Billed,বিল না
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,বিলিং জন্য শ্রেণীবদ্ধ
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
+DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0} সম্পদ ক্রয়ের তারিখ ক্রয় চালান তারিখ সঙ্গে মিলছে না
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,ওয়ারহাউস {0}: কোম্পানি বাধ্যতামূলক
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Account,Payable,প্রদেয়
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),ঋণ গ্রহিতা ({0})
-DocType: Project,Margin,মার্জিন
+DocType: Pricing Rule,Margin,মার্জিন
 DocType: Salary Slip,Arrear Amount,বকেয়া পরিমাণ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,নতুন গ্রাহকরা
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,পুরো লাভ %
@@ -2435,20 +2504,23 @@
 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,আপনি বেতন স্লিপ জমা দেওয়ার সময় প্রতিটি কর্মচারী মেইল বেতন স্লিপ পাঠাতে চান কিনা পরীক্ষা করুন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
 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 +57,Where manufacturing operations are carried.,উত্পাদন অপারেশন কোথায় সম্পন্ন হয়.
 DocType: Stock Entry Detail,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
 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,ন্যূনতম Qty সর্বোচ্চ Qty তার চেয়ে অনেক বেশী হতে পারে না
+DocType: Account,Accumulated Depreciation,সঞ্চিত অবচয়
 DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
 DocType: Payment Request,Email To,ইমেইল
 DocType: Lead,Lead Owner,লিড মালিক
 DocType: Bin,Requested Quantity,অনুরোধ পরিমাণ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
 DocType: Employee,Marital Status,বৈবাহিক অবস্থা
 DocType: Stock Settings,Auto Material Request,অটো উপাদানের জন্য অনুরোধ
 DocType: Time Log,Will be updated when billed.,বিল যখন আপডেট করা হবে.
@@ -2456,11 +2528,12 @@
 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 +115,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 +84,{0}% Delivered,{0}% বিতরণ করা হয়েছে
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,একই সরবরাহকারী একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,অর্ডার আইটেমটি সরবরাহ ক্রয়
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,কোম্পানির নাম কোম্পানি হতে পারে না
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
@@ -2470,13 +2543,14 @@
 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: Payment Request,Payment Details,অর্থ প্রদানের বিবরণ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
+DocType: Asset,Journal Entry for Scrap,স্ক্র্যাপ জন্য জার্নাল এন্ট্রি
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","টাইপ ইমেইল, ফোন, চ্যাট, দর্শন, ইত্যাদি সব যোগাযোগের রেকর্ড"
 DocType: Manufacturer,Manufacturers used in Items,চলছে ব্যবহৃত উৎপাদনকারী
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,কোম্পানি এ সুসম্পন্ন খরচ কেন্দ্র উল্লেখ করুন
 DocType: Purchase Invoice,Terms,শর্তাবলী
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,নতুন তৈরি
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,নতুন তৈরি
 DocType: Buying Settings,Purchase Order Required,আদেশ প্রয়োজন ক্রয়
 ,Item-wise Sales History,আইটেম-জ্ঞানী বিক্রয় ইতিহাস
 DocType: Expense Claim,Total Sanctioned Amount,মোট অনুমোদিত পরিমাণ
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,স্টক লেজার
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},রেট: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,বেতন স্লিপ সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,প্রথমে একটি গ্রুপ নোড নির্বাচন.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,প্রথমে একটি গ্রুপ নোড নির্বাচন.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,কর্মচারী এবং অ্যাটেনডেন্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","গ্রাহক, সরবরাহকারী, বিক্রয় অংশীদার এবং সীসার রেফারেন্স সরান, যেমন আপনার কোম্পানীর ঠিকানা"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} থেকে
 DocType: Task,depends_on,নির্ভর করে
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
 DocType: BOM Replace Tool,BOM Replace Tool,BOM টুল প্রতিস্থাপন
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,দেশ অনুযায়ী ডিফল্ট ঠিকানা টেমপ্লেট
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,পরবর্তী তারিখ পোস্টিং তারিখ অনেক বেশী হতে হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ফরম / আইটেম / {0}) স্টক আউট
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,পরবর্তী তারিখ পোস্টিং তারিখ অনেক বেশী হতে হবে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,চালান পোস্টিং তারিখ
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","উল্লেখ্য: পেমেন্ট কোনো রেফারেন্স বিরুদ্ধে প্রণীত না হয়, তাহলে নিজে জার্নাল এন্ট্রি করতে."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
 ,Stock Ageing,শেয়ার বুড়ো
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
+DocType: Asset Category Account,Fixed Asset Account,পরিসম্পদ অ্যাকাউন্ট
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,অন্তরীণ করা
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,BOM থেকে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,জন্ম অর্ধদিবস ছুটি তারিখ থেকে একই হতে হবে
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,বেতন কাঠামো
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,উদ্ধৃতি
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
 DocType: Sales Invoice Item,Serial No,ক্রমিক নং
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
-DocType: Item,Is Fixed Asset Item,পরিসম্পদ আইটেম
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
 DocType: Purchase Invoice,Print Language,প্রিন্ট ভাষা
 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","আপনি দীর্ঘ মুদ্রণ বিন্যাস আছে, এই বৈশিষ্ট্য প্রতিটি পেজে সব শিরোলেখ এবং পাদলেখ সঙ্গে একাধিক পাতায় ছাপা হবে পাতা বিভক্ত করতে ব্যবহার করা যেতে পারে"
+DocType: Asset,Number of Depreciations,Depreciations সংখ্যা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 DocType: Fiscal Year,Year Name,সাল নাম
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
 DocType: Product Bundle Item,Product Bundle Item,পণ্য সমষ্টি আইটেম
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
 DocType: Payment Reconciliation,Maximum Invoice Amount,সর্বাধিক চালান পরিমাণ
 DocType: Purchase Invoice Item,Image View,চিত্র দেখুন
 apps/erpnext/erpnext/config/selling.py +23,Customers,গ্রাহকদের
+DocType: Asset,Partially Depreciated,আংশিকভাবে মূল্যমান হ্রাস
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,রক্ষণাবেক্ষণ ব্যাবস্থাপক
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,মোট শূন্য হতে পারে না
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'সর্বশেষ অর্ডার থেকে এখন পর্যন্ত হওয়া দিনের সংখ্যা' শূন্য এর চেয়ে বড় বা সমান হতে হবে
-DocType: C-Form,Amended From,সংশোধিত
+DocType: Asset,Amended From,সংশোধিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,সামনে আগাও
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,কোম্পানি &#39;অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির অ্যাকাউন্ট&#39; ক্লিক করুন
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,কার্ট যোগ করুন
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,গ্রুপ দ্বারা
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
 DocType: Production Planning Tool,Get Material Request,উপাদান অনুরোধ করুন
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ঠিকানা খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,ঠিকানা খরচ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,মোট বর্তমান
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,অ্যাকাউন্টিং বিবৃতি
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,অ্যাকাউন্টিং বিবৃতি
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ঘন্টা
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
@@ -2687,15 +2766,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 ইউনিট আদেশ আছে. এবং আপনার ভাতা তারপর আপনি 110 ইউনিট গ্রহণ করার অনুমতি দেওয়া হয় 10% হয়.
 DocType: Pricing Rule,Customer Group,গ্রাহক গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: Item,Website Description,ওয়েবসাইট বর্ণনা
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 ,Sales Register,সেলস নিবন্ধন
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
@@ -2703,12 +2783,13 @@
 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,গ্রাহক গ্রুপ নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,ভাউচার টাইপ বিরুদ্ধে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},ত্রুটি: {0}&gt; {1}
 DocType: Item,Attributes,আরোপ করা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,জানানোর পান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
 DocType: C-Form,C-Form,সি-ফরম
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,মোবাইল নাম্বার
 DocType: Payment Tool,Make Journal Entry,জার্নাল এন্ট্রি করতে
 DocType: Leave Allocation,New Leaves Allocated,নতুন পাতার বরাদ্দ
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,ব্যবসায়িক
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},ত্রুটি: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 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 +52,All Products or Services.,সব পণ্য বা সেবা.
 DocType: Supplier Quotation,Supplier Address,সরবরাহকারী ঠিকানা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty আউট
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
+apps/erpnext/erpnext/config/accounts.py +259,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,অর্থনৈতিক সেবা
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} অ্যাট্রিবিউট জন্য মূল্য পরিসীমা মধ্যে হতে হবে {1} করার {2} এর মধ্যে বাড়তি {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,হস্তান্তর
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,হস্তান্তর
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,মন্তব্য
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচামাল আইটেম কোড
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
 DocType: Features Setup,POS View,পিওএস দেখুন
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,পরবর্তী তারিখ দিবস এবং মাসের দিন পুনরাবৃত্তি সমান হতে হবে
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,পরবর্তী তারিখ দিবস এবং মাসের দিন পুনরাবৃত্তি সমান হতে হবে
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,একটি নির্দিষ্ট করুন
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,উপরে
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,টাইম ইন বিল করা হয়েছে
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),প্রোভিশনাল লাভ / ক্ষতি (ক্রেডিট)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},কোম্পানি এ ডিফল্ট মান {0} সেট করুন {1}
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,মাসিক উপস্থিতি পত্রক
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,পাওয়া কোন রেকর্ড
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+DocType: Asset,Straight Line,সোজা লাইন
+DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
 DocType: Features Setup,Sales Discounts,সেলস রহমান
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,অর্ডার সংখ্যা
 DocType: Item Group,HTML / Banner that will show on the top of product list.,পণ্য তালিকার শীর্ষে প্রদর্শন করবে এইচটিএমএল / ব্যানার.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,শিপিং পরিমাণ নিরূপণ শর্ত নির্দিষ্ট
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,শিশু করো
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,খোলা মূল্য
 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,বিক্রয় কমিশনের
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,বিক্রয় কমিশনের
 DocType: Offer Letter Term,Value / Description,মূল্য / বিবরণ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 ,Customers Not Buying Since Long Time,গ্রাহকদের দীর্ঘ সময় থেকে কেনা হয় না
 DocType: Production Order,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,আমোদ - প্রমোদ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,আমোদ - প্রমোদ খরচ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,ছুটি জন্য অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,আইনি খরচ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,আইনি খরচ
 DocType: Sales Invoice,Posting Time,পোস্টিং সময়
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,টেলিফোন খরচ
 DocType: Sales Partner,Logo,লোগো
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},সিরিয়াল সঙ্গে কোনো আইটেম {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,খোলা বিজ্ঞপ্তি
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,সরাসরি খরচ
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,সরাসরি খরচ
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;নোটিফিকেশন \ ইমেল ঠিকানা&#39; একটি অবৈধ ই-মেইল ঠিকানা
 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,ভ্রমণ খরচ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,আমরা এই আইটেম বিক্রয়
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,সরবরাহকারী আইডি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
 DocType: Journal Entry,Cash Entry,ক্যাশ এণ্ট্রি
 DocType: Sales Partner,Contact Desc,যোগাযোগ নিম্নক্রমে
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","নৈমিত্তিক মত পাতা ধরণ, অসুস্থ ইত্যাদি"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,সকল যোগাযোগ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,সম্পদ সরবরাহকারী {0} ক্রয় চালান থেকে প্রস্তুতকারকের সরবরাহকারী পাইকার সঙ্গে মিলছে না
 DocType: Newsletter,Test Email Id,টেস্ট ইমেইল আইডি
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,কাচামাল প্রধান আইটেম হিসাবে একই হতে পারে না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,বেতন টেমপ্লেট মাস্টার.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,পছন্দের বিলিং ঠিকানা
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা দলের payble অ্যাকাউন্ট কারেন্সি সমান হতে হবে
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,সম্পাদক
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","অক্ষম করেন, ক্ষেত্র কথার মধ্যে &#39;কোনো লেনদেনে দৃশ্যমান হবে না"
@@ -2902,13 +2989,13 @@
 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,ঋণদাতাদের
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,ঋণদাতাদের
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,সারি # {0}: সিরিয়াল কোন বাধ্যতামূলক
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অনুযায়ী ট্যাক্স বিস্তারিত
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Hub Settings,Name Token,নাম টোকেন
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
-DocType: Project,Project Name,প্রকল্পের নাম
+DocType: Request for Quotation 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,আইটেম ব্যাচ আমরা
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,শেয়ার লেনদেন
 DocType: Employee,Internal Work History,অভ্যন্তরীণ কাজের ইতিহাস
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,সঞ্চিত অবচয় পরিমাণ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","কোম্পানি, বাধ্যতামূলক হিসাবে এটা আপনার কোম্পানীর ঠিকানা"
 DocType: Item Attribute,From Range,পরিসর থেকে
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,এটা যেহেতু উপেক্ষা আইটেম {0} একটি স্টক আইটেমটি নয়
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,আরও প্রক্রিয়াকরণের জন্য এই উৎপাদন অর্ডার জমা.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,আরও প্রক্রিয়াকরণের জন্য এই উৎপাদন অর্ডার জমা.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","একটি নির্দিষ্ট লেনদেনে প্রাইসিং নিয়ম প্রযোজ্য না করার জন্য, সমস্ত প্রযোজ্য দামে নিষ্ক্রিয় করা উচিত."
 DocType: Company,Domain,ডোমেইন
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,জবস
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,প্রসবের তারিখ
 DocType: Opportunity,Opportunity Date,সুযোগ তারিখ
 DocType: Purchase Receipt,Return Against Purchase Receipt,কেনার রসিদ বিরুদ্ধে ফিরে
+DocType: Request for Quotation Item,Request for Quotation Item,উদ্ধৃতি আইটেম জন্য অনুরোধ
 DocType: Purchase Order,To Bill,বিল
 DocType: Material Request,% Ordered,% আদেশ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ফুরণ
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. কলাম ফাঁকা রাখা আবশ্যক
 DocType: Accounts Settings,Accounts Settings,সেটিংস অ্যাকাউন্ট
 DocType: Customer,Sales Partner and Commission,বিক্রয় অংশীদার এবং কমিশন
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},কোম্পানি &#39;অ্যাসেট নিষ্পত্তি অ্যাকাউন্ট&#39; নির্ধারণ করুন {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,কালো
 DocType: BOM Explosion Item,BOM Explosion Item,BOM বিস্ফোরণ আইটেম
 DocType: Account,Auditor,নিরীক্ষক
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,অক্ষম
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,দিতে এখানে ক্লিক করুন
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","অ্যাসেট {0}, বাতিল করা যাবে না এটা আগে থেকেই {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,কাস্টমার আইডি
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,মার্ক অনুপস্থিত
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,সময় সময় থেকে তার চেয়ে অনেক বেশী করা আবশ্যক
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,থেকে আইটেম যোগ করুন
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,থেকে আইটেম যোগ করুন
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,টাস্ক আইডি
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",যেমন &quot;এমসি&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,আইটেম জন্য উপস্থিত হতে পারে না শেয়ার {0} থেকে ভিন্নতা আছে
 ,Sales Person-wise Transaction Summary,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,গুনমান ব্যবস্থাপনা
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
 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,কর্মচারী বাহ্যিক কাজের ইতিহাস
@@ -3068,7 +3160,7 @@
 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,পরবর্তী যোগাযোগ
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,সেটআপ গেটওয়ে অ্যাকাউন্ট.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,সেটআপ গেটওয়ে অ্যাকাউন্ট.
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
 ,Cash Flow,নগদ প্রবাহ
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,জেনারেল লেজার অনুযায়ী ব্যাংক ব্যালেন্সের
 DocType: Job Applicant,Applicant Name,আবেদনকারীর নাম
 DocType: Authorization Rule,Customer / Item Name,গ্রাহক / আইটেম নাম
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,পরিসীমা থেকে / উল্লেখ করুন
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,লেনদেন বিক্রয় জন্য ডিফল্ট সেটিংস.
 DocType: BOM Replace Tool,Current BOM,বর্তমান BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,সিরিয়াল কোন যোগ
 apps/erpnext/erpnext/config/support.py +43,Warranty,পাটা
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,প্রিন্ট ও নিশ্চল
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,গ্রুপ নোড
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,আপডেট সমাপ্ত পণ্য
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,আপডেট সমাপ্ত পণ্য
 DocType: Workstation,per hour,প্রতি ঘণ্টা
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ক্রয়
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,পরিমাণ অর্থ প্রদান করা
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
 DocType: Leave Block List,Applies to Company,প্রতিষ্ঠানের ক্ষেত্রে প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
 DocType: Purchase Invoice,In Words,শব্দসমূহে
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
 DocType: Production Planning Tool,Material Request For Warehouse,গুদাম জন্য উপাদানের জন্য অনুরোধ
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,যোগদান
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
+DocType: Pricing Rule,Margin Rate or Amount,মার্জিন হার বা পরিমাণ
 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,সেলস অর্ডার আইটেমটি
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ইতিমধ্যে গৃহীত হয়েছে
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,সেলস টিম বিবরণ
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},অকার্যকর {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
 DocType: Account,Chargeable,প্রদেয়
 DocType: Company,Change Abbreviation,পরিবর্তন সমাহার
 DocType: Expense Claim Detail,Expense Date,ব্যয় তারিখ
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,জেনারেল লেজার
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,দেখুন বাড়ে
 DocType: Item Attribute Value,Attribute Value,মূল্য গুন
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ইমেইল আইডি ইতিমধ্যে বিদ্যমান নেই, অনন্য হওয়া আবশ্যক {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ইমেইল আইডি ইতিমধ্যে বিদ্যমান নেই, অনন্য হওয়া আবশ্যক {0}"
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 DocType: Features Setup,To get Item Group in details table,বিবরণ টেবিলে আইটেম গ্রুপ পেতে
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {0}
 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>
@@ -3226,23 +3319,23 @@
 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,প্রকল্প জ্ঞানী স্টক ট্র্যাকিং
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(উৎস / লক্ষ্য) প্রকৃত স্টক
 DocType: Item Customer Detail,Ref Code,সুত্র কোড
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,কর্মচারী রেকর্ড.
 DocType: Payment Gateway,Payment Gateway,পেমেন্ট গেটওয়ে
 DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
 apps/erpnext/erpnext/templates/pages/cart.html +22,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,সি-ফরম প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,ওয়ারহাউস বাধ্যতামূলক
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,দ্বারা এই সমস্যাগুলি সমাধান
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,লেনদেনের কারেন্সি পেমেন্ট গেটওয়ে মুদ্রা একক হিসাবে একই হতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,গ্রহণ করা
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,জমা দিন সৃষ্টির উপর
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,আমার আদেশ
@@ -3296,10 +3389,10 @@
 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,পাঠানোর আগে বার্তা লিখতে
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,জামানতবিহীন ঋণ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
 DocType: Maintenance Schedule Detail,Scheduled Date,নির্ধারিত তারিখ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,মোট পরিশোধিত মাসিক
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; এগিয়ে যাওয়ার জন্য দয়া করে নিশ্চিত করুন.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,সরবরাহকারী পার্ট কোন
 DocType: Purchase Invoice,Contact,যোগাযোগ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,থেকে পেয়েছি
 DocType: Features Setup,Exports,রপ্তানি
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,অ্যাকাউন্ট হেড
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,স্টক সম্পদ
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,বেতন Slips নির্মাণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয় তাহলে কেনার, চেক করা আবশ্যক {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,মাস দিন পুনরাবৃত্তি
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,বছর শুরুর তারিখ বা শেষ তারিখ {0} সঙ্গে ওভারল্যাপিং হয়. এড়ানোর জন্য কোম্পানির সেট দয়া
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,নতুন নিউজলেটার
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","একটা উদাহরণ দেই. সিরিজ সেট করা হয় এবং সিরিয়াল কোন লেনদেন উল্লেখ না করা হয়, তাহলে ABCD #####, তারপর স্বয়ংক্রিয় সিরিয়াল নম্বর এই সিরিজের উপর ভিত্তি করে তৈরি করা হবে. আপনি স্পষ্টভাবে সবসময় এই আইটেমটি জন্য সিরিয়াল আমরা উল্লেখ করতে চান তাহলে. এই মানটি ফাঁকা রাখা হয়."
 DocType: Upload Attendance,Upload Attendance,আপলোড এ্যাটেনডেন্স
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,কোম্পানি মাস্টার ডিফল্ট মুদ্রা লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},সাথে ট্যাক্স রুল দ্বন্দ্ব {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,নতুন অ্যাকাউন্ট নাম
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,গ্রাহক সেবা
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,অপরাধ প্রার্থী একটি কাজের.
 DocType: Notification Control,Prompt for Email on Submission of,জমা ইমেইল জন্য অনুরোধ করা
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,সর্বমোট পাতার সময়ের মধ্যে দিনের বেশী হয়
+DocType: Pricing Rule,Percentage,শতকরা হার
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,আইটেম {0} একটি সেলস পেইজ হতে হবে
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,আইটেম {0} একটি সেলস পেইজ হতে হবে
 DocType: Naming Series,Update Series Number,আপডেট সিরিজ সংখ্যা
 DocType: Account,Equity,ন্যায়
 DocType: Sales Order,Printing Details,মুদ্রণ বিস্তারিত
@@ -3431,11 +3527,12 @@
 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,অনুসন্ধান সাব সমাহারগুলি
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; এর) শিশু যোগ করো-তে ক্লিক করে একটি নতুন অ্যাকাউন্ট তৈরি করতে এবং না ট্যাক্স হার উল্লেখ.
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
 DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,সফলভাবে মীমাংসা
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
 DocType: Tax Rule,Validity,বৈধতা
+DocType: Request for Quotation,Supplier Detail,সরবরাহকারী বিস্তারিত
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced পরিমাণ
 DocType: Attendance,Attendance,উপস্থিতি
 apps/erpnext/erpnext/config/projects.py +55,Reports,প্রতিবেদন
 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 +508,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,লেনদেন কেনার জন্য ট্যাক্স টেমপ্লেট.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,লেনদেন কেনার জন্য ট্যাক্স টেমপ্লেট.
 ,Item Prices,আইটেমটি মূল্য
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 DocType: Period Closing Voucher,Period Closing Voucher,সময়কাল সমাপ্তি ভাউচার
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,পরিবর্তন
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
+DocType: Asset Category,Asset Category Name,অ্যাসেট শ্রেণী নাম
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,ব্যাচ
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,সেলস পারসন
 DocType: Sales Invoice,Cold Calling,মৃদু ডাক
 DocType: SMS Parameter,SMS Parameter,এসএমএস পরামিতি
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
 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.,মান উপর ভিত্তি করে লেনদেনের সীমিত করার নিয়ম তৈরি করুন.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,ক্রয় প্রচলিত
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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,গৃহীত পরিমাণ
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,মূল অ্যাকাউন্ট
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,শিক্ষা
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
 DocType: Address,Office,অফিস
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,ব্যাচ পরিসংখ্যা
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
 DocType: Sales Order,Track this Sales Order against any Project,কোন প্রকল্পের বিরুদ্ধে এই বিক্রয় আদেশ ট্র্যাক
+DocType: Sales Invoice Item,Discount and Margin,ছাড় এবং মার্জিন
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,মাসিক বেতন নিবন্ধন
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
@@ -3617,22 +3717,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,অন্তত একটি সারিতে প্রদেয় টাকার পরিমাণ লিখতে অনুগ্রহ
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 DocType: Payment Gateway Account,Payment URL Message,পেমেন্ট ইউআরএল পাঠান
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,সারি {0}: পেমেন্ট পরিমাণ বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,অবৈতনিক মোট
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,টাইম ইন বিলযোগ্য নয়
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
+DocType: Asset,Asset Category,অ্যাসেট শ্রেণী
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,নিজে বিরুদ্ধে ভাউচার লিখুন দয়া করে
 DocType: SMS Settings,Static Parameters,স্ট্যাটিক পরামিতি
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,সরবরাহকারী উপাদান
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,আবগারি চালান
 DocType: Expense Claim,Employees Email Id,এমপ্লয়িজ ইমেইল আইডি
 DocType: Employee Attendance Tool,Marked Attendance,চিহ্নিত এ্যাটেনডেন্স
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,বর্তমান দায়
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,বর্তমান দায়
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,সাংখ্যিক মান
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,লোগো সংযুক্ত
 DocType: Customer,Commission Rate,কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,বৈশ্লেষিক ন্যায়
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,কার্ট খালি হয়
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,মূলধন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,মূলধন
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
 DocType: Payment Gateway Account,Payment Gateway Account,পেমেন্ট গেটওয়ে অ্যাকাউন্টে
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,পেমেন্ট সম্পন্ন করার পর নির্বাচিত পৃষ্ঠাতে ব্যবহারকারী পুনর্নির্দেশ.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
+DocType: Asset,Current Value (After Depreciation),বর্তমান মূল্য (অবচয় পর)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,উপকরণ বিল
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,সুত্র তারিখ
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index ba7d607..19eb160 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljuje
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da setup zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 DocType: Purchase Order,Customer Contact,Kontakt kupca
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Stablo
 DocType: Job Applicant,Job Applicant,Posao podnositelj
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Pokaži otvoren
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Updated uspješno
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show Varijante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Računi stol ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Oznaka
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Novi {0}: {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Novi {0}: {1} #
 ,Sales Partners Commission,Prodaja Partneri komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Skraćeni naziv ne može imati više od 5 znakova
 DocType: Payment Request,Payment Request,Plaćanje Upit
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dozvoljeno za {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Get stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Lijekovi
+DocType: Item,Is Fixed Asset,Fiksni Asset
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G-din
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Svi kontakti
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} je smrznuto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show time Dnevnici
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Status instalacije
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 DocType: BOM Replace Tool,New BOM,Novi BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Unesite tvrtke
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
 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 +217,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 +227,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
 ,Contact Name,Kontakt ime
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 DocType: Payment Tool,Reference No,Poziv na broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,banka unosi
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Obavijest kontrola
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite Stavka Grupa-mudre proračune na ovom području. Također možete uključiti sezonalnost postavljanjem Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite roditelja grupe računa za skladište {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Unesite roditelja grupe računa za skladište {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Učiti
+DocType: Asset,Next Depreciation Date,Sljedeća Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Trošak po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun ne postoji u fakturi {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Menadzeri prodaje - Upravljanje.
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti očistiti
 DocType: Item,Synced With Hub,Pohranjen Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Pogrešna lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jedinice [{1}] (# obrazac / Stavka / {1}) naći u [{2}] (# obrazac / Skladište / {2})
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,posao Profile
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje 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 +381,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri 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 +73,Please select month and year,Molimo odaberite mjesec i godinu
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Order Smatran
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Odaberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete artikala
 DocType: Leave Application,Leave Approver Name,Ostavite Approver Ime
-,Schedule Date,Raspored Datum
+DocType: Depreciation Schedule,Schedule Date,Raspored Datum
 DocType: Packed Item,Packed Item,Dostava Napomena Pakiranje artikla
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivnost troškova postoji za zaposlenog {0} protiv Aktivnost Tip - {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.,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
@@ -348,6 +355,7 @@
 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
+DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Workstation,Working Hours,Radno vrijeme
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
@@ -359,7 +367,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,Razlog za gubljenje
 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}
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Prilike
 DocType: Employee,Single,Singl
 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
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,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 +70,Holiday master.,Majstor za odmor .
-DocType: Material Request Item,Required Date,Potrebna Datum
+DocType: Request for Quotation Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Neplaćeno
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 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 +315,Managing Subcontracting,Upravljanje Subcontracting
+DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupna na web stranici ovih korisnika
 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 +53,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Prirast ne može biti 0
 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 +86,Item {0} is not Purchase Item,Stavka {0} nije Kupnja predmeta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Stavka {0} nije Kupnja predmeta
 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
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,U očekivanju Količina
 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 +126,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 +127,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
@@ -471,13 +481,13 @@
  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 +126,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 +230,Financial / accounting year.,Financijska / obračunska godina .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 DocType: Project Task,Project Task,Projektni zadatak
-,Lead Id,Id potencijalnog kupca
+,Lead Id,Lead id
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Isporučuje se: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Račun se plaća
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Povrat robe
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Plaća komponente.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Majstori
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update Bank Transakcijski Termini
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update Bank Transakcijski Termini
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Molimo prvo unesite Kupovina prijem
 DocType: Buying Settings,Supplier Naming By,Dobavljač nazivanje
 DocType: Activity Type,Default Costing Rate,Uobičajeno Costing Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Raspored održavanja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto promjena u zalihama
 DocType: Employee,Passport Number,Putovnica Broj
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,menadžer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Istu stavku je ušao više puta.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupisanje po ' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Podesite odmora listu za bilo zaposlenih ili Društvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Iznos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Isporučena Iznos
 DocType: Supplier,Fixed Days,Fiksni Dani
 DocType: Quotation Item,Item Balance,stavka Balance
 DocType: Sales Invoice,Packing List,Popis pakiranja
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projektni korisnik
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Operacija Time
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupe do grupe
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Moji projekti
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Račun br
+DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / gubitak računa na Asset Odlaganje
 DocType: Purchase Invoice,Quarterly,Kvartalno
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
 DocType: Sales Order Item,Basic Rate (Company Currency),Osnovna stopa (valuta preduzeća)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Plaćanje Ulaz je već stvorena
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Ukupna naplata ove godine
 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 +529,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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,Tip stabla
@@ -598,7 +611,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Dugotrajna imovina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} ne postoji na zalihama.
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je Poslovna prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
@@ -609,18 +623,18 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/setup_wizard/industry_type.py +25,Energy,energija
-DocType: Opportunity,Opportunity From,Poslovna prilika od
+DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Postoji greška u vašem Adresa Template {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Novi nalog
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Novi nalog
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {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.,Računovodstva unosi može biti pokrenuta protiv lista čvorova. Nisu dozvoljeni stavke protiv Grupe.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -668,17 +682,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Moj Fakture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moj Fakture
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Niti jedan zaposlenik pronađena
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Podrska za Analitiku
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logičke pogreške: morate pronaći preklapanja
 DocType: Item,Website Warehouse,Web stranica galerije
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ocjena mora biti manja od ili jednaka 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C - Form zapisi
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C - Form zapisi
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kupaca i dobavljača
 DocType: Email Digest,Email Digest Settings,E-pošta Postavke
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podrska zahtjeva od strane korisnika
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,Projektovana kolicina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Menadžer
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
 DocType: Item Attribute,Item Attribute Values,Stavka Atributi vrijednosti
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 DocType: Employee,Ms,G-đa
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Majstor valute .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Majstor valute .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Prodaja Partneri i teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} mora biti aktivna
+DocType: Journal Entry,Depreciation Entry,Amortizacija Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Košarica
 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
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -795,34 +812,37 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Kupnja fakture
+DocType: Asset,Purchase Invoice,Kupnja fakture
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
 DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost Odlazni
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum otvaranja i zatvaranja datum bi trebao biti u istoj fiskalnoj godini
 DocType: Lead,Request for Information,Zahtjev za informacije
 DocType: Payment Request,Paid,Plaćen
 DocType: Salary Slip,Total in words,Ukupno je u riječima
-DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
+DocType: Material Request Item,Lead Time Date,Datum i vrijeme Lead-a
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,Obavezan unos. Možda nije kreirana valuta za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Za &#39;proizvoda Bundle&#39; stavki, Magacin, serijski broj i serijski broj smatrat će se iz &#39;Pakiranje List&#39; stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo &#39;Bundle proizvoda&#39; stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u &#39;Pakiranje List&#39; stol."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Za &#39;proizvoda Bundle&#39; stavki, Magacin, serijski broj i serijski broj smatrat će se iz &#39;Pakiranje List&#39; stol. Ako Skladište i serijski broj su isti za sve pakovanje stavke za bilo &#39;Bundle proizvoda&#39; stavku, te vrijednosti mogu se unijeti u glavnom Stavka stola, vrijednosti će se kopirati u &#39;Pakiranje List&#39; stol."
 DocType: Job Opening,Publish on website,Objaviti na web stranici
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Isporuke kupcima.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set iznos uplate = preostali iznos
 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 +672,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Izaberite Stavka za transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Procenat
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Red {0}: Račun {1} je nevažeća, to može biti otkazan / ne postoji. \ Molimo unesite važeću fakture"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 ,Employee Holiday Attendance,Zaposlenik Holiday Posjeta
 DocType: Opportunity,Walk In,Ulaz u
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock unosi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock unosi
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Napraviti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 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 +5,My Cart,Moja košarica
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
 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 +180,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Da li zaista želite da vratite ovaj ukinut imovine?
+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 +80,Leave Allocation Tool,Ostavite raspodjele alat
 DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 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 +547,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Popust
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Time Dnevnici
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Time Dnevnici
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,Tiketi
+DocType: Asset,Scrapped,odbačen
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,regrutacija
 DocType: BOM Operation,Operation,Operacija
 DocType: Lead,Organization Name,Naziv organizacije
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Prodajni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Doktor
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 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
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -923,7 +945,7 @@
 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 +130,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 +131,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 +42,Contribution %,Doprinos%
@@ -932,22 +954,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt Collaboration Poziv
 DocType: Salary Slip,Deductions,Odbici
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ovo Batch Vrijeme Log je naplaćeno.
 DocType: Salary Slip,Leave Without Pay,Ostavite bez plaće
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapaciteta za planiranje Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapaciteta za planiranje Error
 ,Trial Balance for Party,Suđenje Balance za stranke
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Zarada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ništa se zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 stvarnog datuma završetka """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,upravljanje
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
@@ -958,18 +981,18 @@
 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"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Molimo podesite mail ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Molimo podesite mail ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod artikla ne može se mijenjati za serijski broj.
 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/config/buying.py +33,Supplier database.,Šifarnik dobavljača
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Šifarnik dobavljača
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Porez i drugih isplata plaća.
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Odmor
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako smatra za sve grane
 ,Daily Time Log Summary,Dnevni pregled log-a
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nije primjenjiv za fakture: {0}
 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
@@ -996,19 +1020,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
 DocType: Contact,User ID,Korisnički ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Pogledaj Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Isplaćene dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Isplaćene dividende
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Zadržana dobit
 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
@@ -1016,7 +1041,7 @@
 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,Poslovna prilika artikla
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeno Otvaranje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Privremeno Otvaranje
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Računi se plaćaju Sažetak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Zaglavlje konta {0} je kreirano
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelenilo
 DocType: Item,Auto re-order,Autorefiniš reda
 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
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 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
@@ -1063,19 +1088,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Prodavač Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status radnog naloga je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status radnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,za Supplier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Nije našao bilo koji predmet pod nazivom {0}
 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
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Website Stavka Grupe
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
-DocType: Journal Entry,Journal Entry,Časopis Stupanje
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 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
@@ -1095,6 +1121,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljač
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,Ponavljajući Upto
 DocType: Attendance,HR Manager,Šef ljudskih resursa
@@ -1105,6 +1132,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Trenutna vrijednost Nakon amortizacije mora biti manji od jednak {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ako Godišnji budžet prekoračena (za trošak računa)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Datume početka i završetka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Prosječni popust
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značajke konfiguracija
+DocType: Asset,Depreciation Schedules,Amortizacija rasporedi
 DocType: Item,Is Service Item,Je usluga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
 DocType: Item,Will also apply to variants,Primjenjivat će se i na varijanti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,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.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Korpa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odlazni
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevni pregled komunikacije
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
 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 +472,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ne može biti veća od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Porez pravilo za transakcije.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Porez pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Kupili smo ovaj artikal
 DocType: Address,Billing,Naplata
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Očitavanja
 DocType: Stock Entry,Total Additional Costs,Ukupno dodatnih troškova
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,pod skupštine
+DocType: Asset,Asset Name,Asset ime
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Odreskom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,najam ureda
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Odreskom
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke Setup SMS gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahtjev za ponudu može biti pristup klikom sljedeći link
+DocType: Asset,Number of Months in a Period,Broj mjeseci u periodu
 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.,Još nema unijete adrese.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Roditelj troška
 DocType: Sales Invoice,Source,Izvor
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Show zatvoren
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tok iz ulagačkih
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Item Group,Item Group Name,Naziv grupe artikla
 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 +86,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
 DocType: Pricing Rule,For Price List,Za Cjeniku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1269,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Posjeta za odrzavanje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Posjeta za odrzavanje
 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: Landed Cost Voucher,Landed Cost Help,Sleteo Cost Pomoć
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,Šifarnik brendova
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kutija
@@ -1266,7 +1298,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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
+DocType: Address,Lead Name,Ime Lead-a
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,Otvaranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} se mora pojaviti samo jednom
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Potraživanja za tvrtke trošak.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovo pošaljite mail plaćanja
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Ostali izveštaji
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Pogledaj
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Količina ne smije biti više od {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Prethodne finansijske godine nije zatvoren
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Dobavljač Vrsta majstor .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 DocType: Purchase Invoice,Reference Document,referentni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturisana
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto promjena na računima dobavljača
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Molimo vas da provjerite svoj e-mail id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 DocType: Quotation,Term Details,Oročeni Detalji
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet planiranje (Dana)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantni  rok
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni protiv {0} {1} ne može biti veći \ od Grand Ukupno {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Odaberite Šifra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
 DocType: Territory,Territory Manager,Manager teritorije
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (Opcionalno)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Jedna jedinica stavku.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Skladište potrebno na red No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Skladište potrebno na red No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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,Sledeci put kontaktirace ga
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","npr ""XYZ Narodne banke """
+DocType: Asset,Depreciation Method,Način Amortizacija
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 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 +29,Shopping Cart is enabled,Košarica je omogućeno
 DocType: Job Applicant,Applicant for a Job,Kandidat za posao
 DocType: Production Plan Material Request,Production Plan Material Request,Proizvodni plan materijala Upit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nema Radni nalozi stvoreni
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nema Radni nalozi stvoreni
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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,Poslovna prilika iz polja je obavezna
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika iz polja je obavezna
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Regija Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adrese
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,Appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Stavka nije dozvoljeno da ima proizvodni Order.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Stavka nije dozvoljeno da ima proizvodni Order.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
 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: 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 +27,Time Logs for manufacturing.,Dnevnici vremena za proizvodnju.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
+DocType: Request for Quotation Supplier,Send Email to Supplier,Pošalji e-mail dobavljaču
 DocType: SMS Center,Create Receiver List,Kreiraj listu primalaca
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Production Planning Tool,Material Requests,materijal Zahtjevi
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 DocType: Stock Settings,Allowance Percent,Dodatak posto
 DocType: SMS Settings,Message Parameter,Poruka parametra
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree financijskih troškova centara.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree financijskih troškova centara.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Get Predmeti iz otkupa Primici
 DocType: Serial No,Creation Date,Datum stvaranja
@@ -1510,48 +1548,51 @@
 ,Amount to Deliver,Iznose Deliver
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} kreirao
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} kreirao
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Serijski Bez Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tablica ne može biti prazna
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: {1} Za postavljanje periodici, razlika između od i do danas \
  mora biti veći ili jednak {2}"
 DocType: Pricing Rule,Selling,Prodaja
 DocType: Employee,Salary Information,Plaća informacije
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway nalog nije konfiguriran
 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} unosi isplate ne mogu 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: Production Order,Material Request Item,Materijal Zahtjev artikla
+DocType: Request for Quotation Item,Material Request Item,Materijal Zahtjev artikla
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,prodan
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crven
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Izbrisati sve transakcije za ovu kompaniju
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investicije
 DocType: Issue,Resolution Details,Detalji o rjesenju problema
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Atributi Ime
 DocType: Item Group,Show In Website,Pokaži Na web stranice
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,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, Poslovna prilika, Industrijska Zahtjev, tačka, narudžbenica, Kupovina vaučer, Kupac prijem, citat, prodaje fakture, proizvoda Bundle, naloga prodaje, serijski broj"
+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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantogram svih zadataka.
+DocType: Pricing Rule,Margin Type,Margina Tip
 DocType: Appraisal,For Employee Name,Za ime zaposlenika
 DocType: Holiday List,Clear Table,Poništi tabelu
 DocType: Features Setup,Brands,Brendovi
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,Adrese i kontakti kupaca
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset je obavezna protiv osnovnih sredstava Stavka
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za posjećenost preko Setup&gt; numeracije serije
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 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: Asset,Purchase Date,Datum kupovine
 DocType: Employee,Personal Details,Osobni podaci
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo podesite &#39;Asset Amortizacija troškova Center&#39; u kompaniji {0}
 ,Maintenance Schedules,Rasporedi održavanja
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa Non-grupa
 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/public/js/setup_wizard.js +272,Unit,jedinica
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Navedite tvrtke
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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 podrazumijevana Fiskalna godina . Osvježite svoj browserda bi se izmjene primijenile.
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Trošak potraživanja
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM pretraga
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
@@ -1611,42 +1656,43 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,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/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
 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
 DocType: Territory,Classification of Customers by region,Klasifikacija Kupci po regiji
 DocType: Project,% Tasks Completed,% Zavrsenih zadataka
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Izračunato Banka bilans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invaliditetom korisnika
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Ponude
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Održavanje korisnika
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Troškova Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Troškova Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
-DocType: Opportunity,Customer / Lead Address,Kupac / Adresa potencijalnog kupca
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+DocType: Opportunity,Customer / Lead Address,Kupac / Adresa Lead-a
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da setup zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 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/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/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 kampanje. Pratite Poslovne prilike, Ponude, Porudžbenice itd iz Kampanje i 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 kampanje. Pratite Lead-ove, Ponude, Porudžbenice itd iz Kampanje i procijeniti povrat investicije."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
@@ -1654,12 +1700,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Korisnik {0} je onemogućen
@@ -1668,7 +1714,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Količina mora biti 1, kao stavka je vezana za sredstvo"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Molimo vas da uklonite stavku `{0}` i uštedite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Novi trošak
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idite na odgovarajuću grupu (obično Izvor sredstava&gt; Trenutno Obaveze&gt; poreza i doprinosa i stvoriti novi nalog (klikom na Dodaj djece) tipa &quot;poreza&quot; i da li spomenuti stopu poreza.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Quality Inspection,In Process,U procesu
@@ -1695,10 +1741,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
 DocType: Quotation Item,Stock Balance,Kataloški bilanca
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Time logova:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time logova:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Molimo odaberite ispravan račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Molimo navedite zemlju za ovaj Dostava pravilo ili provjeriti dostavom diljem svijeta
 DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,To je potrebno Debit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
 DocType: Offer Letter Term,Offer Term,Ponuda Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 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 +141,Please select Incharge Person's name,Odaberite incharge ime osobe
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
@@ -1730,22 +1777,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Cjenik {0} je onemogućen
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cjenik {0} je onemogućen
 DocType: Manufacturing Settings,Allow Overtime,Omogućiti Prekovremeni rad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za artikal {1}. koji ste trazili {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Rate
 DocType: Item,Customer Item Codes,Customer Stavka Codes
 DocType: Opportunity,Lost Reason,Razlog gubitka
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Kreirajte plaćanja unosi protiv naloga ili faktura.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Kreirajte plaćanja unosi protiv naloga ili faktura.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1754,10 +1801,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nema plaće slip pronađena za mjesec:
 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 +175,Serial No {0} not found,Serial No {0} nije pronađena
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} nije pronađena
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vaši klijenti
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Blok Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Prijavite se sada
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Prijavite se sada
 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 ."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novi radnom mjestu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Postavi status Zatvoreno
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},No Stavka s Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},No Stavka s Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Ako imate prodajnog tima i prodaja partnerima (partneri) mogu biti označene i održavati svoj doprinos u prodajne aktivnosti
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Prijenos materijala
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Stavka {0} mora biti prodaje stavka u {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
 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
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e-mail od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Pozovi kao korisnika
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Molimo podesite {0} u kompaniji {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
@@ -1830,9 +1879,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Misa mailing
 DocType: Rename Tool,File to Rename,File da biste preimenovali
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Plaćanje računa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto promjena u Potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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 planirana kolicina ({2}) u proizvodnoj porudzbini {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirana kolicina ({2}) u proizvodnoj porudzbini {3}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Brzi unos u dnevniku
 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 +206,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nije proslijedjen
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,stvoreni su sljedeći nalozi:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,stvoreni su sljedeći nalozi:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Mail lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
@@ -1886,7 +1935,7 @@
 apps/erpnext/erpnext/config/stock.py +185,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,Poslovna prilika
+DocType: Lead,Opportunity,Prilika (Opportunity)
 DocType: Salary Structure Earning,Salary Structure Earning,Plaća Struktura Zarada
 ,Completed Production Orders,Završeni Radni nalozi
 DocType: Operation,Default Workstation,Uobičajeno Workstation
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} je zatvoren
 DocType: Email Digest,How frequently?,Koliko često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idite na odgovarajuću grupu (obično Primjena sredstava&gt; obrtna sredstva&gt; bankovnih računa i stvoriti novi nalog (klikom na Dodaj djece) tipa &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: Authorization Rule,Applicable To (Role),Odnosi se na (uloga)
 DocType: Stock Entry,Purpose,Svrha
+DocType: Company,Fixed Asset Depreciation Settings,Osnovnih sredstava Amortizacija Postavke
 DocType: Item,Will also apply for variants unless overrridden,Primjenjivat će se i za varijante osim overrridden
 DocType: Purchase Invoice,Advances,Avansi
 DocType: Production Order,Manufacture against Material Request,Proizvodnja protiv Materijal Upit
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1959,12 +2009,14 @@
  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: Purchase Receipt Item,Recd Quantity,RecD Količina
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategorija računa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idite na odgovarajuću grupu (obično Primjena sredstava&gt; obrtna sredstva&gt; bankovnih računa i stvoriti novi nalog (klikom na Dodaj djece) tipa &quot;Banka&quot;
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1973,7 +2025,7 @@
 DocType: Material Request,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 koja je potencijalni kupac
+DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe koja je Lead
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +69,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
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moj Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,Iznad 90
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,No zaposlenih za gore odabrane kriterije ili plate klizanja već stvorio
@@ -2017,7 +2069,7 @@
 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 +200,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 '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,platni spisak
 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"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje Obrasci
 DocType: Account,Income Account,Konto prihoda
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No default Adresa Template pronađeno. Molimo vas da se stvori novi iz Setup&gt; Printing and Branding&gt; Adresa Template.
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Upravljanje vrstama djelatnosti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Novi troška Naziv
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
 DocType: Appraisal,HR User,HR korisnika
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/config/support.py +7,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +90,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra veliki
 ,Profit and Loss Statement,Račun dobiti i gubitka
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
 DocType: C-Form Invoice Detail,Territory,Regija
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
 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 +142,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
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Tražena
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No Napomene
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Osnovnih sredstava Stavka mora biti ne-stock stavka
 DocType: Supplier Quotation Item,Material Request No,Materijal Zahtjev Ne
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2176,7 +2231,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Payment Request,Recipient and Message,Primalac i poruka
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Izaberite dobavljač adresa
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute-mail
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Upit za ponudu.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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: 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 +294,Price List Currency not selected,Cjenik valuta ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Protiv dokumentu nema
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Upravljanje prodajnih partnera.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Odaberite {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Posjeta
@@ -2240,6 +2296,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Troškovi amortizacije računa
 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
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Unesite olakšavanja datum .
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2267,18 +2324,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaja HNB {0} do {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaja HNB {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Prodajni tim
 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 +410,[Error],[Greska]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Greska]
 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/setup_wizard/industry_type.py +55,Venture Capital,Preduzetnički kapital
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (Opcionalno)
 DocType: Pricing Rule,Discount Percentage,Postotak rabata
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
@@ -2304,14 +2362,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
 DocType: GL Entry,Voucher No,Bon Ne
 DocType: Leave Allocation,Leave Allocation,Ostavite Raspodjela
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Predložak termina ili ugovor.
 DocType: Purchase Invoice,Address and Contact,Adresa i kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
+DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost Nakon Korisni Life
 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
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu o isporuci na svim Projektima
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto novčani tok od investicione
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Korijen račun ne može biti izbrisan
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} mora biti dostavljena
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Upravljanje Adrese
-DocType: Pricing Rule,Item Code,Šifra artikla
+DocType: Asset,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 DocType: Journal Entry,User Remark,Upute Zabilješka
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Stvaranje materijalni zahtijevi
 DocType: Employee Education,School/University,Škola / Univerzitet
 DocType: Payment Request,Reference Details,Reference Detalji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 ,Billed Amount,Naplaćeni iznos
+DocType: Asset,Double Declining Balance,Double degresivne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena kako se ne može otkazati. Otvarati da otkaže.
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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"""
+DocType: Asset,Fully Depreciated,potpuno je oslabio
 ,Stock Projected Qty,Projektovana kolicina na zalihama
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Posjećenost HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serijski broj i Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Prodavač na malo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Onemogućena u Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Raspored održavanja stavki
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank Prekoračenje računa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo podesite Računi se odnose amortizacije u Asset Kategorija {0} ili kompanije {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Početno stanje Equity
 DocType: Appraisal,Appraisal,Procjena
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail poslati na dobavljač {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 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 +187,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
@@ -2401,7 +2467,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,Bulk Uvoz Pomoć
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Odaberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odjavili od ovog mail Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poruka je poslana
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Ukupno margina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavite Stavke za Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vrsta djelatnosti Kupaca / Kupci
 DocType: Payment Gateway Account,Default Payment Request Message,Uobičajeno plaćanje poruka zahtjeva
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite pokazati u web
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bankarstvo i platni promet
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankarstvo i platni promet
 ,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,Potencijalni kupac do ponude
@@ -2450,17 +2517,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupni troskovi ( iz Time Log-a)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projektovan
 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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 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/config/hr.py +55,Leaves and Holiday,Lišće i privatnom
 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/stock/doctype/warehouse/warehouse.py +115,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.,Još nema ni jednog unijetog kontakta.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Sleteo Cost vaučera Iznos
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
@@ -2476,15 +2543,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Amortizacija troškova Center
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Datum kupovine imovine {0} ne odgovara datum fakture o kupovini
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 ,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}
 DocType: Journal Entry,Stock Entry,Kataloški Stupanje
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dužnici ({0})
-DocType: Project,Margin,Marža
+DocType: Pricing Rule,Margin,Marža
 DocType: Salary Slip,Arrear Amount,Iznos unatrag
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi Kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobit%
@@ -2492,20 +2561,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
 DocType: Newsletter,Newsletter List,Newsletter Lista
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Provjerite ako želite poslati plaće slip u pošti svakom zaposleniku, dok podnošenje plaće slip"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
 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 +57,Where manufacturing operations are carried.,Gdje se obavljaju proizvodne operacije.
 DocType: Stock Entry Detail,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
 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: Account,Accumulated Depreciation,Akumuliranu amortizaciju
 DocType: Stock Entry,Customer or Supplier Details,Detalji o Kupcu ili Dobavljacu
 DocType: Payment Request,Email To,E-mail Da
-DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
+DocType: Lead,Lead Owner,Vlasnik Lead-a
 DocType: Bin,Requested Quantity,Tražena količina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Je potrebno skladište
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Isporučeno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Istog dobavljača je ušao više puta
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2527,13 +2600,14 @@
 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.
 DocType: Payment Request,Payment Details,Detalji plaćanja
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Journal Entry za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Snimak svih komunikacija tipa e-mail, telefon, chat, itd"
 DocType: Manufacturer,Manufacturers used in Items,Proizvođači se koriste u Predmeti
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Stvori novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Stopa: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Odaberite grupu čvora prvi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Odaberite grupu čvora prvi.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenih i posjećenost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Svrha mora biti jedan od {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Uklonite referencu kupaca, dobavljača, prodaje partnera i olova, kao što je vaša kompanija adresa"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} Od
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od Datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Pokaži porez break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# obrazac / Stavka / {0}) je out of stock
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od Datum knjiženja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun Datum knjiženja
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za artikal {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
 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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2612,7 +2687,7 @@
 DocType: Purchase Order,Customer Contact Email,Email kontakta kupca
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
@@ -2623,7 +2698,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
@@ -2632,11 +2707,12 @@
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
+DocType: Asset Category Account,Fixed Asset Account,Osnovnih sredstava računa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
@@ -2644,7 +2720,7 @@
 DocType: Stock Entry,From BOM,Iz BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
@@ -2652,17 +2728,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Tiketi - materijal
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Serijski br
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
-DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 DocType: Purchase Invoice,Print Language,print Jezik
 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"
+DocType: Asset,Number of Depreciations,Broj Amortizacija
 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
@@ -2670,13 +2746,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Zahtjev za ponudu
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalni iznos fakture
 DocType: Purchase Invoice Item,Image View,Prikaz slike
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
+DocType: Asset,Partially Depreciated,Djelomično oslabio
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2692,13 +2770,13 @@
 DocType: Quotation,Maintenance Manager,Održavanje Manager
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,' Dana od poslednje porudzbine ' mora biti veći ili jednak nuli
-DocType: C-Form,Amended From,Izmijenjena Od
+DocType: Asset,Amended From,Izmijenjena Od
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2711,21 +2789,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Molimo vas da spomenuti &#39;dobitak / gubitak računa na Asset Odlaganje&#39; poduzeća
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Meč plaćanja fakture
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Meč plaćanja fakture
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Omogućiti / onemogućiti valute .
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 DocType: Production Planning Tool,Get Material Request,Get materijala Upit
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati granicu za prekoracenje
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati granicu za prekoracenje
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Ukupno Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,knjigovodstvene isprave
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,knjigovodstvene isprave
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2745,15 +2824,16 @@
 DocType: C-Form,Invoices,Fakture
 DocType: Job Opening,Job Title,Titula
 DocType: Features Setup,Item Groups in Details,Grupe artikala u detaljima
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 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 +32,Visit report for maintenance call.,Posjetite izvješće za održavanje razgovora.
 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,Vrsta djelatnosti Kupaca
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,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 +171,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Web stranica Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto promjena u kapitalu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
@@ -2761,12 +2841,13 @@
 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
 DocType: Customer Group,Customer Group Name,Naziv vrste djelatnosti Kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Greška: {0}&gt; {1}
 DocType: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Datum
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
 DocType: C-Form,C-Form,C-Form
@@ -2778,18 +2859,18 @@
 DocType: Purchase Invoice,Mobile No,Br. mobilnog telefona
 DocType: Payment Tool,Make Journal Entry,Make Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projekat - mudar podaci nisu dostupni za ponudu
+apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Projekat - 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/setup_wizard/setup_wizard.py +343,Commercial,trgovački
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Greška: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Svi proizvodi i usluge.
 DocType: Supplier Quotation,Supplier Address,Dobavljač Adresa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2800,10 +2881,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
 DocType: Tax Rule,Billing State,State billing
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Prijenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
@@ -2823,20 +2904,22 @@
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Pošalji dobavljač Email
 DocType: Features Setup,POS View,POS Pogledaj
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Prijavite se Fakturisana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Setup&gt; Postavke&gt; Imenovanje serije
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Molimo postavite default vrijednost {0} {1} u Društvo
@@ -2846,12 +2929,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za posjećenost preko Setup&gt; numeracije serije
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+DocType: Asset,Straight Line,Duž
+DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena za otvoreni unos
 DocType: Features Setup,Sales Discounts,Prodajni popusti
@@ -2865,39 +2949,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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: 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 +117,Add Child,Dodaj podređenu stavku
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,otvaranje vrijednost
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 ,Customers Not Buying Since Long Time,Kupci koji ne kupuju dugo vremena
 DocType: Production Order,Expected Delivery Date,Očekivani rok isporuke
 apps/erpnext/erpnext/accounts/general_ledger.py +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Troškovi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Prijave za odsustvo.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Pravni troškovi
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Sales Order,% Amount Billed,% Naplaćenog iznosa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonski troškovi
 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.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},No Stavka s rednim brojem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Stavka s rednim brojem {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorena obavjestenja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direktni troškovi
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Direktni troškovi
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} je nevažeća e-mail adresu u &quot;Obavijest \ E-mail adresa &#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
@@ -2914,7 +2999,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupna naplata (iz Time Log-a)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Prodajemo ovaj artikal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavljač Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Količina bi trebao biti veći od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Količina bi trebao biti veći od 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
@@ -2925,11 +3010,12 @@
 DocType: Production Order,Total Operating Cost,Ukupni trošak
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dobavljač aktive {0} ne odgovara dobavljača u fakture o kupovini
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plaća predložak majstor .
@@ -2945,12 +3031,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran 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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Billing valuta mora biti jednaka valuti ili default comapany ili račun valuti payble stranke
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretarica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite, &#39;riječima&#39; polju neće biti vidljivi u bilo koju transakciju"
@@ -2960,13 +3047,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ovo Batch Vrijeme Log je otkazan.
 ,Reqd By Date,Reqd Po datumu
 DocType: Salary Slip Earning,Salary Slip Earning,Plaća proklizavanja Zarada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditori
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Serial No je obavezno
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2984,18 +3071,17 @@
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","u minutama 
  ažurirano preko 'Time Log'"
-DocType: Customer,From Lead,Od Potencijalnog kupca
+DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
-DocType: Project,Project Name,Naziv projekta
+DocType: Request for Quotation Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije artikla
@@ -3025,6 +3111,7 @@
 DocType: Sales Invoice,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transakcije
 DocType: Employee,Internal Work History,Interni History Work
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Ispravka vrijednosti iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Ocjena Kupca
 DocType: Account,Expense,rashod
@@ -3032,7 +3119,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Kompanija je obavezno, kao što je vaša kompanija adresa"
 DocType: Item Attribute,From Range,Od Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Artikal {0} se ignorira budući da nije skladišni artikal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
 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.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Company,Domain,Domena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Posao
@@ -3044,6 +3131,7 @@
 DocType: Time Log,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3060,6 +3148,7 @@
 DocType: Sales Order,Delivery Date,Datum isporuke
 DocType: Opportunity,Opportunity Date,Datum prilike
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vratiti protiv Kupovina prijem
+DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za ponudu artikla
 DocType: Purchase Order,To Bill,To Bill
 DocType: Material Request,% Ordered,% Poruceno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,rad plaćen na akord
@@ -3074,11 +3163,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Podešavanja konta
 DocType: Customer,Sales Partner and Commission,Prodajnog partnera i Komisije
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Molimo podesite &#39;Asset Odlaganje računa&#39; u kompaniji {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Postrojenja i strojevi
 DocType: Sales Partner,Partner's Website,Web stranica partnera
 DocType: Opportunity,To Discuss,Za diskusiju
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Privremeni računi
 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
@@ -3087,21 +3177,22 @@
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,Na čekanju
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klinite ovdje za placanje
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne može biti ukinuta, jer je već {1}"
 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,Id Kupca
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsutan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Dodaj stavke iz
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladište {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3116,6 +3207,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Stavka {0} je onemogućena
 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
@@ -3127,7 +3219,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Podešavanje Gateway račune.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Podešavanje Gateway račune.
 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
 ,Cash Flow,Priliv novca
@@ -3141,7 +3233,7 @@
 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,Novo {0} Ime
-apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},U prilogu {0} {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},U prilogu {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -3157,19 +3249,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Molimo navedite iz / u rasponu
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/support.py +43,Warranty,garancija
 DocType: Production Order,Warehouses,Skladišta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Update gotovih proizvoda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 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 ."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menadzer projekata
@@ -3199,7 +3290,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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."
 DocType: Leave Block List,Applies to Company,Odnosi se na preduzeće
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
 DocType: Purchase Invoice,In Words,Riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Danas je {0} 's rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Materijal Zahtjev za galeriju
@@ -3212,9 +3303,11 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,pristupiti
 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 +564,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
+DocType: Pricing Rule,Margin Rate or Amount,Margina Rate ili iznos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' Do datuma ' je obavezno
 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
@@ -3224,22 +3317,21 @@
 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 +782,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
 ,Requested Items To Be Transferred,Traženi stavki za prijenos
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne mogućnosti za prodaju.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Setup&gt; Postavke&gt; Imenovanje serije
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
@@ -3257,14 +3349,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Svrha posjete za odrzavanje
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Period
-,General Ledger,Glavna knjiga
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Glavna knjiga
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj potencijalne kupce
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {0}
 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>
@@ -3296,23 +3389,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
 ,Project wise Stock Tracking,Supervizor pracenje zaliha
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarna kol (na izvoru/cilju)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaposlenih evidencija.
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,Postavke plaće
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite Marka ...
 DocType: Sales Invoice,C-Form Applicable,C-obrascu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3330,7 +3423,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transakcija valuta mora biti isti kao i Payment Gateway valutu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Zavrsen
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
@@ -3338,14 +3431,14 @@
 DocType: Purchase Invoice,Submit on creation,Dostavi na stvaranju
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Moje narudžbe
@@ -3366,10 +3459,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-prodaju profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Maintenance Schedule Detail,Scheduled Date,Planski datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Ukupno Paid Amt
@@ -3381,11 +3474,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Dobavljač dio br
 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
@@ -3394,12 +3488,12 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Od {0} {1} za
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz Datum računa
@@ -3408,7 +3502,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +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
@@ -3421,7 +3515,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3435,15 +3529,15 @@
 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 +576,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
 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: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3463,8 +3557,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,datum početka godine ili datum završetka je preklapaju sa {0}. Da bi se izbjegla molimo vas da postavite kompanija
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novi Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 DocType: 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.","Primjer:. ABCD ##### 
  Ako serije je postavljen i serijski broj se ne spominje u transakcijama, a zatim automatski serijski broj će biti kreiran na osnovu ove serije. Ako želite uvijek izričito spomenuti Serial Nos za ovu stavku. ovo ostavite prazno."
@@ -3476,11 +3571,11 @@
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-pošte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Kataloški Stupanje Detalj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dnevni podsjetnik
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Naziv novog naloga
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Naziv novog naloga
 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/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
@@ -3490,11 +3585,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,postotak
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3502,11 +3598,12 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 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 +385,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Partner Tip
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idite na odgovarajuću grupu (obično Izvor sredstava&gt; Trenutno Obaveze&gt; poreza i doprinosa i stvoriti novi nalog (klikom na Dodaj djece) tipa &quot;poreza&quot; i da li spomenuti stopu poreza.
 DocType: Production Order,Production Order,Proizvodnja Red
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
@@ -3525,18 +3622,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvi put odgovorio dana
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani Završni datum
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Punovažnost
+DocType: Request for Quotation,Supplier Detail,dobavljač Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturisanog
 DocType: Attendance,Attendance,Pohađanje
 apps/erpnext/erpnext/config/projects.py +55,Reports,Izvještaji
 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 +508,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,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
@@ -3546,10 +3644,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Obavestenje putem E-mail adrese' nije specificirano za ponavljajuce% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Obavestenje putem E-mail adrese' nije specificirano za ponavljajuce% s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativni troškovi
 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 +455,Change,Promjena
@@ -3557,6 +3655,7 @@
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Ime kategorije
 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
@@ -3568,13 +3667,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Serija
@@ -3588,7 +3687,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Referent prodaje
 DocType: Sales Invoice,Cold Calling,Hladno pozivanje
 DocType: SMS Parameter,SMS Parameter,SMS parametar
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budžet i troškova Center
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budžet i troškova Center
 DocType: Maintenance Schedule Item,Half Yearly,Polu godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Stvaranje pravila za ograničavanje prometa na temelju vrijednosti .
@@ -3619,9 +3718,9 @@
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite 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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3629,7 +3728,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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 dodano
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0} pretplatnika dodano
 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;"
 DocType: Account,Parent Account,Roditelj račun
@@ -3645,7 +3744,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
 DocType: Address,Office,Ured
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
@@ -3660,6 +3759,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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 porudzbinu na svim Projektima
+DocType: Sales Invoice Item,Discount and Margin,Popust i Margin
 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: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
@@ -3680,7 +3780,7 @@
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
@@ -3688,22 +3788,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Plaćanje URL Poruka
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Ukupno Neplaćeno
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Vrijeme Log nije naplatnih
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
+DocType: Asset,Asset Category,Asset Kategorija
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Akcizama Račun
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Označena Posjeta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kratkoročne obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kratkoročne obveze
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Stvarni Qty je obavezno
@@ -3724,17 +3825,16 @@
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Priložiti logo
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analitika
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No default Adresa Template pronađeno. Molimo vas da se stvori novi iz Setup&gt; Printing and Branding&gt; Adresa Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapitala
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway računa
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka uplate preusmjeriti korisnika na odabrani stranicu.
@@ -3743,20 +3843,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
+DocType: Asset,Current Value (After Depreciation),Trenutna vrijednost (nakon amortizacije)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,Project master.,Direktor Projekata
 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 +409, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref: Datum
@@ -3764,6 +3865,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Konto {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index c1c084b..3dfdbd3 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Llogat
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
 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ó.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració de sistema de noms dels empleats en Recursos Humans&gt; Configuració de recursos humans
 DocType: Purchase Order,Customer Contact,Client Contacte
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Mostra oberts
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sèrie actualitzat correctament
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Nova aplicació Deixar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostra variants
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Quantitat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Designació
@@ -64,7 +66,7 @@
 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 +642,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nova {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissió dels revenedors
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
 DocType: Payment Request,Payment Request,Sol·licitud de Pagament
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Casat
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No està permès per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Cost total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registre d'activitat:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,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/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
+DocType: Item,Is Fixed Asset,És actiu fix
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Tots els contactes
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} és congelada
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Despeses d'estoc
 DocType: Newsletter,Email Sent?,Email Sent?
 DocType: Journal Entry,Contra Entry,Entrada Contra
 DocType: Production Order Operation,Show Time Logs,Mostrar Registres Temps
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,L'Article {0} ha de ser un article de compra
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: BOM Replace Tool,New BOM,Nova llista de materials
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Si us plau entra l'Empresa
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Efectiu net de Finançament
 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 +217,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Newsletter List,Total Subscribers,Els subscriptors totals
 ,Contact Name,Nom de Contacte
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,entrades bancàries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Control de Notificació
 DocType: Lead,Suggestions,Suggeriments
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Pressupostos Set-Group savi article sobre aquest territori. També pot incloure l'estacionalitat mitjançant l'establiment de la Distribució.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Si us plau ingressi grup de comptes dels pares per al magatzem {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Si us plau ingressi grup de comptes dels pares per al magatzem {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Aprendre
+DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Proveïdor de factura no existeix en la factura de la compra {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Organigrama de vendes
 DocType: Job Applicant,Cover Letter,carta de presentació
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Xecs pendents i Dipòsits per aclarir
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unitats de [{1}] (# Formulari / article / {1}) que es troba en [{2}] (# Formulari / Magatzem / {2})
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuració d&#39;Impostos
 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 +381,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Selecciona el mes i l'any
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat per Empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Article de qualitat de paràmetres d'Inspecció
 DocType: Leave Application,Leave Approver Name,Nom de l'aprovador d'absències
-,Schedule Date,Horari Data
+DocType: Depreciation Schedule,Schedule Date,Horari Data
 DocType: Packed Item,Packed Item,Article amb embalatge
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Ajustos predeterminats per a transaccions de compra.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustos predeterminats per a transaccions de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Hi Cost Activitat d&#39;Empleat {0} contra el Tipus d&#39;Activitat - {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.,"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
@@ -348,6 +355,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
 DocType: Workstation,Working Hours,Hores de Treball
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
-DocType: Material Request Item,Required Date,Data Requerit
+DocType: Request for Quotation Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Missatge per als Proveïdors
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
 DocType: Employee,Health Concerns,Problemes de Salut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No pagat
@@ -418,17 +427,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,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
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 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 +315,Managing Subcontracting,Subcontractació Gestió
+DocType: Project,Project will be accessible on the website to these users,Projecte serà accessible a la pàgina web a aquests usuaris
 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 +53,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Increment no pot ser 0
 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 +86,Item {0} is not Purchase Item,Article {0} no és article de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Article {0} no és article de Compra
 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
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 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 +126,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 +127,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
@@ -471,13 +481,13 @@
  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 +126,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 +230,Financial / accounting year.,Exercici comptabilitat /.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Els valors acumulats
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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ó
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Lliurat: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Compte per Pagar
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunt currículum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Devolucions de vendes
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Components salarials.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Màsters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,temps de seguiment
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Si us plau primer entra el rebut de compra
 DocType: Buying Settings,Supplier Naming By,NOmenament de proveïdors per
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Programa de manteniment
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Canvi net en l&#39;Inventari
 DocType: Employee,Passport Number,Nombre de Passaport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Si us plau, estableix una llista de festa per l&#39;empleat o per la Companyia"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,import de l&#39;amortització
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Quantitat lliurada
 DocType: Supplier,Fixed Days,Dies Fixos
 DocType: Quotation Item,Item Balance,concepte Saldo
 DocType: Sales Invoice,Packing List,Llista De Embalatge
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Ordres de compra donades a Proveïdors.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordres de compra donades a Proveïdors.
 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
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Temps de funcionament
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grup de Grup
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Els meus projectes
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
 DocType: Journal Entry,Bill No,Factura Número
+DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
 DocType: Sales Order Item,Basic Rate (Company Currency),Tarifa Bàsica (En la divisa de la companyia)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Ja està creat Entrada Pagament
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,La facturació total d&#39;aquest any
 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 +529,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
 DocType: Item Group,Website Specifications,Especificacions del lloc web
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Hi ha un error en la seva plantilla de direcció {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nou Compte
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nou Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {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.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -668,17 +682,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Despeses de manteniment d'oficines
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Llista de preus no seleccionat
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Els meus Factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Els meus Factures
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Supplier Quotation,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Puja saldo d'existències a través csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara
 ,Support Analytics,Suport Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Error lògic: ha de trobar solapament
 DocType: Item,Website Warehouse,Lloc Web del magatzem
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 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 +267,C-Form records,Registres C-Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Registres C-Form
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Clients i Proveïdors
 DocType: Email Digest,Email Digest Settings,Ajustos del processador d'emails
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultes de suport de clients.
@@ -722,7 +738,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Es subcontracta
 DocType: Item Attribute,Item Attribute Values,Element Valors d'atributs
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Veure Subscriptors
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
 DocType: Employee,Ms,Sra
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Tipus de canvi principal.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Tipus de canvi principal.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Punts de venda i Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} ha d'estar activa
+DocType: Journal Entry,Depreciation Entry,Entrada depreciació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Anar a la cistella
 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
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -795,10 +812,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
+DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Número de detall del comprovant
 DocType: Stock Entry,Total Outgoing Value,Valor Total sortint
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d&#39;obertura ha de ser dins el mateix any fiscal
@@ -808,21 +825,24 @@
 DocType: Material Request Item,Lead Time Date,Termini d'execució Data
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
 DocType: Job Opening,Publish on website,Publicar al lloc web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Enviaments a clients.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Ingressos Indirectes
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pagament = Suma Pendent
 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 +672,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Seleccionar element de Transferència
 DocType: Purchase Invoice,Additional Discount Percentage,Percentatge de descompte addicional
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Fila {0}: {1} factura no és vàlida, podria ser cancel·lat / no existeix. \ Introduïu una factura vàlida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
 ,Employee Holiday Attendance,Empleat d&#39;Assistència de vacances
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entrades d&#39;arxiu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Entrades d&#39;arxiu
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferit
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Fer
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 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 +5,My Cart,Carro de la compra
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 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 +180,Qty for {0},Quantitat de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
+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 +80,Leave Allocation Tool,Deixa Eina d'Assignació
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 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 +547,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Descompte
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Rebut de compra d'articles
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Quantitat de Venda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Registres de temps
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Registres de temps
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,rebutjat
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,reclutament
 DocType: BOM Operation,Operation,Operació
 DocType: Lead,Organization Name,Nom de l'organització
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Despeses de venda
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Compra Standard
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Per {0} | {1} {2}
 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
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Moneda per defecte
 DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -923,7 +945,7 @@
 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 +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}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Contribució%
@@ -932,22 +954,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
 DocType: Salary Slip,Deductions,Deduccions
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Aquest registre de temps ha estat facturat.
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Planificació de la capacitat d&#39;error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Planificació de la capacitat d&#39;error
 ,Trial Balance for Party,Balanç de comprovació per a la festa
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Guanys
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Res per sol·licitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Administració
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Tipus d'activitats per a les fitxes de Temps
@@ -958,18 +981,18 @@
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Si us plau ajust ID de correu electrònic
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Si us plau ajust ID de correu electrònic
 DocType: Item,UOMs,UOMS
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
 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/config/buying.py +33,Supplier database.,Base de dades de proveïdors.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Impostos i altres deduccions salarials.
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Festiu
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma no és aplicable per a la factura: {0}
 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
@@ -996,19 +1020,20 @@
 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"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
 DocType: Contact,User ID,ID d'usuari
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Veure Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Veure Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividends pagats
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividends pagats
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Comptabilitat principal
 DocType: Stock Reconciliation,Difference Amount,Diferència Monto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Guanys Retingudes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Guanys Retingudes
 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
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Obertura Temporal
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Comptes per Pagar Resum
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Compte cap {0} creat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verd
 DocType: Item,Auto re-order,Acte reordenar
 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
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 apps/erpnext/erpnext/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
@@ -1063,19 +1088,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Venedor Lloc Web
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Estat de l'ordre de producció és {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Estat de l'ordre de producció és {0}
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},No s&#39;ha trobat cap element anomenat {0}
 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ó
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Grups d'article del Web
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
 apps/erpnext/erpnext/stock/utils.py +166,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: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 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
@@ -1095,6 +1121,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sol·licitud de Cotització Proveïdor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
 DocType: Sales Order,Recurring Upto,Fins que es repeteix
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Plantilla Appraisal
 DocType: Salary Slip,Earning,Guany
 DocType: Payment Tool,Party Account Currency,Compte Partit moneda
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valor actual després de la depreciació ha de ser inferior a igual a {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Afegir o Deduir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si el pressupost anual excedit (per compte de despeses)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Les dates d&#39;inici i fi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Descompte Mig
 DocType: Address,Utilities,Utilitats
 DocType: Purchase Invoice Item,Accounting,Comptabilitat
 DocType: Features Setup,Features Setup,Característiques del programa d'instal·lació
+DocType: Asset,Depreciation Schedules,programes de depreciació
 DocType: Item,Is Service Item,És un servei
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,moneda de la transacció
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Des {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Des {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descripció de la operació
 DocType: Item,Will also apply to variants,També s'aplicarà a les variants
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No es poden canviar les dates de l'any finscal (inici i fi) una vegada ha estat desat
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No es poden canviar les dates de l'any finscal (inici i fi) una vegada ha estat desat
 DocType: Quotation,Shopping Cart,Carro De La Compra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Mitjana diària sortint
 DocType: Pricing Rule,Campaign,Campanya
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Canvi net en actius fixos
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 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 +472,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Regla fiscal per a les transaccions.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Comprem aquest article
 DocType: Address,Billing,Facturació
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assemblies
+DocType: Asset,Asset Name,Nom d&#39;actius
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Supplier,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Llista de presència
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,lloguer de l'oficina
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Llista de presència
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Sol·licitud de pressupost es pot accedir fent clic a següent enllaç
+DocType: Asset,Number of Months in a Period,Nombre de mesos en un període
 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
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Variants de l&#39;article
 DocType: Company,Services,Serveis
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Mostra tancada
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No hi ha registres a la taula de Pagaments
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux d&#39;efectiu d&#39;inversió
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
 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 +86,Transfer Materials for Manufacture,Materials de transferència per Fabricació
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1269,7 @@
 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/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."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Manteniment Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Manteniment Visita
 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: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,Mestre Marca.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Caixa
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Les reclamacions per compte de l'empresa.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Liabilities
 DocType: Purchase Receipt,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,altres informes
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Veure
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Canvi Net en Efectiu
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Exercici anterior no està tancada
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Taula mestre de tipus de proveïdor
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
 DocType: Purchase Invoice,Reference Document,Document de referència
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Anunciat
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Canvi net en comptes per pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Verifiqui si us plau el seu correu electrònic d&#39;identificació
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client requereix per a 'Descompte Customerwise'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
 DocType: Quotation,Term Details,Detalls termini
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Reclamació de la Garantia
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Adreça Permanent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avançament pagat contra {0} {1} no pot ser major \ de Gran Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Seleccioneu el codi de l'article
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Seleccioneu el codi de l'article
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduir Deducció per absències sense sou (LWP)
 DocType: Territory,Territory Manager,Gerent de Territory
 DocType: Packed Item,To Warehouse (Optional),Per magatzems (Opcional)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Unitat individual d'un article
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Compra import brut
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
+DocType: Asset,Depreciation Method,Mètode de depreciació
 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/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 +29,Shopping Cart is enabled,Cistella de la compra està habilitat
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
 DocType: Production Plan Material Request,Production Plan Material Request,Producció Sol·licitud Pla de materials
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,No hi ha ordres de fabricació creades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No hi ha ordres de fabricació creades
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
 DocType: Territory,Territory Name,Nom del Territori
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Direccions
+apps/erpnext/erpnext/hooks.py +91,Addresses,Direccions
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,taxacions
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,L&#39;article no se li permet tenir ordre de producció.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,L&#39;article no se li permet tenir ordre de producció.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
 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: 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 +27,Time Logs for manufacturing.,Registres de temps per a la seva fabricació.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Registre de temps per a les tasques.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Marca comercial
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
 DocType: Quotation Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Associat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
+DocType: Request for Quotation Supplier,Send Email to Supplier,Enviar correu electrònic a Proveïdor
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 DocType: Packing Slip,To Package No.,Al paquet No.
 DocType: Production Planning Tool,Material Requests,Les sol·licituds de materials
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
 DocType: Stock Settings,Allowance Percent,Percentatge de Subsidi
 DocType: SMS Settings,Message Parameter,Paràmetre del Missatge
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
 DocType: Serial No,Delivery Document No,Lliurament document nº
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir els articles des dels rebuts de compra
 DocType: Serial No,Creation Date,Data de creació
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,La quantitat a Deliver
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} creat
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
 ,Serial No Status,Estat del número de sèrie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Taula d'articles no pot estar en blanc
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Per establir {1} periodicitat, diferència entre des de i fins a la data \
  ha de ser més gran que o igual a {2}"
 DocType: Pricing Rule,Selling,Vendes
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Taxes i impostos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Pagament de comptes de porta d&#39;enllaç no està configurat
 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: Production Order,Material Request Item,Material Request Item
+DocType: Request for Quotation Item,Material Request Item,Material Request Item
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,venut
 ,Item-wise Purchase History,Historial de compres d'articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermell
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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ó
 DocType: Installation Note,Installation Time,Temps d'instal·lació
 DocType: Sales Invoice,Accounting Details,Detalls de Comptabilitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteris d'acceptació
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 DocType: Item Group,Show In Website,Mostra en el lloc web
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grup
@@ -1552,6 +1592,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama de Gantt de totes les tasques.
+DocType: Pricing Rule,Margin Type,tipus marge
 DocType: Appraisal,For Employee Name,Per Nom de l'Empleat
 DocType: Holiday List,Clear Table,Taula en blanc
 DocType: Features Setup,Brands,Marques
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Fila # {0}: l&#39;element és obligatori contra un article d&#39;actiu fix
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través de Configuració&gt; Sèrie de numeració
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Parell
+DocType: Asset,Depreciation Schedule,Programació de la depreciació
 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: Asset,Purchase Date,Data de compra
 DocType: Employee,Personal Details,Dades Personals
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
 ,Maintenance Schedules,Programes de manteniment
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup de No-Grup
 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/public/js/setup_wizard.js +272,Unit,Unitat
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Si us plau, especifiqui l'empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Cercar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Tancament (Obertura + totals)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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ó
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 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
 DocType: Territory,Classification of Customers by region,Classificació dels clients per regió
 DocType: Project,% Tasks Completed,% Tasques Completades
 DocType: Project,Gross Margin,Marge Brut
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Si us plau indica primer l'Article a Producció
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Si us plau indica primer l'Article a Producció
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculat equilibri extracte bancari
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Oferta
 DocType: Salary Slip,Total Deduction,Deducció total
 DocType: Quotation,Maintenance User,Usuari de Manteniment
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Cost Actualitzat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Cost Actualitzat
 DocType: Employee,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració de sistema de noms dels empleats en Recursos Humans&gt; Configuració de recursos humans
 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
@@ -1645,8 +1691,8 @@
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
+DocType: Request for Quotation,Manufacturing Manager,Gerent de Fàbrica
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,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 +154,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Els enviaments
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
@@ -1654,12 +1700,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,L'usuari {0} està deshabilitat
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Fila # {0}: Quantitat ha de ser 1, com a element està vinculat a un actiu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Nen Article no ha de ser un paquet de productes. Si us plau remoure l&#39;article `` {0} i guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nou Centre de Cost
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 actuals &gt;&gt; Passius d&#39;impostos, drets i crear un nou compte (fent clic a Add Child) de tipus &quot;impostos&quot; i fer parlar de la taxa d&#39;impostos."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nou Centre de Cost
 DocType: Bin,Ordered Quantity,Quantitat demanada
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Quality Inspection,In Process,En procés
@@ -1695,10 +1741,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
 DocType: Quotation Item,Stock Balance,Saldos d'estoc
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Registres de temps de creació:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Registres de temps de creació:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Seleccioneu el compte correcte
 DocType: Item,Weight UOM,UDM del pes
 DocType: Employee,Blood Group,Grup sanguini
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Si us plau, especifiqui un país d&#39;aquesta Regla de la tramesa o del check Enviament mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Es requereix dèbit per
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 DocType: Offer Letter Term,Offer Term,Oferta Termini
 DocType: Quality Inspection,Quality Manager,Gerent de Qualitat
 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 +141,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
@@ -1730,22 +1777,22 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,La llista de preus {0} està deshabilitada
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,La llista de preus {0} està deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoració actual Taxa
 DocType: Item,Customer Item Codes,Codis dels clients
 DocType: Opportunity,Lost Reason,Raó Perdut
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1754,10 +1801,11 @@
 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 +175,Serial No {0} not found,Serial No {0} no trobat
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} no trobat
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Els teus Clients
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
 DocType: Leave Block List Date,Block Date,Bloquejar Data
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplicar ara
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplicar ara
 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."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establir com Tancada
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Número d'article amb Codi de barres {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Número d'article amb Codi de barres {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 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,Si vostè té equip de vendes i Venda Partners (Socis de canal) que poden ser etiquetats i mantenir la seva contribució en l'activitat de vendes
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transferir material
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Element {0} ha de ser un article de venda en {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
 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
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Crear fulla de nòmina
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importació de correu electrònic De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Convida com usuari
 DocType: Features Setup,After Sale Installations,Instal·lacions després de venda
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Si us plau, estableix {0} a l&#39;empresa {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} està totalment facturat
 DocType: Workstation Working Hour,End Time,Hora de finalització
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condicions contractuals estàndard per Vendes o la compra.
@@ -1830,9 +1879,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Seient Ràpida
 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 +206,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} no es presenta
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Butlletí de la llista de correu
 DocType: Delivery Note,Transporter Name,Nom Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autoritzat
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} està tancada
 DocType: Email Digest,How frequently?,Amb quina freqüència?
 DocType: Purchase Receipt,Get Current Stock,Obtenir Stock actual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (en general Aplicació de Fons&gt; Actiu Corrent&gt; Comptes bancaris i crear un nou compte (fent clic a Add Child) de tipus &quot;Banc&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre de la llista de materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marc Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
 DocType: Production Order,Actual End Date,Data de finalització actual
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
 DocType: Stock Entry,Purpose,Propòsit
+DocType: Company,Fixed Asset Depreciation Settings,Configuració de depreciació dels immobles
 DocType: Item,Will also apply for variants unless overrridden,També s'aplicarà per a les variants menys overrridden
 DocType: Purchase Invoice,Advances,Advances
 DocType: Production Order,Manufacture against Material Request,Fabricació contra comanda Material
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
 DocType: Campaign,Campaign-.####,Campanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1959,12 +2009,14 @@
  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: Purchase Receipt Item,Recd Quantity,Recd Quantitat
-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}
+DocType: Asset Category Account,Asset Category Account,Compte categoria d&#39;actius
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (en general Aplicació de Fons&gt; Actiu Corrent&gt; Comptes bancaris i crear un nou compte (fent clic a Add Child) de tipus &quot;Banc&quot;
 DocType: Journal Entry,Credit Note,Nota de Crèdit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Cap empleat per als criteris anteriorment seleccionat o nòmina ja creat
@@ -2017,7 +2069,7 @@
 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 +200,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ó"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,nòmina de sous
 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"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
 DocType: Account,Income Account,Compte d'ingressos
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No s&#39;ha trobat la plantilla d&#39;adreces per defecte. Si us plau, crear una nova des Configuració&gt; Premsa i Branding&gt; plantilla de direcció."
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Administrar grup Client arbre.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nou nom de centres de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
-apps/erpnext/erpnext/config/support.py +7,Issues,Qüestions
+apps/erpnext/erpnext/hooks.py +90,Issues,Qüestions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estat ha de ser un {0}
 DocType: Sales Invoice,Debit To,Per Dèbit
 DocType: Delivery Note,Required only for sample item.,Només és necessari per l'article de mostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
 ,Profit and Loss Statement,Guanys i Pèrdues
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
 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 +139,Please mention no of visits required,"Si us plau, no de visites requerides"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
 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 +142,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
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Comanda
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Sense Observacions
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Actius Fixos L&#39;article ha de ser una posició no de magatzem
 DocType: Supplier Quotation Item,Material Request No,Número de sol·licitud de Material
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2176,7 +2231,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Payment Request,Recipient and Message,Del destinatari i el missatge
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar adreça del proveïdor
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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ó.
 DocType: Payment Request,Mute Email,Silenciar-mail
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Sol · licitud de pressupost.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
 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 +294,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Contra el document n
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Administrar Punts de vendes.
 DocType: Quality Inspection,Inspection Type,Tipus d'Inspecció
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Seleccioneu {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,L&#39;assistència sense marcar
@@ -2240,6 +2296,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
 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
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 DocType: Payment Gateway,Gateway,Porta d&#39;enllaç
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Please enter relieving date.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2267,18 +2324,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},No es pot trobar el tipus de canvi per a {0} a {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},No es pot trobar el tipus de canvi per a {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medi Dia Marcos
 DocType: Sales Invoice,Sales Team,Equip de vendes
 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 +410,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,El número de sèrie {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Magatzem al client (opcional)
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
@@ -2304,14 +2362,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,Assignació d'absència
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Sol·licituds de material {0} creats
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Sol·licituds de material {0} creats
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Plantilla de termes o contracte.
 DocType: Purchase Invoice,Address and Contact,Direcció i Contacte
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
+DocType: Asset,Expected Value After Useful Life,Valor esperat després de la vida útil
 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
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} es cancel·la o tancada
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectiu net d&#39;inversió
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Compte root no es pot esborrar
 ,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/asset/depreciation.py +99,Asset {0} must be submitted,Actius {0} ha de ser presentat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Administrar Direccions
-DocType: Pricing Rule,Item Code,Codi de l'article
+DocType: Asset,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
 DocType: Journal Entry,User Remark,Observació de l'usuari
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
 DocType: Employee Education,School/University,Escola / Universitat
 DocType: Payment Request,Reference Details,Detalls Referència
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
 ,Billed Amount,Quantitat facturada
+DocType: Asset,Double Declining Balance,Doble saldo decreixent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ordre tancat no es pot cancel·lar. Unclose per cancel·lar.
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Número de sèrie i de lot
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Detallista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,En desactivar Paraules
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank Overdraft Account
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Préstecs Garantits
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Si us plau, estableix els comptes relacionats de depreciació d&#39;actius en Categoria {0} o de la seva empresa {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Saldo inicial Equitat
 DocType: Appraisal,Appraisal,Avaluació
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},El correu electrònic enviat al proveïdor {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data repetida
 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 +187,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
@@ -2401,7 +2467,7 @@
 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
 DocType: Item Price,Bulk Import Help,A granel d&#39;importació Ajuda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Seleccioneu Quantitat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleccioneu Quantitat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol d'aprovador no pot ser el mateix que el rol al que la regla s'ha d'aplicar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Missatge enviat
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,marge total
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
 DocType: Payment Gateway Account,Default Payment Request Message,Defecte de sol·licitud de pagament del missatge
 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/config/accounts.py +118,Banking and Payments,De bancs i pagaments
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,De bancs i pagaments
 ,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ó
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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
 DocType: Notification Control,Quotation Message,Cita Missatge
 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/config/hr.py +55,Leaves and Holiday,Les fulles i les vacances
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 DocType: Time Log,Batched for Billing,Agrupat per a la Facturació
@@ -2476,15 +2543,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Centre de l&#39;amortització del cost dels actius
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Data de compra d&#39;actius {0} no coincideix amb la data de compra de la factura
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
 ,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}
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Account,Payable,Pagador
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Deutors ({0})
-DocType: Project,Margin,Marge
+DocType: Pricing Rule,Margin,Marge
 DocType: Salary Slip,Arrear Amount,Arrear Amount
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Benefici Brut%
@@ -2492,20 +2561,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
 DocType: Newsletter,Newsletter List,Llista Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Comproveu si vol enviar nòmina al correu a cada empleat en enviar nòmina
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Compra import brut és obligatori
 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 +57,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
 DocType: Stock Entry Detail,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
 DocType: Employee,Confirmation Date,Data de confirmació
 DocType: C-Form,Total Invoiced Amount,Suma total facturada
 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: Account,Accumulated Depreciation,Depreciació acumulada
 DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
 DocType: Payment Request,Email To,Email To
 DocType: Lead,Lead Owner,Responsable del client potencial
 DocType: Bin,Requested Quantity,quantitat sol·licitada
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Es requereix Magatzem
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Lliurat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Lliurat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Mateix proveïdor s&#39;ha introduït diverses vegades
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article de l'ordre de compra Subministrat
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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ó.
@@ -2527,13 +2600,14 @@
 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.
 DocType: Payment Request,Payment Details,Detalls del pagament
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
 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 +73,"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."
 DocType: Manufacturer,Manufacturers used in Items,Fabricants utilitzats en articles
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Crear nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Ledger Stock
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Qualificació: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducció de la fulla de nòmina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Seleccioneu un node de grup primer.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Seleccioneu un node de grup primer.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,I assistència d&#39;empleats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Propòsit ha de ser un de {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminar la referència del client, proveïdor, distribuïdor i plom, ja que és la direcció de l&#39;empresa"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Des {1}
 DocType: Task,depends_on,depèn de
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Següent data ha de ser major que la data de publicació
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mostrar impostos ruptura
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Formulari / article / {0}) està esgotat
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Següent data ha de ser major que la data de publicació
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/accounts/party.py +289,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'
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Data de la factura d&#39;enviament
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;actiu fix
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
@@ -2646,7 +2722,7 @@
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 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 +96,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
@@ -2654,17 +2730,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cites
 DocType: Hub Settings,Access Token,Token d'accés
 DocType: Sales Invoice Item,Serial No,Número de sèrie
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
-DocType: Item,Is Fixed Asset Item,És la partida de l'actiu fix
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
 DocType: Purchase Invoice,Print Language,Llenguatge d&#39;impressió
 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"
+DocType: Asset,Number of Depreciations,Nombre de Depreciacions
 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
@@ -2672,13 +2748,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Sol·licitud de Cites
 DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
 DocType: Purchase Invoice Item,Image View,Veure imatges
 apps/erpnext/erpnext/config/selling.py +23,Customers,clients
+DocType: Asset,Partially Depreciated,parcialment depreciables
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
@@ -2694,13 +2772,13 @@
 DocType: Quotation,Maintenance Manager,Gerent de Manteniment
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,El total no pot ser zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Modificada Des de
+DocType: Asset,Amended From,Modificada Des de
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,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 +484,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 +325,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
@@ -2713,21 +2791,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Si us plau, &#39;Compte / Pèrdua de beneficis per alienacions d&#39;actius&#39; a l&#39;empresa"
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Els pagaments dels partits amb les factures
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Els pagaments dels partits amb les factures
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Afegir a la cistella
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar per
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Activar / desactivar les divises.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Activar / desactivar les divises.
 DocType: Production Planning Tool,Get Material Request,Obtenir Sol·licitud de materials
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despeses postals
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Present total
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Les declaracions de comptabilitat
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Les declaracions de comptabilitat
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2747,15 +2826,16 @@
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
 DocType: Features Setup,Item Groups in Details,Els grups d'articles en detalls
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Inici de punt de venda (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Visita informe de presa de manteniment.
 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 +169,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 +171,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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Canvi en el Patrimoni Net
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 ,Sales Register,Registre de vendes
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
@@ -2763,12 +2843,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Error: {0}&gt; {1}
 DocType: Item,Attributes,Atributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obtenir elements
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Darrera Data de comanda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
 DocType: C-Form,C-Form,C-Form
@@ -2780,18 +2861,18 @@
 DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Payment Tool,Make Journal Entry,Feu entrada de diari
 DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Comercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Error: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Tots els Productes o Serveis.
 DocType: Supplier Quotation,Supplier Address,Adreça del Proveïdor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2802,10 +2883,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferència
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Data de venciment és obligatori
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
@@ -2825,20 +2906,22 @@
 DocType: GL Entry,Remarks,Observacions
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
 DocType: Journal Entry,Write Off Based On,Anotació basada en
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
 DocType: Features Setup,POS View,POS Veure
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Hora de registre ha estat qualificada
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través de Configuració&gt; Configuració&gt; Sèrie Naming
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Si us plau, estableix el valor per defecte {0} a l'empresa {1}"
@@ -2848,12 +2931,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través de Configuració&gt; Sèrie de numeració
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obtenir elements del paquet del producte
+DocType: Asset,Straight Line,Línia recta
+DocType: Project User,Project User,usuari projecte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Descomptes de venda
@@ -2867,39 +2951,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Afegir Nen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Valor d&#39;obertura
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
 DocType: Tax Rule,Billing Country,Facturació País
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Despeses d'Entreteniment
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Despeses d'Entreteniment
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Despeses legals
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Despeses telefòniques
 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.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},No Element amb Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Element amb Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Obrir Notificacions
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despeses directes
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Despeses directes
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} és una adreça de correu electrònic vàlida en el &#39;Notificació \ Adreça de correu electrònic&#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
@@ -2916,7 +3001,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Identificador de Proveïdor
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipus de fulles com casual, malalts, etc."
@@ -2927,11 +3012,12 @@
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Proveïdor d&#39;actius {0} no coincideix amb el proveïdor de la factura de compra
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Salary template master.
@@ -2947,12 +3033,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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ó
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,moneda de facturació ha de ser igual a la moneda ja sigui per defecte de comapany o divisa del compte del partit payble
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivat, &quot;en les paraules de camp no serà visible en qualsevol transacció"
@@ -2962,13 +3049,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Aquest registre de temps ha estat cancel·lat.
 ,Reqd By Date,Reqd Per Data
 DocType: Salary Slip Earning,Salary Slip Earning,Salary Slip Earning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditors
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Creditors
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de tots els articles
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2989,15 +3076,14 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
-DocType: Project,Project Name,Nom del projecte
+DocType: Request for Quotation Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
 DocType: Features Setup,Item Batch Nos,Números de Lot d'articles
@@ -3027,6 +3113,7 @@
 DocType: Sales Invoice,End Date,Data de finalització
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Les transaccions de valors
 DocType: Employee,Internal Work History,Historial de treball intern
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,La depreciació acumulada Import
 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
@@ -3034,7 +3121,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Company és obligatòria, ja que és la direcció de l&#39;empresa"
 DocType: Item Attribute,From Range,De Gamma
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Article {0} ignorat ja que no és un article d'estoc
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Presentar aquesta ordre de producció per al seu posterior processament.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Presentar aquesta ordre de producció per al seu posterior processament.
 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.","Per no aplicar la Regla de preus en una transacció en particular, totes les normes sobre tarifes aplicables han de ser desactivats."
 DocType: Company,Domain,Domini
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ocupacions
@@ -3046,6 +3133,7 @@
 DocType: Time Log,Additional Cost,Cost addicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3062,6 +3150,7 @@
 DocType: Sales Order,Delivery Date,Data De Lliurament
 DocType: Opportunity,Opportunity Date,Data oportunitat
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorn Contra Compra Rebut
+DocType: Request for Quotation Item,Request for Quotation Item,Sol·licitud de Cotització d&#39;articles
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
@@ -3076,11 +3165,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
 DocType: Accounts Settings,Accounts Settings,Ajustaments de comptabilitat
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Ajust &#39;compte de liquidació de Béns&#39; en la seva empresa {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Instal·lacions tècniques i maquinària
 DocType: Sales Partner,Partner's Website,Lloc Web dels Partners
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Comptes temporals
 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
@@ -3089,21 +3179,22 @@
 DocType: Pricing Rule,Disable,Desactiva
 DocType: Project Task,Pending Review,Pendent de Revisió
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Feu clic aquí per pagar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marc Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Afegir elements de
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Afegir elements de
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","per exemple ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,El magatzem {0} no existeix
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3118,6 +3209,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Element {0} ha estat desactivat
 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
@@ -3129,7 +3221,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
 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
 ,Cash Flow,Flux d&#39;Efectiu
@@ -3143,7 +3235,7 @@
 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 +132,Please find attached {0} #{1},Troba adjunt {0} #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Troba adjunt {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
 DocType: Authorization Rule,Customer / Item Name,Client / Nom de l'article
@@ -3159,19 +3251,18 @@
 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"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Ajustos predeterminats per a les transaccions de venda
 DocType: BOM Replace Tool,Current BOM,BOM actual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Afegir Número de sèrie
 apps/erpnext/erpnext/config/support.py +43,Warranty,garantia
 DocType: Production Order,Warehouses,Magatzems
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir i Papereria
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Imprimir i Papereria
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Actualitzar Productes Acabats
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Actualitzar Productes Acabats
 DocType: Workstation,per hour,per hores
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Quantitat pagada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
@@ -3201,7 +3292,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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."
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
 DocType: Purchase Invoice,In Words,En Paraules
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Avui és {0} 's aniversari!
 DocType: Production Planning Tool,Material Request For Warehouse,Sol·licitud de material per al magatzem
@@ -3214,9 +3305,11 @@
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,unir-se
 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 +564,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 +569,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
+DocType: Pricing Rule,Margin Rate or Amount,Taxa de marge o Monto
 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
@@ -3226,7 +3319,7 @@
 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 +782,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3234,14 +3327,13 @@
 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 +17,Potential opportunities for selling.,Els possibles oportunitats de venda.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},No vàlida {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través de Configuració&gt; Configuració&gt; Sèrie Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
@@ -3259,14 +3351,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Comptabilitat General
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veure ofertes
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","L'adreça de correu electrònic ha de ser única, ja existeix per {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","L'adreça de correu electrònic ha de ser única, ja existeix per {0}"
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {0}"
 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>
@@ -3298,23 +3391,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
 ,Project wise Stock Tracking,Projecte savi Stock Seguiment
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Hi Manteniment Programa de {0} contra {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Hi Manteniment Programa de {0} contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Actual Quantitat (en origen / destinació)
 DocType: Item Customer Detail,Ref Code,Codi de Referència
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registres d'empleats.
 DocType: Payment Gateway,Payment Gateway,Passarel·la de Pagament
 DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Poseu l&#39;ordre
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root no pot tenir un centre de costos pares
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccioneu una marca ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,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}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Magatzem és obligatori
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3332,7 +3425,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Moneda de la transacció ha de ser la mateixa que la moneda de pagament de porta d&#39;enllaç
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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ó
@@ -3340,14 +3433,14 @@
 DocType: Purchase Invoice,Submit on creation,Presentar a la creació
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Les meves comandes
@@ -3368,10 +3461,10 @@
 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-"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Punt de Venda Perfil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Préstecs sense garantia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total pagat Amt
@@ -3383,11 +3476,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Proveïdor de part
 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
@@ -3396,12 +3490,12 @@
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Des {0} de {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
@@ -3410,7 +3504,7 @@
 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 +351,'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 +356,'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
@@ -3423,7 +3517,7 @@
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
@@ -3437,15 +3531,15 @@
 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 +576,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Activitat del projecte / tasca.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
 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: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3465,8 +3559,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Any data d&#39;inici o data de finalització es col·loqui per sobre de {0}. Per evitar configuri empresa
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
 DocType: 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.","Exemple :. ABCD ##### 
  Si la sèrie s'estableix i Nombre de sèrie no s'esmenta en les transaccions, nombre de sèrie a continuació automàtica es crearà sobre la base d'aquesta sèrie. Si sempre vol esmentar explícitament els números de sèrie per a aquest article. deixeu en blanc."
@@ -3478,11 +3573,11 @@
 ,Sales Analytics,Analytics de venda
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuració de Correu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
 DocType: Stock Entry Detail,Stock Entry Detail,Detall de les entrades d'estoc
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Recordatoris diaris
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nou Nom de compte
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
@@ -3492,11 +3587,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,percentatge
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,L'Article {0} ha de ser un article de Vendes
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3504,11 +3600,12 @@
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
 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 +385,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 DocType: Purchase Taxes and Charges,Actual,Reial
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 actuals &gt;&gt; Passius d&#39;impostos, drets i crear un nou compte (fent clic a Add Child) de tipus &quot;impostos&quot; i fer parlar de la taxa d&#39;impostos."
 DocType: Production Order,Production Order,Ordre de Producció
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 DocType: Quotation Item,Against Docname,Contra DocName
@@ -3527,18 +3624,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Reconciliats amb èxit
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Tax Rule,Validity,Validesa
+DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Quantitat facturada
 DocType: Attendance,Attendance,Assistència
 apps/erpnext/erpnext/config/projects.py +55,Reports,Informes
 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 +508,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
 ,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
@@ -3548,10 +3646,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Despeses d'Administració
 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 +455,Change,Canvi
@@ -3559,6 +3657,7 @@
 DocType: Appraisal Goal,Score Earned,Score Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Nom de la categoria d&#39;actius
 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
@@ -3570,13 +3669,13 @@
 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 +559,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 +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Lot
@@ -3590,7 +3689,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Trucades en fred
 DocType: SMS Parameter,SMS Parameter,Paràmetre SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Pressupost i de centres de cost
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Pressupost i de centres de cost
 DocType: Maintenance Schedule Item,Half Yearly,Semestrals
 DocType: Lead,Blog Subscriber,Bloc subscriptor
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear regles per restringir les transaccions basades en valors.
@@ -3621,9 +3720,9 @@
 DocType: Purchase Common,Purchase Common,Purchase Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Cita Proveïdor {0} creat
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3631,7 +3730,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures enviades als clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Compte primària
@@ -3647,7 +3746,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
@@ -3662,6 +3761,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Descompte i Marge
 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: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
@@ -3682,7 +3782,7 @@
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
@@ -3690,22 +3790,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pagament URL Missatge
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total no pagat
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Registre d'hores no facturable
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
+DocType: Asset,Asset Category,categoria actius
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materials de Proveïdor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Impostos Especials Factura
 DocType: Expense Claim,Employees Email Id,Empleats Identificació de l'email
 DocType: Employee Attendance Tool,Marked Attendance,assistència marcada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Passiu exigible
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Passiu exigible
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,La quantitat actual és obligatòria
@@ -3726,17 +3827,16 @@
 DocType: Item Attribute,Numeric Values,Els valors numèrics
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analítica
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No s&#39;ha trobat la plantilla d&#39;adreces per defecte. Si us plau, crear una nova des Configuració&gt; Premsa i Branding&gt; plantilla de direcció."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passarel·la de Pagament
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Després de la realització del pagament redirigir l&#39;usuari a la pàgina seleccionada.
@@ -3745,20 +3845,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
+DocType: Asset,Current Value (After Depreciation),Valor actual (després de la depreciació)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3766,6 +3867,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 59f07c1..4e189fe 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zaměstnanců jmenovat systém v oblasti lidských zdrojů&gt; Nastavení HR
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Ukázat otevřené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Zobrazit Varianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Účty tabulka nemůže být prázdné.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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ě
 DocType: Designation,Designation,Označení
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 DocType: Payment Request,Payment Request,Platba Poptávka
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Není dovoleno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Získat předměty z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
+DocType: Item,Is Fixed Asset,Je dlouhodobého majetku
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Vše Kontakt
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Záznamy
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Stav instalace
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Prosím, zadejte společnost"
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Čistý peněžní tok z financování
 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 +217,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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é
 ,Contact Name,Kontakt Jméno
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,bankovní Příspěvky
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Učit se
+DocType: Asset,Next Depreciation Date,Vedle Odpisy Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnost na jednoho zaměstnance
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dodavatelské faktury No existuje ve faktuře {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Správa obchodník strom.
 DocType: Job Applicant,Cover Letter,Průvodní dopis
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Vynikající Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Špatné Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: 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."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednotek [{1}] (# Form / bodu / {1}) byla nalezena v [{2}] (# Form / sklad / {2})
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavení Daně
 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 +381,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Vyberte měsíc a rok
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,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 dovolené
-,Schedule Date,Plán Datum
+DocType: Depreciation Schedule,Schedule Date,Plán Datum
 DocType: Packed Item,Packed Item,Zabalená položka
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pro zaměstnance {0} proti Typ aktivity - {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.,"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
@@ -348,6 +355,7 @@
 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í"
+DocType: Request for Quotation,Request for Quotation,Žádost o cenovou nabídku
 DocType: Workstation,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
-DocType: Material Request Item,Required Date,Požadovaná data
+DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Zpráva pro dodavatele
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
 DocType: Employee,Health Concerns,Zdravotní Obavy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Nezaplacený
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 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 +315,Managing Subcontracting,Správa Subdodávky
+DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozici na webových stránkách k těmto uživatelům
 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"
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Přírůstek nemůže být 0
 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 +86,Item {0} is not Purchase Item,Položka {0} není Nákup položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Položka {0} není Nákup položky
 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í
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Čekající Množství
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -471,13 +481,13 @@
  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 +126,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 +230,Financial / accounting year.,Finanční / Účetní rok.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Neuhrazená Hodnoty
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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í
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Dodává: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Splatnost účtu
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Sales Return
 DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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."
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Transakční Data aktualizace Bank
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Transakční Data aktualizace Bank
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -522,27 +532,27 @@
 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,Výchozí kalkulace Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Plán údržby
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Čistá Změna stavu zásob
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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é"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Prosím nastavte si dovolenou seznam buď pro zaměstnance nebo společnost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,odpisy Částka
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Dodává Částka
 DocType: Supplier,Fixed Days,Pevné Dny
 DocType: Quotation Item,Item Balance,Balance položka
 DocType: Sales Invoice,Packing List,Balení Seznam
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
 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
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Provozní doba
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Skupiny ke skupině
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mé projekty
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
+DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráty na majetku likvidaci
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company měny)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Vstup Platba je již vytvořili
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Celkem fakturace tento rok
 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 +529,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tam je chyba v adrese šabloně {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nový účet
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {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.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -668,17 +682,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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í"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moje Faktury
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logická chyba: musí najít překrývání
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form záznamy
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form záznamy
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Zákazník a Dodavatel
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora dotazy ze strany zákazníků.
@@ -722,7 +738,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobrazit Odběratelé
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 DocType: Employee,Ms,Paní
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Devizový kurz master.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Devizový kurz master.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Obchodní partneři a teritoria
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} musí být aktivní
+DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto košík
 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
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -795,10 +812,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
+DocType: Asset,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum zahájení a datem ukončení by mělo být v rámci stejného fiskální rok
@@ -808,21 +825,24 @@
 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á chybí záznam směnného kurzu pro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Publikovat na webových stránkách
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Zásilky zákazníkům.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Částka platby = dlužné částky
 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 +672,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Vybrat položku pro převod
 DocType: Purchase Invoice,Additional Discount Percentage,Další slevy Procento
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Řádek {0}: faktura {1} je neplatná, to by mohlo být zrušeno / neexistuje. \ Zadejte platnou fakturu"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 ,Employee Holiday Attendance,Zaměstnanec Holiday Účast
 DocType: Opportunity,Walk In,Vejít
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Sklad Příspěvky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Sklad Příspěvky
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Převedené
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Dělat
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 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 +5,My Cart,Můj košík
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
 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 +180,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Opravdu chcete obnovit tento vyřazen aktivum?
+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 +80,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
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 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 +547,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Sleva
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodejní Částka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Čas Záznamy
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Čas Záznamy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,sešrotován
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Společnosti
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Nábor
 DocType: BOM Operation,Operation,Operace
 DocType: Lead,Organization Name,Název organizace
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Prodejní náklady
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 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
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Výchozí měna
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Příspěvek%
@@ -932,22 +954,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globální Výchozí
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
 DocType: Salary Slip,Leave Without Pay,Volno bez nároku na mzdu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Plánování kapacit Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Plánování kapacit Chyba
 ,Trial Balance for Party,Trial váhy pro stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Dokončeno Položka {0} musí být zadán pro vstup typu Výroba
 apps/erpnext/erpnext/config/learn.py +92,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 +473,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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ž ""Skutečné datum ukončení"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Řízení
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Typy činností pro Time listy
@@ -958,18 +981,18 @@
 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"""
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Prosím nastavte e-mail ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Prosím nastavte e-mail ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro 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} 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/config/buying.py +33,Supplier database.,Databáze dodavatelů.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Dovolená
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma se nevztahuje na faktuře: {0}
 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
@@ -996,19 +1020,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
 DocType: Contact,User ID,User ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,View Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendy placené
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendy placené
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účetní Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdíl Částka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nerozdělený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Nerozdělený zisk
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Dočasné Otevření
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Splatné účty Shrnutí
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,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 +165,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Hlava účtu {0} vytvořil
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 apps/erpnext/erpnext/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
@@ -1063,19 +1088,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Prodejce Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Nenalezl žádnou položku s názvem {0}
 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
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
-DocType: Journal Entry,Journal Entry,Zápis do deníku
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 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
@@ -1095,6 +1121,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žádost o cenovou nabídku dodavatele
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakující Až
 DocType: Attendance,HR Manager,HR Manager
@@ -1105,6 +1132,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Aktuální hodnota po odpisech musí být menší než rovná {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 DocType: Company,If Yearly Budget Exceeded (for expense account),Pokud Roční rozpočet překročen (pro výdajového účtu)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Datum zahájení a ukončení
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účetnictví
 DocType: Features Setup,Features Setup,Nastavení Funkcí
+DocType: Asset,Depreciation Schedules,odpisy Plány
 DocType: Item,Is Service Item,Je Service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,Transakční měna
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operace Popis
 DocType: Item,Will also apply to variants,Bude se vztahovat i na varianty
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: Pricing Rule,Campaign,Kampaň
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
 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 +472,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nemůže být větší než 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Vykupujeme tuto položku
 DocType: Address,Billing,Fakturace
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkem Dodatečné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Podsestavy
+DocType: Asset,Asset Name,Asset Name
 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 +142,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Balení Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Balení Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavení SMS brány
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Žádost o cenovou nabídku může být přístup kliknutím na následující odkaz
+DocType: Asset,Number of Months in a Period,Počet měsíců v období
 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
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Položka Varianty
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Show uzavřen
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peněžní tok z investičních
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Item Group,Item Group Name,Položka Název skupiny
 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 +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1269,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Maintenance Visit
 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: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,Master Značky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Krabice
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Nároky na náklady firmy.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslat e-mail Payment
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Ostatní zprávy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Zobrazit
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Čistá změna v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Platba Poptávka již existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Množství nesmí být větší než {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Předchozí finanční rok není uzavřen
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Dodavatel Type master.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 DocType: Purchase Invoice,Reference Document,referenční dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovano
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Čistá Změna účty závazků
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ověřte prosím svou e-mailovou id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 DocType: Quotation,Term Details,Termín Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí být větší než 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
 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ě.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Záruční reklamace
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplacena záloha proti {0} {1} nemůže být větší \ než Grand Celkem {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Prosím, vyberte položku kód"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (volitelné)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Single jednotka položky.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,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 +385,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
+DocType: Asset,Depreciation Method,odpisy Metoda
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 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 +29,Shopping Cart is enabled,Nákupní košík je povoleno
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 DocType: Production Plan Material Request,Production Plan Material Request,Výroba Poptávka Plán Materiál
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Žádné výrobní zakázky vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Žádné výrobní zakázky vytvořené
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Hlavní
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresy
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,ocenění
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Položka nesmí mít výrobní zakázky.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Položka nesmí mít výrobní zakázky.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
 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: 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 +27,Time Logs for manufacturing.,Čas Protokoly pro výrobu.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Značka
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
+DocType: Request for Quotation Supplier,Send Email to Supplier,Odeslat e-mail na dodavatele
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Production Planning Tool,Material Requests,materiál Žádosti
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 DocType: Stock Settings,Allowance Percent,Allowance Procento
 DocType: SMS Settings,Message Parameter,Parametr zpráv
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Strom Nákl.střediska finančních.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Strom Nákl.střediska finančních.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z Příjmového listu
 DocType: Serial No,Creation Date,Datum vytvoření
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,"Částka, která má dodávat"
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} vytvořil
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} vytvořil
 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 +448,Item table can not be blank,Tabulka Položka nemůže být prázdný
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
 DocType: Pricing Rule,Selling,Prodejní
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Odvody a daně
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Platební brána účet není nakonfigurován
 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: Production Order,Material Request Item,Materiál Žádost o bod
+DocType: Request for Quotation Item,Material Request Item,Materiál Žádost o bod
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Prodáno
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účetní detaily
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokace
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: Item Group,Show In Website,Show pro webové stránky
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Skupina
@@ -1552,6 +1592,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Řádek # {0}: Prostředek je povinná proti dlouhodobého majetku výtisku
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastavit číslování série pro docházky prostřednictvím nabídky Setup&gt; Číslování Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pár
+DocType: Asset,Depreciation Schedule,Plán odpisy
 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: Asset,Purchase Date,Datum nákupu
 DocType: Employee,Personal Details,Osobní data
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové středisko&quot; ve firmě {0}
 ,Maintenance Schedules,Plány údržby
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Částka - doprava
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina na Non-Group
 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/public/js/setup_wizard.js +272,Unit,Jednotka
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Uveďte prosím, firmu"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavření (Otevření + součty)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
 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"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
 DocType: Project,% Tasks Completed,% splněných úkolů
 DocType: Project,Gross Margin,Hrubá marže
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Vypočtená výpis z bankovního účtu zůstatek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Náklady Aktualizováno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Náklady Aktualizováno
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zaměstnanců jmenovat systém v oblasti lidských zdrojů&gt; Nastavení HR
 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
@@ -1645,8 +1691,8 @@
 ,SO Qty,SO Množství
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+DocType: Request for Quotation,Manufacturing Manager,Výrobní ředitel
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Zásilky
 DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
@@ -1654,12 +1700,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Uživatel {0} je zakázána
@@ -1668,7 +1714,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Řádek # {0}: Množství musí být jedno, protože položka je spojena s aktivem"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dítě Položka by neměla být produkt Bundle. Odeberte položku `{0}` a uložit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nové Nákladové Středisko
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 do 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 podřízené) typu &quot;daně&quot; a to nemluvím o sazbu daně.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Quality Inspection,In Process,V procesu
@@ -1695,10 +1741,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Čas Záznamy vytvořil:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Čas Záznamy vytvořil:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Item,Weight UOM,Hmotnostní jedn.
 DocType: Employee,Blood Group,Krevní Skupina
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím zemi, k tomuto Shipping pravidla nebo zkontrolovat Celosvětová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debetní K je vyžadováno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Nabídka Term
 DocType: Quality Inspection,Quality Manager,Manažer kvality
 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 +141,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Nabídka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
@@ -1730,22 +1777,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povolit Přesč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é 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,Důvod ztráty
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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í
@@ -1754,10 +1801,11 @@
 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 +175,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vaši Zákazníci
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Použít teď
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Použít teď
 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."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavit jako Zavřeno
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},No Položka s čárovým kódem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},No Položka s čárovým kódem {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 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,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Přenos materiálu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} musí být Sales položka v {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Prosím nastavte opakující se po uložení
 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
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Importovat e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Pozvat jako Uživatel
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Prosím nastavte {0} ve firmě {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je plně fakturováno
 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.
@@ -1830,9 +1879,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Rename Tool,File to Rename,Soubor přejmenovat
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Účast na data
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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 +147,{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 +210,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Rychlý vstup Journal
 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 +206,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} není odesláno
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter adresář
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} je uzavřen
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získejte aktuální stav
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte do příslušné skupiny (obvykle využití 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;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálů
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Současnost
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
 DocType: Stock Entry,Purpose,Účel
+DocType: Company,Fixed Asset Depreciation Settings,Nastavení odpisování dlouhodobého majetku
 DocType: Item,Will also apply for variants unless overrridden,"Bude platit i pro varianty, pokud nebude přepsáno"
 DocType: Purchase Invoice,Advances,Zálohy
 DocType: Production Order,Manufacture against Material Request,Výroba proti Materiál Request
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1959,12 +2009,14 @@
  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: Purchase Receipt Item,Recd Quantity,Recd Množství
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategorie Account
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","např. banka, hotovost, kreditní karty"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte do příslušné skupiny (obvykle využití 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;Banka&quot;
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Žádný zaměstnanec pro výše zvolených kritérií nebo výplatní pásce již vytvořili
@@ -2017,7 +2069,7 @@
 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 +200,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"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Mzdy
 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"
@@ -2027,8 +2079,9 @@
 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
 DocType: Account,Income Account,Účet příjmů
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žádné šablony výchozí adresa nalezen. Prosím vytvořte novou z Nastavení&gt; Tisk a značky&gt; šablony adresy.
 DocType: Payment Request,Amount in customer's currency,Částka v měně zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Jméno Nového Nákladového Střediska
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,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
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/config/support.py +7,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +90,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Velké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 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 +139,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
 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 +142,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
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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í"
 ,Requested,Požadované
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Žádné poznámky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset položky musí být non-skladová položka
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2176,7 +2231,7 @@
 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ě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Payment Request,Recipient and Message,Příjemce a zpráv
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Vybrat Dodavatel Address
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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."
 DocType: Payment Request,Mute Email,Mute Email
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Žádost o cenovou nabídku.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
 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 +294,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Proti dokumentu č
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Prosím, vyberte {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštěvnost
@@ -2240,6 +2296,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
 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ů
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrzeno
 DocType: Payment Gateway,Gateway,Brána
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Zadejte zmírnění datum.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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ň"
@@ -2267,18 +2324,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nepodařilo se najít kurz pro {0} do {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nepodařilo se najít kurz pro {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Půldenní
 DocType: Sales Invoice,Sales Team,Prodejní tým
 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 +410,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Zákazník Warehouse (volitelně)
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
@@ -2304,14 +2362,16 @@
 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,Přidelení dovolené
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materiál Žádosti {0} vytvořené
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Účet oprávek
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
+DocType: Asset,Expected Value After Useful Life,Očekávaná hodnota po celou dobu životnosti
 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í
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} je zrušen nebo zavřené
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čistý peněžní tok z investiční
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root účet nemůže být smazán
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} musí být předloženy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Správa adres
-DocType: Pricing Rule,Item Code,Kód položky
+DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uživatel Poznámka
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 ,Billed Amount,Fakturovaná částka
+DocType: Asset,Double Declining Balance,Double degresivní
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Uzavřená objednávka nemůže být zrušen. Otevřít zrušit.
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získat aktualizace
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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"""
+DocType: Asset,Fully Depreciated,plně odepsán
 ,Stock Projected Qty,Reklamní Plánovaná POČET
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účast HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Pořadové číslo a Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Maloobchodník
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Zakázat ve slovech
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Kontokorentní úvěr na účtu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizace účty s ním souvisejících v kategorii Asset {0} nebo {1} Company"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Počáteční stav Equity
 DocType: Appraisal,Appraisal,Ocenění
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mailu zaslaného na dodavatele {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 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 +187,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
@@ -2401,7 +2467,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Zvolte množství
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Zvolte množství
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odhlásit se z tohoto Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Zpráva byla odeslána
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,celková marže
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Payment Gateway Account,Default Payment Request Message,Výchozí Platba Request Message
 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/config/accounts.py +118,Banking and Payments,Bankovnictví a platby
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankovnictví a platby
 ,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
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
 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/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
@@ -2476,15 +2543,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového střediska
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Datum nákupu aktiva {0} neshoduje s datem nákupní faktury
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 ,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}
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dlužníci ({0})
-DocType: Project,Margin,Marže
+DocType: Pricing Rule,Margin,Marže
 DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Hrubý Zisk %
@@ -2492,20 +2561,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
 DocType: Newsletter,Newsletter List,Newsletter Seznam
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Zkontrolujte, zda chcete poslat výplatní pásku za poštou na každého zaměstnance při předkládání výplatní pásku"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
 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 +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
 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: Account,Accumulated Depreciation,oprávky
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
 DocType: Payment Request,Email To,E-mail na
 DocType: Lead,Lead Owner,Majitel leadu
 DocType: Bin,Requested Quantity,Požadované množství
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Sklad je vyžadován
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,11 +2585,12 @@
 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 +115,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}% dodávno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% dodávno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Stejný dodavatel byl zadán vícekrát
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2527,13 +2600,14 @@
 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."
 DocType: Payment Request,Payment Details,Platební údaje
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Zápis do deníku do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
 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 +73,"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"
 DocType: Manufacturer,Manufacturers used in Items,Výrobci používané v bodech
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Reklamní Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Rychlost: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Vyberte první uzel skupinu.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaměstnanců a docházky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odebrat odkaz na zákazníka, dodavatele, prodejní partner a olovo, tak jak je vaše firma adresa"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
 DocType: Task,depends_on,záleží na
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Další Datum musí být větší než Datum zveřejnění
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) není na skladě
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Další Datum musí být větší než Datum zveřejnění
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +289,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í"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Datum zveřejnění
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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ě."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ý
+DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Cena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,Od BOM
 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 +96,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citace
 DocType: Hub Settings,Access Token,Přístupový Token
 DocType: Sales Invoice Item,Serial No,Výrobní číslo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
-DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,Tisk Language
 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ě"
+DocType: Asset,Number of Depreciations,Počet Odpisy
 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
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Žádost o citátů
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximální částka faktury
 DocType: Purchase Invoice Item,Image View,Image View
 apps/erpnext/erpnext/config/selling.py +23,Customers,zákazníci
+DocType: Asset,Partially Depreciated,částečně odepisována
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,Správce údržby
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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í
+DocType: Asset,Amended From,Platném znění
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Uveďte &#39;/ ZTRÁTY zisk z aktiv odstraňováním &quot;ve firmě
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Zápas platby fakturami
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Zápas platby fakturami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Povolit / zakázat měny.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Povolit / zakázat měny.
 DocType: Production Planning Tool,Get Material Request,Získat Materiál Request
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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 +145,{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 +56,Total Present,Celkem Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,účetní závěrka
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,účetní závěrka
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2746,15 +2825,16 @@
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Název pozice
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 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 +169,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 +171,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Čistá změna ve vlastním kapitálu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
 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
@@ -2762,12 +2842,13 @@
 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
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 DocType: Item,Attributes,Atributy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
 DocType: C-Form,C-Form,C-Form
@@ -2779,18 +2860,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Obchodní
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Supplier Quotation,Supplier Address,Dodavatel Address
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2801,10 +2882,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 DocType: Tax Rule,Billing State,Fakturace State
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Převod
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Datum splatnosti je povinné
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Nastavení číselných řad
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,Poznámky
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Poslat Dodavatel e-maily
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Log bylo účtováno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování Series
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
@@ -2847,12 +2930,13 @@
 ,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 +176,{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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastavit číslování série pro docházky prostřednictvím nabídky Setup&gt; Číslování Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Získat předměty z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Získat předměty z Bundle Product
+DocType: Asset,Straight Line,Přímka
+DocType: Project User,Project User,projekt Uživatel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Prodejní Slevy
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Přidat dítě
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,otevření Value
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
 DocType: Tax Rule,Billing Country,Fakturace Země
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Výdaje na reprezentaci
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Výdaje na právní služby
 DocType: Sales Invoice,Posting Time,Čas zadání
 DocType: Sales Order,% Amount Billed,% Fakturované částky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonní Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonní Náklady
 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.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},No Položka s Serial č {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Položka s Serial č {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otevřené Oznámení
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Přímé náklady
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Přímé náklady
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} je neplatná e-mailová adresa v &quot;Oznámení \ &#39;e-mailovou adresu
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Množství by měla být větší než 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Množství by měla být větší než 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dodavatel aktiva {0} neshoduje s dodavatelem na faktuře
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plat master šablona.
@@ -2946,12 +3032,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Fakturační měna se musí rovnat peněz buď výchozího comapany nebo payble měny účtu účastníka
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokud zakázat, &quot;ve slovech&quot; poli nebude viditelný v jakékoli transakce"
@@ -2961,13 +3048,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena.
 ,Reqd By Date,Př p Podle data
 DocType: Salary Slip Earning,Salary Slip Earning,Plat Slip Zisk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Věřitelé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Věřitelé
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Řádek # {0}: Výrobní číslo je povinné
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,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
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
-DocType: Project,Project Name,Název projektu
+DocType: Request for Quotation Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
@@ -3026,6 +3112,7 @@
 DocType: Sales Invoice,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Sklad Transakce
 DocType: Employee,Internal Work History,Vnitřní práce History
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Oprávky Částka
 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
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Společnost je povinná, protože to je vaše firma adresa"
 DocType: Item Attribute,From Range,Od Rozsah
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
 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.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Company,Domain,Doména
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -3045,6 +3132,7 @@
 DocType: Time Log,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,Dodávka Datum
 DocType: Opportunity,Opportunity Date,Příležitost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o koupi
+DocType: Request for Quotation Item,Request for Quotation Item,Žádost o cenovou nabídku výtisku
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% objednáno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
@@ -3075,11 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavení účtu
 DocType: Customer,Sales Partner and Commission,Prodej Partner a Komise
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Prosím nastavte dispozici majetkový účet &quot;ve firmě {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Továrna a strojní zařízení
 DocType: Sales Partner,Partner's Website,Partnera Website
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Dočasné Účty
 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
@@ -3088,21 +3178,22 @@
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klikněte zde platit
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Aktiva {0} nemůže být vyhozen, jak je tomu již {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Přidat položky z
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Přidat položky z
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","např ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Sklad {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} byl zakázán
 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
@@ -3128,7 +3220,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Nastavení brány účty.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Nastavení brány účty.
 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
 ,Cash Flow,Tok peněz
@@ -3142,7 +3234,7 @@
 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 +132,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -3158,19 +3250,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte prosím z / do rozmezí
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Přidat Sériové číslo
 apps/erpnext/erpnext/config/support.py +43,Warranty,Záruka
 DocType: Production Order,Warehouses,Sklady
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Dokončení aktualizace zboží
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nákup
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Platí pro firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Purchase Invoice,In Words,Slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
@@ -3213,9 +3304,11 @@
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Připojit
 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 +564,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Výplatní páska
+DocType: Pricing Rule,Margin Rate or Amount,Margin sazbou nebo pevnou částkou
 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
@@ -3225,7 +3318,7 @@
 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 +782,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3233,14 +3326,13 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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í.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Změna Zkratky
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
@@ -3258,14 +3350,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Hlavní Účetní Kniha
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobrazit Vodítka
 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}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršela.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo společnosti {0}
 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>
@@ -3297,23 +3390,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
 DocType: Payment Gateway,Payment Gateway,Platební brána
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Objednat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3331,7 +3424,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Měna transakce musí být stejná jako platební brána měnu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,Předložení návrhu na vytvoření
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Moje objednávky
@@ -3367,10 +3460,10 @@
 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"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Celkem uhrazeno Amt
@@ -3382,11 +3475,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Vaši Dodavatelé
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Žádný dodavatel Part
 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
@@ -3395,12 +3489,12 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktury Datum
@@ -3409,7 +3503,7 @@
 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 +351,'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 +356,'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
@@ -3422,7 +3516,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3436,15 +3530,15 @@
 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 +576,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 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: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3464,8 +3558,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Rok datum zahájení nebo ukončení se překrývá s {0}. Aby se zabránilo nastavte firmu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 DocType: 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.","Příklad:. ABCD ##### 
  Je-li série nastavuje a pořadové číslo není uvedeno v transakcích, bude vytvořen poté automaticky sériové číslo na základě této série. Pokud chcete vždy výslovně uvést pořadová čísla pro tuto položku. ponechte prázdné."
@@ -3477,11 +3572,11 @@
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavení e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Denní Upomínky
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nový název účtu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
@@ -3491,11 +3586,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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í
+DocType: Pricing Rule,Percentage,Procento
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
+apps/erpnext/erpnext/stock/get_item_details.py +131,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ů
@@ -3503,11 +3599,12 @@
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
 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 +385,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 do 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 podřízené) typu &quot;daně&quot; a to nemluvím o sazbu daně.
 DocType: Production Order,Production Order,Výrobní Objednávka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
@@ -3526,18 +3623,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Doba platnosti
+DocType: Request for Quotation,Supplier Detail,dodavatel Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná částka
 DocType: Attendance,Attendance,Účast
 apps/erpnext/erpnext/config/projects.py +55,Reports,zprávy
 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 +508,Posting date and posting time is mandatory,Datum a čas zadání je povinný
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,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
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro oznámení"" nejsou uvedeny pro opakující se %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativní náklady
 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 +455,Change,Změna
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset název kategorie
 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
@@ -3569,13 +3668,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Šarže
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodej Osoba
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS parametr
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Rozpočet a nákladového střediska
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Rozpočet a nákladového střediska
 DocType: Maintenance Schedule Item,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
 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.
@@ -3620,9 +3719,9 @@
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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í
@@ -3630,7 +3729,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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
@@ -3646,7 +3745,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3661,6 +3760,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Sleva a Margin
 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: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
@@ -3681,7 +3781,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +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}."
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3689,22 +3789,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Platba URL Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Celkem Neplacené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Time Log není zúčtovatelné
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
+DocType: Asset,Asset Category,Asset Kategorie
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Spotřební Faktura
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštěvnost
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Krátkodobé závazky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Krátkodobé závazky
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Skutečné Množství je povinné
@@ -3725,17 +3826,16 @@
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Připojit Logo
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analytika
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdný
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žádné šablony výchozí adresa nalezen. Prosím vytvořte novou z Nastavení&gt; Tisk a značky&gt; šablony adresy.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Základní kapitál
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platební brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby přesměrovat uživatele na vybrané stránky.
@@ -3744,20 +3844,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
+DocType: Asset,Current Value (After Depreciation),Current Value (po odpisu)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Item-wise registr nákupu
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
@@ -3765,6 +3866,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index c43cbc1..5952f95 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,538 +1,74 @@
-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 +81,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/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 +48,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/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 +176,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 +229,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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 +146,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 +642,Invoice,Faktura
-DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-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 +198,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 +557,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 +180,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 +131,New {0}: #{1},Ny {0}: # {1}
-,Sales Partners Commission,Salg Partners Kommissionen
-apps/erpnext/erpnext/setup/doctype/company/company.py +38,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: 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 +272,Kg,Kg
-apps/erpnext/erpnext/config/hr.py +45,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 +397,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
-DocType: Process Payroll,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,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 Invoice Item,Sales Invoice Item,Salg Faktura Vare
-DocType: Account,Credit,Credit
-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 +140,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/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 +137,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 +324,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 +27,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 +197,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 +269,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
-DocType: Production Order Operation,Show Time Logs,Vis Time Logs
-DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,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 +507,"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 +170,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 +40,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/config/manufacturing.py +62,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 +62,Items and Pricing,Varer og Priser
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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 +93,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 +27,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/stock.py +102,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 +79,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
-,Purchase Order Trends,Indkøbsordre Trends
-apps/erpnext/erpnext/config/hr.py +81,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 +79,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"
-DocType: Sales Partner,Reseller,Forhandler
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,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 +217,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: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
-apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,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 +118,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
-DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
-apps/erpnext/erpnext/stock/utils.py +178,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 +427,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,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
-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 +592,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,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 +18,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 +20,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: Accounts Settings,Settings for Accounts,Indstillinger for konti
-apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Item,Synced With Hub,Synkroniseret med Hub
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Forkert Adgangskode
-DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Følgeseddel
-apps/erpnext/erpnext/config/learn.py +87,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 +381,{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 +73,Please select month and year,Vælg måned og år
-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 +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +674,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 +254,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,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 +118,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 +213,Please see attachment,Se venligst vedhæftede
-DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Opsætning Allerede Complete !!
-,Finished Goods,Færdigvarer
-DocType: Delivery Note,Instructions,Instruktioner
-DocType: Quality Inspection,Inspected By,Inspiceres af
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
-DocType: 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 +60,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 +192,{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 +141,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
-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 +229,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 +67,Avg. Selling Rate,Gns. Salgskurs
-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 +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
-DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
-DocType: SMS Log,Sent On,Sendt On
-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 +70,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 +770,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 +24,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 +212,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 +308,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 +378,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 +454,"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 +53,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
-DocType: Sales Order Item,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 +86,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
-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 +232,Closing (Cr),Lukning (Cr)
-DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
-DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-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 +126,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 +230,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"
-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 +35,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 +640,Sales Return,Salg Return
-apps/erpnext/erpnext/config/hr.py +115,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 +22,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 +91,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 +211,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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/stock/stock_ledger.py +337,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
-DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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"
+DocType: Depreciation Schedule,Schedule Date,Tidsplan Dato
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 apps/erpnext/erpnext/config/hr.py +151,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
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,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/manufacturing/doctype/bom/bom.py +220,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 +674,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/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Faste dage
-DocType: Sales Invoice,Packing List,Pakning List
-apps/erpnext/erpnext/config/buying.py +23,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 +141,{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 +202,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}
-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 +57,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
-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 +529,Item has variants.,Element har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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 +176,"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
+DocType: Hub Settings,Hub Settings,Hub Indstillinger
 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 +22,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
-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 +91,{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 +155,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 +29,Please select weekly off day,Vælg ugentlige off dag
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{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 +177,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 +212,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/public/js/setup_wizard.js +40,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Opret ny
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,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 +60,Investments,Investeringer
 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 +92,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 +125,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 +98,Monthly salary statement.,Månedlige lønseddel.
-DocType: Item Group,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Ny konto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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 +362,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 +188,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 +84,Sales campaigns.,Salgskampagner.
+DocType: Upload Attendance,Get Template,Få skabelon
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,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 +206,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Amount,Beløb
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,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 +623,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 +645,Invoice,Faktura
+DocType: Bin,Actual Quantity,Faktiske Mængde
+apps/erpnext/erpnext/setup/setup_wizard/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
+,Welcome to ERPNext,Velkommen til ERPNext
+DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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 +148,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/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/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Samlet Target
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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/templates/generators/item.html +68,Add to Cart,Tilføj til indkøbsvogn
+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
+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 +220,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
 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
@@ -553,1100 +89,3013 @@
 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."
-DocType: Employee,Bank A/C No.,Bank A / C No.
-DocType: Purchase Invoice Item,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 +320,"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 +111,Please enter Item first,Indtast Vare først
-DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prisliste ikke valgt
-DocType: Employee,Family Background,Familie Baggrund
-DocType: Process Payroll,Send Email,Send Email
-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 +272,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 +666,My Invoices,Mine Fakturaer
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
-DocType: Supplier Quotation,Stopped,Stoppet
-DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/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 +149,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/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 +267,C-Form records,C-Form optegnelser
-apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kunde og leverandør
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
-apps/erpnext/erpnext/config/support.py +12,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 +342,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
-DocType: Maintenance Visit,Completion Status,Afslutning status
-DocType: Production Order,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 +50,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 +34,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: Quotation 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 Reorder,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 +146,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 +311,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"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 +44,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Kvittering
-,Received Items To Be Billed,Modtagne varer skal faktureres
+apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
+DocType: Request for Quotation 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
+,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: Employee,Personal Details,Personlige oplysninger
+DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
+DocType: Purchase Invoice,Total Advance,Samlet Advance
+DocType: Production Order,Actual Start Date,Faktiske startdato
+DocType: Employee,Place of Issue,Sted for Issue
+apps/erpnext/erpnext/config/accounts.py +248,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 +356,'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 +134,"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 +161,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/public/js/setup_wizard.js +19,Company Abbreviation,Firma Forkortelse
+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})
+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/accounts.py +240,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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 +427,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 +36,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_balance/stock_balance.py +53,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 +137,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
-DocType: Purchase Receipt,Range,Range
+apps/erpnext/erpnext/config/crm.py +84,Sales campaigns.,Salgskampagner.
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
+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 +67,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 '
 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 +524,Item Variants {0} updated,Item Varianter {0} opdateret
-DocType: Quality Inspection Reading,Reading 6,Læsning 6
+DocType: Quality Inspection Reading,Reading 7,Reading 7
+apps/erpnext/erpnext/setup/doctype/company/company.js +66,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/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/accounts/party.py +286,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 +79,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/setup_wizard/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
-DocType: Address,Shop,Butik
-DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,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 +139,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 Request,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 +110,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 +539,"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 +17,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 +672,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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,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
-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/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +115,Salary components.,Løn komponenter.
+apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Alle produkter eller tjenesteydelser.
+DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,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 +353,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 +601,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +20,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 +74,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,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 +180,Qty for {0},Antal for {0}
-DocType: Leave Application,Leave Application,Forlad Application
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
-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/public/js/pos/pos.html +28,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 +69,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Time Logs
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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 +191,"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 +181,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/doctype/item_group/item_group.py +53,"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 +474,Material Requests {0} created,Materiale Anmodning {0} skabt
+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 +65,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+DocType: Supplier,Contact HTML,Kontakt HTML
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,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 +18,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 +235,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 +334,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 +42,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 +208,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: Purchase Taxes and Charges,Actual,Faktiske
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,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 +72,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
+DocType: Supplier,Credit Days Based On,Credit Dage Baseret på
+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/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
+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 +73,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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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 +150,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/setup_wizard/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/config/selling.py +301,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 +53,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/public/js/setup_wizard.js +211,Your Customers,Dine kunder
+,Produced,Produceret
+apps/erpnext/erpnext/setup/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 +56,Total Absent,Total Fraværende
+,Customer Credit Balance,Customer Credit Balance
+DocType: Journal Entry,Stock Entry,Stock indtastning
+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 +258,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 +48,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/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblades
+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 +356,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/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Global Defaults,Global Defaults,Globale standarder
-DocType: Salary Slip,Deductions,Fradrag
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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
+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 +12,Support queries from customers.,Support forespørgsler fra kunder.
+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/setup_wizard/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: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+DocType: Asset,Supplier,Leverandør
+DocType: Account,Expense,Expense
+DocType: Journal Entry,Remark,Bemærkning
+apps/erpnext/erpnext/public/js/setup_wizard.js +234,Your Suppliers,Dine Leverandører
+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 +390,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+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 +178,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 +67,Avg. Selling Rate,Gns. Salgskurs
+DocType: Asset,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>"
+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
+DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
+DocType: Shopping Cart Settings,Orders,Ordrer
+apps/erpnext/erpnext/config/accounts.py +270,"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
+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/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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 +289,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 +60,Applications for leave.,Ansøgning om orlov.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
+apps/erpnext/erpnext/setup/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: 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 +59,Actual Qty is mandatory,Faktiske Antal er obligatorisk
+DocType: Packing Slip,Gross Weight,Bruttovægt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
+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
+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 +162,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/setup/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)
+DocType: Shipping Rule,Calculate Based On,Beregn baseret på
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finansiel / regnskabsår.
+DocType: BOM,Costing,Koster
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,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 +677,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}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+DocType: SMS Center,All Sales Person,Alle Sales Person
+DocType: Account,Auditor,Revisor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,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/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+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/setup_wizard/setup_wizard.py +362,Local,Lokal
+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: Lead,Middle Income,Midterste indkomst
+DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
+apps/erpnext/erpnext/config/accounts.py +45,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 +116,Newsletter Mailing List,Nyhedsbrev Mailing List
+DocType: Production Order Operation,Work In Progress,Work In Progress
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
+DocType: Sales Order Item,For Production,For Produktion
+,Billed Amount,Faktureret beløb
+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/erpnext/erpnext/config/selling.py +147,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: Purchase Taxes and Charges,Deduct,Fratrække
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+,Financial Analytics,Finansielle Analytics
+DocType: Lead,Call,Opkald
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
+apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Vedhæft Logo
+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 +80,{0}% Billed,{0}% Billed
+,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 +91,{0} is not a stock Item,{0} er ikke et lager Vare
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,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 +529,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/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/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 +114,Office Rent,Kontorleje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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
+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 +242,"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 +157,Terms and Conditions Template,Vilkår og betingelser Skabelon
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+DocType: Attendance,Absent,Fraværende
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Lave
+DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,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."
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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 +44,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 +330,{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: 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 +127,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/accounts/doctype/gl_entry/gl_entry.py +176,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 +166,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
+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
+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/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.
-DocType: Salary Slip,Leave Without Pay,Lad uden løn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning Fejl
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,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 +239,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +95,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 +248,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 +42,{0} subscribers added,{0} abonnenter tilføjet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,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/accounts/doctype/journal_entry/journal_entry.py +198,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 +27,Target On,Target On
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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/manufacturing/doctype/production_order/production_order.js +80,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/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,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
+DocType: Serial No,Creation Date,Oprettelsesdato
+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: Leave Application,Leave Balance Before Application,Lad Balance Før Application
+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 +65,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 +539,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
+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/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: 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,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 +142,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
+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 +143,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/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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Passiver
+,Employee Information,Medarbejder Information
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +145,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/public/js/feature_setup.js +220,"Grid """,Grid &quot;
+apps/erpnext/erpnext/setup/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/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: 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
+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 +87,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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: 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 +108,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: Purchase Invoice Item,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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+DocType: Leave Block List,Block Days,Bloker dage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
+DocType: Purchase Invoice Item,PR Detail,PR Detail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
+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 +62,Items and Pricing,Varer og Priser
+DocType: Upload Attendance,Import Attendance,Import Fremmøde
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,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 +16,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 +111,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+apps/erpnext/erpnext/public/js/setup_wizard.js +268,Products,Produkter
+DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
+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 +73,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 +290,Item Variants,Item Varianter
+DocType: Task,Urgent,Urgent
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
+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 +308,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/cost_center/cost_center.js +65,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 +99,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 +48,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: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,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/setup_wizard/industry_type.py +12,Banking,Banking
+DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
+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 +94,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: 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
+DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
+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 +209,New Account Name,Ny Kontonavn
+DocType: Purchase Invoice,Contact Person,Kontakt Person
+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: Authorization Rule,Average Discount,Gennemsnitlig rabat
+DocType: Upload Attendance,Upload HTML,Upload HTML
+DocType: Project Task,Pending Review,Afventer anmeldelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +137,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 +275,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/config/accounts.py +50,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/stock/doctype/item/item.js +48,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/setup_wizard/industry_type.py +6,Advertising,Reklame
+DocType: Time Log,From Time,Fra Time
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Materiale
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
+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 +120,Tax and other salary deductions.,Skat og andre løn fradrag.
+apps/erpnext/erpnext/stock/get_item_details.py +272,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 +76,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: Address,Plant,Plant
+DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
+apps/erpnext/erpnext/setup/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 +229,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 +104,Generate Salary Slips,Generer lønsedler
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
+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/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
+apps/erpnext/erpnext/public/js/setup_wizard.js +21,What does it do?,Hvad gør det?
+,Lead Id,Bly Id
+apps/erpnext/erpnext/public/js/setup_wizard.js +22,"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 +24,Please select Time Logs.,Vælg Time Logs.
+DocType: Project,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/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/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/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 +27,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grøn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,Direkte Indkomst
+apps/erpnext/erpnext/config/projects.py +40,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 +486,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 +53,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
+apps/erpnext/erpnext/config/stock.py +22,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 +328,My Shipments,Mine forsendelser
+DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +540,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+,Serial No Status,Løbenummer status
+DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
+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}
+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 +93,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 +42,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 +121,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
+DocType: Lead,Mobile No.,Mobil No.
+DocType: Employee,Date Of Retirement,Dato for pensionering
+DocType: Batch,Batch Description,Batch Beskrivelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Køber
+DocType: Production Order,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 +106,Customer {0} does not exist,Kunde {0} eksisterer ikke
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
+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/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
+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/hr/doctype/employee/employee.py +109,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 +87,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 +164,Creditors,Kreditorer
+apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabat Beløb
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,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: 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 +201,Select a group node first.,Vælg en gruppe node først.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,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 +111,Please enter Item first,Indtast Vare først
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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 +115,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Element {0} er allerede blevet returneret
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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 +311,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/hr.py +242,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
+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 +80,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,For Leverandøren
+DocType: Price List,Price List Name,Pris List Name
+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 +333,"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 +339,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/accounts/doctype/account/account.py +215,"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/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Told og afgifter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+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
+DocType: Journal Entry,Accounting Entries,Bogføring
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
+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 +46,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: 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 +158,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Indtast lindre dato.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,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 +80,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 +86,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 +209,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,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 +213,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 +32,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/config/stock.py +186,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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 +65,"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 +138,Utility Expenses,Utility Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,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 +185,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/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Vedligeholdelse Besøg
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Account,Frozen,Frosne
+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:
+DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Dine produkter eller tjenester
+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 +17,Bills raised by Suppliers.,Regninger rejst af leverandører.
+,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +216,"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/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/config/crm.py +110,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/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 +324,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Optag element bevægelse.
+DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provision på salg
+DocType: Quality Inspection Reading,Accepted,Accepteret
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
+DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
+apps/erpnext/erpnext/config/crm.py +68,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
+DocType: Account,Root Type,Root Type
+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 +135,Travel Expenses,Rejser Udgifter
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+DocType: Employee,Exit,Udgang
+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}%
+DocType: Employee,Date of Birth,Fødselsdato
+DocType: Lead,Next Contact Date,Næste Kontakt Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +235,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/accounts/doctype/purchase_invoice/purchase_invoice.py +94,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 +106,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+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
+DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
+DocType: Shopping Cart Settings,Quotation Series,Citat Series
+,Batch-Wise Balance History,Batch-Wise Balance History
+DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+DocType: Brand,Item Manager,Item manager
+DocType: Supplier,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: Quotation Item,Projected Qty,Projiceret Antal
+DocType: SMS Log,SMS Log,SMS Log
+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
+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 +78,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.
+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 +43,Contribution Amount,Bidrag Beløb
+DocType: Sales Order Item,Gross Profit,Gross Profit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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 +123,Installation record for a Serial No.,Installation rekord for en Serial No.
+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/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+DocType: Production Planning Tool,Material Requirement,Material Requirement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+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 +229,"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 +53,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 +44,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 +342,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 +449,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 +194,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
+,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/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +331,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 +270,Capacity Planning Error,Capacity Planning Fejl
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,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/public/js/setup_wizard.js +144,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/stock/doctype/purchase_receipt/purchase_receipt.py +211,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 +23,{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 +176,"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/accounts/report/gross_profit/gross_profit.py +70,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/setup_wizard/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine Adresser
+DocType: Quotation,Shopping Cart,Indkøbskurv
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Intet at anmode
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,Total Enestående Amt
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
+DocType: Email Digest,Income / Expense,Indtægter / Expense
+apps/erpnext/erpnext/config/crm.py +17,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 +142,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/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 +154,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 +195,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/config/stock.py +180,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 +168,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+DocType: Item Group,Item Classification,Item Klassifikation
+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.
+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"
+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 +309,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/setup_wizard/industry_type.py +8,Agriculture,Landbrug
+DocType: Employee,Passport Number,Passport Number
+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 +34,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/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Issue Materiale
+DocType: Quality Inspection,Inspection Type,Inspektion Type
+apps/erpnext/erpnext/config/manufacturing.py +33,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: Employee,Encashment Date,Indløsning Dato
+DocType: SMS Settings,SMS Settings,SMS-indstillinger
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Kg,Kg
+,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
+DocType: Salary Slip,Total Deduction,Samlet Fradrag
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,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 +592,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 +158,Report Type is mandatory,Rapporttype er obligatorisk
+DocType: Payment Gateway Account,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/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+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
+apps/erpnext/erpnext/config/crm.py +92,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/setup_wizard/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 +155,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/setup_wizard/industry_type.py +44,Real Estate,Real Estate
+DocType: Salary Structure,Total Earning,Samlet Earning
+DocType: Sales Invoice,Sales Team1,Salg TEAM1
+DocType: Delivery Note,Vehicle No,Vehicle Ingen
+apps/erpnext/erpnext/setup/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/stock.py +72,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 +65,"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/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,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/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/setup_wizard/industry_type.py +42,Private Equity,Private Equity
+,S.O. No.,SÅ No.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,Total Invoiced Amt,Samlede fakturerede Amt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Opsætning Allerede Complete !!
+DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
+DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
+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 +48,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +43,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 +483,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+DocType: Journal Entry,Reference Number,Referencenummer
+apps/erpnext/erpnext/accounts/doctype/account/account.py +166,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 +69,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 +207,New Account,Ny konto
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+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: 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 +83,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 +166,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
+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/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,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 +137,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
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+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: Lead,Consultant,Konsulent
-DocType: Salary Slip,Earnings,Indtjening
+DocType: Stock Entry,Repack,Pakke
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektaktivitet / opgave.
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
+apps/erpnext/erpnext/config/buying.py +38,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/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 +265,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 +337,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}
+apps/erpnext/erpnext/setup/setup_wizard/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 +196,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 +91,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 +533,"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 +117,Postal Expenses,Postale Udgifter
+DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+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: 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/setup_wizard/setup_wizard.py +343,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/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
+apps/erpnext/erpnext/public/js/setup_wizard.js +276,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
+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 +143,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 +159,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/setup_wizard/industry_type.py +18,Consulting,Rådgivning
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order kræves for Item {0}
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+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
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
+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 +190,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+DocType: Bank Reconciliation Detail,Cheque Number,Check Number
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
+,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 +32,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 +235,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: Material Request,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/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 +167,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: 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 +13,Orders released for production.,Ordrer frigives til produktion.
+,Employee Leave Balance,Medarbejder Leave Balance
+apps/erpnext/erpnext/config/projects.py +78,Managing Projects,Håndtering af Projekter
+apps/erpnext/erpnext/config/stock.py +159,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,Åbning Stock Balance
+DocType: Campaign,Campaign-.####,Kampagne -. ####
+apps/erpnext/erpnext/public/js/setup_wizard.js +258,"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/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +303,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/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/config/hr.py +98,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)
+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/public/js/setup_wizard.js +161,Add Users,Tilføj Brugere
+DocType: Warranty Claim,Resolved By,Løst Af
+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
+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 +77,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 +39,Add Serial No,Tilføj Løbenummer
+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 +195,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/hooks.py +71,Shipments,Forsendelser
+DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +212,"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 +113,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/public/js/setup_wizard.js +20,"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}
+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 +459,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+DocType: Naming Series,Select Transaction,Vælg Transaktion
+DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
+apps/erpnext/erpnext/public/js/setup_wizard.js +201,e.g. 5,f.eks 5
+apps/erpnext/erpnext/config/hr.py +185,Organization unit (department) master.,Organisation enhed (departement) herre.
+DocType: Employee,Job Profile,Job profil
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,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: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+DocType: Account,Income,Indkomst
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+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 +63,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
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+,Item-wise Purchase History,Vare-wise Købshistorik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,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 +113,No Item with Barcode {0},Ingen Vare med Barcode {0}
+apps/erpnext/erpnext/accounts/party.py +277,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 +220,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 Request,Paid,Betalt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Repræsentationsudgifter
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+,Accounts Payable Summary,Kreditorer Resumé
+DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
+,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: Quotation,Maintenance Manager,Vedligeholdelse manager
+DocType: Installation Note Item,Against Document No,Mod dokument nr
+apps/erpnext/erpnext/config/selling.py +18,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 +190,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/public/js/setup_wizard.js +269,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 +249,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 Reorder,Re-Order Level,Re-Order Level
+apps/erpnext/erpnext/public/js/setup_wizard.js +201,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 +115,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +183,"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: Quality Inspection,Report Date,Report Date
+DocType: Salary Slip,Payment Days,Betalings Dage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +105,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 +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: 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 +120,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 +19,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 +131,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/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+apps/erpnext/erpnext/setup/setup_wizard/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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,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'
+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 +25,Name or Email is mandatory,Navn eller E-mail er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,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 +131,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+apps/erpnext/erpnext/setup/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: 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
+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
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garanti krav
+DocType: Employee,Confirmation Date,Bekræftelse Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 +699,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
+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/hr/doctype/salary_slip/salary_slip.py +77,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 +106,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
+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/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 +132,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
+DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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
+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: Salary Slip,Gross Pay,Gross Pay
+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 +169,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 +46,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 +49,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+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"
+DocType: Item,Supplier Items,Leverandør Varer
+DocType: Purchase Invoice Item,Item,Vare
+apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,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
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
+DocType: Quotation Item,Actual Qty,Faktiske Antal
+DocType: Employee,Permanent Address,Permanent adresse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +102,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"
+apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Projiceret
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,Produktionsordre er Obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+DocType: UOM,UOM Name,UOM Navn
+DocType: Employee,Personal Email,Personlig Email
+apps/erpnext/erpnext/public/js/setup_wizard.js +269,Consumable,Forbrugsmaterialer
+apps/erpnext/erpnext/setup/setup_wizard/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 +219,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,Indstillinger for HR modul
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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
+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.
+DocType: Employee,Cheque,Cheque
+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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/config/accounts.py +243,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 +773,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 +156,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
+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/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+DocType: Bank Reconciliation,From Date,Fra dato
+apps/erpnext/erpnext/config/manufacturing.py +18,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/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 +76,Account {0} is inactive,Konto {0} er inaktiv
+apps/erpnext/erpnext/config/stock.py +185,Unit of Measure,Måleenhed
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,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 +171,{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 +33,Supplier database.,Leverandør database.
-DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,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 +209,"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 +120,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 +83,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 +410,'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 +242,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/page/accounts_browser/accounts_browser.js +128,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 +431,"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 +412,Rest Of The World,Resten af verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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 +127,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 +33,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 +192,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 +165,"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 +493,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 +257,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: 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 +118,"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 +482,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
-apps/erpnext/erpnext/stock/get_item_details.py +143,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 +329,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,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
-DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +166,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 +433,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
-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 +167,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/inactive_customers/inactive_customers.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 +136,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/crm.py +68,"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 +366,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
-DocType: Item,Is Service Item,Er service Item
-DocType: Activity Cost,Projects,Projekter
-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 +31,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 +28,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 +210,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 +513,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 +181,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 +17,Communication log.,Kommunikation log.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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 +472,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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/config/manufacturing.py +27,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 +520,{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 +139,Please select item code,Vælg emne kode
+DocType: Process Payroll,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/setup_wizard/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 +780,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,Tree of varegrupper.
+DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
+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 +194,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/config/stock.py +191,"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
+DocType: Expense Claim,Approval Status,Godkendelsesstatus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
 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: 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 +146,Performance appraisal.,Præstationsvurdering.
+DocType: Sales Order,%  Delivered,% Leveres
+apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
+DocType: Item,End of Life,End of Life
+DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
+DocType: Purchase Invoice Item,Net Amount,Nettobeløb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Indtast venligst Produktion Vare først
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
+apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
+DocType: Sales Invoice,Cold Calling,Telefonsalg
+apps/erpnext/erpnext/setup/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
+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 +127,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste Ordredato
+DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
+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/public/js/setup_wizard.js +266,A Product or Service,En vare eller tjenesteydelse
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Logs oprettet:
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,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: Supplier,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 +71,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 +349,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 +141,{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 +219,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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/public/js/setup_wizard.js +14,The Organization,Organisationen
+DocType: Features Setup,Imports,Import
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/controllers/buying_controller.py +24,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 +171,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
+DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,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 +187,Leave approver must be one of {0},Lad godkender skal være en af {0}
+DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+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 +436,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: Supplier Quotation,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/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 +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: Workstation,Rent Cost,Leje Omkostninger
+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 +675,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/hooks.py +91,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 +24,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: 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/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{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 +17,Communication log.,Kommunikation log.
+DocType: Salary Slip Deduction,Default Amount,Standard Mængde
+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
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +180,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/stock/get_item_details.py +123,Please specify Company,Angiv venligst Company
+apps/erpnext/erpnext/config/selling.py +163,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/config/hr.py +131,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 +93,Total Tax,I alt Skat
+apps/erpnext/erpnext/config/hr.py +12,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/setup_wizard/install_fixtures.py +87,Associate,Associate
+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 +436,"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 +492,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/setup_wizard/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/stock/doctype/warehouse/warehouse.py +112,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
+DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'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 +61,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
+DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
+DocType: Serial No,Under AMC,Under AMC
+DocType: Sales Order Item,Ordered Qty,Bestilt Antal
+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 +413,[Error],[Fejl]
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,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/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/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
+DocType: Address,Postal,Postal
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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 +38,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 +86,Indirect Expenses,Indirekte udgifter
+DocType: Project,% Tasks Completed,% Opgaver Afsluttet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Vedligeholdelse Skema
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/config/buying.py +76,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 +691,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/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
+,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 +87,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 +136,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 +237,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/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/config/crm.py +101,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/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/public/js/setup_wizard.js +41,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 +179,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 +50,Offer candidate a Job.,Offer kandidat et job.
+DocType: Issue,Issue,Issue
+DocType: Customer,Individual,Individuel
+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 +222,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 +108,Miscellaneous Expenses,Diverse udgifter
+,Sales Browser,Salg Browser
+apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
+apps/erpnext/erpnext/hooks.py +90,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/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+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/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Salg Return
+apps/erpnext/erpnext/public/js/setup_wizard.js +42,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;"
+,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 +82,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 +139,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
+DocType: Salary Slip,Earning,Optjening
+apps/erpnext/erpnext/accounts/doctype/account/account.py +46,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
+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: Depreciation Schedule,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 +381,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"
+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 +143,Operation ID not set,Operation ID ikke indstillet
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Dato
+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 +74,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 +259,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/setup_wizard/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +410,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+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/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
+,BOM Search,BOM Søg
+DocType: Notification Control,Purchase Receipt Message,Kvittering Message
+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 +442,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citater til Leads eller kunder.
+DocType: Purchase Invoice,Shipping Address,Forsendelse Adresse
+DocType: Quotation Item,Quotation Item,Citat Vare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +175,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+DocType: Item,Serial Number Series,Serial Number Series
+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 +189,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 +142,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.js +49,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 +56,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 +36,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: 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 +28,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/public/js/setup_wizard.js +172,user@example.com,user@example.com
+DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,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 +180,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 +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/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 +56,Total Present,Samlet Present
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +113,"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"
+DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+DocType: Quality Inspection,Sample Size,Sample Size
+DocType: Production Order Operation,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 +65,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrationsomkostninger
+DocType: Request for Quotation Item,Project Name,Projektnavn
+DocType: Opportunity,Opportunity From,Mulighed Fra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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/public/js/setup_wizard.js +269,Raw Material,Raw Material
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Total Ulønnet
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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/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 +171,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 +155,Indirect Income,Indirekte Indkomst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
+DocType: Newsletter,Email Sent?,E-mail Sendt?
+DocType: Budget Detail,Budget Allocated,Budgettet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+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 +149,Upload stock balance via csv.,Upload lager balance via csv.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/stock/doctype/item/item.js +20,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
+DocType: Attendance,Present,Present
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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/setup_wizard/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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resten af verden
+DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
+DocType: Features Setup,Item Barcode,Item Barcode
+DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
+apps/erpnext/erpnext/setup/setup_wizard/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/config/accounts.py +275,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 +454,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
+DocType: Quality Inspection,Inspected By,Inspiceres af
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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 +140,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
+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: 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 +113,Production Order status is {0},Produktionsordre status er {0}
+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/public/js/setup_wizard.js +275,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
+DocType: Sales Partner,Retailer,Forhandler
+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/page/accounts_browser/accounts_browser.js +131,View Ledger,Vis Ledger
+DocType: Pricing Rule,Buying,Køb
+DocType: Territory,For reference,For reference
+apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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 +24,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 +125,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/public/js/setup_wizard.js +20,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/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,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 +50,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
+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 +30,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,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 +40,Applicant for a Job.,Ansøger om et job.
+apps/erpnext/erpnext/setup/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 +25,Address Title is mandatory.,Adresse Titel er obligatorisk.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,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
+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."
+,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 +61,"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 +118,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,Closing (Dr),Lukning (dr)
+DocType: Item Group,Default Expense Account,Standard udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +324,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/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 +133,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Office vedligeholdelsesudgifter
+apps/erpnext/erpnext/config/website.py +12,"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 +157,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 +62,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
+DocType: Hub Settings,Name Token,Navn Token
+DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+DocType: Company,Round Off Cost Center,Afrunde Cost center
+DocType: Sales Invoice,End Date,Slutdato
+apps/erpnext/erpnext/setup/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 +240,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
+DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+DocType: Sales Invoice,Customer Address,Kunde Adresse
+DocType: Task,Review Date,Anmeldelse Dato
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
+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
+apps/erpnext/erpnext/accounts/general_ledger.py +137,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 +72,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/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
+DocType: Employee,Married,Gift
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,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 +147,Main,Main
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
+apps/erpnext/erpnext/config/stock.py +118,Batch (lot) of an Item.,Batch (parti) af et element.
+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 +145,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/public/js/setup_wizard.js +24,"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 +148,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/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/setup/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 +227,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,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 +265,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 +133,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/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 +129,"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: Stock Entry,For Quantity,For Mængde
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +126,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: Purchase Invoice Item,Qty,Antal
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Prisliste ikke valgt
+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 +488,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 +247,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 +131,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
+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 +136,Types of Expense Claim.,Typer af Expense krav.
+DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
+apps/erpnext/erpnext/setup/setup_wizard/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
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
+DocType: Email Digest,How frequently?,Hvor ofte?
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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 +313,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/public/js/setup_wizard.js +44,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 +99,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,Send masse SMS til dine kontakter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,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
+DocType: Payment Request,Make Sales Invoice,Make Sales Invoice
+DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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/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
+DocType: Purchase Order,To Receive,At Modtage
+apps/erpnext/erpnext/config/stock.py +77,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
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
+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/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
+DocType: Salary Slip,Deduction,Fradrag
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Selling
+DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
+DocType: Employee,Held On,Held On
+DocType: Address,Personal,Personlig
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Åbning for et job.
+apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Forkert Adgangskode
+DocType: Payment Reconciliation,Reconcile,Forene
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,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 +72,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: 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
+DocType: Project,Project Type,Projekt type
+DocType: C-Form,Series,Series
+DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,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: Workstation Working Hour,Start Time,Start Time
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +22,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/selling/doctype/sales_order/sales_order.js +802,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 +86,Stores,Butikker
+DocType: Account,Balance Sheet,Balance
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,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 +121,"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)
+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: Supplier Quotation,Stopped,Stoppet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,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 +165,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
+DocType: Account,Warehouse,Warehouse
+DocType: Pricing Rule,Valid From,Gyldig fra
+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.
+apps/erpnext/erpnext/stock/stock_ledger.py +406,"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/public/js/setup_wizard.js +162,"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 +497,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/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/config/stock.py +175,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
+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 +37,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/setup_wizard/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 +181,"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 +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+DocType: Issue,First Responded On,Først svarede den
+apps/erpnext/erpnext/templates/includes/cart.js +136,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
-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/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/config/hr.py +175,"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/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: POS Profile,Terms and Conditions,Betingelser
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+DocType: Item,Has Serial No,Har Løbenummer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+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/setup_wizard/industry_type.py +53,Television,Fjernsyn
+DocType: Company,Services,Tjenester
+DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/setup_wizard/install_fixtures.py +40,Others,Andre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{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 +415,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+DocType: Address,City/Town,By / Town
+DocType: Request for Quotation 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 Reorder,Re-Order Qty,Re-prisen evt
+DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
+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
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
+,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
+apps/erpnext/erpnext/config/stock.py +102,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Konto head {0} oprettet
+DocType: Account,Round Off,Afrunde
+DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Regnskabsår Startdato
+DocType: Account,Credit,Credit
+DocType: Sales Invoice,Is POS,Er POS
+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
+apps/erpnext/erpnext/config/accounts.py +233,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
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
+,Stock Projected Qty,Stock Forventet Antal
+DocType: Supplier,Stock Manager,Stock manager
+apps/erpnext/erpnext/public/js/pos/pos.js +557,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}
+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 +192,Opening Balance Equity,Åbning Balance Egenkapital
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,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 +42,Contribution %,Bidrag%
+DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
+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 +102,Please select a csv file,Vælg en CSV-fil
+DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +232,Closing (Cr),Lukning (Cr)
+DocType: Sales Invoice,Customer Name,Customer Name
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,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 +73,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 +378,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/config/accounts.py +70,Masters,Masters
+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/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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/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/accounts/doctype/account/account.py +44,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/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Samlet Varians
+DocType: Time Log Batch,Total Hours,Total Hours
+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: Request for Quotation,Manufacturing Manager,Produktion manager
+DocType: Cost Center,Cost Center,Cost center
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Rabat
+DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
+apps/erpnext/erpnext/setup/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/inactive_customers/inactive_customers.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
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
+DocType: Employee,Emergency Contact,Emergency Kontakt
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlige off dag
+DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
+apps/erpnext/erpnext/setup/setup_wizard/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/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 +74,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
+DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
+DocType: Account,Stock Adjustment,Stock Justering
+apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Gruppe
+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
+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 +189,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: 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: Employee,Contact Details,Kontaktoplysninger
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
+DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
+apps/erpnext/erpnext/controllers/stock_controller.py +167,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,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
+DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
+apps/erpnext/erpnext/controllers/status_updater.py +143,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 +39,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/general_ledger/general_ledger.py +174,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/setup_wizard/install_fixtures.py +156,White,Hvid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Markedsføringsomkostninger
+DocType: Journal Entry,User Remark,Bruger Bemærkning
+DocType: Sales Order,Partly Delivered,Delvist Delivered
+apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,Specifikationer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+DocType: Purchase Invoice,Credit To,Credit Til
+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/public/js/setup_wizard.js +272,Nos,Nos
+DocType: Purchase Invoice Item,Rate,Rate
+apps/erpnext/erpnext/config/stock.py +164,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/public/js/setup_wizard.js +273,Minute,Minut
+apps/erpnext/erpnext/public/js/pos/pos.js +435,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."
+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 +115,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
+DocType: Process Payroll,Send Email,Send Email
+apps/erpnext/erpnext/config/hr.py +70,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;
+DocType: Hub Settings,Seller Description,Sælger Beskrivelse
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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 +50,Cost of various activities,Omkostninger ved forskellige aktiviteter
+DocType: Tax Rule,Sales,Salg
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,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/erpnext/erpnext/config/hr.py +110,Salary template master.,Løn skabelon mester.
+,Monthly Salary Register,Månedlig Løn Tilmeld
+apps/erpnext/erpnext/controllers/trends.py +265,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
+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 +708,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 +12,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 +182,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
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,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
+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/public/js/setup_wizard.js +287,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"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/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/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+DocType: Workstation,Net Hour Rate,Net Hour Rate
+apps/erpnext/erpnext/config/learn.py +239,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,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
+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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
+DocType: Lead,Opportunity,Mulighed
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,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/setup/doctype/company/company.js +20,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
+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 +173,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 +67,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
+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 +129,Sales Expenses,Salgsomkostninger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{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: Employee,Mr,Hr
+,Hub,Hub
+DocType: Item Reorder,Item Reorder,Item Genbestil
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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 +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/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
+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 +366,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: 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 +306,Sales Order to Payment,Sales Order til Betaling
+DocType: Job Applicant,Hold,Hold
+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 +270,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+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 +99,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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
+DocType: Installation Note Item,Installed Qty,Antal installeret
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
+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 +109,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +205,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+DocType: Address,Lead Name,Bly navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,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: SMS Settings,Static Parameters,Statiske parametre
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,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 +92,Update Finished Goods,Opdater færdigvarer
+DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
+DocType: Item Attribute,Attribute Name,Attribut Navn
+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: 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: Supplier,Fixed Days,Faste dage
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +13,Project master.,Projekt mester.
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+DocType: Employee,Marital Status,Civilstand
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: Asset,Amended From,Ændret Fra
+DocType: Pricing Rule,For Price List,For prisliste
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,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 +103,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+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 +126,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
+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
+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: Address Template,Address Template,Adresse Skabelon
+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: Account,Depreciation,Afskrivninger
+DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
+DocType: Customer,Default Price List,Standard prisliste
 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/hr/doctype/employee/employee.py +156,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 +276,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/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 +269,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 +142,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 +600,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 +145,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 +415,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: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +290,Item Variants,Item Varianter
-DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,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 +129,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/public/js/setup_wizard.js +39,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 +261,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: 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 +86,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 +406,"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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Vedligeholdelse Besøg
-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 +194,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 +43,Contribution Amount,Bidrag Beløb
-DocType: Purchase 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 +196,Brand master.,Brand mester.
-DocType: Sales Invoice Item,Brand Name,Brandnavn
-apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kasse
-apps/erpnext/erpnext/public/js/setup_wizard.js +14,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
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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 +295,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 +540,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
-DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/hr.py +131,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
-,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.
-DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +180,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 +520,{0} View,{0} Vis
-DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,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 +184,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 +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/config/buying.py +38,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 +93,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 +203,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 +240,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 +65,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 +129,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.
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garanti krav
-,Lead Details,Bly Detaljer
-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 +48,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/support/doctype/maintenance_schedule/maintenance_schedule.py +135,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 +194,"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 +53,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,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 +392,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 +155,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 +268,Products,Produkter
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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 +24,"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 +232,No Production Orders created,Ingen produktionsordrer oprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +53,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/stock/doctype/item/item.py +361,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Make indkøbsordre
-DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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 +40,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 +37,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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 +337,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 +27,Time Logs for manufacturing.,Time Logs til produktion.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} skal indsendes
-DocType: Authorization Control,Authorization Control,Authorization Kontrol
-apps/erpnext/erpnext/config/projects.py +35,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/stock.py +72,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
-DocType: Quotation Item,Actual Qty,Faktiske Antal
-DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/public/js/setup_wizard.js +258,"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 +44,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
-DocType: SMS Center,Create Receiver List,Opret Modtager liste
-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 +126,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
-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 +78,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 +201,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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 +266,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 +230,{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 +448,Item table can not be blank,Item tabel kan ikke være tom
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"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 +271,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 +326,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: Production Order,Material Request Item,Materiale Request Vare
-apps/erpnext/erpnext/config/stock.py +85,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 +215,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 +66,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
-DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +267,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 +25,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
-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 +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +138,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 +308,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
-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
-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 +318,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 +127,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 +234,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 +272,Unit,Enhed
-apps/erpnext/erpnext/stock/get_item_details.py +124,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 +42,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 +49,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 +56,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 +137,Please enter Production Item first,Indtast venligst Produktion Vare først
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,handicappet bruger
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
-DocType: Salary Slip,Total Deduction,Samlet Fradrag
-DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Omkostninger Opdateret
-DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +179,"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 +178,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
-apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +71,Shipments,Forsendelser
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,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 +167,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 +350,"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 +139,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 +175,"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 +361,{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 +154,"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 +94,Sales Order required for Item {0},Sales Order kræves for Item {0}
-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 +39,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 +296,New Cost Center,Ny Cost center
-DocType: Bin,Ordered Quantity,Bestilt Mængde
-apps/erpnext/erpnext/public/js/setup_wizard.js +22,"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 +334,{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
-DocType: Quotation Item,Stock Balance,Stock Balance
-apps/erpnext/erpnext/config/selling.py +306,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 +281,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/setup/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
-DocType: Employee,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 +141,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbyd Letter
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,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 +103,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 +234,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 +121,"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 +273,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 +123,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 +488,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 +300,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 +175,Serial No {0} not found,Løbenummer {0} ikke fundet
-apps/erpnext/erpnext/public/js/setup_wizard.js +211,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."
-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
-DocType: Payment Request,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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}
 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 +114,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 +86,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 +608,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 +190,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 +61,"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
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
+DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
-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 +217,{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 +181,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 +196,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
-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
-DocType: Warranty Claim,Raised By,Rejst af
-DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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 +210,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 +402,"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 +206,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 +214,{0} {1} is not submitted,{0} {1} er ikke indsendt
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
-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 +116,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 +56,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,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 +185,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 +46,Tree of Bill of Materials,Tree of Bill of Materials
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,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: 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/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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 +210,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 +84,{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
-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 +121,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 +346,{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
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +57,Please enter item details,Indtast venligst item detaljer
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
+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 +57,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 +342,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,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 +112,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 +425,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
+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/public/js/setup_wizard.js +180,Accountant,Revisor
+apps/erpnext/erpnext/config/hr.py +190,"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/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
+DocType: Item,Website Item Groups,Website varegrupper
+DocType: Target Detail,Target Detail,Target Detail
+DocType: Quotation,Quotation To,Citat Til
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +136,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 +643,Packing Slip,Packing Slip
+DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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 +107,To Time must be greater than From Time,Til Time skal være større end From Time
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
+DocType: Delivery Note,Excise Page Number,Excise Sidetal
+DocType: Delivery Note,To Warehouse,Til Warehouse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"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 +145,{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 +104,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 +272,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/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 +80,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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/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/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 +59,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 +179,Unsecured Loans,Usikrede lån
+apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
+DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
+DocType: Item,Minimum Order Qty,Minimum Antal
+DocType: Target Detail,Target  Amount,Målbeløbet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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 +71,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +103,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/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 +118,"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 +493,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/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
+DocType: Delivery Note,% Installed,% Installeret
+DocType: Shipping Rule,Shipping Account,Forsendelse konto
+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: 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/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
+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 +80,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
+apps/erpnext/erpnext/setup/setup_wizard/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 +455,Change,Ændring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/accounts/general_ledger.py +127,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: Asset,Item Code,Item Code
+DocType: Sales Invoice,Recurring,Tilbagevendende
+,BOM Browser,BOM Browser
+,Completed Production Orders,Afsluttede produktionsordrer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Materiale Request
+apps/erpnext/erpnext/config/projects.py +35,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;
+DocType: Offer Letter,Awaiting Response,Afventer svar
+,Stock Ledger,Stock Ledger
+DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,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_balance/stock_balance.py +53,Balance Value,Balance Value
+apps/erpnext/erpnext/config/stock.py +17,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
+DocType: Item,Inspection Required,Inspection Nødvendig
+DocType: Company,Default Currency,Standard Valuta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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: 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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +120,Add Child,Tilføj Child
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +69,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: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
+apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Spor fører af Industry Type.
+,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
+,SO Qty,SO Antal
+apps/erpnext/erpnext/setup/setup_wizard/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 +508,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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: Project,Gross Margin,Gross Margin
+DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
+apps/erpnext/erpnext/controllers/recurring_document.py +132,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"
+,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/public/js/setup_wizard.js +199,e.g. VAT,fx moms
+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 +47,All Addresses.,Alle adresser.
+DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +146,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 +407, (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 +218,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
+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 +13,Request for purchase.,Anmodning om køb.
+DocType: Journal Entry,Contra Entry,Contra indtastning
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,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
+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
+DocType: Earning Type,Earning Type,Optjening Type
+DocType: Production Order Operation,Pending,Afventer
+DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
+DocType: Customer,Sales Team Details,Salg Team Detaljer
+DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
+DocType: Quotation Item,Stock Balance,Stock Balance
+DocType: Lead,Converted,Konverteret
+DocType: Supplier,Supplier Details,Leverandør Detaljer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 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
@@ -1668,1539 +3117,87 @@
 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: 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 +497,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 +262,"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 +218,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: Material Request,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 +69,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 +125,My Addresses,Mine Adresser
-DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +180,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 +74,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 +200,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
-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 +168,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 +326,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,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 +47,All Addresses.,Alle adresser.
-DocType: Company,Stock Settings,Stock Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +92,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Ny Cost center navn
-DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
-DocType: Appraisal,HR User,HR Bruger
-DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-apps/erpnext/erpnext/config/support.py +7,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 +500,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 +362,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 +139,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 +214,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 +142,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 +154,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
-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
-apps/erpnext/erpnext/controllers/stock_controller.py +173,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
-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 +24,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 +109,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 +67,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 +211,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 +101,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 +442,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 +449,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 +87,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 +148,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 +579,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 +190,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 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 +294,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 +158,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 +113,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,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 +25,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/config/stock.py +159,Incoming quality inspection.,Inspektion indkommende kvalitet.
-DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,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 +356,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 +132,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/hr/doctype/employee/employee.py +131,Please enter relieving date.,Indtast lindre dato.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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 +127,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 +410,[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 +49,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
-DocType: Shopping Cart Settings,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
-DocType: Account,Depreciation,Afskrivninger
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-DocType: Supplier,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 +471,Material Requests {0} created,Materiale Anmodning {0} skabt
-apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
-DocType: Supplier,Last Day of the Next Month,Sidste dag i den næste måned
-DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/accounts/party.py +280,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 +193,Root account can not be deleted,Root-konto kan ikke slettes
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,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 +226,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 +163,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 +135,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/config/hr.py +247,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 +167,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 +242,"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 +131,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 +137,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 +273,Minute,Minut
-DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
-,Qty to Receive,Antal til Modtag
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-DocType: 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 +46,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 +94,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/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 +19,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
-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/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 +50,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,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 +328,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 +199,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
-apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
-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 +17,Bills raised by Suppliers.,Regninger rejst af leverandører.
-DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,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 +199,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 +53,"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
-,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 +72,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 +57,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 +253,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 +115,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 +79,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 +83,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 +140,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 +247,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 +78,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 +198,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Formålet skal være en af {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,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
-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 +283,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 +45,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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 +80,{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 +128,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 +57,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 +109,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 +213,{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 +229,"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 +469,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 +12,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 +161,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 +378,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 +44,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 +64,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 +265,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/selling/doctype/installation_note/installation_note.js +50,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 +375,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 +96,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,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 +112,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/hr/doctype/employee/employee.js +29,Salary Structure,Løn Struktur
-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 +612,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 +131,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 +77,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 +59,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 +27,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/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
-DocType: C-Form,Amended From,Ændret Fra
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +486,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 +143,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 +191,"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/templates/generators/item.html +68,Add to Cart,Tilføj til indkøbsvogn
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
-apps/erpnext/erpnext/config/accounts.py +235,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: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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 +56,Total Present,Samlet Present
-apps/erpnext/erpnext/public/js/setup_wizard.js +273,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/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/stock/doctype/delivery_note/delivery_note.py +353,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
-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 +32,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 +169,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 +416,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 +519,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste Ordredato
-apps/erpnext/erpnext/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 +143,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 +261,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 +343,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 +52,All Products or Services.,Alle produkter eller tjenesteydelser.
-DocType: Supplier Quotation,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 +251,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 +165,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,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 +92,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
-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 +106,Customer {0} does not exist,Kunde {0} eksisterer ikke
-DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,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 +123,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 +73,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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 +35,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 +176,{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 +76,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 +64,'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
-apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,Specifikationer
-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/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,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 +127,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 +189,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 +60,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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 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 +118,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 +50,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 +60,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/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 +20,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 +275,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 +65,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
-DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
-DocType: 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 +150,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 +19,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 +71,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 +110,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/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 +13,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 +488,{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 +44,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,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/stock/doctype/item/item.py +390,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/stock.py +97,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 +172,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 +13,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 +456,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 +106,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
-DocType: Project,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 +239,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 +133,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 +29,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: 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 +136,Types of Expense Claim.,Typer af Expense krav.
-DocType: Item,Taxes,Skatter
-DocType: Project,Default Cost Center,Standard Cost center
-DocType: Sales 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 +201,Rate (%),Sats (%)
-apps/erpnext/erpnext/public/js/setup_wizard.js +41,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"
-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 +162,"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 +350,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 +68,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
-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 +107,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 +479,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 +20,"e.g. ""MC""",fx &quot;MC&quot;
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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: Project,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 +16,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 +113,"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: 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
+DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
 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/setup/doctype/company/company.js +20,Cost Centers,Omkostninger Centers
-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 +183,"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 +132,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 +42,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 +147,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 +39,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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,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.js +435,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 +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
-DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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 +220,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
-DocType: Project Task,View Task,View Opgave
-apps/erpnext/erpnext/public/js/setup_wizard.js +40,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/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: Customer,Sales Team Details,Salg Team Detaljer
-DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/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/controllers/stock_controller.py +72,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/inactive_customers/inactive_customers.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
-DocType: C-Form,Series,Series
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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 +268,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 +114,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 +153,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 +12,Employee records.,Medarbejder Records.
-DocType: HR Settings,Payroll Settings,Payroll Indstillinger
-apps/erpnext/erpnext/config/accounts.py +135,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 +144,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 +340,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 +75,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 +46,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 +38,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 +420,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 +65,"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 +137,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
-DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +313,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 +136,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,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 +241,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 +185,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 +250,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 +63,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 +272,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 +141,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 +234,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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 +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
-DocType: Issue,Content Type,Indholdstype
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
-DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,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/erpnext/erpnext/public/js/setup_wizard.js +21,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 +351,'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 +164,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}
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
-DocType: Item,Customer Code,Customer Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Birthday Reminder for {0}
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-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 +18,Project activity / task.,Projektaktivitet / opgave.
-apps/erpnext/erpnext/config/hr.py +104,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: 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
-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 +144,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
-DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
-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 +451,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 +91,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 +206,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 +50,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 +72,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
-apps/erpnext/erpnext/config/accounts.py +225,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 +132,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 +385,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 +248,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: BOM,Raw Material Cost,Raw Material Omkostninger
-DocType: Item Reorder,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 +158,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/accounts/doctype/fiscal_year/fiscal_year.py +49,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 +115,Successfully Reconciled,Succesfuld Afstemt
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/config/stock.py +180,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 +508,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
-apps/erpnext/erpnext/config/buying.py +71,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 +77,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 +159,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 +99,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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 +455,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 +18,"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/stock/doctype/item/item.js +20,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 +74,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 +139,Set as Lost,Sæt som Lost
-DocType: Supplier,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: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
-DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +216,"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: 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 +95,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 +93,{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/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 +230,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 +12,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 +492,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 +99,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 +99,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 +50,Accounting journal entries.,Regnskab journaloptegnelser.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,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 +239,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
-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 +175,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 +78,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 +12,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 +204,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total Ulønnet
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Time Log ikke fakturerbare
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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 +178,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 +109,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 +127,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 +59,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 +175,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 +149,Attach Logo,Vedhæft Logo
-DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/config/hr.py +87,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 +80,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 +102,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 +157,Terms and Conditions Template,Vilkår og betingelser Skabelon
-DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Material Request Item,For Warehouse,For Warehouse
+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/stock/doctype/stock_entry/stock_entry.py +681,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 +380,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}
-,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 +13,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 +409, (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 +599,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
+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/config/manufacturing.py +33,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},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 +169,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 +212,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/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
+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: 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 +157,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/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
+DocType: SMS Log,Sender Name,Sender Name
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
+DocType: Sales Order,To Deliver,Til at levere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,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 +68,Avg. Buying Rate,Gns. Køb Rate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Sikrede lån
+DocType: Employee Education,Employee Education,Medarbejder Uddannelse
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+,Items To Be Requested,Varer skal ansøges
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +167,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
+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/public/js/setup_wizard.js +212,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
+DocType: Activity Cost,Activity Type,Aktivitet Type
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Afsætte blade for året.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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)
+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/public/js/setup_wizard.js +191,"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 +33,Item {0} must be Sales Item,Vare {0} skal være Sales Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +75,Allocate leaves for a period.,Afsætte blade i en periode.
+DocType: Serial No,Maintenance Status,Vedligeholdelse status
+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}
+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 +179,"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
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,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
+DocType: Attendance,Leave Type,Forlad Type
+DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+DocType: Issue,Content Type,Indholdstype
+DocType: Salary Slip,Total in words,I alt i ord
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+DocType: Warehouse,Warehouse Detail,Warehouse Detail
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index f1de7a5..3c4049e 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Forhandler
 DocType: Employee,Rented,Lejet
 DocType: POS Profile,Applicable for User,Gældende for Bruger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Vil du virkelig ønsker at skrotte dette aktiv?
 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/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,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/templates/pages/projects.js +81,Show open,Vis åben
 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/projects/doctype/project/project.py +44,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 +229,New Leave Application,Ny Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Regnskab tabel kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Salg Partners Kommissionen
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
 DocType: Payment Request,Payment Request,Betaling Request
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tilladt for {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,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 +197,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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: Item,Is Fixed Asset,Er anlægsaktiv
 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
@@ -156,7 +159,8 @@
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Udgifter
 DocType: Newsletter,Email Sent?,E-mail Sendt?
 DocType: Journal Entry,Contra Entry,Contra indtastning
 DocType: Production Order Operation,Show Time Logs,Vis Time Logs
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Installation status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 DocType: BOM Replace Tool,New BOM,Ny BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Indtast Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Netto kontant fra Finansiering
 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 +217,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,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 +427,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 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}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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"
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Lære
+DocType: Asset,Next Depreciation Date,Næste Afskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Administrer Sales Person Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Udestående Checks og Indlån at rydde
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Forkert Adgangskode
 DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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/manufacturing/doctype/production_order/production_order.py +315,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."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheder af [{1}] (# Form / Item / {1}) findes i [{2}] (# Form / Warehouse / {2})
 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: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +87,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 +381,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Vælg måned og år
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Vælg Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
 DocType: 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: Depreciation Schedule,Schedule Date,Tidsplan Dato
 DocType: Packed Item,Packed Item,Pakket Vare
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
+apps/erpnext/erpnext/config/buying.py +65,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
@@ -346,6 +353,7 @@
 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: Request for Quotation,Request for Quotation,Anmodning om Citat
 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."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,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 +70,Holiday master.,Ferie mester.
-DocType: Material Request Item,Required Date,Nødvendig Dato
+DocType: Request for Quotation Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Besked til Leverandøren
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
 DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Håndtering af underleverancer
+DocType: Project,Project will be accessible on the website to these users,Projekt vil være tilgængelig på hjemmesiden for at disse brugere
 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 +53,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Tilvækst kan ikke være 0
 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 +86,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Afventer Antal
 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
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Finansiel / regnskabsår.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Akkumulerede værdier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Emne Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Leveret: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Genoptag Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
 DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Salg Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Salg Return
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Løn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Opdatering Bank transaktionstidspunkterne
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Opdatering Bank transaktionstidspunkterne
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tidsregistrering
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
@@ -518,27 +528,27 @@
 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: Activity Type,Default Costing Rate,Standard Costing Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Vedligeholdelse Skema
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto Ændring i Inventory
 DocType: Employee,Passport Number,Passport Number
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Venligst sætte en Holiday liste til enten Medarbejderen eller Selskabet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Afskrivninger Beløb
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Faste dage
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Pakning List
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
+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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operation Time
 DocType: Pricing Rule,Sales Manager,Salgschef
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Gruppe til Gruppe
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mine projekter
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
 DocType: Journal Entry,Bill No,Bill Ingen
+DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / Tab konto på Asset Bortskaffelse
 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)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Betaling post er allerede skabt
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Total fakturering år
 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 +529,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Element har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"Emne skal indstilles, hvis mulighed er lavet af emne"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlige off dag
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedlige lønseddel.
 DocType: Item Group,Website Specifications,Website Specifikationer
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Der er en fejl i din adresse Skabelon {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Ny konto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Ny konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {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.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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 +188,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Office vedligeholdelsesudgifter
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Indtast Vare først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,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
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logisk fejl: Skal finde overlappende
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste Faktura Beløb
 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 +267,C-Form records,C-Form optegnelser
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form optegnelser
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kunde og leverandør
 DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support forespørgsler fra kunder.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +752,15 @@
 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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Kvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Valutakursen mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Salg Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} skal være aktiv
+DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Kurv
 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"
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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 +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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: Asset,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
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Leveringstid Dato
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Måske Valutaveksling rekord er ikke skabt til
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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: Job Opening,Publish on website,Udgiv på hjemmesiden
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunderne.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Faktura Dato kan ikke være større end Udstationering Dato
 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Indirekte Indkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Beløb = udestående beløb
 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 +672,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Yderligere rabatprocent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Række {0}: Faktura {1} er ugyldig, kan det blive annulleret / findes ikke. \ Indtast en gyldig faktura"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
 ,Employee Holiday Attendance,Medarbejder Holiday Deltagerliste
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Angivelser
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock Angivelser
 DocType: Item,Inspection Criteria,Inspektion Kriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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 emner (åbne)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Lave
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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/templates/pages/cart.html +5,My Cart,Indkøbskurv
@@ -825,7 +845,8 @@
 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 +180,Qty for {0},Antal for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Vil du virkelig vil gendanne denne skrottet aktiv?
+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 +80,Leave Allocation Tool,Lad Tildeling Tool
 DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
@@ -838,7 +859,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Rabat
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,Slags beløb
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Time Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Time Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,ophugget
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
 DocType: BOM Operation,Operation,Operation
 DocType: Lead,Organization Name,Organisationens navn
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Salgsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgs kostcenter
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,Citater modtaget fra leverandører.
+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
@@ -892,7 +914,7 @@
 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 +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Bidrag%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globale standarder
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt Samarbejde Invitation
 DocType: Salary Slip,Deductions,Fradrag
 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.
 DocType: Salary Slip,Leave Without Pay,Lad uden løn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning Fejl
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacity Planning Fejl
 ,Trial Balance for Party,Trial Balance til Party
 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 +92,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 +473,Nothing to request,Intet at anmode
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 +45,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
@@ -935,18 +958,18 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Venligst sæt E-mail-id
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Venligst sæt E-mail-id
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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 +33,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Skat og andre løn fradrag.
 DocType: Lead,Lead,Emne
 DocType: Email Digest,Payables,Gæld
@@ -960,6 +983,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formen er ikke for faktura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Konto {0} skal være en ikke-lagervare
 DocType: Contact,User ID,Bruger-id
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Vis Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,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 +431,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Resten af verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Betalt udbytte
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskab Ledger
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,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
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Midlertidig Åbning
 ,Employee Leave Balance,Medarbejder Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Værdiansættelse Rate kræves for Item i række {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Kreditorer Resumé
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,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 +165,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den samlede Udstedelse / Transfer mængde {0} i Material Request {1} \ ikke kan være større end ønskede mængde {2} for Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,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
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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 +257,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/stock/get_item_details.py +142,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produktionsordre status er {0}
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,For Leverandøren
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},"Fandt ikke nogen post, kaldet {0}"
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Website varegrupper
 DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
-DocType: Journal Entry,Journal Entry,Kassekladde
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Anmodning om Citat Leverandør
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Attendance,HR Manager,HR Manager
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
 DocType: Salary Slip,Earning,Optjening
 DocType: Payment Tool,Party Account Currency,Party Account Valuta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Aktuel værdi efter afskrivninger skal være mindre end lig med {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
 DocType: Company,If Yearly Budget Exceeded (for expense account),Hvis Årlig budget overskredet (for udgiftskonto)
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
 DocType: Project,Start and End Dates,Start- og slutdato
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operationer kan ikke være tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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
+DocType: Asset,Depreciation Schedules,Afskrivninger Tidsplaner
 DocType: Item,Is Service Item,Er service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Projekter
 DocType: Payment Request,Transaction Currency,Transaktion Valuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,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 +31,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/accounts/doctype/fiscal_year/fiscal_year.py +32,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
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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 +17,Communication log.,Kommunikation log.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,må ikke være større end 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Skat Regel for transaktioner.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Skat Regel for transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Vi køber denne vare
 DocType: Address,Billing,Fakturering
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Aflæsninger
 DocType: Stock Entry,Total Additional Costs,Total Yderligere omkostninger
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub forsamlinger
+DocType: Asset,Asset Name,Asset Name
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,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 +600,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/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Packing Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Anmodning om tilbud kan være adgang ved at klikke på følgende link
+DocType: Asset,Number of Months in a Period,Antal måneder i en periode
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),I alt ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost center
 DocType: Sales Invoice,Source,Kilde
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Vis lukket
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,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 +261,Packing Slip(s) cancelled,Packing Slip (r) annulleret
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 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 +86,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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 +406,"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."
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Vedligeholdelse Besøg
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Vedligeholdelse Besøg
 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
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Brand mester.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Sales Invoice Item,Brand Name,Brandnavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kasse
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Passiver
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gensend Betaling E-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Andre rapporter
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto Ændring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Betaling Anmodning findes allerede {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Mængde må ikke være mere end {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Foregående regnskabsår er ikke lukket
 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/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,Leverandør Type mester.
+apps/erpnext/erpnext/config/buying.py +43,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 +93,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 DocType: Purchase Invoice,Reference Document,referencedokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/config/website.py +12,"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 +80,{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
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto Ændring i Kreditor
 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 +129,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
 DocType: Quotation,Term Details,Term Detaljer
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} skal være større end 0
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garanti krav
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Forskud mod {0} {1} kan ikke være større \ end Grand alt {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Vælg emne kode
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,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: Packed Item,To Warehouse (Optional),Til Warehouse (valgfri)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Enkelt enhed af et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Gross Købesum
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
+DocType: Asset,Depreciation Method,afskrivningsmetode
 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
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Indkøbskurv er aktiveret
 DocType: Job Applicant,Applicant for a Job,Ansøger om et job
 DocType: Production Plan Material Request,Production Plan Material Request,Produktion Plan Materiale Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Ingen produktionsordrer oprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produktionsordrer oprettet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,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/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger 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 +37,Addresses,Adresser
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresser
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,Appraisals
 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 +337,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Indstil filter baseret på Item eller Warehouse
 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 +27,Time Logs for manufacturing.,Time Logs til produktion.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tid Log til opgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+DocType: Request for Quotation Supplier,Send Email to Supplier,Send Email til Leverandøren
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 DocType: Packing Slip,To Package No.,At pakke No.
 DocType: Production Planning Tool,Material Requests,Materiale Anmodning
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
 DocType: SMS Settings,Message Parameter,Besked Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree of finansielle omkostninger Centers.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree of finansielle omkostninger Centers.
 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
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,"Beløb, Deliver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} oprettet
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
 ,Serial No Status,Løbenummer status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Item tabel kan ikke være tom
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"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,Salg
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Told og afgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Indtast Referencedato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Betaling Gateway konto er ikke konfigureret
 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: Production Order,Material Request Item,Materiale Request Vare
+DocType: Request for Quotation Item,Material Request Item,Materiale Request Vare
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,solgt
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Sales Invoice,Accounting Details,Regnskab Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investeringer
 DocType: Issue,Resolution Details,Opløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tildelinger
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Indtast Materiale Anmodning i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast Materiale Anmodning i ovenstående tabel
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: Item Group,Show In Website,Vis I Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Gruppe
@@ -1527,6 +1567,7 @@
 ,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 +25,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,For Medarbejder Navn
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset er obligatorisk mod et anlægsaktiv Item
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
 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 +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Asset,Depreciation Schedule,Afskrivninger Schedule
 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: Asset,Purchase Date,Købsdato
 DocType: Employee,Personal Details,Personlige oplysninger
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Venligst sæt &#39;Asset Afskrivninger Omkostninger Centers i Company {0}
 ,Maintenance Schedules,Vedligeholdelsesplaner
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,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
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
 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 +318,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 +127,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 +234,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe til ikke-Group
 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 +272,Unit,Enhed
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Angiv venligst Company
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,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)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Vare Pris tilføjet for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Vare Pris tilføjet for {0} i prisliste {1}
 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 +137,Please enter Production Item first,Indtast venligst Produktion Vare først
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Indtast venligst Produktion Vare først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Beregnede kontoudskrift balance
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,handicappet bruger
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
 DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Omkostninger Opdateret
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Omkostninger Opdateret
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Antal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
+DocType: Request for Quotation,Manufacturing Manager,Produktion manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Forsendelser
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
 apps/erpnext/erpnext/stock/doctype/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Diverse udgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Bruger {0} er deaktiveret
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{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 +154,"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 +94,Sales Order required for Item {0},Sales Order kræves for Item {0}
@@ -1653,11 +1699,11 @@
 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/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Antal skal være en, som varen er knyttet til et aktiv"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item bør ikke være et produkt Bundle. Fjern element `{0}` og gemme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Ny Cost center
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; Nuværende Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj Child) af typen &quot;Skat&quot; og gør nævne Skatteprocent.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Ny Cost center
 DocType: Bin,Ordered Quantity,Bestilt Mængde
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Quality Inspection,In Process,I Process
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Time Logs oprettet:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Logs oprettet:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægt UOM
 DocType: Employee,Blood Group,Blood Group
@@ -1691,13 +1738,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Angiv et land for denne forsendelse Regel eller check Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debit Til kræves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debit Til kræves
 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 +141,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Vælg Incharge Person navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbyd Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
@@ -1705,22 +1752,22 @@
 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 +103,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 +234,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/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Prisliste {0} er deaktiveret
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prisliste {0} er deaktiveret
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serienumre, der kræves for Item {1}. Du har givet {2}."
 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 +123,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 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 +175,Serial No {0} not found,Løbenummer {0} ikke fundet
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Løbenummer {0} ikke fundet
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Dine kunder
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om projektet: {0}
 DocType: Leave Block List Date,Block Date,Block Dato
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Ansøg nu
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Ansøg nu
 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."
@@ -1756,7 +1804,7 @@
 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 +114,No Item with Barcode {0},Ingen Vare med Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,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
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Materiale
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Vare {0} skal være en salgsvare i {1}
 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/public/js/controllers/transaction.js +839,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
 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
@@ -1791,12 +1839,13 @@
 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Inviter som Bruger
 DocType: Features Setup,After Sale Installations,Efter salg Installationer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Venligst sæt {0} i Company {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{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.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Angiv venligst Company for at fortsætte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoændring i Debitor
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Hurtig Kassekladde
 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 +206,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} er ikke indsendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Følgende produktionsordrer blev skabt:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Følgende produktionsordrer blev skabt:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Nyhedsbrev Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} er lukket
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fonde&gt; Omsætningsaktiver&gt; Bankkonti og oprette en ny konto (ved at klikke på Tilføj Child) af typen &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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: Company,Fixed Asset Depreciation Settings,Anlægsaktiv Afskrivninger Indstillinger
 DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
 DocType: Purchase Invoice,Advances,Forskud
 DocType: Production Order,Manufacture against Material Request,Fremstilling mod Materiale Request
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
 DocType: Campaign,Campaign-.####,Kampagne -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: 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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fonde&gt; Omsætningsaktiver&gt; Bankkonti og oprette en ny konto (ved at klikke på Tilføj Child) af typen &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine Adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisation gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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-over
 DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen medarbejder for de ovenfor udvalgte kriterier eller lønseddel allerede skabt
@@ -1972,7 +2024,7 @@
 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 +200,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;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Lønningsliste
 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"
@@ -1982,8 +2034,9 @@
 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
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Address skabelon.
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,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 +326,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
 DocType: Appraisal,HR User,HR Bruger
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-apps/erpnext/erpnext/config/support.py +7,Issues,Spørgsmål
+apps/erpnext/erpnext/hooks.py +90,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/accounts/party.py +322,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Resultatopgørelse
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,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 +214,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
+apps/erpnext/erpnext/config/accounts.py +222,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 +142,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
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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 +67,No Remarks,Ingen Bemærkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fast aktivpost skal være en ikke-lagervare
 DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2119,7 +2174,7 @@
 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 +449,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Payment Request,Recipient and Message,Modtager og besked
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandør Adresse
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Anmodning om tilbud.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Mod dokument nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Administrer Sales Partners.
 DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Vælg {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,umærket Deltagelse
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Indtast lindre dato.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Kan ikke finde valutakurs for {0} til {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Kan ikke finde valutakurs for {0} til {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halvdags
 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 +410,[Error],[Fejl]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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 +49,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (valgfri)
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
@@ -2247,14 +2305,16 @@
 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 +471,Material Requests {0} created,Materiale Anmodning {0} skabt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materiale Anmodning {0} skabt
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og kontakt
 DocType: Supplier,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 +280,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/accounts/party.py +286,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: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
+DocType: Asset,Expected Value After Useful Life,Forventet værdi efter Nyttige Life
 DocType: Item,Reorder level based on Warehouse,Genbestil niveau baseret på Warehouse
 DocType: Activity Cost,Billing Rate,Fakturering Rate
 ,Qty to Deliver,Antal til Deliver
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} er aflyst eller lukket
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Netto kontant fra Investering
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root-konto kan ikke slettes
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} skal indsendes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Administrer Adresser
-DocType: Pricing Rule,Item Code,Item Code
+DocType: Asset,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
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
 DocType: Employee Education,School/University,Skole / Universitet
 DocType: Payment Request,Reference Details,Henvisning Detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter Nyttig Livet skal være mindre end Gross Købesum
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
 ,Billed Amount,Faktureret beløb
+DocType: Asset,Double Declining Balance,Dobbelt Faldende Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Lukket ordre kan ikke annulleres. Unclose at annullere.
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Send nyhedsbrev
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,fuldt afskrevet
 ,Stock Projected Qty,Stock Forventet Antal
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Løbenummer og Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
 ,Qty to Receive,Antal til Modtag
 DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
 DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Deaktiver i ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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,% Leveret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank kassekredit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Vare Gruppe&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Sikrede lån
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Venligst sæt Afskrivninger relaterede konti i Asset kategori {0} eller Company {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Appraisal,Appraisal,Vurdering
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail sendt til leverandør {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gentages
 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 +187,Leave approver must be one of {0},Lad godkender skal være en af {0}
@@ -2344,7 +2410,7 @@
 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 +199,Select Quantity,Vælg antal
+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.py +66,Unsubscribe from this Email Digest,Afmelde denne e-mail-Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Samlet Margin
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Expense Claim,Approval Status,Godkendelsesstatus
 DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
 DocType: Payment Gateway Account,Default Payment Request Message,Standard Betaling Request Message
 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/config/accounts.py +118,Banking and Payments,Bank- og betalinger
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bank- og betalinger
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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/config/hr.py +55,Leaves and Holiday,Blade og Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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
@@ -2419,15 +2486,17 @@
 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 +53,"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: Company,Asset Depreciation Cost Center,Asset Afskrivninger Omkostninger center
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Købsdato af aktiver {0} ikke passer med købsfakturaen dato
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
 ,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
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Tilgodehavender ({0})
-DocType: Project,Margin,Margen
+DocType: Pricing Rule,Margin,Margen
 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 +72,Gross Profit %,Gross Profit%
@@ -2435,20 +2504,23 @@
 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"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Brutto Købesummen er obligatorisk
 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 +57,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
 DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installation Dato
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} hører ikke til selskab {2}
 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: Account,Accumulated Depreciation,Akkumulerede afskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
 DocType: Payment Request,Email To,E-mail Til
 DocType: Lead,Lead Owner,Emne ejer
 DocType: Bin,Requested Quantity,Anmodet Mængde
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Warehouse kræves
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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."
@@ -2456,11 +2528,12 @@
 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 +115,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/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Delivered
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Samme leverandør er indtastet flere gange
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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: Payment Request,Payment Details,Betalingsoplysninger
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Registrering af al kommunikation af type e-mail, telefon, chat, besøg osv"
 DocType: Manufacturer,Manufacturers used in Items,"Producenter, der anvendes i artikler"
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Opret ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Pris: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Vælg en gruppe node først.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Vælg en gruppe node først.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbejder og fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Formålet skal være en af {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern henvisning af kunde, leverandør, salg partner og bly, da det er din firmaadresse"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Næste dato skal være større end Udstationering Dato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Vis skat break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er udsolgt
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Næste dato skal være større end Udstationering Dato
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Bogføringsdato
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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 +44,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
+DocType: Asset Category Account,Fixed Asset Account,Anlægsaktiv konto
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
@@ -2587,7 +2663,7 @@
 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 +96,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Løn Struktur
 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 +612,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citater
 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 +131,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
-DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
 DocType: Purchase Invoice,Print Language,print Sprog
 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"
+DocType: Asset,Number of Depreciations,Antal Afskrivninger
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Anmodning om Citater
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
 DocType: Purchase Invoice Item,Image View,Billede View
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
+DocType: Asset,Partially Depreciated,Delvist Afskrives
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
@@ -2635,13 +2713,13 @@
 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/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
-DocType: C-Form,Amended From,Ændret Fra
+DocType: Asset,Amended From,Ændret Fra
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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 +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Henvis &#39;Gevinst / Tab konto på Asset Bortskaffelse&#39; i Company
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Betalinger med fakturaer
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Tilføj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Aktivere / deaktivere valutaer.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 DocType: Production Planning Tool,Get Material Request,Hent Materiale Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,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: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Samlet Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,regnskaber
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,regnskaber
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
 DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
 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 +32,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
 DocType: Stock Entry,Update Rate and Availability,Opdatering Vurder og tilgængelighed
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
 DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoændring i Equity
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Venligst annullere købsfaktura {0} først
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Fejl: {0}&gt; {1}
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste Ordredato
 apps/erpnext/erpnext/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
@@ -2720,18 +2801,18 @@
 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 +261,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Kommerciel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
 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 +52,All Products or Services.,Alle produkter eller tjenesteydelser.
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Række {0} # Der skal være af typen &#39;anlægsaktiv&#39;
 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 +251,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
+apps/erpnext/erpnext/config/accounts.py +259,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
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
 DocType: Tax Rule,Billing State,Fakturering stat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Forfaldsdato er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning Series
@@ -2765,20 +2846,22 @@
 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å
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Send Leverandør Emails
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Installation rekord for en Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Næste dato dag og Gentag på Dag Måned skal være lig
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Næste dato dag og Gentag på Dag Måned skal være lig
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Log er blevet faktureret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Venligst sæt Navngivning serien til {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Få elementer fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Få elementer fra Product Bundle
+DocType: Asset,Straight Line,Lige linje
+DocType: Project User,Project User,Projekt Bruger
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Tilføj Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,åbning Value
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provision på salg
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Repræsentationsudgifter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Juridiske Udgifter
 DocType: Sales Invoice,Posting Time,Udstationering Time
 DocType: Sales Order,% Amount Billed,% Beløb Faktureret
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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 +118,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åbne Meddelelser
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} er en ugyldig e-mailadresse i &#39;Notification \ e-mail adresse&#39;
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Mængde bør være større end 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Mængde bør være større end 0
 DocType: Journal Entry,Cash Entry,Cash indtastning
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Leverandør af aktiv {0} ikke passer med leverandøren i købsfakturaen
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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 +110,Salary template master.,Løn skabelon mester.
@@ -2887,12 +2973,13 @@
 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 +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Fakturering valuta skal være lig med enten standard comapany valuta eller parts valuta payble konto
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Words&#39; område vil ikke være synlig i enhver transaktion"
@@ -2902,13 +2989,13 @@
 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.
 ,Reqd By Date,Reqd Efter dato
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditorer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,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 +449,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 +106,Standard Selling,Standard salg
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
-DocType: Project,Project Name,Projektnavn
+DocType: Request for Quotation Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Features Setup,Item Batch Nos,Item Batch nr
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Slutdato
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transaktioner
 DocType: Employee,Internal Work History,Intern Arbejde Historie
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumuleret Afskrivninger Beløb
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Expense
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Selskabet er obligatorisk, da det er din firmaadresse"
 DocType: Item Attribute,From Range,Fra Range
 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/manufacturing/doctype/production_order/production_order.js +30,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
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Yderligere omkostninger
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Leveringsdato
 DocType: Opportunity,Opportunity Date,Opportunity Dato
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+DocType: Request for Quotation Item,Request for Quotation Item,Anmodning om Citat Vare
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
@@ -3015,11 +3104,12 @@
 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
 DocType: Customer,Sales Partner and Commission,Salg Partner og Kommissionen
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Venligst sæt &#39;Asset Bortskaffelse konto&#39; i Company {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Afventer anmeldelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klik her for at betale
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Aktiv {0} kan ikke kasseres, da det allerede {1}"
 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/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Tilføj elementer fra
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Tilføj elementer fra
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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 +20,"e.g. ""MC""",fx &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Vare {0} er blevet deaktiveret
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Opsætning Gateway konti.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Opsætning Gateway konti.
 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
 ,Cash Flow,Penge strøm
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
 DocType: Job Applicant,Applicant Name,Ansøger Navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Angiv fra / til spænder
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Standardindstillinger for salgstransaktioner.
 DocType: BOM Replace Tool,Current BOM,Aktuel BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj Løbenummer
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garanti
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print og Stationær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Opdater færdigvarer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Opdater færdigvarer
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Indkøb
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
 DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,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 +220,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
@@ -3153,9 +3244,11 @@
 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/projects/doctype/project/project.py +133,Join,Tilslutte
 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 +564,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
+DocType: Pricing Rule,Margin Rate or Amount,Margin sats eller beløb
 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
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3266,13 @@
 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 +17,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Venligst sæt Navngivning serien til {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,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
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,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}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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 +114,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Venligst sætte en standard Holiday List for Medarbejder {0} eller Company {0}
 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>
@@ -3226,23 +3319,23 @@
 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: Tax Rule,Purchase Tax Template,Køb Skat Skabelon
 ,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,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 +12,Employee records.,Medarbejder Records.
 DocType: Payment Gateway,Payment Gateway,Betaling Gateway
 DocType: HR Settings,Payroll Settings,Payroll Indstillinger
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Angiv bestilling
 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
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Vælg mærke ...
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transaktion valuta skal være samme som Payment Gateway valuta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Indsend om skabelse
 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 +420,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 +425,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 +65,"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 +137,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mine ordrer
@@ -3296,10 +3389,10 @@
 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 +250,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/config/accounts.py +258,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,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 +63,Total Paid Amt,Total Betalt Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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 +234,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Leverandør varenummer
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Udstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra fakturadato
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Customer Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Birthday Reminder for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Projektaktivitet / opgave.
 apps/erpnext/erpnext/config/hr.py +104,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: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller slutdato overlapper med {0}. For at undgå du indstille selskab
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
 DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daglige Påmindelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Ny Kontonavn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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 salgsmodul
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Procent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+apps/erpnext/erpnext/config/accounts.py +233,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 +132,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 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 +385,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; Nuværende Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj Child) af typen &quot;Skat&quot; og gør nævne Skatteprocent.
 DocType: Production Order,Production Order,Produktionsordre
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Succesfuld Afstemt
 DocType: Production Order,Planned End Date,Planlagt Slutdato
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Hvor emner er gemt.
 DocType: Tax Rule,Validity,Gyldighed
+DocType: Request for Quotation,Supplier Detail,Leverandør Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
 DocType: Attendance,Attendance,Fremmøde
 apps/erpnext/erpnext/config/projects.py +55,Reports,Rapporter
 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 +508,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
+apps/erpnext/erpnext/config/buying.py +76,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Ændring
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Kategori Navn
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Salg Person
 DocType: Sales Invoice,Cold Calling,Telefonsalg
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budget og Cost center
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budget og Cost center
 DocType: Maintenance Schedule Item,Half Yearly,HalvÅ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.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Indkøb Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Leverandør Citat {0} skabt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Vare Gruppe&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,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 +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Parent Konto
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Rabat og Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Betaling URL Besked
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total Ulønnet
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Time Log ikke fakturerbare
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"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: Asset,Asset Category,Asset Kategori
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiale til leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiale til leverandøren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Skattestyrelsen Faktura
 DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Markant Deltagelse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kortfristede forpligtelser
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Faktiske Antal er obligatorisk
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Numeriske værdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Vedhæft Logo
 DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Er tom Indkøbskurv
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Address skabelon.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betaling afslutning omdirigere brugeren til valgte side.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Asset,Current Value (After Depreciation),Aktuel værdi (efter afskrivninger)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},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
@@ -3693,6 +3794,6 @@
 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 +169,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 +212,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} findes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 99de639..d5ba9c2 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Händler
 DocType: Employee,Rented,Gemietet
 DocType: POS Profile,Applicable for User,Anwenden für Benutzer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Wollen Sie wirklich diese Anlageklasse zu Schrott?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource&gt; HR-Einstellungen
 DocType: Purchase Order,Customer Contact,Kundenkontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,zeigen open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie erfolgreich aktualisiert
 DocType: Pricing Rule,Apply On,Anwenden auf
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Neuer Urlaubsantrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Varianten anzeigen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Menge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Tabelle Konten können nicht leer sein.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
 DocType: Employee Education,Year of Passing,Abschlussjahr
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
 DocType: Designation,Designation,Bezeichnung
@@ -64,7 +66,7 @@
 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 +642,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Neu {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Neu {0}: #{1}
 ,Sales Partners Commission,Vertriebspartner-Provision
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abkürzung darf nicht länger als 5 Zeichen sein
 DocType: Payment Request,Payment Request,Zahlungsaufforderung
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Verheiratet
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nicht zulässig für {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Holen Sie Elemente aus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesewert 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitätsprotokoll:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
+DocType: Item,Is Fixed Asset,Ist Anlagevermögens
 DocType: Expense Claim Detail,Claim Amount,Betrag einfordern
 DocType: Employee,Mr,Hr.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Lieferantentyp / Lieferant
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Alle Kontakte
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} ist gesperrt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Lagerkosten
 DocType: Newsletter,Email Sent?,Wurde die E-Mail abgesendet?
 DocType: Journal Entry,Contra Entry,Gegenbuchung
 DocType: Production Order Operation,Show Time Logs,Zeitprotokolle anzeigen
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Installationsstatus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Artikel {0} muss ein Kaufartikel sein
+apps/erpnext/erpnext/stock/get_item_details.py +139,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"
 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 übertragen wurde."
-apps/erpnext/erpnext/controllers/accounts_controller.py +507,"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/controllers/accounts_controller.py +533,"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 +170,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: BOM Replace Tool,New BOM,Neue Stückliste
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Voraus Betrag kann nicht größer sein als {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Voraus Betrag kann nicht größer sein als {0} {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 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Bitte Firmenname angeben
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettocashflow aus Finanzierung
 DocType: Lead,Address & Contact,Adresse & Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
 DocType: Newsletter List,Total Subscribers,Gesamtanzahl der Abonnenten
 ,Contact Name,Ansprechpartner
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 DocType: Payment Tool,Reference No,Referenznr.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank-Einträge
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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"
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Benachrichtungseinstellungen
 DocType: Lead,Suggestions,Vorschläge
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Artikelgruppenbezogene Budgets für diese Region erstellen. Durch Setzen der Auslieferungseinstellungen können auch saisonale Aspekte mit einbezogen werden.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Bitte die übergeordnete Kontengruppe für das Lager {0} eingeben
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Bitte die übergeordnete Kontengruppe für das Lager {0} eingeben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Lernen
+DocType: Asset,Next Depreciation Date,Weiter Abschreibungen Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitätskosten je Mitarbeiter
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Lieferantenrechnung existiert in Kauf Rechnung {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Job Applicant,Cover Letter,Motivationsschreiben
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Herausragende Schecks und Einlagen zu löschen
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} Einheiten von [{1}] (# Form / Item / {1}) gefunden in [{2}] (# Form / Lager / {2})
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Stellenbeschreibung
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Lieferschein
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Steuern einrichten
 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 +381,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Bitte Monat und Jahr auswählen
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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, Lieferantenauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
 DocType: Item Tax,Tax Rate,Steuersatz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Artikel auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
-,Schedule Date,Geplantes Datum
+DocType: Depreciation Schedule,Schedule Date,Geplantes Datum
 DocType: Packed Item,Packed Item,Verpackter Artikel
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen
+apps/erpnext/erpnext/config/buying.py +65,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
@@ -346,6 +353,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Verfügbarer Kredit
 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"
+DocType: Request for Quotation,Request for Quotation,Angebotsanfrage
 DocType: Workstation,Working Hours,Arbeitszeit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Startnummer/aktuelle laufende Nummer einer bestehenden Serie ändern.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
-DocType: Material Request Item,Required Date,Angefragtes Datum
+DocType: Request for Quotation Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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."
+DocType: Request for Quotation,Message for Supplier,Nachricht für Lieferanten
 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
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Unteraufträge vergeben
+DocType: Project,Project will be accessible on the website to these users,Projekt wird auf der Website für diese Benutzer zugänglich sein
 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 +53,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Schrittweite kann nicht 0 sein
 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 +86,Item {0} is not Purchase Item,Artikel {0} ist kein Kaufartikel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Artikel {0} ist kein Kaufartikel
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Ausstehende Menge
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -468,13 +478,13 @@
 Um ein Budget auf diese Art zu verteilen, ""monatsweise Verteilung"" bei ""Kostenstelle"" einstellen"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Finanz-/Rechnungsjahr
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Kumulierte Werte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
 DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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,Entscheidung
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Geliefert: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verbindlichkeiten-Konto
@@ -482,7 +492,7 @@
 DocType: Job Applicant,Resume Attachment,Resume-Anlage
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Bestandskunden
 DocType: Leave Control Panel,Allocate,Zuweisen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Rücklieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Rücklieferung
 DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Streckengeschäft)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Gehaltskomponenten
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden
@@ -491,7 +501,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 apps/erpnext/erpnext/accounts/utils.py +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.
@@ -501,7 +511,7 @@
 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/config/accounts.py +70,Masters,Stämme
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update-Bankgeschäftstermine
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update-Bankgeschäftstermine
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Zeiterfassung
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
@@ -519,27 +529,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Bitte zuerst Kaufbeleg eingeben
 DocType: Buying Settings,Supplier Naming By,Bezeichnung des Lieferanten nach
 DocType: Activity Type,Default Costing Rate,Standardkosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Wartungsplan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettoveränderung des Bestands
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leiter
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Datum der Entscheidung
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Bitte stellen Sie eine Feiertagsliste entweder für die Mitarbeiter oder die Gesellschaft
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Abschreibungsbetrag
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Stichtage
 DocType: Quotation Item,Item Balance,die Balance der Gegenstände
 DocType: Sales Invoice,Packing List,Packliste
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,An Lieferanten erteilte Lieferantenaufträge
+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
@@ -554,8 +564,10 @@
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
 DocType: Pricing Rule,Sales Manager,Vertriebsleiter
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Gruppe zu Gruppe
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Meine Projekte
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
 DocType: Journal Entry,Bill No,Rechnungsnr.
+DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten
 DocType: Purchase Invoice,Quarterly,Quartalsweise
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
 DocType: Sales Order Item,Basic Rate (Company Currency),Grundpreis (Firmenwährung)
@@ -567,13 +579,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Payment Eintrag bereits erstellt
 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 Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall eines Produktes mit zu protokollieren."
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
+apps/erpnext/erpnext/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Vermögens {1} nicht auf Artikel verknüpft {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Insgesamt Abrechnung in diesem Jahr
 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 +529,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -596,6 +609,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
 ,Sales Person Target Variance Item Group-Wise,Artikelgruppenbezogene Zielabweichung des Vertriebsmitarbeiters
@@ -610,14 +624,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Monatliche Gehaltsabrechnung
 DocType: Item Group,Website Specifications,Webseiten-Spezifikationen
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Es ist ein Fehler in der Adressvorlage {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Neues Konto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Neues Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mehrere Preisregeln mit gleichen Kriterien vorhanden ist, lösen Sie Konflikte nach Priorität zuweisen. Preis Regeln: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Es sind mehrere Preisregeln mit gleichen Kriterien vorhanden, lösen Sie Konflikte, indem Sie Prioritäten zuweisen. Preis Regeln: {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.,Buchungen können zu Unterknoten erfolgen. Buchungen zu Gruppen sind nicht erlaubt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -665,17 +679,17 @@
 DocType: Address,Personal,Persönlich
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Büro-Wartungskosten
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Bitte zuerst den Artikel angeben
 DocType: Account,Liability,Verbindlichkeit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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 +275,Price List not selected,Preisliste nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -683,7 +697,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Meine Rechnungen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Meine Rechnungen
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Kein Mitarbeiter gefunden
 DocType: Supplier Quotation,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
@@ -692,10 +707,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Lagerbestand über CSV hochladen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden
 ,Support Analytics,Support-Analyse
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logische Fehler: Muss finden überlappende
 DocType: Item,Website Warehouse,Webseiten-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 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 +267,C-Form records,Kontakt-Formular Datensätze
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Kontakt-Formular Datensätze
 apps/erpnext/erpnext/config/selling.py +301,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 +12,Support queries from customers.,Support-Anfragen von Kunden
@@ -719,7 +735,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -756,14 +772,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Ist Untervergabe
 DocType: Item Attribute,Item Attribute Values,Artikel-Attributwerte
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Abonnenten anzeigen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Von Lieferanten gelieferte Artikel, die noch abgerechnet werden müssen"
 DocType: Employee,Ms,Fr.
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Vertriebspartner und Territorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Stückliste {0} muss aktiv sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Stückliste {0} muss aktiv sein
+DocType: Journal Entry,Depreciation Entry,Abschreibungen Eintrag
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Wagen
 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
@@ -782,7 +799,7 @@
 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,Artikelbarcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
 DocType: Address,Shop,Laden
@@ -792,10 +809,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
 DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
-DocType: Journal Entry Account,Purchase Invoice,Eingangsrechnung
+DocType: Asset,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 sollten im gleichen Geschäftsjahr sein
@@ -805,21 +822,24 @@
 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 zwingend erforderlich. Vielleicht wurde kein Datensatz für den Geldwechsel erstellt für
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Veröffentlichen Sie auf der Website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Lieferungen an Kunden
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Indirekte Erträge
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = Ausstehender Betrag"" setzen"
 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 +672,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Artikel für Übertrag auswählen
 DocType: Purchase Invoice,Additional Discount Percentage,Zusätzlicher prozentualer Rabatt
 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 in Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Maximalmenge
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Rechnung {1} ist ungültig, könnte es abgebrochen werden / nicht vorhanden. \ Bitte geben Sie eine gültige Rechnung"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
@@ -828,14 +848,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
 ,Employee Holiday Attendance,Mitarbeiterferien Teilnahme
 DocType: Opportunity,Walk In,Laufkundschaft
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Lizenz Einträge
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Lizenz Einträge
 DocType: Item,Inspection Criteria,Prüfkriterien
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Übergeben
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Erstellen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Erstellen
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
 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 +5,My Cart,Mein Warenkorb
@@ -845,7 +865,8 @@
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
 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 +180,Qty for {0},Menge für {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Wollen Sie wirklich dieses verschrottet Asset wiederherzustellen?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Menge für {0}
 DocType: Leave Application,Leave Application,Urlaubsantrag
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
 DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
@@ -858,7 +879,7 @@
 DocType: POS Profile,Cash/Bank Account,Bar-/Bankkonto
 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 +547,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -873,20 +894,21 @@
 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
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Verkaufsbetrag
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Zeitprotokolle
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Zeitprotokolle
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,Verschrottet
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrutierung
 DocType: BOM Operation,Operation,Arbeitsgang
 DocType: Lead,Organization Name,Firmenname
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Vertriebskosten
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
@@ -903,7 +925,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Soll
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Angebote von Lieferanten
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},An {0} | {1} {2}
 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
@@ -912,7 +934,7 @@
 DocType: Company,Default Currency,Standardwährung
 DocType: Contact,Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
 DocType: Expense Claim,From Employee,Von Mitarbeiter
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -920,7 +942,7 @@
 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 +130,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 +131,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 +42,Contribution %,Beitrag in %
@@ -929,22 +951,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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 übertragen, um eine neue Ausgangsrechnung zu erstellen."
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt-Zusammenarbeit Einladung
 DocType: Salary Slip,Deductions,Abzüge
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Dieser Zeitprotokollstapel wurde abgerechnet.
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Fehler in der Kapazitätsplanung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Fehler in der Kapazitätsplanung
 ,Trial Balance for Party,Summen- und Saldenliste für Gruppe
 DocType: Lead,Consultant,Berater
 DocType: Salary Slip,Earnings,Einkünfte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Eröffnungsbilanz
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Nichts anzufragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Verwaltung
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Arten der Aktivitäten für Tätigkeitsnachweise
@@ -955,18 +978,18 @@
 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"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Bitte E-Mail-ID eingeben
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Bitte E-Mail-ID eingeben
 DocType: Item,UOMs,Maßeinheiten
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
 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/config/buying.py +33,Supplier database.,Lieferantendatenbank
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
@@ -980,6 +1003,7 @@
 DocType: Holiday,Holiday,Urlaub
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-Form ist nicht anwendbar für Rechnung: {0}
 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
@@ -993,19 +1017,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
 DocType: Contact,User ID,Benutzer-ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Hauptbuch anzeigen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Hauptbuch anzeigen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Ausgeschüttete Dividenden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Ausgeschüttete Dividenden
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Hauptbuch
 DocType: Stock Reconciliation,Difference Amount,Differenzmenge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Gewinnrücklagen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Gewinnrücklagen
 DocType: BOM Item,Item Description,Artikelbeschreibung
 DocType: Payment Tool,Payment Mode,Zahlungsweise
 DocType: Purchase Invoice,Is Recurring,ist wiederkehrend
@@ -1013,7 +1038,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Temporäre Eröffnungskonten
 ,Employee Leave Balance,Übersicht der Urlaubskonten der Mitarbeiter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
@@ -1028,8 +1053,8 @@
 ,Accounts Payable Summary,Übersicht der Verbindlichkeiten
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
@@ -1037,7 +1062,7 @@
 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,Position 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kontobezeichnung {0} erstellt
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Kontobezeichnung {0} erstellt
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gesamtsumme erreicht
@@ -1045,12 +1070,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Vertrag
 DocType: Email Digest,Add Quote,Angebot hinzufügen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 apps/erpnext/erpnext/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
@@ -1060,19 +1085,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Webseite des Verkäufers
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Für Lieferant
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Hat keinen Artikel finden genannt {0}
 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
@@ -1080,10 +1106,10 @@
 DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
 DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
-DocType: Journal Entry,Journal Entry,Buchungssatz
+DocType: Depreciation Schedule,Journal Entry,Buchungssatz
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
 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 +433,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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
 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
@@ -1092,6 +1118,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Angebotsanfrage Lieferant
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Recurring Bis
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
@@ -1102,6 +1129,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage zur Zielorientierung
 DocType: Salary Slip,Earning,Einkommen
 DocType: Payment Tool,Party Account Currency,Gruppenkonten-Währung
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Aktueller Wert nach Abschreibung muss kleiner sein als gleich {0}
 ,BOM Browser,Stücklisten-Browser
 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)
@@ -1116,21 +1144,22 @@
 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}
 DocType: Project,Start and End Dates,Start- und Enddatum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
 ,Delivered Items To Be Billed,"Gelieferte Artikel, die abgerechnet werden müssen"
 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: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
 DocType: Address,Utilities,Dienstprogramme
 DocType: Purchase Invoice Item,Accounting,Buchhaltung
 DocType: Features Setup,Features Setup,Funktionen einstellen
+DocType: Asset,Depreciation Schedules,Abschreibungen Termine
 DocType: Item,Is Service Item,Ist Dienstleistung
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
 DocType: Payment Request,Transaction Currency,Transaktionswährung
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Von {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Von {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Vorgangsbeschreibung
 DocType: Item,Will also apply to variants,Gilt auch für Varianten
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
 DocType: Quotation,Shopping Cart,Warenkorb
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Durchschnittlicher täglicher Abgang
 DocType: Pricing Rule,Campaign,Kampagne
@@ -1144,8 +1173,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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 Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationsprotokoll
@@ -1153,8 +1182,8 @@
 DocType: Sales Invoice,Shipping Address Name,Lieferadresse
 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 +472,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,Kann nicht größer als 100 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1175,11 +1204,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Steuerregel für Transaktionen
+apps/erpnext/erpnext/config/accounts.py +175,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 +276,We buy this Item,Wir kaufen diesen Artikel
 DocType: Address,Billing,Abrechnung
@@ -1189,12 +1218,15 @@
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Unterbaugruppen
+DocType: Asset,Asset Name,Asset-Name
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Supplier,Stock Manager,Leitung Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,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 +600,Packing Slip,Packzettel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Packzettel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Angebotsanfrage kann der Zugriff sein durch folgenden Link klicken
+DocType: Asset,Number of Months in a Period,Anzahl der Monate in einem Zeitraum
 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
@@ -1211,19 +1243,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regierung
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Artikelvarianten
 DocType: Company,Services,Dienstleistungen
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Gesamtsumme ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Gesamtsumme ({0})
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 DocType: Sales Invoice,Source,Quelle
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Zeige geschlossen
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cashflow aus Investitionen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Genommen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Material der Fertigung übergeben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Material der Fertigung übergeben
 DocType: Pricing Rule,For Price List,Für Preisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1232,7 +1265,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Wartungsbesuch
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Wartungsbesuch
 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: Landed Cost Voucher,Landed Cost Help,Hilfe zum Einstandpreis
@@ -1246,7 +1279,6 @@
 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 +196,Brand master.,Stammdaten zur Marke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
 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 +272,Box,Kiste
@@ -1274,7 +1306,7 @@
 DocType: Quality Inspection Reading,Reading 4,Ablesewert 4
 apps/erpnext/erpnext/config/hr.py +131,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Receipt,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
@@ -1283,7 +1315,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Weitere Berichte
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1293,26 +1325,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} anzeigen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Zurück Geschäftsjahr nicht geschlossen
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Stammdaten zum Lieferantentyp
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Artikelnummer Lieferant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
 DocType: Purchase Invoice,Reference Document,Referenzdokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder  beendet
 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 +203,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
@@ -1334,8 +1367,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettoveränderung der Verbindlichkeiten
 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 +129,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} muss größer als 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantieantrag
@@ -1348,12 +1382,12 @@
 DocType: Sales Invoice,Packed Items,Verpackte Artikel
 apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,Garantieantrag zu Serien-Nr.
 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","Eine bestimmte Stückliste in allen anderen Stücklisten austauschen, in denen sie eingesetzt wird. Ersetzt die Verknüpfung zur alten Stücklisten, aktualisiert die Kosten und erstellt die Tabelle ""Stücklistenerweiterung Artikel"" nach der neuen Stückliste"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',&#39;Gesamt&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total','Gesamtbetrag'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Warenkorb aktivieren
 DocType: Employee,Permanent Address,Feste Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Anzahlung zu {0} {1} kann nicht größer sein als als Gesamtsumme {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Bitte Artikelnummer auswählen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,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: Packed Item,To Warehouse (Optional),Eingangslager (Optional)
@@ -1363,15 +1397,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Einzelnes Element eines Artikels
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1388,33 +1422,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","z. B. ""XYZ Nationalbank"""
+DocType: Asset,Depreciation Method,Abschreibungsmethode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
 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 +29,Shopping Cart is enabled,Warenkorb aktiviert
 DocType: Job Applicant,Applicant for a Job,Bewerber für einen Job
 DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplan-Material anfordern
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Keine Fertigungsaufträge erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Keine Fertigungsaufträge erstellt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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,Mehrfache Kundenaufträge zu einer Kundenbestellung zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Haupt
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Haupt
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1422,31 +1458,32 @@
 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,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adressen
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adressen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,Appraisals
 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 +337,Item is not allowed to have Production Order.,Artikel darf keinen Fertigungsauftrag haben.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Artikel darf keinen Fertigungsauftrag haben.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
 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: 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 +27,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Zeitprotokoll für Aufgaben
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Bezahlung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Marke
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Quotation Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
@@ -1457,6 +1494,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiter/-in
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
+DocType: Request for Quotation Supplier,Send Email to Supplier,Senden Sie E-Mail an den Lieferanten
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 DocType: Packing Slip,To Package No.,Bis Paket Nr.
 DocType: Production Planning Tool,Material Requests,Materialwünsche
@@ -1474,7 +1512,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
 DocType: Stock Settings,Allowance Percent,Zugelassener Prozentsatz
 DocType: SMS Settings,Message Parameter,Mitteilungsparameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Baum der finanziellen Kostenstellen.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Baum der finanziellen Kostenstellen.
 DocType: Serial No,Delivery Document No,Lieferdokumentennummer
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen
 DocType: Serial No,Creation Date,Erstellungsdatum
@@ -1506,40 +1544,42 @@
 ,Amount to Deliver,Liefermenge
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} erstellt
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
 ,Serial No Status,Seriennummern-Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						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 Mitarbeiter-ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Zölle und Steuern
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Bitte den Stichtag eingeben
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway Konto ist nicht konfiguriert
 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: Production Order,Material Request Item,Materialanfrageartikel
+DocType: Request for Quotation Item,Material Request Item,Materialanfrageartikel
 apps/erpnext/erpnext/config/stock.py +85,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"
+DocType: Asset,Sold,Verkauft
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rot
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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,Offene Fertigungsaufträge
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Zuführungen
 DocType: Quality Inspection Reading,Acceptance Criteria,Akzeptanzkriterien
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
 DocType: Item Attribute,Attribute Name,Attributname
 DocType: Item Group,Show In Website,Auf der Webseite anzeigen
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Gruppe
@@ -1547,6 +1587,7 @@
 ,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","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 +25,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben
+DocType: Pricing Rule,Margin Type,Margin-Art
 DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
 DocType: Holiday List,Clear Table,Tabelle leeren
 DocType: Features Setup,Brands,Marken
@@ -1554,20 +1595,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Vermögens ist obligatorisch gegen einen Posten des Anlagevermögens
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte Setup-Nummerierungsserie für Besucher über Setup&gt; Nummerierung Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Umsatz Bestandskunden
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Paar
+DocType: Asset,Depreciation Schedule,Abschreibungsplan
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
 DocType: Item,Has Batch No,Hat Chargennummer
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
+DocType: Asset,Purchase Date,Kaufdatum
 DocType: Employee,Personal Details,Persönliche Daten
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen &#39;Asset-Abschreibungen Kostenstelle&#39; in Gesellschaft {0}
 ,Maintenance Schedules,Wartungspläne
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
@@ -1581,23 +1627,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen
 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 +318,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,Einstellungen zum Modul Personalwesen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe an konzernfremde
 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/public/js/setup_wizard.js +272,Unit,Einheit
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Bitte Firma angeben
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 (Sperrlager)"
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,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,Aufwandsabrechnungen
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
 ,BOM Search,Stücklisten-Suche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
@@ -1606,29 +1651,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert
-apps/erpnext/erpnext/controllers/accounts_controller.py +249,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
 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 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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Berechneten Kontoauszug Bilanz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivierter Benutzer
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Angebot
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 DocType: Quotation,Maintenance User,Nutzer Instandhaltung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kosten aktualisiert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource&gt; HR-Einstellungen
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
@@ -1640,8 +1686,8 @@
 ,SO Qty,Kd.-Auftr.-Menge
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
+DocType: Request for Quotation,Manufacturing Manager,Fertigungsleiter
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
 apps/erpnext/erpnext/hooks.py +71,Shipments,Lieferungen
 DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
@@ -1649,12 +1695,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Sonstige Aufwendungen
 DocType: Global Defaults,Default Company,Standardfirma
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Benutzer {0} ist deaktiviert
@@ -1663,7 +1709,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Currency Exchange,From Currency,Von Währung
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
@@ -1673,11 +1719,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Menge muss 1 sein, als Element mit einem Vermögenswert verbunden ist"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kind Artikel sollte nicht ein Produkt-Bundle sein. Bitte entfernen Sie Punkt `{0}` und sparen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Neue Kostenstelle
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gehen Sie auf die entsprechende Gruppe (in der Regel Quelle der Fonds&gt; Kurzfristige Verbindlichkeiten&gt; Steuern und Abgaben und ein neues Konto erstellen (indem Sie auf Hinzufügen Kind) vom Typ &quot;Tax&quot; und machen den Steuersatz erwähnen.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Neue Kostenstelle
 DocType: Bin,Ordered Quantity,Bestellte Menge
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Quality Inspection,In Process,Während des Fertigungsprozesses
@@ -1690,10 +1736,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Vermögens {1} ist bereits {2}
 DocType: Quotation Item,Stock Balance,Lagerbestand
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Zeitprotokolle erstellt:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Zeitprotokolle erstellt:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Bitte richtiges Konto auswählen
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
 DocType: Employee,Blood Group,Blutgruppe
@@ -1711,13 +1758,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Bitte ein Land für diese Versandregel angeben oder ""Weltweiter Versand"" aktivieren"
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debit Um erforderlich
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
 DocType: Quality Inspection,Quality Manager,Qualitätsmanager
 DocType: Job Applicant,Job Opening,Offene Stellen
 DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Angebotsschreiben
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
@@ -1725,22 +1772,22 @@
 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 +103,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Preisliste {0} ist deaktiviert
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Preisliste {0} ist deaktiviert
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel {1} erforderlich. Sie haben {2} zur Verfügung gestellt.
 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 +123,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1749,10 +1796,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Keine Gehaltsabrechnung gefunden für Monat:
 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 +175,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Ihre Kunden
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Sie wurden auf dem Projekt zur Zusammenarbeit eingeladen: {0}
 DocType: Leave Block List Date,Block Date,Datum sperren
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Jetzt bewerben
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Jetzt bewerben
 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"
@@ -1776,7 +1824,7 @@
 DocType: Employee,Employment Details,Beschäftigungsdetails
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,"Als ""abgeschlossen"" markieren"
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Kein Artikel mit Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Kein Artikel mit Barcode {0}
 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
@@ -1794,10 +1842,10 @@
 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 +608,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Material übergeben
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Artikel {0} muss ein Verkaufseinzelteil in sein {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
 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
@@ -1811,12 +1859,13 @@
 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: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Als Benutzer einladen
 DocType: Features Setup,After Sale Installations,After Sale-Installationen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Bitte setzen Sie {0} in Gesellschaft {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{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
@@ -1825,9 +1874,9 @@
 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: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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
@@ -1844,25 +1893,25 @@
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,Accepted,Genehmigt
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Streckenhandel-Artikel."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Streckenhandel-Artikel."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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 +206,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1871,7 +1920,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Folgende Fertigungsaufträge wurden erstellt:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Folgende Fertigungsaufträge wurden erstellt:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter-Versandliste
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
 DocType: Authorization Rule,Authorized Value,Autorisierter Wert
@@ -1889,13 +1938,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} ist geschlossen
 DocType: Email Digest,How frequently?,Wie häufig?
 DocType: Purchase Receipt,Get Current Stock,Aktuellen Lagerbestand aufrufen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gehen Sie auf die entsprechende Gruppe (in der Regel Anwendung der Fonds&gt; Umlaufvermögen&gt; Bankkonten und ein neues Konto erstellen (indem Sie auf Hinzufügen Kind) vom Typ &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Stücklistenstruktur
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Geschenk
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,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
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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),Anwenden auf (Rolle)
 DocType: Stock Entry,Purpose,Zweck
+DocType: Company,Fixed Asset Depreciation Settings,Abschreibungen auf Sachanlagen Einstellungen
 DocType: Item,Will also apply for variants unless overrridden,"Gilt auch für Varianten, sofern nicht außer Kraft gesetzt"
 DocType: Purchase Invoice,Advances,Anzahlungen
 DocType: Production Order,Manufacture against Material Request,"Herstellen, gegen Material anfordern"
@@ -1904,6 +1953,7 @@
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
 DocType: Campaign,Campaign-.####,Kampagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1954,12 +2004,14 @@
 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: 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}"
+DocType: Asset Category Account,Asset Category Account,Anlagekategorie Konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","z. B. Bank, Bargeld, Kreditkarte"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gehen Sie auf die entsprechende Gruppe (in der Regel Anwendung der Fonds&gt; Umlaufvermögen&gt; Bankkonten und ein neues Konto erstellen (indem Sie auf Hinzufügen Kind) vom Typ &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Gutschrift
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1983,9 +2035,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Meine Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Stammdaten zu Unternehmensfilialen
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,oder
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Kein Mitarbeiter für die oben ausgewählten Kriterien oder Gehaltsabrechnung bereits erstellt
@@ -2012,7 +2064,7 @@
 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 +200,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"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Lohn-und Gehaltsabrechnung
 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"
@@ -2022,8 +2074,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
 DocType: Account,Income Account,Ertragskonto
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Keine Standardadressvorlage gefunden. Bitte legen Sie eine neue von Setup&gt; Druck und Branding-&gt; Adressvorlage.
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2045,21 +2098,22 @@
 apps/erpnext/erpnext/config/selling.py +168,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 +326,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 +665,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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/accounts/doctype/account/account.py +215,"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 +92,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Neuer Kostenstellenname
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
 DocType: Appraisal,HR User,Nutzer Personalabteilung
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
-apps/erpnext/erpnext/config/support.py +7,Issues,Fälle
+apps/erpnext/erpnext/hooks.py +90,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,Belasten auf
 DocType: Delivery Note,Required only for sample item.,Nur erforderlich für Probeartikel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Besonders groß
 ,Profit and Loss Statement,Gewinn- und Verlustrechnung
@@ -2073,10 +2127,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
 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 +139,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen
+apps/erpnext/erpnext/config/accounts.py +222,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 +142,Quotation {0} is cancelled,Angebot {0} wird storniert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag
@@ -2144,13 +2198,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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.
 ,Requested,Angefordert
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Keine Anmerkungen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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 der Verteilung
 DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Posten des Anlagevermögens muss ein Nichtlagerposition sein
 DocType: Supplier Quotation Item,Material Request No,Materialanfragenr.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2171,7 +2226,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 DocType: Payment Request,Recipient and Message,Empfänger und Message
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
@@ -2185,7 +2240,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Wählen Sie Lieferant Adresse
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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."
 DocType: Payment Request,Mute Email,Mute Email
@@ -2207,11 +2262,12 @@
 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/config/buying.py +18,Request for quotation.,Angebotsanfrage.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
 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 +294,Price List Currency not selected,Preislistenwährung nicht ausgewählt
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Startdatum des Projekts
@@ -2220,7 +2276,7 @@
 DocType: Installation Note Item,Against Document No,Zu Dokument Nr.
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Vertriebspartner verwalten
 DocType: Quality Inspection,Inspection Type,Art der Prüfung
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Bitte {0} auswählen
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarkierte Teilnahme
@@ -2235,6 +2291,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Der Abschreibungsaufwand Konto
 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
@@ -2248,7 +2305,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bestätigt
 DocType: Payment Gateway,Gateway,Tor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Menge
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Menge
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2262,18 +2319,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Wechselkurs für {0} zu {1} kann nicht gefunden werden
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Wechselkurs für {0} zu {1} kann nicht gefunden werden
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halbtages
 DocType: Sales Invoice,Sales Team,Verkaufsteam
 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 +410,[Error],[Fehler]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Seriennummer {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Kundenwarehouse (Optional)
 DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
@@ -2299,14 +2357,16 @@
 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 +471,Material Requests {0} created,Materialanfrage {0} erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materialanfrage {0} erstellt
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
 DocType: Purchase Invoice,Address and Contact,Adresse und Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+DocType: Asset Category Account,Accumulated Depreciation Account,Wertberichtigungskonto
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
+DocType: Asset,Expected Value After Useful Life,Erwartungswert nach der Ausmusterung
 DocType: Item,Reorder level based on Warehouse,Meldebestand auf Basis des Lagers
 DocType: Activity Cost,Billing Rate,Abrechnungsbetrag
 ,Qty to Deliver,Zu liefernde Menge
@@ -2316,15 +2376,15 @@
 DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
-apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} wird abgebrochen oder geschlossen
+apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} wurde abgebrochen oder geschlossen
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettocashflow aus Investitionen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
 ,Is Primary Address,Ist Hauptadresse
 DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Vermögens {0} muss eingereicht werden
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Adressen verwalten
-DocType: Pricing Rule,Item Code,Artikelnummer
+DocType: Asset,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
@@ -2343,8 +2403,10 @@
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Payment Request,Reference Details,Reference Details
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
 ,Billed Amount,Rechnungsbetrag
+DocType: Asset,Double Declining Balance,Doppelte degressive
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Geschlossen Auftrag nicht abgebrochen werden kann. Unclose abzubrechen.
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates abholen
@@ -2363,6 +2425,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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"
+DocType: Asset,Fully Depreciated,vollständig abgeschriebene
 ,Stock Projected Qty,Projizierter Lagerbestand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Teilnahme HTML
@@ -2370,25 +2433,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Seriennummer und Chargen
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Einzelhändler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Deaktivieren Sie in den Wörtern
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Kontokorrentkredit-Konto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Gedeckte Kredite
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Bitte setzen Abschreibungen im Zusammenhang mit Konten in der Anlagekategorie {0} oder Gesellschaft {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Anfangsstand Eigenkapital
 DocType: Appraisal,Appraisal,Bewertung
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-Mail an den Lieferanten gesendet {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte/-r
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
@@ -2396,7 +2462,7 @@
 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 +199,Select Quantity,Menge wählen
+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, 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-Bericht
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mitteilung gesendet
@@ -2424,6 +2490,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Gesamt-Margin
 DocType: Supplier,Supplier Details,Lieferantendetails
 DocType: Expense Claim,Approval Status,Genehmigungsstatus
 DocType: Hub Settings,Publish Items to Hub,Artikel über den Hub veröffentlichen
@@ -2437,7 +2504,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundengruppe / Kunde
 DocType: Payment Gateway Account,Default Payment Request Message,Standard Payment Request Message
 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/config/accounts.py +118,Banking and Payments,Bank- und Zahlungs
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bank- und Zahlungs
 ,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,Vom Lead zum Angebot
@@ -2445,17 +2512,17 @@
 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,Lagermaßeinheit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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/config/hr.py +55,Leaves and Holiday,Blätter und Ferien
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Einstandskosten
 DocType: Time Log,Batched for Billing,Für Abrechnung gebündelt
@@ -2471,15 +2538,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
 DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"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: Company,Asset Depreciation Cost Center,Asset-Abschreibungen Kostenstellen
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Kaufdatum des Asset {0} nicht mit Kaufrechnungsdatum entsprechen
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Lager {0}: Firma ist zwingend erforderlich
 ,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}
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Account,Payable,Zahlbar
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Schuldnern ({0})
-DocType: Project,Margin,Marge
+DocType: Pricing Rule,Margin,Marge
 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 +72,Gross Profit %,Rohgewinn %
@@ -2487,20 +2556,23 @@
 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 E-Mail an jeden Mitarbeiter senden möchten während Sie sie übertragen."
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist obligatorisch
 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 +57,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Vermögens {1} gehört nicht zur Gesellschaft {2}
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
 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: Account,Accumulated Depreciation,Kumulierte Abschreibungen
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
 DocType: Payment Request,Email To,E-Mail an
 DocType: Lead,Lead Owner,Eigentümer des Leads
 DocType: Bin,Requested Quantity,die angeforderte Menge
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Angabe des Lagers wird benötigt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Angabe des Lagers wird benötigt
 DocType: Employee,Marital Status,Familienstand
 DocType: Stock Settings,Auto Material Request,Automatische Materialanfrage
 DocType: Time Log,Will be updated when billed.,"Wird aktualisiert, wenn abgerechnet ist."
@@ -2508,11 +2580,12 @@
 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 +115,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
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% geliefert
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% geliefert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Same Anbieter wurde mehrmals eingegeben
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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
@@ -2522,13 +2595,14 @@
 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."
 DocType: Payment Request,Payment Details,Zahlungsdetails
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
+DocType: Asset,Journal Entry for Scrap,Journaleintrag für Schrott
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung jeglicher Kommunikation vom Typ Email, Telefon, Chat, Besuch usw."
 DocType: Manufacturer,Manufacturers used in Items,Hersteller im Artikel verwendet
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Neuen Eintrag erstellen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2541,7 +2615,7 @@
 ,Stock Ledger,Lagerbuch
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Preis: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Abzug auf der Gehaltsabrechnung
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Zuerst einen Gruppenknoten wählen.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Zuerst einen Gruppenknoten wählen.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Mitarbeiter und Teilnahme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Entfernen Bezug von Kunden, Lieferanten, Vertriebspartner und Blei, wie es Ihre Firmenadresse ist"
@@ -2563,13 +2637,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Von {1}
 DocType: Task,depends_on,hängt ab von
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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 an Kunden
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Nächster Termin muss größer sein als Datum der Veröffentlichung
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Steuerverteilung anzeigen
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ist ausverkauft
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Nächster Termin muss größer sein als Datum der Veröffentlichung
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/accounts/party.py +289,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  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
@@ -2584,7 +2659,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2598,7 +2673,7 @@
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2607,7 +2682,7 @@
 DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
@@ -2618,7 +2693,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
@@ -2627,11 +2702,12 @@
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Feste Asset-Konto
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Von Lieferschein
 DocType: Time Log,From Time,Von-Zeit
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Preis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Praktikant
@@ -2639,7 +2715,7 @@
 DocType: Stock Entry,From BOM,Von Stückliste
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
@@ -2647,17 +2723,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Gehaltsstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Material ausgeben
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Zitate
 DocType: Hub Settings,Access Token,Zugriffstoken
 DocType: Sales Invoice Item,Serial No,Seriennummer
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
-DocType: Item,Is Fixed Asset Item,Ist Posten des Anlagevermögens
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
 DocType: Purchase Invoice,Print Language,drucken Sprache
 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"
+DocType: Asset,Number of Depreciations,Anzahl der abschreibungen
 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
@@ -2665,13 +2741,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Antrag auf Zitate
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximale Rechnungsbetrag
 DocType: Purchase Invoice Item,Image View,Bildansicht
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kundschaft
+DocType: Asset,Partially Depreciated,Partiell Abgeschrieben
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
@@ -2687,13 +2765,13 @@
 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/inactive_customers/inactive_customers.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"
-DocType: C-Form,Amended From,Abgeändert von
+DocType: Asset,Amended From,Abgeändert von
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
 DocType: Leave Control Panel,Carry Forward,Übertragen
@@ -2706,21 +2784,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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 ""Wertbestimmtung"" oder ""Wertbestimmung und Summe"" ist"
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Bitte erwähnen Sie &quot;Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten&quot; in Unternehmen
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Spiel Zahlungen mit Rechnungen
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Spiel Zahlungen mit Rechnungen
 DocType: Journal Entry,Bank Entry,Bankbuchung
 DocType: Authorization Rule,Applicable To (Designation),Anwenden auf (Bezeichnung)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,In den Warenkorb legen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppieren nach
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
 DocType: Production Planning Tool,Get Material Request,Get-Material anfordern
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portoaufwendungen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Portoaufwendungen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Summe Anwesend
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Accounting Statements
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Accounting Statements
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2739,15 +2818,16 @@
 DocType: C-Form,Invoices,Rechnungen
 DocType: Job Opening,Job Title,Stellenbezeichnung
 DocType: Features Setup,Item Groups in Details,Detaillierte Artikelgruppen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 +169,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: Item,Website Description,Webseiten-Beschreibung
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoveränderung des Eigenkapitals
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
 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
@@ -2755,12 +2835,13 @@
 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
 DocType: Customer Group,Customer Group Name,Kundengruppenname
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Fehler: {0}&gt; {1}
 DocType: Item,Attributes,Attribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Artikel aufrufen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Letztes Bestelldatum
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
 DocType: C-Form,C-Form,Kontakt-Formular
@@ -2772,18 +2853,18 @@
 DocType: Purchase Invoice,Mobile No,Mobilfunknummer
 DocType: Payment Tool,Make Journal Entry,Buchungssatz erstellen
 DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Werbung
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Fehler: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Supplier Quotation,Supplier Address,Lieferantenadresse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Konto muss Typ &quot;Anlagevermögens&quot;
 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 +251,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 apps/erpnext/erpnext/controllers/item_variant.py +62,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
@@ -2794,10 +2875,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Haben
 DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Übertragung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Übertragung
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
@@ -2817,20 +2898,22 @@
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Senden Lieferant von E-Mails
 DocType: Features Setup,POS View,Verkaufsstellen-Ansicht
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Zeitprotokoll wurde Angekündigt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte setzen Sie Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Vorläufiger Gewinn / Verlust (Haben)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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,Position 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Bitte Standardwert {0} in Firma {1} setzen
@@ -2840,12 +2923,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte Setup-Nummerierungsserie für Besucher über Setup&gt; Nummerierung Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+DocType: Asset,Straight Line,Gerade Linie
+DocType: Project User,Project User,Projektarbeit Benutzer
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Verkaufsrabatte
@@ -2859,39 +2943,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Unterpunkt hinzufügen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Öffnungswert
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provision auf den Umsatz
 DocType: Offer Letter Term,Value / Description,Wert / Beschreibung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
 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,Geplanter Liefertermin
 apps/erpnext/erpnext/accounts/general_ledger.py +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Bewirtungskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Bewirtungskosten
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Urlaubsanträge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Rechtskosten
 DocType: Sales Invoice,Posting Time,Buchungszeit
 DocType: Sales Order,% Amount Billed,% des Betrages berechnet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonkosten
 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.,"Hier aktivieren, wenn der Benutzer gezwungen sein soll, vor dem Speichern eine Serie auszuwählen. Bei Aktivierung gibt es keine Standardvorgabe."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Kein Artikel mit Seriennummer {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Offene Benachrichtigungen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte Aufwendungen
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Direkte Aufwendungen
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} ist eine ungültige E-Mail-Adresse in &#39;Benachrichtigung \ E-Mail-Adresse&#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Reisekosten
 DocType: Maintenance Visit,Breakdown,Ausfall
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
@@ -2908,7 +2993,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Gesamtumsatz (über Zeitprotokolle)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Wir verkaufen diesen Artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Lieferanten-ID
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Sollte Menge größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Sollte Menge größer als 0 sein
 DocType: Journal Entry,Cash Entry,Kassenbuchung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Grund für Beurlaubung, wie Erholung, krank usw."
@@ -2919,11 +3004,12 @@
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle Kontakte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Lieferant für Asset {0} nicht mit dem Lieferanten in der Kaufrechnung entsprechen
 DocType: Newsletter,Test Email Id,E-Mail-ID testen
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
@@ -2939,12 +3025,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei payble Kontowährung gleich
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Wenn deaktivieren, wird &quot;in den Wörtern&quot; Feld nicht in einer Transaktion sichtbar sein"
@@ -2954,13 +3041,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Dieser Zeitprotokollstapel wurde storniert.
 ,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Gläubiger
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2980,15 +3067,14 @@
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
-DocType: Project,Project Name,Projektname
+DocType: Request for Quotation Item,Project Name,Projektname
 DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
 DocType: Features Setup,Item Batch Nos,Artikel-Chargennummern
@@ -3016,8 +3102,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,Bezahlt und nicht geliefert
 DocType: Project,Default Cost Center,Standardkostenstelle
 DocType: Sales Invoice,End Date,Enddatum
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Aktiengeschäfte
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagertransaktionen
 DocType: Employee,Internal Work History,Interne Arbeits-Historie
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kumulierte Abschreibungen Betrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Kosten
@@ -3025,7 +3112,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Gesellschaft ist zwingend erforderlich, da es Ihre Firmenadresse ist"
 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 übertragen.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,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
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Arbeitsplätze
@@ -3037,6 +3124,7 @@
 DocType: Time Log,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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
@@ -3053,6 +3141,7 @@
 DocType: Sales Order,Delivery Date,Liefertermin
 DocType: Opportunity,Opportunity Date,Datum der Opportunity
 DocType: Purchase Receipt,Return Against Purchase Receipt,Zurück zum Kaufbeleg
+DocType: Request for Quotation Item,Request for Quotation Item,Angebotsanfrage Artikel
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% bestellt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbeit
@@ -3067,11 +3156,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein
 DocType: Accounts Settings,Accounts Settings,Konteneinstellungen
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Bitte setzen &#39;Asset-Disposal Konto &quot;in Gesellschaft {0}
 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,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Temporäre Konten
 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
@@ -3080,21 +3170,22 @@
 DocType: Pricing Rule,Disable,Deaktivieren
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Klicken Sie hier, um zu zahlen"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset-{0} kann nicht verschrottet werden, als es ohnehin schon ist {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Fügen Sie Elemente aus
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Fügen Sie Elemente aus
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert
 DocType: Project Task,Task ID,Aufgaben-ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","z. B. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Lager {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3109,6 +3200,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Artikel {0} wurde deaktiviert
 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
@@ -3120,7 +3212,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup-Gateway-Konten.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup-Gateway-Konten.
 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
 ,Cash Flow,Cash Flow
@@ -3134,7 +3226,7 @@
 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 +132,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
 DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
@@ -3150,19 +3242,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/config/selling.py +147,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 +39,Add Serial No,Seriennummer hinzufügen
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantie
 DocType: Production Order,Warehouses,Lager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Druck- und Schreibwaren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Druck- und Schreibwaren
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppen-Knoten
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Fertigwaren aktualisieren
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Fertigwaren aktualisieren
 DocType: Workstation,per hour,pro stunde
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Einkauf
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Zahlbetrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
@@ -3192,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +177,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,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 +220,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialanfrage für Lager
@@ -3205,9 +3296,11 @@
 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/projects/doctype/project/project.py +133,Join,Beitreten
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
+DocType: Pricing Rule,Margin Rate or Amount,Margin Rate oder Menge
 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
@@ -3217,7 +3310,7 @@
 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 +782,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3225,14 +3318,13 @@
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
 DocType: Expense Claim,Total Claimed Amount,Gesamtforderung
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mögliche Opportunity für den Vertrieb
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Ungültige(r) {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte setzen Sie Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaufhäuser
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
 DocType: Company,Change Abbreviation,Abkürzung ändern
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
@@ -3250,14 +3342,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Hauptbuch
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Leads anzeigen
 DocType: Item Attribute Value,Attribute Value,Attributwert
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",E-Mail-ID muss einmalig sein; diese E-Mail-ID existiert bereits für {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",E-Mail-ID muss einmalig sein; diese E-Mail-ID existiert bereits für {0}
 ,Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Firma {0}
 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>
@@ -3289,23 +3382,23 @@
 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."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
 ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel)
 DocType: Item Customer Detail,Ref Code,Ref-Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Mitarbeiterdatensätze
 DocType: Payment Gateway,Payment Gateway,Zahlungs-Gateways
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
 apps/erpnext/erpnext/templates/pages/cart.html +22,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,Anwenden auf Kontakt-Formular
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse ist obligatorisch
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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 für jede Position aktualisiert
 DocType: Payment Tool,Get Outstanding Vouchers,Offene Posten aufrufen
 DocType: Warranty Claim,Resolved By,Entschieden von
@@ -3323,7 +3416,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transaktionswährung muß gleiche wie Payment Gateway Währung
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Empfangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3331,14 +3424,14 @@
 DocType: Purchase Invoice,Submit on creation,Senden über die Schöpfung
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 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 übertragen werden
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 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 +187,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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,"Angefragte Artikel, die bestellt werden sollen"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,Meine Bestellungen
@@ -3359,10 +3452,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Verkaufsstellen-Profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Ungesicherte Kredite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplantes Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Summe gezahlte Beträge
@@ -3374,11 +3467,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Ihre Lieferanten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Lieferant Teile-Nr
 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
@@ -3387,12 +3481,12 @@
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Von {0} für {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
 DocType: Payment Reconciliation,From Invoice Date,Ab Rechnungsdatum
@@ -3401,7 +3495,7 @@
 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 +351,'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 +356,'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
@@ -3414,7 +3508,7 @@
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
@@ -3428,15 +3522,15 @@
 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 +576,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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/controllers/recurring_document.py +169,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 +18,Project activity / task.,Projektaktivität/Aufgabe
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
 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: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
 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 an Tag des Monats
@@ -3456,8 +3550,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,"Jahresbeginn oder Enddatum überlappt mit {0}. Um zu vermeiden, stellen Sie bitte Firma"
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
 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.","Beispiel: ABCD.##### 
  Wenn ""Serie"" eingestellt ist und ""Seriennummer"" in den Transaktionen nicht aufgeführt ist, dann wird eine Seriennummer automatisch auf der Grundlage dieser Serie erstellt. Wenn immer explizit Seriennummern für diesen Artikel aufgeführt werden sollen, muss das Feld leer gelassen werden."
@@ -3469,11 +3564,11 @@
 ,Sales Analytics,Vertriebsanalyse
 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 +91,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
 DocType: Stock Entry Detail,Stock Entry Detail,Lagerbuchungsdetail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Tägliche Erinnerungen
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Neuer Kontoname
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice
@@ -3483,11 +3578,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Prozentsatz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen
+apps/erpnext/erpnext/config/accounts.py +233,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 +132,Item {0} must be a Sales Item,Artikel {0} muss ein Verkaufsartikel sein
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3495,11 +3591,12 @@
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
 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 +385,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
 DocType: Sales Partner,Partner Type,Partnertyp
 DocType: Purchase Taxes and Charges,Actual,Tatsächlich
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gehen Sie auf die entsprechende Gruppe (in der Regel Quelle der Fonds&gt; Kurzfristige Verbindlichkeiten&gt; Steuern und Abgaben und ein neues Konto erstellen (indem Sie auf Hinzufügen Kind) vom Typ &quot;Tax&quot; und machen den Steuersatz erwähnen.
 DocType: Production Order,Production Order,Fertigungsauftrag
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
 DocType: Quotation Item,Against Docname,Zu Dokumentenname
@@ -3518,18 +3615,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Production Order,Planned End Date,Geplantes Enddatum
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Ort an dem Artikel gelagert werden
 DocType: Tax Rule,Validity,Gültigkeit
+DocType: Request for Quotation,Supplier Detail,Lieferant Details
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rechnungsbetrag
 DocType: Attendance,Attendance,Anwesenheit
 apps/erpnext/erpnext/config/projects.py +55,Reports,Berichte
 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 +508,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Steuervorlage für Einkaufstransaktionen
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Steuervorlage 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
@@ -3539,10 +3637,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungswerkzeug zu benutzen"
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Verwaltungskosten
 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 +455,Change,Ändern
@@ -3550,6 +3648,7 @@
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
+DocType: Asset Category,Asset Category Name,Asset-Kategorie Name
 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
@@ -3561,13 +3660,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Charge
@@ -3581,7 +3680,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vertriebsmitarbeiter
 DocType: Sales Invoice,Cold Calling,Kaltakquise
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budget und Kostenstellen
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budget und Kostenstellen
 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
@@ -3612,9 +3711,9 @@
 DocType: Purchase Common,Purchase Common,Einkauf Allgemein
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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 einzureichen."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
 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 Sale)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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,Angenommene Menge
@@ -3622,7 +3721,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rechnungen an Kunden
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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"
 DocType: Account,Parent Account,Übergeordnetes Konto
@@ -3638,7 +3737,7 @@
 DocType: Employee,Education,Bildung
 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 +219,"Optional. Sets company's default currency, if not specified.","Optional. Stellt die Standardwährung des Unternehmens ein, falls nichts angegeben ist."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
@@ -3653,6 +3752,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Chargenverwaltung
 DocType: Employee,Contract End Date,Vertragsende
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
+DocType: Sales Invoice Item,Discount and Margin,Discount und Margin
 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: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
@@ -3673,7 +3773,7 @@
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
-apps/erpnext/erpnext/accounts/party.py +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.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
@@ -3681,22 +3781,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Payment URL Nachricht
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Summe Offene Beträge
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Zeitprotokoll ist nicht abrechenbar
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
+DocType: Asset,Asset Category,Anlagekategorie
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Bitte die Gegenbelege manuell eingeben
 DocType: SMS Settings,Static Parameters,Statische Parameter
 DocType: Purchase Order,Advance Paid,Angezahlt
 DocType: Item,Item Tax,Artikelsteuer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material an den Lieferanten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Verbrauch Rechnung
 DocType: Expense Claim,Employees Email Id,E-Mail-ID des Mitarbeiters
 DocType: Employee Attendance Tool,Marked Attendance,Marked Teilnahme
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kurzfristige Verbindlichkeiten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kurzfristige Verbindlichkeiten
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
@@ -3717,17 +3818,16 @@
 DocType: Item Attribute,Numeric Values,Numerische Werte
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Logo anhängen
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variante erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Variante erstellen
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Keine Standardadressvorlage gefunden. Bitte legen Sie eine neue von Setup&gt; Druck und Branding-&gt; Adressvorlage.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Grundkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Grundkapital
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nach Zahlung Abschluss an ausgewählte Seite umleiten Benutzer.
@@ -3736,20 +3836,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
+DocType: Asset,Current Value (After Depreciation),Aktueller Wert (nach Abschreibungen)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfalldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Stückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref-Datum
@@ -3757,6 +3858,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
 DocType: GL Entry,Is Opening,Ist Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} existiert nicht
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 0f4f845..ad65db1 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Έμπορος
 DocType: Employee,Rented,Νοικιασμένο
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Θέλετε πραγματικά να καταργήσει αυτό το περιουσιακό στοιχείο;
 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.,* Θα υπολογίζεται στη συναλλαγή.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Εμφάνιση ανοιχτή
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Νέα αίτηση άδειας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Προβολή παραλλαγών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Ποσότητα
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
 DocType: Designation,Designation,Ονομασία
@@ -64,7 +66,7 @@
 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 +642,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Νέο {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Νέο {0}: # {1}
 ,Sales Partners Commission,Προμήθεια συνεργάτη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Μια συντομογραφία δεν μπορεί να έχει περισσότερους από 5 χαρακτήρες
 DocType: Payment Request,Payment Request,Αίτημα πληρωμής
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Παντρεμένος
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Πάρτε τα στοιχεία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Στόχος στις
 DocType: BOM,Total Cost,Συνολικό κόστος
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
+DocType: Item,Is Fixed Asset,Είναι Παγίων
 DocType: Expense Claim Detail,Claim Amount,Ποσό απαίτησης
 DocType: Employee,Mr,Κ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
@@ -156,7 +159,8 @@
 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,Έξοδα αποθέματος
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} είναι κατεψυγμένα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Έξοδα αποθέματος
 DocType: Newsletter,Email Sent?,Εστάλη μήνυμα email;
 DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρωσης
 DocType: Production Order Operation,Show Time Logs,Εμφάνιση χρόνος Καταγράφει
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Το είδος {0} πρέπει να είναι ένα είδος αγοράς
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: BOM Replace Tool,New BOM,Νέα Λ.Υ.
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Παρακαλώ εισάγετε εταιρεία
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Καθαρές ροές από επενδυτικές
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
 DocType: Newsletter List,Total Subscribers,Σύνολο Συνδρομητές
 ,Contact Name,Όνομα επαφής
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Τράπεζα Καταχωρήσεις
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Έλεγχος ενημερώσεων
 DocType: Lead,Suggestions,Προτάσεις
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ορισμός προϋπολογισμών ανά ομάδα είδους για αυτήν την περιοχή. Μπορείτε επίσης να συμπεριλάβετε εποχικότητα ρυθμίζοντας τη διανομή.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Παρακαλώ εισάγετε την γονική ομάδα λογαριασμού για την αποθήκη {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Παρακαλώ εισάγετε την γονική ομάδα λογαριασμού για την αποθήκη {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Μέγιστο 5 χαρακτήρες
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Μαθαίνω
+DocType: Asset,Next Depreciation Date,Επόμενο Ημερομηνία Αποσβέσεις
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Προμηθευτής τιμολόγιο αριθ υπάρχει στην Αγορά Τιμολόγιο {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Διαχειριστείτε το δέντρο πωλητών.
 DocType: Job Applicant,Cover Letter,συνοδευτική επιστολή
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Εξαιρετική επιταγές και καταθέσεις για να καθαρίσετε
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Λάθος Κωδικός
 DocType: Item,Variant Of,Παραλλαγή του
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Κυκλικού λάθους Αναφορά
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} μονάδες [{1}] (# έντυπο / Θέση / {1}) βρίσκονται στο [{2}] (# έντυπο / Αποθήκη / {2})
 DocType: Lead,Industry,Βιομηχανία
 DocType: Employee,Job Profile,Προφίλ εργασίας
 DocType: Newsletter,Newsletter,Ενημερωτικό δελτίο
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Δελτίο αποστολής
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα'
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Ο σειριακός αριθμός {0} δεν ανήκει στο δελτίο αποστολής {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Παράμετρος ελέγχου ποιότητας είδους
 DocType: Leave Application,Leave Approver Name,Όνομα υπευθύνου έγκρισης άδειας
-,Schedule Date,Ημερομηνία χρονοδιαγράμματος
+DocType: Depreciation Schedule,Schedule Date,Ημερομηνία χρονοδιαγράμματος
 DocType: Packed Item,Packed Item,Συσκευασμένο είδος
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αγοράς.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αγοράς.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Υπάρχει δραστηριότητα Κόστος υπάλληλου {0} ενάντια Τύπος δραστηριότητας - {1}
 apps/erpnext/erpnext/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,Ανταλλαγή συναλλάγματος
@@ -346,6 +353,7 @@
 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",Είδη που θα ζητηθούν τα οποία είναι εκτός αποθέματος εξετάζοντας όλες τις αποθήκες με βάση την προβλεπόμενη ποσότητα και την ελάχιστη ποσότητα παραγγελιών
+DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
 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.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
-DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
+DocType: Request for Quotation Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,Μήνυμα για την Προμηθευτής
 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,Απλήρωτα
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 ,Serial No Warranty Expiry,Ημερομηνία λήξης της εγγύησης του σειριακού αριθμού
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Διαχείριση της υπεργολαβίας
+DocType: Project,Project will be accessible on the website to these users,Του έργου θα είναι προσβάσιμη στην ιστοσελίδα του σε αυτούς τους χρήστες
 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 +53,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Το είδος {0} δεν είναι είδος αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Το είδος {0} δεν είναι είδος αγοράς
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Εν αναμονή Ποσότητα
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
 DocType: Pricing Rule,Valid From,Ισχύει από
 DocType: Sales Invoice,Total Commission,Συνολική προμήθεια
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
@@ -469,13 +479,13 @@
  Για να κατανέμετε τον προϋπολογισμό χρησιμοποιώντας αυτή την κατανομή ορίστε αυτή την ** μηνιαία κατανομή ** στο ** κέντρο κόστους **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,συσσωρευμένες Αξίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Η ημερομηνία έναρξης για τη χρήση δεν πρέπει να είναι μεταγενέστερη της ημερομηνία λήξης
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Η ημερομηνία έναρξης για τη χρήση δεν πρέπει να είναι μεταγενέστερη της ημερομηνία λήξης
 DocType: Warranty Claim,Resolution,Επίλυση
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Δημοσιεύθηκε: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Πληρωτέος λογαριασμός
@@ -483,7 +493,7 @@
 DocType: Job Applicant,Resume Attachment,Συνέχιση Συνημμένο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Επιστροφή πωλήσεων
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Συνιστώσες του μισθού.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Βάση δεδομένων των δυνητικών πελατών.
@@ -492,7 +502,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
@@ -502,7 +512,7 @@
 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/config/accounts.py +70,Masters,Κύριες εγγραφές
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Ημερομηνίες των συναλλαγών Ενημέρωση Τράπεζα
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Ημερομηνίες των συναλλαγών Ενημέρωση Τράπεζα
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Σφάλμα αρνητικού αποθέματος ({6}) για το είδος {0} στην αποθήκη {1} στο {2} {3} σε {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Παρακολούθηση του χρόνου
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
@@ -520,27 +530,27 @@
 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,Προεπιλογή Κοστολόγηση Τιμή
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Στόχοι πωλητή
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Παρακαλούμε να ορίσετε μια λίστα για διακοπές είτε για την Υπάλληλος ή την Εταιρεία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
+DocType: Depreciation Schedule,Depreciation Amount,αποσβέσεις Ποσό
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Σταθερή Ημέρες
 DocType: Quotation Item,Item Balance,στοιχείο Υπόλοιπο
 DocType: Sales Invoice,Packing List,Λίστα συσκευασίας
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Παραγγελίες αγοράς που δόθηκαν σε προμηθευτές.
+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,Καταναλώθηκε
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
 DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Ομάδα με ομάδα
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Τα έργα μου
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
+DocType: Company,Gain/Loss Account on Asset Disposal,Ο λογαριασμός Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
 DocType: Purchase Invoice,Quarterly,Τριμηνιαίος
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
 DocType: Sales Order Item,Basic Rate (Company Currency),Βασικό επιτόκιο (νόμισμα της εταιρείας)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Σύνολο χρέωσης του τρέχοντος έτους
 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 +529,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Τύπος δέντρου
@@ -597,6 +610,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Mode of Payment Account,Default Account,Προεπιλεγμένος λογαριασμός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Η επαφή πρέπει να οριστεί αν η ευκαιρία προέρχεται από επαφή
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
 ,Sales Person Target Variance Item Group-Wise,Εύρος στόχου πωλητή ανά ομάδα είδους
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
 DocType: Item Group,Website Specifications,Προδιαγραφές δικτυακού τόπου
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Υπάρχει ένα σφάλμα στο Πρότυπο σας Διεύθυνση {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Νέος λογαριασμός
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Νέος λογαριασμός
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Πολλαπλές Κανόνες Τιμή υπάρχει με τα ίδια κριτήρια, παρακαλούμε επίλυση των συγκρούσεων με την ανάθεση προτεραιότητα. Κανόνες Τιμή: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Πολλαπλές Κανόνες Τιμή υπάρχει με τα ίδια κριτήρια, παρακαλούμε επίλυση των συγκρούσεων με την ανάθεση προτεραιότητα. Κανόνες Τιμή: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -666,17 +680,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Η λογιστική εγγραφή {0} έχει συνδεθεί με την παραγγελία {1}, ελέγξτε αν πρέπει να ληφθεί ως προκαταβολή σε αυτό το τιμολόγιο."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Δαπάνες συντήρησης γραφείου
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Account,Liability,Υποχρέωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
 DocType: Company,Default Cost of Goods Sold Account,Προεπιλογή Κόστος Πωληθέντων Λογαριασμού
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Process Payroll,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Τιμολόγια μου
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Τιμολόγια μου
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Supplier Quotation,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Ανεβάστε υπόλοιπο αποθεμάτων μέσω csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Αποστολή τώρα
 ,Support Analytics,Στατιστικά στοιχεία υποστήριξης
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Λογικό λάθος: πρέπει να βρει επικαλυπτόμενες
 DocType: Item,Website Warehouse,Αποθήκη δικτυακού τόπου
 DocType: Payment Reconciliation,Minimum Invoice Amount,Ελάχιστο ποσό του τιμολογίου
 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 +267,C-Form records,C-form εγγραφές
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-form εγγραφές
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Πελάτες και Προμηθευτές
 DocType: Email Digest,Email Digest Settings,Ρυθμίσεις ενημερωτικών άρθρων μέσω email
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Ερωτήματα υποστήριξης από πελάτες.
@@ -720,7 +736,7 @@
 DocType: Quotation Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,Δαπάνες
@@ -757,14 +773,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Έχει ανατεθεί ως υπεργολαβία
 DocType: Item Attribute,Item Attribute Values,Τιμές χαρακτηριστικού είδους
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Προβολή Συνδρομητές
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
 DocType: Employee,Ms,Κα
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+DocType: Journal Entry,Depreciation Entry,αποσβέσεις Έναρξη
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Μετάβαση Καλάθι
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 DocType: Address,Shop,Κατάστημα
@@ -793,10 +810,10 @@
 DocType: Employee,Permanent Address Is,Η μόνιμη διεύθυνση είναι
 DocType: Production Order Operation,Operation completed for how many finished goods?,Για πόσα τελικά προϊόντα ολοκληρώθηκε η λειτουργία;
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Το εμπορικό σήμα
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
 DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
-DocType: Journal Entry Account,Purchase Invoice,Τιμολόγιο αγοράς
+DocType: Asset,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,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
@@ -806,21 +823,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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» πίνακα."
 DocType: Job Opening,Publish on website,Δημοσιεύει στην ιστοσελίδα
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Αποστολές προς τους πελάτες.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Τιμολόγιο προμηθευτή ημερομηνία αυτή δεν μπορεί να είναι μεγαλύτερη από την απόσπαση Ημερομηνία
 DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Έμμεσα έσοδα
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
 DocType: Purchase Invoice,Additional Discount Percentage,Πρόσθετες ποσοστό έκπτωσης
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Σειρά {0}: Τιμολόγιο {1} δεν είναι έγκυρη, θα μπορούσε να ακυρωθεί / δεν υπάρχει. \ Παρακαλώ εισάγετε ένα έγκυρο τιμολόγιο"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
@@ -829,14 +849,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
 ,Employee Holiday Attendance,Υπάλληλος Συμμετοχή Διακοπές
 DocType: Opportunity,Walk In,Προχωρήστε
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Χρηματιστήριο Καταχωρήσεις
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Χρηματιστήριο Καταχωρήσεις
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Μεταφέρονται
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Δημιούργησε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,Το Καλάθι μου
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
 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 +180,Qty for {0},Ποσότητα για {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
+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 +80,Leave Allocation Tool,Εργαλείο κατανομής αδειών
 DocType: Leave Block List,Leave Block List Dates,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
@@ -859,7 +880,7 @@
 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 +547,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Έκπτωση
@@ -874,20 +895,21 @@
 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 +69,Selling Amount,Ποσό πώλησης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Αρχεία καταγραφής χρονολογίου
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Αρχεία καταγραφής χρονολογίου
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας
 DocType: Issue,Issue,Έκδοση
+DocType: Asset,Scrapped,αχρηστία
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Ο λογαριασμός δεν ταιριάζει με την εταιρεία
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Στρατολόγηση
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Έξοδα πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Έξοδα πωλήσεων
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
@@ -904,7 +926,7 @@
 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,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
+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,Μέσος όρος ηλικίας
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,Προεπιλεγμένο νόμισμα
 DocType: Contact,Enter designation of this Contact,Εισάγετε ονομασία αυτής της επαφής
 DocType: Expense Claim,From Employee,Από υπάλληλο
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,Βασικός τομέας επιδόσεων
@@ -921,7 +943,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Συμβολή (%)
@@ -930,22 +952,23 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
 ,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,Καθολικές προεπιλογές
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
 DocType: Salary Slip,Deductions,Κρατήσεις
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Αυτή η παρτίδα αρχείων καταγραφής χρονολογίου έχει χρεωθεί.
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
 ,Trial Balance for Party,Ισοζύγιο για το Κόμμα
 DocType: Lead,Consultant,Σύμβουλος
 DocType: Salary Slip,Earnings,Κέρδη
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Τίποτα να ζητηθεί
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Τίποτα να ζητηθεί
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Διαχείριση
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Τύποι δραστηριοτήτων για ωριαία φύλλα
@@ -956,18 +979,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,Παρακαλούμε να ορίσετε ID Email
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Παρακαλούμε να ορίσετε ID Email
 DocType: Item,UOMs,Μ.Μ.
 apps/erpnext/erpnext/stock/utils.py +171,{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/config/buying.py +33,Supplier database.,Βάση δεδομένων προμηθευτών.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Βάση δεδομένων προμηθευτών.
 DocType: Account,Balance Sheet,Ισολογισμός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Φορολογικές και άλλες κρατήσεις μισθών.
 DocType: Lead,Lead,Επαφή
 DocType: Email Digest,Payables,Υποχρεώσεις
@@ -981,6 +1004,7 @@
 DocType: Holiday,Holiday,Αργία
 DocType: Leave Control Panel,Leave blank if considered for all branches,Άφησε το κενό αν ισχύει για όλους τους κλάδους
 ,Daily Time Log Summary,Καθημερινή σύνοψη καταγραφής χρόνου
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-μορφή δεν ισχύει για Τιμολόγιο: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Μη συμφωνημένες λεπτομέρειες πληρωμής
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
@@ -994,19 +1018,20 @@
 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,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 DocType: Contact,User ID,ID χρήστη
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Προβολή καθολικού
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Προβολή καθολικού
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Μερίσματα που καταβάλλονται
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,Αδιανέμητα Κέρδη
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Αδιανέμητα Κέρδη
 DocType: BOM Item,Item Description,Περιγραφή είδους
 DocType: Payment Tool,Payment Mode,Τρόπος πληρωμής
 DocType: Purchase Invoice,Is Recurring,Είναι επαναλαμβανόμενo
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Προσωρινό άνοιγμα
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Αποτίμηση Βαθμολογήστε που απαιτούνται για τη θέση στη γραμμή {0}
@@ -1029,8 +1054,8 @@
 ,Accounts Payable Summary,Σύνοψη πληρωτέων λογαριασμών
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 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 +165,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Μικρό
@@ -1038,7 +1063,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Η κύρια εγγραφή λογαριασμού {0} δημιουργήθηκε
 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,Σύνολο που επιτεύχθηκε
@@ -1046,12 +1071,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 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,Πληροφορίες επικοινωνίας για την αποθήκη
@@ -1061,19 +1086,20 @@
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
 DocType: Hub Settings,Seller Website,Ιστοσελίδα πωλητή
 apps/erpnext/erpnext/controllers/selling_controller.py +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},Η κατάσταση της εντολής παραγωγής είναι {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},δεν βρήκε κανένα στοιχείο που ονομάζεται {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Συνολική εξερχόμενη
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Μπορεί να υπάρχει μόνο μία συνθήκη κανόνα αποστολής με 0 ή κενή τιμή για το πεδίο 'εώς αξία'
 DocType: Authorization Rule,Transaction,Συναλλαγή
@@ -1081,10 +1107,10 @@
 DocType: Item,Website Item Groups,Ομάδες ειδών δικτυακού τόπου
 DocType: Purchase Invoice,Total (Company Currency),Σύνολο (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Ο σειριακός αριθμός {0} εισήχθηκε περισσότερο από μία φορά
-DocType: Journal Entry,Journal Entry,Λογιστική εγγραφή
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
@@ -1093,6 +1119,7 @@
 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,Σταθμός εργασίας
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Αίτηση για Προσφορά Προμηθευτής
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
@@ -1103,6 +1130,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Στόχος προτύπου αξιολόγησης
 DocType: Salary Slip,Earning,Κέρδος
 DocType: Payment Tool,Party Account Currency,Κόμμα Λογαριασμού Νόμισμα
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Τρέχουσα αξία μετά την απόσβεση πρέπει να είναι μικρότερη από ίση με {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Πρόσθεση ή Αφαίρεση
 DocType: Company,If Yearly Budget Exceeded (for expense account),Αν ετήσιος προϋπολογισμός Υπέρβαση (για λογαριασμό εξόδων)
@@ -1117,21 +1145,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
 DocType: Project,Start and End Dates,Ημερομηνίες έναρξης και λήξης
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Χαρακτηριστικά διαμόρφωσης
+DocType: Asset,Depreciation Schedules,Δρομολόγια αποσβέσεων
 DocType: Item,Is Service Item,Είναι υπηρεσία
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
 DocType: Payment Request,Transaction Currency,Νόμισμα συναλλαγής
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Από {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Από {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Περιγραφή λειτουργίας
 DocType: Item,Will also apply to variants,Θα ισχύουν και για τις παραλλαγές
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Δεν μπορεί να αλλάξει ημερομηνία έναρξης και ημερομηνία λήξης φορολογικού έτους μετά την αποθήκευση του.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Εκστρατεία
@@ -1145,8 +1174,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Μέγιστο: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,Για την εταιρεία
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Αρχείο καταγραφής επικοινωνίας
@@ -1154,8 +1183,8 @@
 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 +472,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1176,11 +1205,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
 DocType: Rename Tool,Type of document to rename.,Τύπος του εγγράφου για να μετονομάσετε.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Αγοράζουμε αυτό το είδος
 DocType: Address,Billing,Χρέωση
@@ -1190,12 +1219,15 @@
 DocType: Quality Inspection,Readings,Μετρήσεις
 DocType: Stock Entry,Total Additional Costs,Συνολικό πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Υποσυστήματα
+DocType: Asset,Asset Name,Όνομα του ενεργητικού
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Supplier,Stock Manager,Διευθυντής Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Δελτίο συσκευασίας
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ενοίκιο γραφείου
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Αίτηση για προσφορά μπορεί να είναι η πρόσβαση κάνοντας κλικ παρακάτω σύνδεσμο
+DocType: Asset,Number of Months in a Period,Αριθμός μηνών σε μια περίοδο
 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,Ώρες εργαασίας σταθμού εργασίας
@@ -1212,19 +1244,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Σύνολο ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Σύνολο ({0})
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
 DocType: Sales Invoice,Source,Πηγή
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Εμφάνιση κλειστά
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 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 +86,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} δεν βρέθηκε, η οποία είναι απαραίτητη για την λογιστική εγγραφή (δαπάνη). Παρακαλώ να αναφέρετε την τιμή του είδους με βάση κάποιο τιμοκατάλογο αγοράς."
@@ -1233,7 +1266,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
 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.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Επίσκεψη συντήρησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Επίσκεψη συντήρησης
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Διαθέσιμο παρτίδας Ποσότητα σε αποθήκη
 DocType: Time Log Batch Detail,Time Log Batch Detail,Λεπτομέρεια παρτίδας αρχείων καταγραφής χρονολογίου
 DocType: Landed Cost Voucher,Landed Cost Help,Βοήθεια κόστους αποστολής εμπορευμάτων
@@ -1247,7 +1280,6 @@
 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 +196,Brand master.,Κύρια εγγραφή εμπορικού σήματος
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Κουτί
@@ -1275,7 +1307,7 @@
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +131,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,Υποχρεώσεις αποθέματος
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Υποχρεώσεις αποθέματος
 DocType: Purchase Receipt,Supplier Warehouse,Αποθήκη προμηθευτή
 DocType: Opportunity,Contact Mobile No,Αριθμός κινητού επαφής
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
@@ -1284,7 +1316,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,άλλες εκθέσεις
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,Διακοπή υπενθυμίσεων γενεθλίων
@@ -1294,26 +1326,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Προβολή
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Προηγούμενο οικονομικό έτος δεν έχει κλείσει
 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 +40,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 +38,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
 DocType: Purchase Invoice,Reference Document,έγγραφο αναφοράς
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Χρεώθηκαν
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
@@ -1335,8 +1368,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Καθαρή Αλλαγή πληρωτέων λογαριασμών
 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',Για την έκπτωση με βάση πελάτη είναι απαραίτητο να επιλεγεί πελάτης
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
 DocType: Quotation,Term Details,Λεπτομέρειες όρων
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} πρέπει να είναι μεγαλύτερη από μηδέν
 DocType: Manufacturing Settings,Capacity Planning For (Days),Ο προγραμματισμός της δυναμικότητας Για (Ημέρες)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Αξίωση εγγύησης
@@ -1354,7 +1388,7 @@
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Καταβληθείσα προκαταβολή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερο \ από Γενικό Σύνολο {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Μείωση αφαίρεσης για άδεια άνευ αποδοχών (Α.Α.Α.)
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
 DocType: Packed Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
@@ -1364,15 +1398,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Μία μονάδα ενός είδους
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Η παρτίδα αρχείων καταγραφής χρονολογίου {0} πρέπει να 'υποβληθεί'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
@@ -1389,33 +1423,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,Ταμείο πωλήσεων ανά είδος
+DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","Π.Χ. ""Xyz εθνική τράπεζα """
+DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
 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 +29,Shopping Cart is enabled,Καλάθι Αγορών είναι ενεργοποιημένη
 DocType: Job Applicant,Applicant for a Job,Αιτών εργασία
 DocType: Production Plan Material Request,Production Plan Material Request,Παραγωγή Αίτημα Σχέδιο Υλικό
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Κύριο
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1423,31 +1459,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Αιτών εργασία
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Διευθύνσεις
+apps/erpnext/erpnext/hooks.py +91,Addresses,Διευθύνσεις
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,εκτιμήσεις
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Το στοιχείο δεν επιτρέπεται να έχει εντολή παραγωγής.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Το στοιχείο δεν επιτρέπεται να έχει εντολή παραγωγής.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Παρακαλούμε να ορίσετε το φίλτρο σύμφωνα με το σημείο ή την αποθήκη
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Το καθαρό βάρος της εν λόγω συσκευασίας. (Υπολογίζεται αυτόματα ως το άθροισμα του καθαρού βάρους των ειδών)
 DocType: Sales Order,To Deliver and Bill,Για να παρέχουν και να τιμολογούν
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Χρόνος Καταγράφει για την κατασκευή.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Αρχείο καταγραφής χρονολογίου για εργασίες.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Εμπορικό σήμα
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
 DocType: Quotation Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
@@ -1458,6 +1495,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
+DocType: Request for Quotation Supplier,Send Email to Supplier,Αποστολή email σε Προμηθευτή
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 DocType: Packing Slip,To Package No.,Για τον αρ. συσκευασίας
 DocType: Production Planning Tool,Material Requests,υλικό αιτήσεις
@@ -1475,7 +1513,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Αποθήκη Παράδοση
 DocType: Stock Settings,Allowance Percent,Ποσοστό επίδοματος
 DocType: SMS Settings,Message Parameter,Παράμετρος στο μήνυμα
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Δέντρο των Κέντρων οικονομικό κόστος.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Δέντρο των Κέντρων οικονομικό κόστος.
 DocType: Serial No,Delivery Document No,Αρ. εγγράφου παράδοσης
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Πάρετε τα στοιχεία από τις πωλήσεις παραγγελίες
 DocType: Serial No,Creation Date,Ημερομηνία δημιουργίας
@@ -1507,40 +1545,42 @@
 ,Amount to Deliver,Ποσό Παράδοση
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Ένα προϊόν ή υπηρεσία
 DocType: Naming Series,Current Value,Τρέχουσα αξία
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} Δημιουργήθηκε
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} Δημιουργήθηκε
 DocType: Delivery Note Item,Against Sales Order,Κατά την παραγγελία πώλησης
 ,Serial No Status,Κατάσταση σειριακού αριθμού
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,"Ο πίνακας ειδών, δεν μπορεί να είναι κενός"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 DocType: Pricing Rule,Selling,Πώληση
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Δασμοί και φόροι
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Πύλη πληρωμής Ο λογαριασμός δεν έχει ρυθμιστεί
 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: Production Order,Material Request Item,Είδος αίτησης υλικού
+DocType: Request for Quotation Item,Material Request Item,Είδος αίτησης υλικού
 apps/erpnext/erpnext/config/stock.py +85,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,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
+DocType: Asset,Sold,Πωληθεί
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
 DocType: Sales Invoice,Accounting Details,Λογιστική Λεπτομέρειες
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Διαγράψτε όλες τις συναλλαγές για αυτή την Εταιρεία
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Επενδύσεις
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,χορηγήσεις
 DocType: Quality Inspection Reading,Acceptance Criteria,Κριτήρια αποδοχής
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Παρακαλούμε, εισάγετε αιτήσεις Υλικό στον παραπάνω πίνακα"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Παρακαλούμε, εισάγετε αιτήσεις Υλικό στον παραπάνω πίνακα"
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 DocType: Item Group,Show In Website,Εμφάνιση στην ιστοσελίδα
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Ομάδα
@@ -1548,6 +1588,7 @@
 ,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, Πωλήσεις Τάξης, Αύξων αριθμός"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Διάγραμμα gantt όλων των εργασιών.
+DocType: Pricing Rule,Margin Type,περιθώριο Τύπος
 DocType: Appraisal,For Employee Name,Για το όνομα υπαλλήλου
 DocType: Holiday List,Clear Table,Καθαρισμός πίνακα
 DocType: Features Setup,Brands,Εμπορικά σήματα
@@ -1555,20 +1596,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,Διευθύνσεις πελατών και των επαφών
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Σειρά # {0}: Asset είναι υποχρεωτική κατά ένα πάγιο περιουσιακό στοιχείο του Είδους
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε setup σειρά αρίθμησης για φοίτηση μέσω της εντολής Setup&gt; Σειρά Αρίθμηση
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Ζεύγος
+DocType: Asset,Depreciation Schedule,Πρόγραμμα αποσβέσεις
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 DocType: Maintenance Schedule Detail,Actual Date,Πραγματική ημερομηνία
 DocType: Item,Has Batch No,Έχει αρ. Παρτίδας
 DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας
+DocType: Asset,Purchase Date,Ημερομηνία αγοράς
 DocType: Employee,Personal Details,Προσωπικά στοιχεία
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Παρακαλούμε να ορίσετε «Asset Κέντρο Αποσβέσεις Κόστους» στην εταιρεία {0}
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
@@ -1582,23 +1628,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Συμπεριέλαβε συμφωνημένες καταχωρήσεις
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Πραγματικό σύνολο
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Μονάδα
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Παρακαλώ ορίστε εταιρεία
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,Απαιτήσεις Εξόδων
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
 ,BOM Search,BOM Αναζήτηση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
@@ -1607,29 +1652,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Η ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία ελέγχου στη γραμμή {0}
 DocType: Salary Slip,Deduction,Κρατήση
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 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 +137,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Υπολογιζόμενο Τράπεζα ισορροπία Δήλωση
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Απενεργοποιημένος χρήστης
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Προσφορά
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 DocType: Quotation,Maintenance User,Χρήστης συντήρησης
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Κόστος Ενημερώθηκε
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
@@ -1641,8 +1687,8 @@
 ,SO Qty,Ποσότητα παρ. πώλησης
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
+DocType: Request for Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Αποστολές
 DocType: Purchase Order Item,To be delivered to customer,Να παραδοθεί στον πελάτη
@@ -1650,12 +1696,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Γραμμή #
 DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας)
-DocType: Pricing Rule,Supplier,Προμηθευτής
+DocType: Asset,Supplier,Προμηθευτής
 DocType: C-Form,Quarter,Τρίμηνο
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Διάφορες δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Διάφορες δαπάνες
 DocType: Global Defaults,Default Company,Προεπιλεγμένη εταιρεία
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Ο χρήστης {0} είναι απενεργοποιημένος
@@ -1664,7 +1710,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
@@ -1674,11 +1720,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο συνδέεται με ένα περιουσιακό στοιχείο"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Παιδί στοιχείο δεν πρέπει να είναι ένα Bundle προϊόντων. Παρακαλώ αφαιρέστε το αντικείμενο `{0}` και να αποθηκεύσετε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Κατάθεση
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Νέο κέντρο κόστους
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Πηγή Χρηματοδότησης&gt; Τρέχουσες Υποχρεώσεις&gt; φόρους και δασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στο Προσθήκη Παιδί) του τύπου «φόρος» και να κάνει αναφέρω το φορολογικό συντελεστή.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Νέο κέντρο κόστους
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Quality Inspection,In Process,Σε επεξεργασία
@@ -1691,10 +1737,11 @@
 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,Εισπρακτέα λογαριασμού
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
 DocType: Quotation Item,Stock Balance,Ισοζύγιο αποθέματος
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Τα αρχεία καταγραφής χρονολογίου δημιουργήθηκαν:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Τα αρχεία καταγραφής χρονολογίου δημιουργήθηκαν:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Employee,Blood Group,Ομάδα αίματος
@@ -1712,13 +1759,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Χρεωστικό να απαιτείται
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
 DocType: Offer Letter Term,Offer Term,Προσφορά Όρος
 DocType: Quality Inspection,Quality Manager,Υπεύθυνος διασφάλισης ποιότητας
 DocType: Job Applicant,Job Opening,Άνοιγμα θέσης εργασίας
 DocType: Payment Reconciliation,Payment Reconciliation,Συμφωνία πληρωμής
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Επιστολή Προσφοράς
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Δημιουργία αιτήσεων υλικών (mrp) και εντολών παραγωγής.
@@ -1726,22 +1773,22 @@
 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 +103,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Τρέχουσα Αποτίμηση Τιμή
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Δημιουργήστε καταχωρήσεις πληρωμή κατά παραγγελίες ή τιμολόγια.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Δημιουργήστε καταχωρήσεις πληρωμή κατά παραγγελίες ή τιμολόγια.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Χρήστες και δικαιώματα
@@ -1750,10 +1797,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Οι πελάτες σας
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Κάνε αίτηση τώρα
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Κάνε αίτηση τώρα
 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."
@@ -1777,7 +1825,7 @@
 DocType: Employee,Employment Details,Λεπτομέρειες απασχόλησης
 DocType: Employee,New Workplace,Νέος χώρος εργασίας
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ορισμός ως Έκλεισε
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Δεν βρέθηκε είδος με barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Δεν βρέθηκε είδος με barcode {0}
 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,Δείτε μια παρουσίαση στην κορυφή της σελίδας
@@ -1795,10 +1843,10 @@
 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 +608,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Μεταφορά υλικού
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Θέση {0} πρέπει να είναι μια Πωλήσεις Θέση στο {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -1812,12 +1860,13 @@
 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: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Πηγή χρηματοδότησης ( παθητικού )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Υπάλληλος
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Εισαγωγή e-mail από
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Πρόσκληση ως χρήστη
 DocType: Features Setup,After Sale Installations,Εγκαταστάσεις μετά την πώληση
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Παρακαλούμε να ορίσετε {0} στην εταιρεία {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 DocType: Workstation Working Hour,End Time,Ώρα λήξης
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Πρότυποι όροι σύμβασης για πωλήσεις ή αγορές.
@@ -1826,9 +1875,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,Φαρμακευτικός
@@ -1845,25 +1894,25 @@
 DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Gateway Account,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 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 +206,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
@@ -1872,7 +1921,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Κατάλογος διευθύνσεων ενημερωτικών δελτίων
 DocType: Delivery Note,Transporter Name,Όνομα μεταφορέα
 DocType: Authorization Rule,Authorized Value,Εξουσιοδοτημένος Αξία
@@ -1890,13 +1939,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} είναι κλειστό
 DocType: Email Digest,How frequently?,Πόσο συχνά;
 DocType: Purchase Receipt,Get Current Stock,Βρες το τρέχον απόθεμα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων&gt; Κυκλοφορούν Ενεργητικό&gt; τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στο Προσθήκη Παιδί) του τύπου &quot;Τράπεζα&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Δέντρο του Πίνακα Υλικών
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Παρόν
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,Σκοπός
+DocType: Company,Fixed Asset Depreciation Settings,Ρυθμίσεις Αποσβέσεις παγίων στοιχείων του ενεργητικού
 DocType: Item,Will also apply for variants unless overrridden,Θα ισχύουν επίσης για τις παραλλαγές εκτός αν υπάρχει υπέρβαση
 DocType: Purchase Invoice,Advances,Προκαταβολές
 DocType: Production Order,Manufacture against Material Request,Κατασκευή κατά Υλικό Αίτηση
@@ -1905,6 +1954,7 @@
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,Έχει θυγατρικό κόμβο
@@ -1955,12 +2005,14 @@
  9. Υπολογισμός φόρου ή επιβάρυνσης για: Σε αυτόν τον τομέα μπορείτε να ορίσετε αν ο φόρος/επιβάρυνση είναι μόνο για αποτίμηση (δεν είναι μέρος του συνόλου) ή μόνο για το σύνολο (δεν προσθέτει αξία στο είδος) ή και για τα δύο.
 10. Πρόσθεση ή Έκπτωση: Αν θέλετε να προσθέσετε ή να αφαιρέσετε τον φόρο."
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
+DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","Π.Χ. Τράπεζα, μετρητά, πιστωτική κάρτα"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων&gt; Κυκλοφορούν Ενεργητικό&gt; τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στο Προσθήκη Παιδί) του τύπου &quot;Τράπεζα&quot;
 DocType: Journal Entry,Credit Note,Πιστωτικό σημείωμα
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {0} για τη λειτουργία {1}
 DocType: Features Setup,Quality,Ποιότητα
@@ -1984,9 +2036,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Διευθύνσεις μου
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,Προεπιλεγμένος τιμοκατάλογος αγορών
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Κανένας εργαζόμενος για τις παραπάνω επιλεγμένα κριτήρια ή εκκαθαριστικό μισθοδοσίας που έχουν ήδη δημιουργηθεί
@@ -2013,7 +2065,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Μισθολόγιο
 apps/erpnext/erpnext/accounts/doctype/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} πρέπει επίσης να συμπεριληφθούν"
@@ -2023,8 +2075,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Είδη αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Έντυπα Προσαρμογή
 DocType: Account,Income Account,Λογαριασμός εσόδων
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Δεν Πρότυπο προεπιλεγμένη διεύθυνση βρέθηκε. Παρακαλούμε να δημιουργήσετε ένα νέο από τις Ρυθμίσεις&gt; Εκτύπωση και Branding&gt; Πρότυπο Διεύθυνση.
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Βασικός τομέας ευθύνης
@@ -2046,21 +2099,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Νέο όνομα κέντρου κόστους
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
 DocType: Purchase Invoice,Taxes and Charges Deducted,Φόροι και επιβαρύνσεις που παρακρατήθηκαν
-apps/erpnext/erpnext/config/support.py +7,Issues,Θέματα
+apps/erpnext/erpnext/hooks.py +90,Issues,Θέματα
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Η κατάσταση πρέπει να είναι ένα από τα {0}
 DocType: Sales Invoice,Debit To,Χρέωση προς
 DocType: Delivery Note,Required only for sample item.,Απαιτείται μόνο για δείγμα
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Πολύ Μεγάλο
 ,Profit and Loss Statement,Έκθεση αποτελέσματος χρήσης
@@ -2074,10 +2128,10 @@
 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 +139,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Καθορίστε την ισοτιμία να μετατραπεί ένα νόμισμα σε ένα άλλο
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
@@ -2145,13 +2199,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
 ,Requested,Ζητήθηκαν
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Δεν βρέθηκαν παρατηρήσεις
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,Πωλήσεις και αγορές
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 DocType: Supplier Quotation Item,Material Request No,Αρ. Αίτησης υλικού
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα της εταιρείας
@@ -2172,7 +2227,7 @@
 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,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 DocType: Payment Request,Recipient and Message,Παραλήπτη και το μήνυμα
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
@@ -2186,7 +2241,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε Διεύθυνση Προμηθευτή
 DocType: 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 DocType: Payment Request,Mute Email,Σίγαση Email
@@ -2208,11 +2263,12 @@
 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/config/buying.py +18,Request for quotation.,Αίτηση για προσφορά.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο&quot; είναι &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; είναι &quot;ναι&quot; και δεν υπάρχει άλλος Bundle Προϊόν
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Ημερομηνία έναρξης του έργου
@@ -2221,7 +2277,7 @@
 DocType: Installation Note Item,Against Document No,Ενάντια έγγραφο αριθ.
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Διαχειριστείτε συνεργάτες πωλήσεων.
 DocType: Quality Inspection,Inspection Type,Τύπος ελέγχου
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Παρακαλώ επιλέξτε {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
 DocType: Employee Attendance Tool,Unmarked Attendance,Χωρίς διακριτικά Συμμετοχή
@@ -2236,6 +2292,7 @@
 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,Διαφήμιση
+DocType: Asset Category Account,Depreciation Expense Account,Ο λογαριασμός Αποσβέσεις
 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,Υπεύθυνος έγκρισης δαπανών
@@ -2249,7 +2306,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Επιβεβαιώθηκε
 DocType: Payment Gateway,Gateway,Είσοδος πυλών
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Ποσό
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Ποσό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
@@ -2263,18 +2320,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Έγκυρη Αποθήκη
 DocType: Bank Reconciliation Detail,Posting Date,Ημερομηνία αποστολής
 DocType: Item,Valuation Method,Μέθοδος αποτίμησης
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Μισή Μέρα
 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 +410,[Error],[Σφάλμα]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Αποθήκη Πελατών (Προαιρετικό)
 DocType: Pricing Rule,Discount Percentage,Ποσοστό έκπτωσης
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
@@ -2300,14 +2358,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Πρότυπο των όρων ή της σύμβασης.
 DocType: Purchase Invoice,Address and Contact,Διεύθυνση και Επικοινωνία
 DocType: Supplier,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Employee,Feedback,Ανατροφοδότηση
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Η άδεια δεν μπορεί να χορηγείται πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
+DocType: Asset,Expected Value After Useful Life,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή
 DocType: Item,Reorder level based on Warehouse,Αναδιάταξη επίπεδο με βάση Αποθήκης
 DocType: Activity Cost,Billing Rate,Χρέωση Τιμή
 ,Qty to Deliver,Ποσότητα για παράδοση
@@ -2320,12 +2380,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ακυρώνεται ή κλειστή
 DocType: Delivery Note,Track this Delivery Note against any Project,Παρακολουθήστε αυτό το δελτίο αποστολής σε οποιουδήποτε έργο
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Καθαρές ταμειακές ροές από επενδυτικές
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Περιουσιακό στοιχείο {0} πρέπει να υποβληθούν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Διαχειριστείτε Διευθύνσεις
-DocType: Pricing Rule,Item Code,Κωδικός είδους
+DocType: Asset,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
@@ -2344,8 +2404,10 @@
 DocType: Production Planning Tool,Create Material Requests,Δημιουργία αιτήσεων υλικού
 DocType: Employee Education,School/University,Σχολείο / πανεπιστήμιο
 DocType: Payment Request,Reference Details,Λεπτομέρειες αναφοράς
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
 DocType: Sales Invoice Item,Available Qty at Warehouse,Διαθέσιμη ποσότητα στην αποθήκη
 ,Billed Amount,Χρεωμένο ποσό
+DocType: Asset,Double Declining Balance,Διπλά φθίνοντος υπολοίπου
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Κλειστά ώστε να μην μπορεί να ακυρωθεί. Ανοίγω για να ακυρώσετε.
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Λήψη ενημερώσεων
@@ -2364,6 +2426,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
+DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
@@ -2371,25 +2434,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Αύξων αριθμός παρτίδας και
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Αξία ή ποσ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Λεπτό
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
 ,Qty to Receive,Ποσότητα για παραλαβή
 DocType: Leave Block List,Leave Block List Allowed,Η λίστα αποκλεισμού ημερών άδειας επετράπη
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
 DocType: Global Defaults,Disable In Words,Απενεργοποίηση στα λόγια
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός item&gt; Στοιχείο Ομάδα&gt; Μάρκα
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Εξασφαλισμένα δάνεια
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Παρακαλούμε να ορίσετε τους σχετικούς λογαριασμούς Αποσβέσεις στο Asset Κατηγορία {0} ή της Εταιρείας {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
 DocType: Appraisal,Appraisal,Εκτίμηση
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Email αποσταλεί στον προμηθευτή {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
@@ -2397,7 +2463,7 @@
 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 +199,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,Κατάργηση εγγραφής από αυτό το email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Το μήνυμα εστάλη
@@ -2425,6 +2491,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Σύνολο Περιθώριο
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
 DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 DocType: Hub Settings,Publish Items to Hub,Δημοσιεύστε είδη στο hub
@@ -2438,7 +2505,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Ομάδα πελατών / πελάτης
 DocType: Payment Gateway Account,Default Payment Request Message,Προεπιλογή Μήνυμα Αίτηση Πληρωμής
 DocType: Item Group,Check this if you want to show in website,"Ελέγξτε αυτό, αν θέλετε να εμφανίζεται στην ιστοσελίδα"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Τραπεζικές συναλλαγές και πληρωμές
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Τραπεζικές συναλλαγές και πληρωμές
 ,Welcome to ERPNext,Καλώς ήλθατε στο erpnext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Αριθμός λεπτομερειών αποδεικτικού
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Να οδηγήσει σε εισαγωγικά
@@ -2446,17 +2513,17 @@
 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 +199,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,Φύλλα και διακοπές
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,Ομαδοποιημένα για χρέωση
@@ -2472,15 +2539,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
+DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Αγορά Ημερομηνία περιουσιακό στοιχείο {0} δεν ταιριάζει με την ημερομηνία αγοράς Τιμολόγιο
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Αποθήκη {0}: η εταιρεία είναι απαραίτητη
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Account,Payable,Πληρωτέος
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Οφειλέτες ({0})
-DocType: Project,Margin,Περιθώριο
+DocType: Pricing Rule,Margin,Περιθώριο
 DocType: Salary Slip,Arrear Amount,Καθυστερημένο ποσό
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι πελάτες
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Μικτό κέρδος (%)
@@ -2488,20 +2557,23 @@
 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,Ελέγξτε αν θέλετε να στείλετε τη βεβαίωση αποδοχών στο ταχυδρομείο κάθε υπάλληλου κατά την υποβολή βεβαίωσης αποδοχών
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
 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 +57,Where manufacturing operations are carried.,Που γίνονται οι μεταποιητικές εργασίες
 DocType: Stock Entry Detail,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
 DocType: Employee,Confirmation Date,Ημερομηνία επιβεβαίωσης
 DocType: C-Form,Total Invoiced Amount,Συνολικό ποσό που τιμολογήθηκε
 DocType: Account,Sales User,Χρήστης πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Η ελάχιστη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την μέγιστη ποσότητα
+DocType: Account,Accumulated Depreciation,Συσσωρευμένες αποσβέσεις
 DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
 DocType: Payment Request,Email To,E-mail Για να
 DocType: Lead,Lead Owner,Ιδιοκτήτης επαφής
 DocType: Bin,Requested Quantity,ζήτησε Ποσότητα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Αποθήκη απαιτείται
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Αποθήκη απαιτείται
 DocType: Employee,Marital Status,Οικογενειακή κατάσταση
 DocType: Stock Settings,Auto Material Request,Αυτόματη αίτηση υλικού
 DocType: Time Log,Will be updated when billed.,Θα ενημερωθεί με την τιμολόγηση.
@@ -2509,11 +2581,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% Παραδόθηκαν
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Ίδιο προμηθευτή έχει εισαχθεί πολλές φορές
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Προμηθεύτηκε είδος παραγγελίας αγοράς
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,Όνομα Εταιρίας δεν μπορεί να είναι Εταιρεία
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
@@ -2523,13 +2596,14 @@
 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.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 DocType: Payment Request,Payment Details,Οι λεπτομέρειες πληρωμής
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
+DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Εγγραφή όλων των ανακοινώσεων τύπου e-mail, τηλέφωνο, chat, επίσκεψη, κ.α."
 DocType: Manufacturer,Manufacturers used in Items,Κατασκευαστές που χρησιμοποιούνται στα σημεία
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Κέντρο Κόστους στην Εταιρεία
 DocType: Purchase Invoice,Terms,Όροι
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Δημιουργία νέου
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Δημιουργία νέου
 DocType: Buying Settings,Purchase Order Required,Απαιτείται παραγγελία αγοράς
 ,Item-wise Sales History,Ιστορικό πωλήσεων ανά είδος
 DocType: Expense Claim,Total Sanctioned Amount,Σύνολο εγκεκριμένων ποσών
@@ -2542,7 +2616,7 @@
 ,Stock Ledger,Καθολικό αποθέματος
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Τιμή: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Παρακρατήσεις στη βεβαίωση αποδοχών
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Επιλέξτε πρώτα έναν κόμβο ομάδας.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Επιλέξτε πρώτα έναν κόμβο ομάδας.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Των εργαζομένων και φοίτηση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Καταργήστε την αναφορά του πελάτη, προμηθευτή, συνεργάτη των πωλήσεων και μολύβδου, όπως είναι η διεύθυνση της εταιρείας σας"
@@ -2564,13 +2638,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Από {1}
 DocType: Task,depends_on,εξαρτάται από
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,"Επόμενη ημερομηνία πρέπει να είναι μεγαλύτερη από ό, τι Απόσπαση Ημερομηνία"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Εμφάνιση φόρου διάλυση
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# έντυπο / Θέση / {0}) έχει εξαντληθεί
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,"Επόμενη ημερομηνία πρέπει να είναι μεγαλύτερη από ό, τι Απόσπαση Ημερομηνία"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/accounts/party.py +289,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',"Αν δραστηριοποιείστε σε μεταποιητικές δραστηριότητες, επιτρέπει την επιλογή 'κατασκευάζεται '"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Τιμολόγιο Ημερομηνία Δημοσίευσης
@@ -2585,7 +2660,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Σημείωση: εάν η πληρωμή δεν γίνεται κατά οποιαδήποτε αναφορά, δημιουργήστε την λογιστική εγγραφή χειροκίνητα."
@@ -2599,7 +2674,7 @@
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
 ,Stock Ageing,Γήρανση αποθέματος
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2608,7 +2683,7 @@
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
@@ -2619,7 +2694,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
@@ -2628,11 +2703,12 @@
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
+DocType: Asset Category Account,Fixed Asset Account,Σταθερή Λογαριασμού Ενεργητικού
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Εκπαιδευόμενος
@@ -2640,7 +2716,7 @@
 DocType: Stock Entry,From BOM,Από BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Η 'έως ημερομηνία' πρέπει να είναι η ίδια με την 'από ημερομηνία'΄για την άδεια μισής ημέρας
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","Π.Χ. Kg, μονάδα, αριθμοί, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
@@ -2648,17 +2724,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Μισθολόγιο
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Προσφορές
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
 DocType: Sales Invoice Item,Serial No,Σειριακός αριθμός
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
-DocType: Item,Is Fixed Asset Item,Είναι πάγιο στοιχείο
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
 DocType: Purchase Invoice,Print Language,Εκτύπωση Γλώσσα
 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","Αν έχετε μεγάλες μορφές εκτύπωσης, αυτό το χαρακτηριστικό μπορεί να χρησιμοποιηθεί για να χωρίσει τη σελίδα που θα εκτυπωθεί σε πολλές σελίδες με όλες τις κεφαλίδες και τα υποσέλιδα σε κάθε σελίδα"
+DocType: Asset,Number of Depreciations,Αριθμός Αποσβέσεις
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 DocType: Fiscal Year,Year Name,Όνομα έτους
@@ -2666,13 +2742,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Αίτηση για προσφορά
 DocType: Payment Reconciliation,Maximum Invoice Amount,Μέγιστο ποσό του τιμολογίου
 DocType: Purchase Invoice Item,Image View,Προβολή εικόνας
 apps/erpnext/erpnext/config/selling.py +23,Customers,Πελάτες
+DocType: Asset,Partially Depreciated,μερικώς αποσβένονται
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
@@ -2688,13 +2766,13 @@
 DocType: Quotation,Maintenance Manager,Υπεύθυνος συντήρησης
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Το σύνολο δεν μπορεί να είναι μηδέν
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,Οι 'ημέρες από την τελευταία παραγγελία' πρέπει να είναι περισσότερες από 0
-DocType: C-Form,Amended From,Τροποποίηση από
+DocType: Asset,Amended From,Τροποποίηση από
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Μεταφορά προς τα εμπρός
@@ -2707,21 +2785,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Παρακαλείστε να αναφέρετε «Ο λογαριασμός / Ζημίες Κέρδη από Ενεργητικού Διάθεση» στην εταιρεία
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Προσθήκη στο καλάθι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Ομαδοποίηση κατά
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
 DocType: Production Planning Tool,Get Material Request,Πάρτε Αίτημα Υλικό
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Ταχυδρομικές δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Ταχυδρομικές δαπάνες
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Σύνολο παρόντων
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,λογιστικές Καταστάσεις
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,λογιστικές Καταστάσεις
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Ώρα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
@@ -2740,15 +2819,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Έναρξη Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,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,Ομάδα πελατών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: Item,Website Description,Περιγραφή δικτυακού τόπου
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
@@ -2756,12 +2836,13 @@
 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,Όνομα ομάδας πελατών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,Κατά τον τύπο αποδεικτικού
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Σφάλμα: {0}&gt; {1}
 DocType: Item,Attributes,Γνωρίσματα
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Βρες είδη
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
 DocType: C-Form,C-Form,C-form
@@ -2773,18 +2854,18 @@
 DocType: Purchase Invoice,Mobile No,Αρ. Κινητού
 DocType: Payment Tool,Make Journal Entry,Δημιούργησε λογιστική εγγραφή
 DocType: Leave Allocation,New Leaves Allocated,Νέες άδειες που κατανεμήθηκαν
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Εμπορικός
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Σφάλμα: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 DocType: Cost Center,Distribution Id,ID διανομής
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Όλα τα προϊόντα ή τις υπηρεσίες.
 DocType: Supplier Quotation,Supplier Address,Διεύθυνση προμηθευτή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ποσότητα εκτός
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
+apps/erpnext/erpnext/config/accounts.py +259,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,Χρηματοοικονομικές υπηρεσίες
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους από {1} σε {2} σε προσαυξήσεις των {3}
@@ -2795,10 +2876,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Μεταφορά
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Μεταφορά
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Due Date είναι υποχρεωτική
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
 DocType: Journal Entry,Pay To / Recd From,Πληρωτέο προς / λήψη από
 DocType: Naming Series,Setup Series,Εγκατάσταση σειρών
@@ -2818,20 +2899,22 @@
 DocType: GL Entry,Remarks,Παρατηρήσεις
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Αποστολή Emails Προμηθευτής
 DocType: Features Setup,POS View,Προβολή POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,επόμενη ημέρα Ημερομηνία και Επαναλάβετε την Ημέρα του μήνα πρέπει να είναι ίση
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,επόμενη ημέρα Ημερομηνία και Επαναλάβετε την Ημέρα του μήνα πρέπει να είναι ίση
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Παρακαλώ ορίστε μια
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Πάνω από
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Χρόνος καταγραφής έχει χρεωθεί
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Προσωρινά κέρδη / ζημιές (πίστωση)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Παρακαλώ ορίστε προεπιλεγμένη τιμή {0} στην εταιρεία {1}
@@ -2841,12 +2924,13 @@
 ,Monthly Attendance Sheet,Μηνιαίο δελτίο συμμετοχής
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Δεν βρέθηκαν εγγραφές
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε setup σειρά αρίθμησης για φοίτηση μέσω της εντολής Setup&gt; Σειρά Αρίθμηση
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+DocType: Asset,Straight Line,Ευθεία
+DocType: Project User,Project User,Ο χρήστης του έργου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""Κέρδη και Ζημίες"" {0} δεν επιτρέπεται στην αρχική καταχώρηση λογαριασμών"
 DocType: Features Setup,Sales Discounts,Εκπτώσεις πωλήσεων
@@ -2860,39 +2944,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Αριθμός παραγγελίας
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ΗΤΜΛ / banner που θα εμφανιστούν στην κορυφή της λίστας των προϊόντων.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Καθορίστε τις συνθήκες για τον υπολογισμό του κόστους αποστολής
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Προσθήκη παιδιού
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,Αξία ανοίγματος
 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,Προμήθεια επί των πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Προμήθεια επί των πωλήσεων
 DocType: Offer Letter Term,Value / Description,Αξία / Περιγραφή
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 ,Customers Not Buying Since Long Time,Πελάτες που έχουν πολύ καιρό να αγοράσουν
 DocType: Production Order,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Δαπάνες ψυχαγωγίας
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Δαπάνες ψυχαγωγίας
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Αιτήσεις για χορήγηση άδειας.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Νομικές δαπάνες
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Νομικές δαπάνες
 DocType: Sales Invoice,Posting Time,Ώρα αποστολής
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Δαπάνες τηλεφώνου
 DocType: Sales Partner,Logo,Λογότυπο
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Ελέγξτε αυτό, αν θέλετε να αναγκάσει τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει καμία προεπιλογή αν επιλέξετε αυτό."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Δεν βρέθηκε είδος με σειριακός αριθμός {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Ανοίξτε Ειδοποιήσεις
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Άμεσες δαπάνες
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Άμεσες δαπάνες
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} είναι μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στο «Κοινοποίηση \ διεύθυνση ηλεκτρονικού ταχυδρομείου&quot;
 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,Έξοδα μετακίνησης
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
@@ -2909,7 +2994,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Πουλάμε αυτό το είδος
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID προμηθευτή
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
 DocType: Journal Entry,Cash Entry,Καταχώρηση μετρητών
 DocType: Sales Partner,Contact Desc,Περιγραφή επαφής
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Τύπος των φύλλων, όπως τυπική, για λόγους υγείας κλπ."
@@ -2920,11 +3005,12 @@
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Όλες οι επαφές.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Προμηθευτής περιουσιακό στοιχείο {0} δεν ταιριάζει με τον προμηθευτή στο τιμολόγιο αγοράς
 DocType: Newsletter,Test Email Id,Δοκιμαστικό email ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Η πρώτη ύλη δεν μπορεί να είναι ίδια με το κύριο είδος
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Κύρια εγγραφή προτύπου μισθολογίου.
@@ -2940,12 +3026,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,Προτιμώμενη διεύθυνση χρέωσης
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα είτε προεπιλογή comapany ή νόμισμα payble λογαριασμό κόμματος
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Γραμματέας
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Αν απενεργοποιήσετε, «σύμφωνα με τα λόγια« πεδίο δεν θα είναι ορατό σε κάθε συναλλαγή"
@@ -2955,13 +3042,13 @@
 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,Πιστωτές
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Πιστωτές
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Σειρά # {0}: Αύξων αριθμός είναι υποχρεωτική
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές λεπτομέρειες για είδη
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
@@ -2982,15 +3069,14 @@
 DocType: Customer,From Lead,Από επαφή
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
-DocType: Project,Project Name,Όνομα έργου
+DocType: Request for Quotation 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,Αρ. Παρτίδας είδους
@@ -3020,6 +3106,7 @@
 DocType: Sales Invoice,End Date,Ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Συναλλαγές απόθεμα
 DocType: Employee,Internal Work History,Ιστορία εσωτερική εργασία
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Συσσωρευμένες Αποσβέσεις Ποσό
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
@@ -3027,7 +3114,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Η εταιρεία είναι υποχρεωτική, όπως είναι η διεύθυνση της εταιρείας σας"
 DocType: Item Attribute,From Range,Από τη σειρά
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Το είδος {0} αγνοήθηκε, δεδομένου ότι δεν είναι ένα αποθηκεύσιμο είδος"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Υποβολή αυτής της εντολής παραγωγής για περαιτέρω επεξεργασία.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Υποβολή αυτής της εντολής παραγωγής για περαιτέρω επεξεργασία.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Για να μην εφαρμοστεί ο κανόνας τιμολόγησης σε μια συγκεκριμένη συναλλαγή, θα πρέπει να απενεργοποιηθούν όλοι οι εφαρμόσιμοι κανόνες τιμολόγησης."
 DocType: Company,Domain,Τομέας
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Θέσεις εργασίας
@@ -3039,6 +3126,7 @@
 DocType: Time Log,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
@@ -3055,6 +3143,7 @@
 DocType: Sales Order,Delivery Date,Ημερομηνία παράδοσης
 DocType: Opportunity,Opportunity Date,Ημερομηνία ευκαιρίας
 DocType: Purchase Receipt,Return Against Purchase Receipt,Επιστροφή Ενάντια απόδειξη αγοράς
+DocType: Request for Quotation Item,Request for Quotation Item,Αίτηση Προσφοράς Είδους
 DocType: Purchase Order,To Bill,Για τιμολόγηση
 DocType: Material Request,% Ordered,Διέταξε%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Εργασία με το κομμάτι
@@ -3069,11 +3158,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Η στήλη πρέπει να είναι κενή
 DocType: Accounts Settings,Accounts Settings,Ρυθμίσεις λογαριασμών
 DocType: Customer,Sales Partner and Commission,Συνεργάτης Πωλήσεων και της Επιτροπής
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Παρακαλούμε να ορίσετε &#39;Ο Λογαριασμός Διάθεση περιουσιακών στοιχείων »στην εταιρεία {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Προσωρινή Λογαριασμοί
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Account,Auditor,Ελεγκτής
@@ -3082,21 +3172,22 @@
 DocType: Pricing Rule,Disable,Απενεργοποίηση
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Κάντε κλικ εδώ για πληρωμή
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Περιουσιακό στοιχείο {0} δεν μπορεί να καταργηθεί, δεδομένου ότι είναι ήδη {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID πελάτη
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Απών
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,"Σε καιρό πρέπει να είναι μεγαλύτερη από ό, τι από καιρό"
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Προσθήκη στοιχείων από
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Προσθήκη στοιχείων από
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Αποθήκη {0}:ο γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","Π.Χ. "" Mc """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,Δεν μπορεί να υπάρχει απόθεμα για το είδος {0} γιατί έχει παραλλαγές
 ,Sales Person-wise Transaction Summary,Περίληψη συναλλαγών ανά πωλητή
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
@@ -3111,6 +3202,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,Διαχείριση ποιότητας
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
 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,Ιστορικό εξωτερικών εργασιών υπαλλήλου
@@ -3122,7 +3214,7 @@
 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,Επόμενο Επικοινωνία
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Ρύθμιση λογαριασμών πύλη.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Ρύθμιση λογαριασμών πύλη.
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Πάγια
 ,Cash Flow,Κατάσταση Ταμειακών Ροών
@@ -3136,7 +3228,7 @@
 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 +132,Please find attached {0} #{1},Επισυνάπτεται #{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Επισυνάπτεται #{0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
 DocType: Authorization Rule,Customer / Item Name,Πελάτης / όνομα είδους
@@ -3152,19 +3244,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Παρακαλείστε να αναφέρετε από / προς το εύρος
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές πωλήσεων.
 DocType: BOM Replace Tool,Current BOM,Τρέχουσα Λ.Υ.
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Προσθήκη σειριακού αριθμού
 apps/erpnext/erpnext/config/support.py +43,Warranty,Εγγύηση
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Εκτύπωση και στάσιμο
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Κόμβος ομάδας
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Ενημέρωση τελικών ειδών
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Ενημέρωση τελικών ειδών
 DocType: Workstation,per hour,Ανά ώρα
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Αγοραστικός
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Πληρωμένο Ποσό
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
@@ -3194,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
 DocType: Leave Block List,Applies to Company,Ισχύει για την εταιρεία
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
 DocType: Purchase Invoice,In Words,Με λόγια
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
 DocType: Production Planning Tool,Material Request For Warehouse,Αίτηση υλικού για αποθήκη
@@ -3207,9 +3298,11 @@
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
+DocType: Pricing Rule,Margin Rate or Amount,Περιθώριο ποσοστό ή την ποσότητα
 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,Είδος παραγγελίας πώλησης
@@ -3219,7 +3312,7 @@
 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 +782,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} έχει ήδη ληφθεί
@@ -3227,14 +3320,13 @@
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Άκυρη {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Πολυκαταστήματα
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
 DocType: Account,Chargeable,Χρεώσιμο
 DocType: Company,Change Abbreviation,Αλλαγή συντομογραφίας
 DocType: Expense Claim Detail,Expense Date,Ημερομηνία δαπάνης
@@ -3252,14 +3344,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Γενικό καθολικό
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Δείτε τις απαγωγές
 DocType: Item Attribute Value,Attribute Value,Χαρακτηριστικό αξία
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID, όπου ένας υποψήφιος θα αποστείλει email π.Χ. 'jobs@example.Com'"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email ID, όπου ένας υποψήφιος θα αποστείλει email π.Χ. 'jobs@example.Com'"
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 DocType: Features Setup,To get Item Group in details table,Για λήψη της oμάδας ειδών σε πίνακα λεπτομερειών
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {0}
 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>
@@ -3291,23 +3384,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Το χρονοδιάγραμμα συντήρησης {0} υπάρχει για {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Το χρονοδιάγραμμα συντήρησης {0} υπάρχει για {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Πραγματική ποσότητα (στην πηγή / στόχο)
 DocType: Item Customer Detail,Ref Code,Κωδ. Αναφοράς
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Εγγραφές υπαλλήλων
 DocType: Payment Gateway,Payment Gateway,Πύλη Πληρωμών
 DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Παραγγέλνω
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Η ρίζα δεν μπορεί να έχει γονικό κέντρο κόστους
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Επιλέξτε Μάρκα ...
 DocType: Sales Invoice,C-Form Applicable,Εφαρμόσιμο σε C-Form
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Αποθήκη είναι υποχρεωτική
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Επιλύθηκε από
@@ -3325,7 +3418,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Νόμισμα συναλλαγής πρέπει να είναι ίδια με πύλη πληρωμής νόμισμα
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Λήψη
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
@@ -3333,14 +3426,14 @@
 DocType: Purchase Invoice,Submit on creation,Υποβολή στη δημιουργία
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Purchase Receipt Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Οι παραγγελίες μου
@@ -3361,10 +3454,10 @@
 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,Παρακαλώ εισάγετε το μήνυμα πριν από την αποστολή
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Προφίλ
+apps/erpnext/erpnext/config/accounts.py +258,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} έχει ήδη χρεωθεί
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Ακάλυπτά δάνεια
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Ακάλυπτά δάνεια
 DocType: Cost Center,Cost Center Name,Όνομα κέντρου κόστους
 DocType: Maintenance Schedule Detail,Scheduled Date,Προγραμματισμένη ημερομηνία
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Συνολικό καταβεβλημένο ποσό
@@ -3376,11 +3469,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. Παρακαλώ ορίστε την κατάσταση του ως ανενεργό για να προχωρήσετε.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Προμηθευτής Μέρος Όχι
 DocType: Purchase Invoice,Contact,Επαφή
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Ελήφθη Από
 DocType: Features Setup,Exports,Εξαγωγές
@@ -3389,12 +3483,12 @@
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Από {0} για {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
 DocType: Issue,Content Type,Τύπος περιεχομένου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
 DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
@@ -3403,7 +3497,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Κύρια εγγραφή λογαριασμού
@@ -3416,7 +3510,7 @@
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,Ενεργητικό αποθέματος
@@ -3430,15 +3524,15 @@
 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 +576,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Δραστηριότητες / εργασίες έργου
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Δημιουργία βεβαιώσεων αποδοχών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",Η επιλογή αγορά πρέπει να οριστεί αν είναι επιλεγμένο το πεδίο 'εφαρμοστέο σε' ως {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Επανάληψη την ημέρα του μήνα
@@ -3458,8 +3552,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Έτος ημερομηνία έναρξης ή την ημερομηνία λήξης είναι η επικάλυψη με {0}. Για την αποφυγή ορίστε εταιρείας
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Νέα Ενημερωτικό Δελτίο
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",". Παράδειγμα: abcd # # # # # αν έχει οριστεί σειρά και ο σειριακός αριθμός δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί σειριακός αριθμός αυτόματα με βάση αυτή τη σειρά. Αν θέλετε πάντα να αναφέρεται ρητά ο σειριακός αριθμός για αυτό το προϊόν, αφήστε κενό αυτό το πεδίο"
 DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες
@@ -3470,11 +3565,11 @@
 ,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 +91,Please enter default currency in Company Master,Παρακαλώ εισάγετε προεπιλεγμένο νόμισμα στην κύρια εγγραφή της εταιρείας
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Φορολογικές Κανόνας Συγκρούσεις με {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Νέο όνομα λογαριασμού
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,Εξυπηρέτηση πελατών
@@ -3484,11 +3579,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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,Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ημέρες κατά την περίοδο
+DocType: Pricing Rule,Percentage,Τοις εκατό
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Το είδος {0} πρέπει να είναι ένα είδος πώλησης
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Το είδος {0} πρέπει να είναι ένα είδος πώλησης
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
 DocType: Account,Equity,Διαφορά ενεργητικού - παθητικού
 DocType: Sales Order,Printing Details,Λεπτομέρειες εκτύπωσης
@@ -3496,11 +3592,12 @@
 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,Συνελεύσεις Αναζήτηση Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
 DocType: Purchase Taxes and Charges,Actual,Πραγματικός
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Πηγή Χρηματοδότησης&gt; Τρέχουσες Υποχρεώσεις&gt; φόρους και δασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στο Προσθήκη Παιδί) του τύπου «φόρος» και να κάνει αναφέρω το φορολογικό συντελεστή.
 DocType: Production Order,Production Order,Εντολή παραγωγής
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
@@ -3519,18 +3616,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Επιτυχής συμφωνία
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Tax Rule,Validity,Εγκυρότητα
+DocType: Request for Quotation,Supplier Detail,Προμηθευτής Λεπτομέρειες
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Ποσό τιμολόγησης
 DocType: Attendance,Attendance,Συμμετοχή
 apps/erpnext/erpnext/config/projects.py +55,Reports,αναφορές
 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 +508,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Φορολογικό πρότυπο για συναλλαγές αγοράς.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Φορολογικό πρότυπο για συναλλαγές αγοράς.
 ,Item Prices,Τιμές είδους
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
 DocType: Period Closing Voucher,Period Closing Voucher,Δικαιολογητικό κλεισίματος περιόδου
@@ -3540,10 +3638,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Αλλαγή
@@ -3551,6 +3649,7 @@
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
+DocType: Asset Category,Asset Category Name,Asset Όνομα κατηγορίας
 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,Μ.Μ. Μικτού βάρους
@@ -3562,13 +3661,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Η φορολογική κατηγορία δεν μπορεί να είναι αποτίμηση ή αποτίμηση και σύνολο, γιατι τα είδη δεν είναι είδη αποθέματος"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Παρτίδα
@@ -3582,7 +3681,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Πωλητής
 DocType: Sales Invoice,Cold Calling,Cold calling
 DocType: SMS Parameter,SMS Parameter,Παράμετροι SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
 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.,Δημιουργία κανόνων για τον περιορισμό των συναλλαγών που βασίζονται σε αξίες.
@@ -3613,9 +3712,9 @@
 DocType: Purchase Common,Purchase Common,Purchase common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός item&gt; Στοιχείο Ομάδα&gt; Μάρκα
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
@@ -3623,7 +3722,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Γονικός λογαριασμός
@@ -3639,7 +3738,7 @@
 DocType: Employee,Education,Εκπαίδευση
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
 DocType: Address,Office,Γραφείο
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
@@ -3654,6 +3753,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Παρτίδα Απογραφή
 DocType: Employee,Contract End Date,Ημερομηνία λήξης συμβολαίου
 DocType: Sales Order,Track this Sales Order against any Project,Παρακολουθήστε αυτές τις πωλήσεις παραγγελίας σε οποιουδήποτε έργο
+DocType: Sales Invoice Item,Discount and Margin,Έκπτωση και Περιθωρίου
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
@@ -3674,7 +3774,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Μηνιαίο ταμείο μισθοδοσίας
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
@@ -3682,22 +3782,23 @@
 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 Προφίλ
 DocType: Payment Gateway Account,Payment URL Message,Πληρωμή URL Μήνυμα
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι μεγαλύτερο από ό,τι το οφειλόμενο ποσό"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Το σύνολο των απλήρωτων
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Το αρχείο καταγραφής χρονολογίου δεν είναι χρεώσιμο
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
+DocType: Asset,Asset Category,Κατηγορία Παγίου
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Παρακαλώ εισάγετε τα αποδεικτικά έναντι χειροκίνητα
 DocType: SMS Settings,Static Parameters,Στατικές παράμετροι
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Υλικό Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
 DocType: Expense Claim,Employees Email Id,Email ID υπαλλήλων
 DocType: Employee Attendance Tool,Marked Attendance,Αισθητή Συμμετοχή
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Βραχυπρόθεσμες υποχρεώσεις
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Βραχυπρόθεσμες υποχρεώσεις
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
@@ -3718,17 +3819,16 @@
 DocType: Item Attribute,Numeric Values,Αριθμητικές τιμές
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Επισύναψη logo
 DocType: Customer,Commission Rate,Ποσό προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Δεν Πρότυπο προεπιλεγμένη διεύθυνση βρέθηκε. Παρακαλούμε να δημιουργήσετε ένα νέο από τις Ρυθμίσεις&gt; Εκτύπωση και Branding&gt; Πρότυπο Διεύθυνση.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Μετοχικού Κεφαλαίου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Μετοχικού Κεφαλαίου
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
 DocType: Payment Gateway Account,Payment Gateway Account,Πληρωμή Λογαριασμού Πύλη
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Μετά την ολοκλήρωση πληρωμής ανακατεύθυνση του χρήστη σε επιλεγμένη σελίδα.
@@ -3737,20 +3837,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
+DocType: Asset,Current Value (After Depreciation),Τρέχουσα Αξία (μετά από αποσβέσεις)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill Υλικών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ημ. αναφοράς
@@ -3758,6 +3859,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 6dc6af9..06c15ad 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,7 +1,7 @@
 DocType: Journal Entry,Write Off,Desajuste
 DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Costo Actualizado
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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/bom/bom.py +151,Cost Updated,Costo Actualizado
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 DocType: Item,Quality Parameters,Parámetros de Calidad
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,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}
@@ -13,7 +13,7 @@
 DocType: HR Settings,Employee Settings,Configuración del Empleado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
 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}
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 DocType: Lead,Lead Type,Tipo de Iniciativa
 DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
@@ -30,12 +30,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Venta estándar
 DocType: Sales Invoice,Packing List,Lista de Envío
 DocType: Packing Slip,From Package No.,Del Paquete N º
-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/manufacturing/doctype/production_order/production_order.py +106,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}
 DocType: Purchase Receipt,Get Current Stock,Verificar Inventario Actual
 ,Quotation Trends,Tendencias de Cotización
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ningún producto con numero de serie {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ningún producto con numero de serie {0}
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Lista de distribución del boletín informativo
 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.
@@ -53,7 +53,7 @@
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,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 +225,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1}
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
 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: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
@@ -77,24 +77,24 @@
 DocType: Upload Attendance,Upload HTML,Subir HTML
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Workstation,Electricity Cost,Coste de electricidad
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comisión de Ventas
-apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comisión de Ventas
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 DocType: BOM,Costing,Costeo
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 ,Purchase Receipt Trends,Tendencias de Recibos de Compra
 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: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +286,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/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y Aceptados
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
 apps/erpnext/erpnext/config/hr.py +185,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
-DocType: Journal Entry,Journal Entry,Asientos Contables
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
+DocType: Depreciation Schedule,Journal Entry,Asientos Contables
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
 DocType: Job Applicant,Hold,Mantener
 DocType: Batch,Batch ID,ID de lote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la Regla Precios?
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} no pertenece a la compañía {1}
 DocType: Leave Control Panel,Allocate,Asignar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
@@ -110,12 +110,12 @@
 apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
 DocType: Warranty Claim,Resolution,Resolución
 DocType: Material Request,Manufacture,Manufactura
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: BOM Operation,Workstation,Puesto de Trabajo
 DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Cost Center,Cost Center,Centro de Costos
 DocType: Item,Item Code for Suppliers,Código del producto para Proveedores
 DocType: Company,Retail,venta al por menor
@@ -125,16 +125,16 @@
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
 DocType: Sales Invoice,Exhibition,Exposición
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
 apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/controllers/recurring_document.py +131,New {0}: #{1},Nuevo {0}: # {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Gastos Legales
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuevo {0}: # {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Gastos Legales
 ,Financial Analytics,Análisis Financieros
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No hay observaciones
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,No hay observaciones
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Hub Settings,Seller Website,Sitio Web Vendedor
@@ -142,7 +142,7 @@
 DocType: Serial No,Creation Document No,Creación del documento No
 ,Reqd By Date,Solicitado Por Fecha
 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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Crear órden de Compra
 DocType: Journal Entry,Bill No,Factura No.
 DocType: C-Form Invoice Detail,Net Total,Total Neto
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
@@ -163,15 +163,16 @@
 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: Time Log Batch Detail,Time Log Batch Detail,Detalle de Grupo de Horas Registradas
 DocType: Task,depends_on,depende de
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Préstamos Garantizados
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 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/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 .
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nombre de Nuevo Centro de Coste
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nombre de Nuevo Centro de Coste
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
 DocType: Email Digest,For Company,Para la empresa
 ,Transferred Qty,Cantidad Transferida
@@ -186,7 +187,7 @@
 DocType: Payment Tool,Make Journal Entry,Haga Comprobante de Diario
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
 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
@@ -196,7 +197,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
-apps/erpnext/erpnext/stock/get_item_details.py +140,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 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
 ,Sales Funnel,"""Embudo"" de Ventas"
@@ -217,11 +218,11 @@
 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}
 apps/erpnext/erpnext/config/stock.py +164,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
 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","Reemplazar una Solicitud de Materiales en particular en todas las demás Solicitudes de Materiales donde se utiliza. Sustituirá el antiguo enlace a la Solicitud de Materiales, actualizara el costo y regenerar una tabla para la nueva Solicitud de Materiales"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres para el almacén {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres para el almacén {0}"
 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'"
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en Línea
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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'"
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
@@ -242,13 +243,13 @@
 DocType: Supplier,Credit Days,Días de Crédito
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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: Attendance,Employee Name,Nombre del Empleado
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
 DocType: Address,Lead Name,Nombre de la Iniciativa
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
 DocType: Customer,Individual,Individual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Utilidades Retenidas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Utilidades Retenidas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
 DocType: Quotation,Term Details,Detalles de los Terminos
 DocType: Task,Urgent,Urgente
@@ -263,7 +264,7 @@
 DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,No existen órdenes de producción
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
 DocType: Address,Personal,Personal
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación .
@@ -281,10 +282,10 @@
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
 DocType: Serial No,Under AMC,Bajo AMC
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Desde {0} | {1} {2}
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de Consumo
 ,Completed Production Orders,Órdenes de producción completadas
 DocType: Cost Center,Distribution Id,Id de Distribución
@@ -297,7 +298,7 @@
 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.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
 DocType: POS Profile,Update Stock,Actualizar el Inventario
 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"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Hacer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Hacer
 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/public/js/pos/pos.js +557,Please select Price List,"Por favor, seleccione la lista de precios"
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
@@ -386,12 +387,12 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Hora de registro {0} ya facturado
 DocType: Production Order Operation,Make Time Log,Hacer Registro de Tiempo
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Pasivo Corriente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Pasivo Corriente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Sales Partner,Agent,Agente
 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"
 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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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"
@@ -405,7 +406,7 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de Productos
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 DocType: Leave Allocation,Leave Allocation,Asignación de Vacaciones
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 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
@@ -414,8 +415,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo
-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/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Recibos de Compra
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Recibos de Compra
 DocType: Stock Entry,For Quantity,Por cantidad
 DocType: Features Setup,Miscelleneous,Varios
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Cotización
@@ -424,7 +425,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Precio de venta promedio
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,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"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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: Pricing Rule,Disable,Inhabilitar
 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
 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
@@ -433,7 +434,7 @@
 DocType: Company,Default Income Account,Cuenta de Ingresos por defecto
 DocType: Pricing Rule,Applicable For,Aplicable para
 DocType: Address,Address Type,Tipo de dirección
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,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/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
@@ -453,7 +454,7 @@
 DocType: Employee,Passport Number,Número de pasaporte
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +395,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Workstation Working Hour,Start Time,Hora de inicio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Employee,Personal Details,Datos Personales
@@ -463,12 +464,12 @@
 DocType: Item Group,Default Expense Account,Cuenta de Gastos por defecto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 DocType: Item Reorder,Re-Order Level,Reordenar Nivel
 DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
 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/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
@@ -477,7 +478,7 @@
 DocType: Employee,Blood Group,Grupo sanguíneo
 ,Item-wise Price List Rate,Detalle del Listado de Precios
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Entregado
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 ,Items To Be Requested,Solicitud de Productos
 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 )
@@ -496,7 +497,7 @@
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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: Features Setup,Brands,Marcas
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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/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/controllers/sales_and_purchase_return.py +77,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 DocType: Expense Claim,Task,Tarea
@@ -520,23 +521,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y Detergente
 DocType: Issue,Content Type,Tipo de Contenido
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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: Currency Exchange,Currency Exchange,Cambio de Divisas
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
 DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Configuración principal para el cambio de divisas
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Configuración principal para el cambio de divisas
 DocType: Appraisal,Employee,Empleado
 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,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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/stock/get_item_details.py +294,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 DocType: Employee,Leave Approvers,Supervisores de Vacaciones
 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}
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
 DocType: POS Profile,Cash/Bank Account,Cuenta de Caja / Banco
 DocType: Lead,Mobile No.,Número Móvil
@@ -566,7 +567,7 @@
 ,Qty to Deliver,Cantidad para Ofrecer
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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'"
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
@@ -599,7 +600,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 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/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visita de Mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visita de Mantenimiento
 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/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"Se requiere de Centros de Costos para la cuenta "" Pérdidas y Ganancias "" {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +21,What does it do?,¿Qué hace?
@@ -608,33 +609,33 @@
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 DocType: Sales Order,Delivery Date,Fecha de Entrega
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Lista de embalaje
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Pricing Rule,Sales Partner,Socio de ventas
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nueva Cuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nueva Cuenta
 DocType: GL Entry,Remarks,Observaciones
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Máximo 5 caracteres
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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"
 DocType: Item Customer Detail,Ref Code,Código Referencia
 DocType: Sales Order,Billing Status,Estado de facturación
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Customer,Default Price List,Lista de precios Por defecto
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[Error]
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Payment Tool,Reference No,Referencia No.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
@@ -649,7 +650,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,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 +303,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: Global Defaults,Global Defaults,Predeterminados globales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
 DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
@@ -700,7 +701,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
 ,Employee Birthday,Cumpleaños del Empleado
 ,Purchase Register,Registro de Compras
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Cuenta {0} no existe
 DocType: Bank Reconciliation,From Date,Desde la fecha
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Fila #
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes Raíces
@@ -717,18 +718,18 @@
 DocType: Production Order,Expected Delivery Date,Fecha Esperada de Envio
 DocType: Product Bundle,Parent Item,Artículo Principal
 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."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Impresión y Papelería
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Impresión y Papelería
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Gastos de Comercialización
 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:"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Gastos Varios
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Gastos Varios
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 DocType: Employee,History In Company,Historia en la Compañia
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,user@example.com,user@example.com
-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/manufacturing/doctype/production_order/production_order.py +156,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
 DocType: Stock Entry Detail,Source Warehouse,fuente de depósito
 DocType: Price List,Price List Name,Nombre de la lista de precios
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos todavía
@@ -739,10 +740,10 @@
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
 DocType: Item,Will also apply to variants,También se aplicará a las variantes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total Pagado Amt
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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/doctype/company/company.py +145,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Principal
 apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,Saldo inicial de Stock
 DocType: Material Request Item,For Warehouse,Por almacén
 ,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
@@ -755,7 +756,7 @@
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
 DocType: Item,Synced With Hub,Sincronizado con Hub
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversiones
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Inversiones
 DocType: Naming Series,Prefix,Prefijo
 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
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
@@ -787,31 +788,31 @@
 ,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
 DocType: Time Log,Billable,Facturable
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Perfiles del Punto de Venta POS
+apps/erpnext/erpnext/config/accounts.py +258,Point-of-Sale Profile,Perfiles del Punto de Venta POS
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 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/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Sales Invoice Item,Serial No,Números de Serie
 ,Bank Reconciliation Statement,Extractos Bancarios
 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
 ,Accounts Receivable Summary,Balance de Cuentas por Cobrar
 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/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
-apps/erpnext/erpnext/stock/get_item_details.py +486,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 +484,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
-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 +147,{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/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Employee,Encashment Date,Fecha de Cobro
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Por favor, especifique la compañía"
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,"Por favor, especifique la compañía"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,Add Taxes,Agregar impuestos
 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.
@@ -867,7 +868,7 @@
 DocType: Sales Invoice,Customer Name,Nombre del Cliente
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Importe de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
-apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,The Organization,La Organización
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
 DocType: Item,Max Discount (%),Descuento Máximo (%)
@@ -877,8 +878,8 @@
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,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
-DocType: Material Request Item,Required Date,Fecha Requerida
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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
+DocType: Request for Quotation Item,Required Date,Fecha Requerida
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
 DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento
@@ -906,20 +907,19 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
 DocType: Sales Order,Not Applicable,No aplicable
 DocType: Item,Purchase Details,Detalles de Compra
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
-DocType: Item,Is Fixed Asset Item,Son partidas de activo fijo
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Financial Year End Date,Fin del ejercicio contable
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Employee Education,Qualification,Calificación
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Por favor, seleccione el código del producto"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Por favor, seleccione el código del producto"
 apps/erpnext/erpnext/public/js/setup_wizard.js +180,Accountant,Contador
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Cotizaciónes a Proveedores
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Cotizaciónes a Proveedores
 DocType: Employee,Held On,Retenida en
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
@@ -932,7 +932,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Registros de Tiempo de creados:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Registros de Tiempo de creados:
 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.
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Conjunto/Paquete de productos
@@ -964,7 +964,7 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
 apps/erpnext/erpnext/config/hr.py +146,Performance appraisal.,Evaluación del Desempeño .
 DocType: Shipping Rule,Net Weight,Peso neto
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Guarde el documento primero.
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
@@ -982,13 +982,13 @@
 DocType: Employee External Work History,Salary,Salario
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventario de Pasivos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Inventario de Pasivos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios Financieros
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite el elemento 'Es Manufacturado'"
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Factura
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este Impuesto en el precio base?
 DocType: Target Detail,Target  Amount,Monto Objtetivo
 ,S.O. No.,S.O. No.
@@ -998,10 +998,10 @@
 DocType: Purchase Invoice,Contact,Contacto
 DocType: SMS Settings,Message Parameter,Parámetro del mensaje
 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."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Seleccione Cantidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleccione Cantidad
 DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta
 DocType: Issue,Resolution Details,Detalles de la resolución
-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/stock/doctype/warehouse/warehouse.py +93,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: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
 DocType: Shipping Rule,Shipping Account,cuenta Envíos
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
@@ -1013,7 +1013,7 @@
 DocType: Features Setup,Point of Sale,Punto de Venta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Variantes del producto
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
@@ -1044,14 +1044,14 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente facturado
 ,Contact Name,Nombre del Contacto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Monto
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Monto
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Configuración completa !
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
 DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, or ,o
 apps/erpnext/erpnext/config/support.py +27,Plan for maintenance visits.,Plan para las visitas de mantenimiento.
 ,SO Qty,SO Cantidad
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
@@ -1073,14 +1073,14 @@
 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: Sales Invoice,Debit To,Débitar a
 DocType: Contact,Passive,Pasivo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Solicitud de Material {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Solicitud de Material {0} creada
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 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
 DocType: Appraisal,Goals,Objetivos
 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.
 DocType: Item,Has Variants,Tiene Variantes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,El producto {0} ya ha sido devuelto
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} existe en contra de {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} existe en contra de {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas para establecer los presupuestos anuales de las cuentas.
@@ -1090,7 +1090,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Quotation Item,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 DocType: Employee,Better Prospects,Mejores Prospectos
 DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
 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}"
@@ -1146,12 +1146,12 @@
 DocType: Employee,Permanent Address Is,Dirección permanente es
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros
 ,Issued Items Against Production Order,Productos emitidos con una orden de producción
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 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 linea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 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}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,Select Item,Seleccione Producto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Item,Item Tax,Impuesto del artículo
 ,Item Prices,Precios de los Artículos
@@ -1164,34 +1164,34 @@
 DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con este correo electrónico debería existir
 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/config/hr.py +70,Holiday master.,Master de vacaciones .
-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/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Orden de Venta {0} no es válida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
-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/manufacturing/doctype/bom/bom.py +362,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/projects/doctype/project/project.py +44,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/manufacturing/doctype/bom/bom.py +371,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/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
 DocType: Company,Ignore,Pasar por alto
 DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 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/crm.py +68,"Newsletters to contacts, leads.","Boletines para contactos, clientes potenciales ."
 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/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Click aquí para pagar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
 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: Production Planning Tool,Production Orders,Órdenes de Producción
 DocType: Salary Slip Deduction,Default Amount,Importe por Defecto
 DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
 DocType: Account,Accounts,Contabilidad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Calendario de Mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Calendario de Mantenimiento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por Departamento
 DocType: Workstation,per hour,por horas
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada
@@ -1199,13 +1199,13 @@
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Dónde se almacenarán los productos
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 DocType: Accounts Settings,Credit Controller,Credit Controller
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: Sales Invoice,Cold Calling,Llamadas en frío
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Comprador
 DocType: Address,Shop,Tienda
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos Cosméticos
 DocType: Shopping Cart Settings,Orders,Órdenes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Agregar subcuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,Agregar subcuenta
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
 DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
@@ -1217,13 +1217,13 @@
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Workstation,Working Hours,Horas de Trabajo
 DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Gastos de Entretenimiento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Gastos de Entretenimiento
 DocType: Supplier,Supplier Details,Detalles del Proveedor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Employee,Reports to,Informes al
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
 DocType: Purchase Invoice Item,Rate,Precio
 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.
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
@@ -1261,7 +1261,7 @@
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
 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/erpnext/erpnext/accounts/doctype/account/account.py +196,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 +193,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 DocType: Bin,Bin,Papelera
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,Mis pedidos
 apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Tiendas
@@ -1271,7 +1271,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
 DocType: Sales Invoice Item,Brand Name,Marca
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura Temporal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Apertura Temporal
 DocType: Employee,Cheque,Cheque
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
@@ -1289,19 +1289,19 @@
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Monthly Distribution,Monthly Distribution,Distribución Mensual
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Registros C -Form
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Gastos de Administració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}
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 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/manufacturing/doctype/bom/bom.py +197,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/hr/doctype/leave_application/leave_application.py +409, (Half Day),(Medio día)
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Medio día)
 DocType: Salary Slip,Gross Pay,Pago bruto
 DocType: SMS Log,Sent On,Enviado Por
-apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +425,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
 DocType: Bin,FCFS Rate,Cambio FCFS
 DocType: Lead,Lead,Iniciativas
@@ -1317,18 +1317,18 @@
 DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,El usuario {0} está deshabilitado
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 DocType: Sales Invoice,Recurring,Periódico
 DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 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 ."
 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
 apps/erpnext/erpnext/public/js/setup_wizard.js +162,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 DocType: Employee,Emergency Contact,Contacto de Emergencia
 DocType: Payment Gateway Account,Payment Account,Pago a cuenta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,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 +442,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
@@ -1364,13 +1364,13 @@
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Account,Debit,Débito
 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/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
 DocType: Item Reorder,Item Reorder,Reordenar productos
 DocType: Purchase Invoice,Next Date,Siguiente fecha
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
 DocType: Item,Allow Production Order,Permitir Orden de Producción
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 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"
@@ -1378,20 +1378,19 @@
 DocType: Email Digest,Receivables,Cuentas por Cobrar
 ,Lead Id,Iniciativa ID
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar etiquetas salariales
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"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/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obtener Artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obtener Artículos
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si desea enviar la nómina por correo a cada empleado, cuando valide la planilla de pagos"
-apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,{0} variantes actualizadas del producto
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,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 +390,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Workstation,Rent Cost,Renta Costo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Cuenta root no se puede borrar
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Agregar No. de serie
-apps/erpnext/erpnext/config/support.py +7,Issues,Problemas
+apps/erpnext/erpnext/hooks.py +90,Issues,Problemas
 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: BOM Replace Tool,Current BOM,Lista de materiales actual
 DocType: Delivery Note,Billing Address,Dirección de Facturación
@@ -1400,10 +1399,10 @@
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Journal Entry,Accounts Receivable,Cuentas por Cobrar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 DocType: Employee,Employment Type,Tipo de Empleo
 DocType: Sales Order,% Amount Billed,% Monto Facturado
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Nada que solicitar
 DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Campo disponible en la Nota de Entrega,  Cotización, Factura de Venta y Pedido de Venta"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
@@ -1457,7 +1456,7 @@
 ,Finished Goods,Productos terminados
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Vacaciones Bloqueadas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Journal Entry,Accounts Payable,Cuentas por Pagar
 DocType: Pricing Rule,Buying,Compras
@@ -1466,11 +1465,11 @@
 DocType: Activity Cost,Costing Rate,Costo calculado
 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: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
-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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,Los gastos de servicios públicos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,Cuenta {0} está inactiva
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 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.
-apps/erpnext/erpnext/controllers/accounts_controller.py +320,"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/controllers/accounts_controller.py +333,"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."
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Account,Parent Account,Cuenta Primaria
@@ -1501,7 +1500,7 @@
 DocType: Company,For Reference Only.,Sólo para referencia.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Instalaciones técnicas y maquinaria
 apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +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.
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Activity Cost,Projects,Proyectos
@@ -1509,7 +1508,7 @@
 DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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}"
 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: C-Form Invoice Detail,Invoice No,Factura No
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
@@ -1528,7 +1527,7 @@
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +24,Please select Time Logs.,Por favor seleccione la bitácora
 DocType: Purchase Invoice,Shipping Address,Dirección de envío
-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/config/website.py +12,"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."
 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."
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado
 DocType: Sales Order,%  Delivered,% Entregado
@@ -1561,7 +1560,7 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
 DocType: Stock Entry,Subcontract,Subcontrato
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
-DocType: Project,Margin,Margen
+DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 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: Email Digest,Email Digest,Boletín por Correo Electrónico
@@ -1583,17 +1582,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de Correo
 ,Requested Qty,Cant. Solicitada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferencia
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
 DocType: Delivery Note,Delivery To,Entregar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura de saldos de capital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Apertura de saldos de capital
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
 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.'
 DocType: Employee,Health Details,Detalles de la Salud
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
@@ -1616,7 +1615,7 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Employee Education,Under Graduate,Bajo Graduación
-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 +164,Creditors,Acreedores
 DocType: Quality Inspection,Purchase Receipt No,Recibo de Compra No
 DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea Aérea
@@ -1628,7 +1627,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: Employee,Permanent Address,Dirección Permanente
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
 DocType: Lead,Suggestions,Sugerencias
 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
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto
@@ -1661,7 +1660,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,deportes
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +44,Casual Leave,Permiso ocacional
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
@@ -1680,7 +1679,7 @@
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
 DocType: Item Attribute Value,Abbreviation,Abreviació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,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Account,Cash,Efectivo
 DocType: Account,Receivable,Cuenta por Cobrar
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
@@ -1689,7 +1688,7 @@
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
 DocType: Journal Entry Account,Sales Invoice,Factura de Venta
 DocType: Expense Claim,Expenses,Gastos
 DocType: BOM,Manufacturing,Producción
@@ -1712,12 +1711,12 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
 apps/erpnext/erpnext/public/js/setup_wizard.js +258,"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: Authorization Rule,Based On,Basado en
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
@@ -1734,13 +1733,13 @@
 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."
 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
 DocType: Quotation,Shopping Cart,Cesta de la compra
-DocType: Pricing Rule,Supplier,Proveedores
+DocType: Asset,Supplier,Proveedores
 DocType: Account,Income,Ingresos
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"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/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de Ventas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Gastos de Ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
@@ -1760,17 +1759,17 @@
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Purchase Order,% Received,% Recibido
 DocType: Sales Invoice,Return Against Sales Invoice,Devolución Contra Factura de venta
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca en el campo si 'Repite un día al mes'---"
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Inventario de Gastos
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 DocType: Stock Reconciliation,Difference Amount,Diferencia
 DocType: Employee Education,Employee Education,Educación del Empleado
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Seleccione un nodo de grupo primero.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Seleccione un nodo de grupo primero.
 DocType: Fiscal Year,Year Name,Nombre del Año
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
@@ -1783,11 +1782,11 @@
 DocType: Dependent Task,Dependent Task,Tarea dependiente
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Sales Invoice,Existing Customer,Cliente Existente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},Cantidad de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0}
 DocType: Production Planning Tool,Production Planning Tool,Herramienta de planificación de la producción
 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: Warranty Claim,Resolved By,Resuelto por
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
@@ -1803,7 +1802,7 @@
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y Total
 DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,Costo de diversas actividades
@@ -1813,8 +1812,8 @@
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
 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: Activity Cost,Activity Cost,Costo de Actividad
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Sales Order Item,Sales Order Date,Fecha de las Órdenes de Venta
 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
@@ -1824,7 +1823,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Proyectado
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
 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"
@@ -1856,7 +1855,7 @@
 DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Ventas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Utilidad/Pérdida Neta
 DocType: Serial No,Delivery Document No,Entrega del documento No
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Serial No,Under Warranty,Bajo Garantía
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
@@ -1868,12 +1867,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},La cantidad no debe ser más de {0}
+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: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 DocType: Item Group,Show In Website,Mostrar En Sitio Web
 DocType: SMS Log,Sent To,Enviado A
 DocType: Sales Partner,Implementation Partner,Socio de implementación
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Cuenta de sobregiros
 apps/erpnext/erpnext/accounts/doctype/account/account.py +137,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Expense Claim Detail,Expense Date,Fecha de Gasto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
@@ -1898,9 +1897,9 @@
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Se requiere Almacén
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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/manufacturing.py +27,Time Logs for manufacturing.,Registros de tiempo para su fabricación.
 DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la Campaña
@@ -1924,18 +1923,18 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Hora
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
 DocType: Notification Control,Expense Claim Approved Message,Mensaje de reembolso de gastos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nuevo Centro de Costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nuevo Centro de Costo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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}
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Componentes salariales.
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
 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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Alquiler de Oficina
 DocType: Lead,Upper Income,Ingresos Superior
-DocType: Pricing Rule,Item Code,Código del producto
+DocType: Asset,Item Code,Código del producto
 DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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 +243,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: Hub Settings,Publish Pricing,Publicar precios
 DocType: Purchase Invoice,Credit To,Crédito Para
 DocType: Currency Exchange,To Currency,Para la moneda
@@ -1956,20 +1955,20 @@
 ,Produced,Producido
 DocType: Purchase Invoice Item,Expense Head,Cuenta de Gastos
 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/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nombre de nueva cuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Nombre de nueva cuenta
 apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,Reclamación de garantía por numero de serie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
 DocType: Purchase Invoice Item,Item,Productos
 apps/erpnext/erpnext/config/crm.py +84,Sales campaigns.,Campañas de Ventas.
-DocType: Project,Project Name,Nombre del proyecto
+DocType: Request for Quotation Item,Project Name,Nombre del proyecto
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
 DocType: Lead,Interested,Interesado
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
-DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
+DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufactura
 DocType: BOM,Item UOM,Unidad de Medida del Artículo
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 DocType: Upload Attendance,Download Template,Descargar Plantilla
@@ -1992,11 +1991,11 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 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/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra
 DocType: Issue,Issue,Asunto
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Serial No {0} no encontrado
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} no encontrado
 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
 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/accounts/utils.py +341,Annual,Anual
@@ -2007,28 +2006,28 @@
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Volver Ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Volver Ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 DocType: Payment Tool Detail,Payment Amount,Pago recibido
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Ver
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 DocType: 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
 DocType: Quality Inspection,Delivery Note No,No. de Nota de Entrega
 DocType: Item,Default Warehouse,Almacén por Defecto
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
 DocType: Purchase Invoice,Yearly,Anual
 DocType: Purchase Invoice,Contact Person,Persona de contacto
 DocType: Monthly Distribution Percentage,Month,Mes.
 DocType: Sales Order,Partly Delivered,Parcialmente Entregado
 DocType: Pricing Rule,Valid Upto,Válido hasta
 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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,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 +449,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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 +179,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 ,Sales Invoice Trends,Tendencias de Ventas
 DocType: Employee,Family Background,Antecedentes familiares
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
@@ -2055,8 +2054,8 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
 DocType: Opportunity,Walk In,Entrar
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
 DocType: Salary Slip,Earning,Ganancia
 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"
@@ -2069,16 +2068,16 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Solicitud de Materiales
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Features Setup,To get Item Group in details table,Para obtener Grupo de Artículo en la tabla detalles
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0} suscriptores añadidos
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Fecha se repite
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +240,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
 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","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Actualización de las Mercancías Terminadas
-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/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Actualización de las Mercancías Terminadas
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/setup_wizard/install_fixtures.py +105,Government,Gobierno
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura
 DocType: Account,Asset,Activo
@@ -2089,7 +2088,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
 DocType: Newsletter List,Total Subscribers,Los suscriptores totales
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,Especificaciones
-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/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos
@@ -2106,18 +2105,18 @@
 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/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Issue,Support,Soporte
-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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},El estado de la orden de producción es {0}
 ,Sales Order Trends,Tendencias de Ordenes de Ventas
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
 DocType: Time Log,Hours,Horas
 ,Qty to Order,Cantidad a Solicitar
 DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
-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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 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/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
-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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Derechos e Impuestos
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de la lista de materiales
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Cuentas Temporales
 DocType: BOM,Manufacturing User,Usuario de Manufactura
 ,Profit and Loss Statement,Estado de Pérdidas y Ganancias
 DocType: Sales Invoice,Commission,Comisión
@@ -2128,7 +2127,7 @@
 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/templates/pages/cart.html +51,Cart is Empty,El carro esta vacío
 DocType: Production Planning Tool,Download Materials Required,Descargar Materiales Necesarios
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Elemento {0} no encontrado
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
@@ -2150,16 +2149,16 @@
 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"
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Upload Attendance,Get Template,Verificar Plantilla
-apps/erpnext/erpnext/controllers/accounts_controller.py +507,"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 +533,"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
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendos pagados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Egresos Indirectos
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 DocType: Payment Tool,Get Outstanding Vouchers,Verificar Comprobantes Pendientes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Address,Utilities,Utilidades
 DocType: Supplier Quotation Item,Material Request No,Nº de Solicitud de Material
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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}"
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Item,Is Service Item,Es un servicio
 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
@@ -2204,7 +2203,7 @@
 DocType: Bank Reconciliation,Bank Account,Cuenta Bancaria
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 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/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de oferta
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
@@ -2239,12 +2238,12 @@
 DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{0}% Billed,{0}% Facturado
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 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: GL Entry,Transaction Date,Fecha de Transacción
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +146,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
-DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
+DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
@@ -2257,14 +2256,14 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
 DocType: Purchase Order Item,Material Request Detail No,Detalle de Solicitud de Materiales No
 DocType: Notification Control,Purchase Receipt Message,Mensaje de Recibo de Compra
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transferencia de Material
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 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.
 DocType: Item,Has Batch No,Tiene lote No
 DocType: Serial No,Creation Document Type,Tipo de creación de documentos
 DocType: Journal Entry,Debit Note,Nota de Débito
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
+apps/erpnext/erpnext/config/accounts.py +259,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 ,Amount to Deliver,Cantidad para envío
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Monto Pendiente
@@ -2275,15 +2274,15 @@
 DocType: Quotation,Maintenance User,Mantenimiento por el Usuario
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
 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/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,Ingreso Directo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Ingresos Indirectos
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
 DocType: Hub Settings,Seller Country,País del Vendedor
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
@@ -2296,15 +2295,15 @@
 DocType: SMS Settings,SMS Sender Name,Nombre del remitente SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variacion
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Identificación del E-mail debe ser único , ya existe para {0}"
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Identificación del E-mail debe ser único , ya existe para {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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}.
 DocType: Time Log,To Time,Para Tiempo
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
 ,Terretory,Territorios
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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: Project,Project Type,Tipo de Proyecto
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
 DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
@@ -2333,7 +2332,7 @@
 DocType: Purchase Invoice,Terms,Términos
 DocType: Account,Payable,Pagadero
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,La lista de precios {0} está deshabilitada
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén
 DocType: Serial No,Serial No Details,Serial No Detalles
@@ -2353,7 +2352,7 @@
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
 DocType: Employee,Place of Issue,Lugar de emisión
 DocType: Attendance,Present,Presente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,La órden de compra {0} no existe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,La órden de compra {0} no existe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
 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/accounts/general_ledger.py +127,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}.
@@ -2368,7 +2367,7 @@
 DocType: Workstation,Wages per hour,Salarios por Hora
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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}
 ,Supplier Addresses and Contacts,Libreta de Direcciones de Proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,El elemento {0} no existe
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Riesgo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
@@ -2383,9 +2382,9 @@
 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 .
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +378,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 +383,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/batch/batch_list.js +7,Not Expired,No ha expirado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,{0} no existe Cliente
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía
@@ -2395,7 +2394,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 DocType: Employee,Widowed,Viudo
-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
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
 DocType: Employee Education,School/University,Escuela / Universidad
 DocType: Pricing Rule,Brand,Marca
@@ -2403,13 +2402,13 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Apertura&#39;
 DocType: Supplier,Credit Days Based On,Días de crédito basados en
 DocType: Price List,Price List Master,Lista de precios principal
-apps/erpnext/erpnext/stock/get_item_details.py +143,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 +114,Postal Expenses,Gastos Postales
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +142,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 +117,Postal Expenses,Gastos Postales
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia
 DocType: Supplier,Is Frozen,Está Inactivo
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 DocType: Hub Settings,Access Token,Token de acceso
 DocType: Stock Settings,Allowance Percent,Porcentaje de Asignación
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
@@ -2443,8 +2442,8 @@
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +666,My Invoices,Mis facturas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mis facturas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 DocType: Sales Order,Recurring Order,Orden Recurrente
@@ -2469,7 +2468,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Can. en balance
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 DocType: BOM,Exploded_items,Vista detallada
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Materia Prima
 apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
@@ -2477,19 +2476,19 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
 DocType: GL Entry,Is Opening,Es apertura
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Descuento
-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 +112,Warehouse {0} does not exist,Almacén {0} no existe
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
 DocType: Appraisal,For Employee,Por empleados
 DocType: Department,Department,Departamento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} no es un producto de stock
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,La fecha de vencimiento es obligatorio
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,La fecha de vencimiento es obligatorio
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Cantidad
 DocType: Salary Structure Earning,Salary Structure Earning,Estructura Salarial Ingreso
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Por favor, seleccione {0}"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +198,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/controllers/recurring_document.py +166,Please select {0},"Por favor, seleccione {0}"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
 DocType: Cost Center,Budget,Presupuesto
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
@@ -2511,16 +2510,16 @@
 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.
 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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,El producto {0} esta cancelado
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +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 .
 apps/erpnext/erpnext/public/js/setup_wizard.js +201,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Cuenta matriz {0} creada
 ,Amount to Bill,Monto a Facturar
-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/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
 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/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Precios para las compras
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Registro de Tiempo para las Tareas.
@@ -2537,15 +2536,15 @@
 apps/erpnext/erpnext/config/accounts.py +70,Masters,Maestros
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
 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/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
-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 +103,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: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque si necesita facturas recurrentes automáticas. Después del envío de cualquier factura de venta, la sección ""Recurrente"" será visible."
 DocType: Task,Closing Date,Fecha de Cierre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Gastos de Viaje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Account,Stock,Existencias
@@ -2558,17 +2557,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,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
 ,Accounts Payable Summary,Balance de Cuentas por Pagar
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 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: Territory,Territory Name,Nombre Territorio
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Stock Entry,Repack,Vuelva a embalar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
 ,Support Analytics,Analitico de Soporte
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
 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."
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
-apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,Configuración de las categorías de proveedores.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Configuración de las categorías de proveedores.
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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}
 DocType: Quality Inspection,Incoming,Entrante
@@ -2576,22 +2575,22 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Lead,Product Enquiry,Petición de producto
 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/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 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/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Purchase Invoice,In Words,En palabras
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} contra orden de venta {1}
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el Plan de Producción
 DocType: Opportunity,Maintenance,Mantenimiento
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (LdM)
-,General Ledger,Balance General
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Balance General
 DocType: Account,Liability,Obligaciones
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada Duplicada
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variación
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
@@ -2646,7 +2645,7 @@
  9. ¿Es esta Impuestos incluidos en Tasa Básica ?: Si marca esto, significa que este impuesto no se mostrará debajo de la tabla de partidas, pero será incluido en la tarifa básica de la tabla principal elemento. Esto es útil en la que desea dar un precio fijo (incluidos todos los impuestos) precio a los clientes."
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
-DocType: Production Order,Material Request Item,Elemento de la Solicitud de Material
+DocType: Request for Quotation Item,Material Request Item,Elemento de la Solicitud de Material
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Todos los productos o servicios.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
@@ -2663,7 +2662,7 @@
 DocType: Contact,User ID,ID de usuario
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 DocType: Project,Gross Margin %,Margen Bruto %
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/accounts/party.py +289,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
 DocType: BOM,Item Desription,Descripción del Artículo
 ,Pending SO Items For Purchase Request,A la espera de la Orden de Compra (OC) para crear Solicitud de Compra (SC)
 ,Received Items To Be Billed,Recepciones por Facturar
@@ -2691,7 +2690,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
 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: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 DocType: Packing Slip,Gross Weight,Peso Bruto
 DocType: SMS Center,Total Message(s),Total Mensage(s)
 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}
@@ -2707,7 +2706,7 @@
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
 DocType: GL Entry,Voucher No,Comprobante No.
 DocType: Journal Entry,Accounting Entries,Asientos Contables
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
 DocType: Sales Invoice,Packed Items,Productos Empacados
 DocType: Sales Invoice,Sales Team,Equipo de Ventas
 DocType: C-Form,Received Date,Fecha de Recepción
@@ -2715,17 +2714,17 @@
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y Marcas
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Cantidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Estructura Salarial
 DocType: Employee,Salutation,Saludo
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
 DocType: Delivery Note,Time at which items were delivered from warehouse,Momento en que los artículos fueron entregados desde el almacén
 DocType: Employee,External Work History,Historial de trabajos externos
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Direcciones
+apps/erpnext/erpnext/hooks.py +91,Addresses,Direcciones
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tabla de artículos no puede estar en blanco
 DocType: Pricing Rule,Item Group,Grupo de artículos
 DocType: Item,Valuation Method,Método de Valoración
@@ -2760,7 +2759,7 @@
 DocType: Employee,Current Address,Dirección Actual
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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: 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: Quality Inspection,Outgoing,Saliente
 DocType: Item,Supplier Items,Artículos del Proveedor
@@ -2782,11 +2781,11 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 ,Sales Partners Commission,Comisiones de Ventas
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturación (Facturas de venta)
 DocType: Appraisal,Appraisal,Evaluación
 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."
-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}"
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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: Salary Slip Earning,Salary Slip Earning,Ingreso en Planilla
 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/projects/doctype/time_log/time_log_list.js +20,Make Time Log Batch,Haga Registro de Tiempo de Lotes
@@ -2832,13 +2831,13 @@
 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: 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: Item,Lead Time in days,Plazo de ejecución en días
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Préstamos sin garantía
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Préstamos sin garantía
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y Cargos Adicionales
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
+apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: SMS Parameter,SMS Parameter,Parámetros SMS
 DocType: Delivery Note,Transporter Info,Información de Transportista
 DocType: Company,Stock Settings,Ajustes de Inventarios
@@ -2853,7 +2852,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},El perfil de POS global {0} ya fue creado para la compañía {1}
 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: Quotation Item,Quotation Item,Cotización del artículo
-apps/erpnext/erpnext/controllers/status_updater.py +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 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
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minuto
 DocType: Issue,First Responded On,Primera respuesta el
@@ -2864,20 +2863,20 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/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"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
 DocType: Purchase Invoice Item,Item Name,Nombre del Producto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Time Log,For Manufacturing,Por fabricación
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
-apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,Finanzas / Ejercicio contable.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanzas / Ejercicio contable.
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Entradas en el diario de contabilidad.
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
 DocType: Purchase Invoice,Is Recurring,Es recurrente
 DocType: Purchase Order Item,Received Qty,Cantidad Recibida
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Crear entradas de pago contra órdenes o facturas.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Crear entradas de pago contra órdenes o 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Social
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
 DocType: Account,Expense Account,Cuenta de gastos
@@ -2888,8 +2887,8 @@
 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
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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/public/js/setup_wizard.js +40,Your financial year begins on,Su año Financiero inicia en
 DocType: BOM,Total Cost,Coste total
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
@@ -2898,26 +2897,26 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 DocType: Lead,Next Contact By,Siguiente Contacto por
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} creado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creado
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,Árbol de las categorías de producto
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
 apps/erpnext/erpnext/config/hr.py +175,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 apps/erpnext/erpnext/public/js/setup_wizard.js +268,Products,Productos
 DocType: Installation Note,Installation Note,Nota de Instalación
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,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: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +181,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 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/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Plantillas de Términos y Condiciones
 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: Time Log,Billing Amount,Monto de facturación
@@ -2926,10 +2925,10 @@
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
 DocType: Employee,Personal Email,Correo Electrónico Personal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Error en la planificación de capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Error en la planificación de capacidad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 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/material_request/material_request.js +599,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: SMS Center,Send To,Enviar a
@@ -2956,7 +2955,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/config/stock.py +102,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorno
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ejecución
 DocType: Lead,Middle Income,Ingresos Medio
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
@@ -2967,7 +2966,7 @@
 DocType: Sales Order Item,Planned Quantity,Cantidad Planificada
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Registros de Tiempo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Registros de Tiempo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +540,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
 DocType: Campaign,Campaign-.####,Campaña-.####
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
@@ -2993,9 +2992,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +213,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Gastos por Servicios Telefónicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Gastos por Servicios Telefónicos
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Production Order,Operation Cost,Costo de operación
 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 %
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +167,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
@@ -3014,7 +3013,7 @@
 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
 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.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc."
 DocType: Purchase Taxes and Charges,Actual,Actual
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
 DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversión
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse
@@ -3030,7 +3029,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 ,Sales Browser,Navegador de Ventas
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Gastos Directos
 DocType: Employee,Contact Details,Datos del Contacto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,"Por favor, seleccione primero {0}"
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
@@ -3057,14 +3056,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Packed Item,Packed Item,Artículo Empacado
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad Basada en
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,No puede ser mayor que 100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,No puede ser mayor que 100
 DocType: Sales Team,Contribution to Net Total,Contribución Neta Total
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Notas de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Notas de Entrega
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
 DocType: Bin,Stock Value,Valor de Inventario
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar Carrito de Compras
@@ -3074,7 +3073,7 @@
 DocType: Packing Slip Item,DN Detail,Detalle DN
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Newsletter,Test,Prueba
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
@@ -3084,7 +3083,7 @@
 DocType: Appraisal,For Employee Name,Por nombre de empleado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie actualizado correctamente
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,El producto tiene variantes.
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 DocType: Opportunity,Opportunity Date,Oportunidad Fecha
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
@@ -3113,11 +3112,11 @@
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
 DocType: Item Group,Item Classification,Clasificación de producto
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Reembolsos de gastos
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 DocType: Features Setup,Sales Discounts,Descuentos sobre Ventas
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de Orden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Por proveedor
 DocType: Hub Settings,Seller Description,Descripción del Vendedor
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 DocType: Employee,Mr,Sr.
@@ -3133,7 +3132,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
 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."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,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/manufacturing/doctype/production_order/production_order.py +342,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/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/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: Process Payroll,Make Bank Entry,Hacer Entrada del Banco
@@ -3157,7 +3156,7 @@
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,My Shipments,Mis envíos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Account,Auditor,Auditor
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
@@ -3167,9 +3166,9 @@
 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.
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Total no pagado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Préstamos (pasivos)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
-apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,Convert to non-Group,Convertir a 'Sin-Grupo'
@@ -3189,7 +3188,7 @@
 DocType: Territory,Parent Territory,Territorio Principal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
 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'---"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Distribuir materiales
 ,Available Qty,Cantidad Disponible
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
@@ -3203,12 +3202,12 @@
 DocType: Purchase Taxes and Charges,Deduct,Deducir
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Ausente
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Crear
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Crear
 DocType: Company,Default Bank Account,Cuenta Bancaria por defecto
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 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.
 DocType: Sales Order Item,Gross Profit,Utilidad bruta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Mostrar libro mayor
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/config/crm.py +132,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
 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
@@ -3222,15 +3221,15 @@
 DocType: Item,UOMs,Unidades de Medida
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
-DocType: C-Form,Amended From,Modificado Desde
+DocType: Asset,Amended From,Modificado Desde
 DocType: Journal Entry Account,Sales Order,Ordenes de Venta
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Actividad del Proyecto / Tarea.
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,para
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ningún producto con código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ningún producto con código de barras {0}
 DocType: Item,Weight UOM,Peso Unidad de Medida
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedores
-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 +154,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
 DocType: Maintenance Visit,Purposes,Propósitos
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad Consumida por Unidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, introduzca compañia"
@@ -3256,19 +3255,17 @@
 DocType: Supplier,Last Day of the Next Month,Último día del siguiente mes
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 ,Purchase Analytics,Analítico de Compras
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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}
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
 DocType: Sales Partner,Sales Partner Name,Nombre de Socio de Ventas
 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: Purchase Order Item,Billed Amt,Monto Facturado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,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: 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"
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Base de datos de proveedores.
-,Schedule Date,Horario Fecha
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
+DocType: Depreciation Schedule,Schedule Date,Horario Fecha
 DocType: UOM,UOM Name,Nombre Unidad de Medida
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Asignar las hojas para el año.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index e154123..2c6fd5d 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Arrendado
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
 DocType: Purchase Order,Customer Contact,Contacto del cliente
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Árbol {0}
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Mostrar abiertos
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Secuencia actualizada correctamente
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Nueva solicitud de ausencia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Cantidad
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
@@ -64,7 +66,7 @@
 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 +642,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año fiscal {0} es necesario
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nuevo/a {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuevo/a {0}: #{1}
 ,Sales Partners Commission,Comisiones de socios de ventas
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Payment Request,Payment Request,Solicitud de pago
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,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/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
+DocType: Item,Is Fixed Asset,Es activo fijo
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Todos los Contactos
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} es congelada
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Gastos sobre existencias
 DocType: Newsletter,Email Sent?,Email enviado?
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Production Order Operation,Show Time Logs,Mostrar gestión de tiempos
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Estado de la instalación
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 validada.
-apps/erpnext/erpnext/controllers/accounts_controller.py +507,"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/controllers/accounts_controller.py +533,"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 +170,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},cantidad de avance no puede ser mayor que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},cantidad de avance no puede ser mayor que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Por favor, introduzca compañia"
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Efectivo neto de Financiamiento
 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 +217,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Newsletter List,Total Subscribers,Suscriptores totales
 ,Contact Name,Nombre de contacto
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,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: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Asientos bancarios
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Solicitud de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Control de notificaciónes
 DocType: Lead,Suggestions,Sugerencias.
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer grupo de presupuestos en este territorio. también puede incluir las temporadas de distribución
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres / principales para el almacén {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Por favor, ingrese el grupo de cuentas padres / principales para el almacén {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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.
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Aprender
+DocType: Asset,Next Depreciation Date,Siguiente Depreciación Fecha
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo de actividad por Empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Job Applicant,Cover Letter,Carta de presentación
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Formulario / artículo / {1}) que se encuentra en [{2}] (# Formulario / Almacén / {2})
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil del puesto
 DocType: Newsletter,Newsletter,Boletín de noticias
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 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 +381,{0} entered twice in Item Tax,{0} se ingresó dos veces en Impuesto del artículo
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} se ingresó dos veces en Impuesto del artículo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +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 +73,Please select month and year,Por favor seleccione el mes y el año
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el Empleado {1} para el periodo {2} hasta {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Seleccione producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
@@ -336,9 +343,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias
-,Schedule Date,Fecha de programa
+DocType: Depreciation Schedule,Schedule Date,Fecha de programa
 DocType: Packed Item,Packed Item,Artículo empacado
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un Costo de actividad para el Empleado {0} contra el Tipo de actividad - {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.,"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
@@ -347,6 +354,7 @@
 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: Request for Quotation,Request for Quotation,Solicitud de presupuesto
 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."
@@ -387,15 +395,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
-DocType: Material Request Item,Required Date,Fecha de solicitud
+DocType: Request for Quotation 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 +770,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,Mensaje para los Proveedores
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Employee,Health Concerns,Problemas de salud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Impagado
@@ -417,17 +426,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,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"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -436,6 +445,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gestión de sub-contrataciones
+DocType: Project,Project will be accessible on the website to these users,Proyecto será accesible en la página web a estos usuarios
 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 +53,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
@@ -447,7 +457,7 @@
 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 +86,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
 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
@@ -458,7 +468,7 @@
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 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 +126,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 +127,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
@@ -468,13 +478,13 @@
 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 los meses si utiliza el concepto de temporadas en su negocio. Para distribuir un presupuesto utilizando esta distribución, establezca esta **Distribución mensual** en el **Centro de costos**"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Finanzas / Ejercicio contable.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Entregado: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por pagar
@@ -482,7 +492,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunto curriculum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Devoluciones de ventas
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Componentes salariales
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
@@ -491,7 +501,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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 contra el que las entradas de stock son realizadas.
@@ -501,7 +511,7 @@
 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/config/accounts.py +70,Masters,Maestros
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Fechas de las transacciones de actualización del Banco
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Fechas de las transacciones de actualización del Banco
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tiempo de seguimiento
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -519,27 +529,27 @@
 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
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Calendario de mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Cambio neto en el Inventario
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basado en' y 'Agrupar por' no pueden ser iguales
 DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Por favor, establece una lista de fiesta por el empleado o por la Compañía"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,importe de la amortización
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Importe entregado
 DocType: Supplier,Fixed Days,Días fijos
 DocType: Quotation Item,Item Balance,Concepto Saldo
 DocType: Sales Invoice,Packing List,Lista de embalaje
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
 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
@@ -554,8 +564,10 @@
 DocType: BOM Operation,Operation Time,Tiempo de operación
 DocType: Pricing Rule,Sales Manager,Gerente de ventas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupo de Grupo
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mis proyectos
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 DocType: Journal Entry,Bill No,Factura No.
+DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta ganancia / pérdida en la disposición de activos
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
 DocType: Sales Order Item,Basic Rate (Company Currency),Precio base (Divisa por defecto)
@@ -567,13 +579,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Ya está creado Entrada Pago
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Activos no vinculado al elemento {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,La facturación total de este año
 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 +529,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -596,6 +609,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} no es un artículo de stock
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
@@ -610,14 +624,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
 DocType: Item Group,Website Specifications,Especificaciones del sitio web
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Hay un error en su plantilla de dirección {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nueva cuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nueva cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {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.,Los asientos contables pueden ser creados contra las subcuentas. No se permiten asientos contra los Grupos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -665,17 +679,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,GASTOS DE MANTENIMIENTO (OFICINA)
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,No ha seleccionado una lista de precios
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -683,7 +697,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mis facturas
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} de activos debe ser presentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Supplier Quotation,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
@@ -692,10 +707,11 @@
 apps/erpnext/erpnext/config/stock.py +149,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
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Error lógico: debe encontrar solapamiento
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
 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 +267,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +301,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 +12,Support queries from customers.,Soporte técnico para los clientes
@@ -719,7 +735,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -756,14 +772,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 DocType: Employee,Ms,Sra.
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Configuración principal para el cambio de divisas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Configuración principal para el cambio de divisas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Puntos de venta y Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+DocType: Journal Entry,Depreciation Entry,Entrada depreciación
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Ir a la Cesta
 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
@@ -782,7 +799,7 @@
 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 +524,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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.
@@ -792,10 +809,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Factura de compra
+DocType: Asset,Purchase Invoice,Factura de compra
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Fecha y Fecha de Cierre de apertura debe ser dentro del mismo año fiscal
@@ -805,21 +822,24 @@
 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. Posiblemente el registro de cambio de divisa no ha sido creado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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'"
 DocType: Job Opening,Publish on website,Publicar en el sitio web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Envíos realizados a los clientes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Ingresos indirectos
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer el importe de pago = pago pendiente
 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 +672,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Seleccione el producto a transferir
 DocType: Purchase Invoice,Additional Discount Percentage,Porcentaje de descuento adicional
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Fila {0}: {1} factura no es válida, podría ser cancelado / no existe. \ Por favor, introduzca una factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
@@ -828,14 +848,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
 ,Employee Holiday Attendance,La asistencia de los empleados de vacaciones
 DocType: Opportunity,Walk In,Entrar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de archivo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Entradas de archivo
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Crear
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 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 +5,My Cart,Mi carrito
@@ -845,7 +865,8 @@
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 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 +180,Qty for {0},Cantidad de {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
+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 +80,Leave Allocation Tool,Herramienta de asignación de vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
@@ -858,7 +879,7 @@
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
 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 +547,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Descuento
@@ -873,20 +894,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Cantidad de venta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Gestión de tiempos
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Gestión de tiempos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,desechado
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,La cuenta no coincide con la Empresa
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Reclutamiento
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Gastos de venta
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
@@ -903,7 +925,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
 DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Deb
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 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
@@ -912,7 +934,7 @@
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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
@@ -920,7 +942,7 @@
 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 +130,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Margen %
@@ -929,22 +951,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Predeterminados globales
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
 DocType: Salary Slip,Deductions,Deducciones
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote de gestión de tiempos ha sido facturado.
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Error en la planificación de capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Error en la planificación de capacidad
 ,Trial Balance for Party,Balance de terceros
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
@@ -955,18 +978,18 @@
 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 '
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Por favor ajuste ID de correo electrónico
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Por favor ajuste ID de correo electrónico
 DocType: Item,UOMs,UdM
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {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/config/buying.py +33,Supplier database.,Base de datos de proveedores.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Impuestos y otras deducciones salariales
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
@@ -980,6 +1003,7 @@
 DocType: Holiday,Holiday,Vacaciones
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma no es aplicable para la factura: {0}
 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
@@ -993,19 +1017,20 @@
 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"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Elemento {0} debe ser una posición no de almacén
 DocType: Contact,User ID,ID de usuario
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Mostrar libro mayor
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,DIVIDENDOS PAGADOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,DIVIDENDOS PAGADOS
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro de contabilidad
 DocType: Stock Reconciliation,Difference Amount,Diferencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,UTILIDADES RETENIDAS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,UTILIDADES RETENIDAS
 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
@@ -1013,7 +1038,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Apertura temporal
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Valoración de los tipos requeridos para el artículo en la fila {0}
@@ -1028,8 +1053,8 @@
 ,Accounts Payable Summary,Balance de cuentas por pagar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Orden de venta {0} no es válida
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
@@ -1037,7 +1062,7 @@
 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,Encabezado de cuenta {0} creado
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Encabezado de cuenta {0} creado
 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
@@ -1045,12 +1070,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 apps/erpnext/erpnext/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
@@ -1060,19 +1085,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/stock/get_item_details.py +142,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
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,De proveedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},No ha encontrado ningún elemento llamado {0}
 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
@@ -1080,10 +1106,10 @@
 DocType: Item,Website Item Groups,Grupos de productos en el sitio web
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +166,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: Depreciation Schedule,Journal Entry,Asiento contable
 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 +433,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 +442,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
 DocType: Salary Slip,Bank Account No.,Cta. bancaria núm.
 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
@@ -1092,6 +1118,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitud de Cotización Proveedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Hasta que se repite
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
@@ -1102,6 +1129,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valor actual después de la depreciación debe ser inferior a igual a {0}
 ,BOM Browser,Explorar listas de materiales (LdM)
 DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o deducir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si el presupuesto anual excedido (por cuenta de gastos)
@@ -1116,21 +1144,22 @@
 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}
 DocType: Project,Start and End Dates,Las fechas de inicio y fin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Address,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
+DocType: Asset,Depreciation Schedules,programas de depreciación
 DocType: Item,Is Service Item,Es un servicio
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,moneda de la transacción
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Desde {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descripción de la operación
 DocType: Item,Will also apply to variants,También se aplicará a las variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 DocType: Quotation,Shopping Cart,Carrito de compras
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente
 DocType: Pricing Rule,Campaign,Campaña
@@ -1144,8 +1173,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Cambio neto en activos fijos
 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 +513,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 +181,Max: {0},Máximo: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
@@ -1153,8 +1182,8 @@
 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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1175,11 +1204,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,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 +167,Tax Rule for transactions.,Regla de impuestos para las transacciones.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Compramos este producto
 DocType: Address,Billing,Facturación
@@ -1189,12 +1218,15 @@
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub-Ensamblajes
+DocType: Asset,Asset Name,Nombre de activos
 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 +142,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Lista de embalaje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ALQUILERES DE LOCAL
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ALQUILERES DE LOCAL
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Solicitud de presupuesto se puede acceder haciendo clic en siguiente enlace
+DocType: Asset,Number of Months in a Period,Número de meses en un período
 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
@@ -1211,19 +1243,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gubernamental
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
 DocType: Sales Invoice,Source,Referencia
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Mostrar cerrada
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flujo de efectivo de inversión
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
 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 +86,Transfer Materials for Manufacture,Transferir materiales para producción
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transferir materiales para producción
 DocType: Pricing Rule,For Price List,Por lista de precios
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1232,7 +1265,7 @@
 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/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."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visita de mantenimiento
 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: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
@@ -1246,7 +1279,6 @@
 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 +196,Brand master.,Marca principal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Caja
@@ -1274,7 +1306,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Peticiones para gastos de compañía
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Receipt,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
 ,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de cotización
@@ -1283,7 +1315,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,otros informes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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.
@@ -1293,26 +1325,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,Ver {0}
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Cambio Neto en Efectivo
 DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},La cantidad no debe ser más de {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Ejercicio anterior no está cerrada
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Categorías principales de proveedores.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Categorías principales de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Purchase Invoice,Reference Document,Documento de referencia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
@@ -1334,8 +1367,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique su Email de identificación"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
+apps/erpnext/erpnext/config/accounts.py +137,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
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Reclamación de garantía
@@ -1353,7 +1387,7 @@
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Por favor, seleccione el código del producto"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,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 goce de salario (LSS)
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
@@ -1363,15 +1397,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Elemento de producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1388,33 +1422,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Compra importe bruto
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
+DocType: Asset,Depreciation Method,Método de depreciación
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
 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 +29,Shopping Cart is enabled,Carrito de compras habilitado
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 DocType: Production Plan Material Request,Production Plan Material Request,Producción Solicitud Plan de materiales
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,No existen órdenes de producción (OP)
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción (OP)
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1422,31 +1458,32 @@
 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 almacén de trabajos en proceso antes de validar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,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 +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Direcciones
+apps/erpnext/erpnext/hooks.py +91,Addresses,Direcciones
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,tasaciones
 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 +337,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
 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: 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 +27,Time Logs for manufacturing.,Gestión de tiempos para la producción.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Gestión de tiempos para las tareas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Payment,Pago
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo reales
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
 DocType: Employee,Salutation,Saludo.
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
@@ -1457,6 +1494,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
+DocType: Request for Quotation Supplier,Send Email to Supplier,Enviar correo electrónico a Proveedor
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 DocType: Packing Slip,To Package No.,Al paquete No.
 DocType: Production Planning Tool,Material Requests,Las solicitudes de materiales
@@ -1474,7 +1512,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
 DocType: Serial No,Delivery Document No,Documento de entrega No.
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener productos desde recibo de compra
 DocType: Serial No,Creation Date,Fecha de creación
@@ -1506,40 +1544,42 @@
 ,Amount to Deliver,Cantidad para envío
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} creado
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
 ,Serial No Status,Estado del número serie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,La tabla de productos no puede estar en blanco
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}"
 DocType: Pricing Rule,Selling,Ventas
 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 +271,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,IMPUESTOS Y ARANCELES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,IMPUESTOS Y ARANCELES
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Pago de cuentas de puerta de enlace no está configurado
 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 pago no pueden ser filtradas 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: Production Order,Material Request Item,Requisición de materiales del producto
+DocType: Request for Quotation Item,Material Request Item,Requisición de materiales del producto
 apps/erpnext/erpnext/config/stock.py +85,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.
+DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Historial de Compras
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rojo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Tiempo de instalación
 DocType: Sales Invoice,Accounting Details,Detalles de contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Las asignaciones
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 DocType: Item Group,Show In Website,Mostrar en el sitio web
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupo
@@ -1547,6 +1587,7 @@
 ,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."
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama Gantt de todas las tareas.
+DocType: Pricing Rule,Margin Type,Tipo margen
 DocType: Appraisal,For Employee Name,Por nombre de empleado
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
@@ -1554,20 +1595,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Fila # {0}: el elemento es obligatorio contra un artículo de activo fijo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{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 +272,Pair,Par
+DocType: Asset,Depreciation Schedule,Programación de la depreciación
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Posee numero de lote
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
+DocType: Asset,Purchase Date,Fecha de compra
 DocType: Employee,Personal Details,Datos personales
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
 ,Maintenance Schedules,Programas de mantenimiento
 ,Quotation Trends,Tendencias de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
@@ -1581,23 +1627,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de No-Grupo
 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/public/js/setup_wizard.js +272,Unit,Unidad(es)
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Por favor, especifique la compañía"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 cual se envian los productos rechazados
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
@@ -1606,29 +1651,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},La cuenta {0} es inválida. La Divisa de la cuenta debe ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},La cuenta {0} es inválida. La Divisa de la cuenta 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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Artículo Precio agregó para {0} en Precio de lista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Artículo Precio agregó para {0} en Precio de lista {1}
 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,Gross Margin,Margen bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculado equilibrio extracto bancario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Costo actualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año fiscal** representa un ejercicio financiero. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
@@ -1640,8 +1686,8 @@
 ,SO Qty,Cant. OV
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
+DocType: Request for Quotation,Manufacturing Manager,Gerente de producción
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,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 +154,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Envíos
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
@@ -1649,12 +1695,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,GASTOS VARIOS
 DocType: Global Defaults,Default Company,Compañía predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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,-Arriba
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,El usuario {0} está deshabilitado
@@ -1663,7 +1709,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Currency Exchange,From Currency,Desde moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
@@ -1673,11 +1719,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Fila # {0}: Cantidad debe ser 1, como elemento está vinculado a un activo"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Niño Artículo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nuevo centro de costos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 (por lo general Fuente de los fondos actuales&gt;&gt; Pasivos de impuestos, derechos y crear una nueva cuenta (haciendo clic en Add Child) de tipo &quot;Impuestos&quot; y hacer hablar de la tasa de impuestos."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nuevo centro de costos
 DocType: Bin,Ordered Quantity,Cantidad ordenada
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Quality Inspection,In Process,En proceso
@@ -1690,10 +1736,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Gestión de tiempos creados:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Gestión de tiempos creados:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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
@@ -1711,13 +1758,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales"
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Se requiere débito para
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Se requiere débito para
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Quality Inspection,Quality Manager,Gerente de calidad
 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 +141,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
@@ -1725,22 +1772,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,La lista de precios {0} está deshabilitada
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,La lista de precios {0} está deshabilitada
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 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 +123,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1749,10 +1796,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No existe nómina salarial para el mes:
 DocType: Bin,Actual Quantity,Cantidad real
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Numero de serie {0} no encontrado
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Numero de serie {0} no encontrado
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Sus clientes
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear fecha
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplica ya
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplica ya
 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."
@@ -1776,7 +1824,7 @@
 DocType: Employee,Employment Details,Detalles del empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como cerrado/a
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ningún producto con código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ningún producto con código de barras {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de caso no puede ser 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,Si usted tiene equipo de ventas y socios de ventas ( Socios de canal ) ellos pueden ser etiquetados y mantener su contribución en la actividad de ventas
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
@@ -1794,10 +1842,10 @@
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 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 +608,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transferencia de Material
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Artículo {0} debe ser un artículo de venta en {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Por favor conjunto recurrente después de guardar
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Por favor conjunto recurrente después de guardar
 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
@@ -1811,12 +1859,13 @@
 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: Process Payroll,Create Salary Slip,Crear nómina salarial
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar correo electrónico de:
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Invitar como usuario
 DocType: Features Setup,After Sale Installations,Instalaciones post venta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Por favor, establece {0} en la empresa {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de finalización
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
@@ -1825,9 +1874,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Sales Invoice,Mass Mailing,Correo masivo
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
@@ -1844,25 +1893,25 @@
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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 la cantidad planificada ({2}) en la Orden de producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la 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 +210,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Asiento Rápida
 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 +206,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} no se ha enviado
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1871,7 +1920,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
 apps/erpnext/erpnext/config/crm.py +116,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
@@ -1889,13 +1938,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} está cerrado
 DocType: Email Digest,How frequently?,¿Con qué frecuencia?
 DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir al grupo apropiado (por lo general Aplicación de Fondos&gt; Activo Corriente&gt; Cuentas bancarias y crear una nueva cuenta (haciendo clic en Add Child) de tipo &quot;Banco&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de lista de materiales
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcos Presente
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
 DocType: Stock Entry,Purpose,Propósito
+DocType: Company,Fixed Asset Depreciation Settings,Configuración de depreciación de los inmuebles
 DocType: Item,Will also apply for variants unless overrridden,También se aplicará para las variantes menos que se sobre escriba
 DocType: Purchase Invoice,Advances,Anticipos
 DocType: Production Order,Manufacture against Material Request,Fabricación contra pedido Material
@@ -1904,6 +1953,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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.,Un distribuidor / proveedor / comisionista / afiliado / revendedor que vende productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Posee Sub-grupo
@@ -1954,12 +2004,14 @@
  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: Purchase Receipt Item,Recd Quantity,Cantidad recibida
-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}
+DocType: Asset Category Account,Asset Category Account,Cuenta categoría de activos
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir al grupo apropiado (por lo general Aplicación de Fondos&gt; Activo Corriente&gt; Cuentas bancarias y crear una nueva cuenta (haciendo clic en Add Child) de tipo &quot;Banco&quot;
 DocType: Journal Entry,Credit Note,Nota de crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1983,9 +2035,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Sucursal principal de la organización.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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 públicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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 o más
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ningún empleado para los criterios anteriormente seleccionado o nómina ya creado
@@ -2012,7 +2064,7 @@
 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 +200,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'"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Nómina de sueldos
 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"
@@ -2022,8 +2074,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
 DocType: Account,Income Account,Cuenta de ingresos
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No se encontró la plantilla de direcciones predeterminada. Por favor, crear una nueva desde Configuración&gt; Prensa y Branding&gt; plantilla de dirección."
 DocType: Payment Request,Amount in customer's currency,Monto de la moneda del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2045,21 +2098,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nombre del nuevo centro de costos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nombre del nuevo centro de costos
 DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
 DocType: Appraisal,HR User,Usuario de recursos humanos
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
-apps/erpnext/erpnext/config/support.py +7,Issues,Incidencias
+apps/erpnext/erpnext/hooks.py +90,Issues,Incidencias
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},El estado debe ser uno de {0}
 DocType: Sales Invoice,Debit To,Debitar a
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant. real 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)
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 ,Profit and Loss Statement,Cuenta de pérdidas y ganancias
@@ -2073,10 +2127,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
 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 +139,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,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
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
+apps/erpnext/erpnext/config/accounts.py +222,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 el tipo de cambio para convertir una moneda a otra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,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
@@ -2144,13 +2198,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Solicitado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No hay observaciones
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Activos Fijos El artículo debe ser una posición no de almacén
 DocType: Supplier Quotation Item,Material Request No,Requisición de materiales Nº
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2171,7 +2226,7 @@
 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 para stock
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Payment Request,Recipient and Message,Del destinatario y el mensaje
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2185,7 +2240,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar dirección del proveedor
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
 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 +579,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/stock/doctype/material_request/material_request.js +582,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 +190,Account {0} is frozen,La 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.
 DocType: Payment Request,Mute Email,Silenciar Email
@@ -2207,11 +2262,12 @@
 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/config/buying.py +18,Request for quotation.,Solicitud de presupuesto.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
 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 +294,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2220,7 +2276,7 @@
 DocType: Installation Note Item,Against Document No,Contra el Documento No
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Administrar socios de ventas.
 DocType: Quality Inspection,Inspection Type,Tipo de inspección
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Por favor, seleccione {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,La asistencia sin marcar
@@ -2235,6 +2291,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
 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
@@ -2248,7 +2305,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 DocType: Payment Gateway,Gateway,Puerta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Monto
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Monto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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."
@@ -2262,18 +2319,19 @@
 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
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},No se puede encontrar el tipo de cambio para {0} a {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},No se puede encontrar el tipo de cambio para {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medio Día Marcos
 DocType: Sales Invoice,Sales Team,Equipo de ventas
 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 +410,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,El número de serie {0} no existe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Almacén al cliente (opcional)
 DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
@@ -2299,14 +2357,16 @@
 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.
 DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Requisición de materiales {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Requisición de materiales {0} creada
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Purchase Invoice,Address and Contact,Dirección y contacto
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +286,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)"
+DocType: Asset Category Account,Accumulated Depreciation Account,Cuenta de depreciación acumulada
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
+DocType: Asset,Expected Value After Useful Life,Valor esperado después de la Vida Útil
 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
@@ -2319,12 +2379,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} está cancelado o cerrado
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectivo neto de inversión
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,La cuenta root no se puede borrar
 ,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/asset/depreciation.py +99,Asset {0} must be submitted,Activos {0} debe ser presentado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Administrar direcciones
-DocType: Pricing Rule,Item Code,Código del producto
+DocType: Asset,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 DocType: Journal Entry,User Remark,Observaciones
@@ -2343,8 +2403,10 @@
 DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales
 DocType: Employee Education,School/University,Escuela / Universidad.
 DocType: Payment Request,Reference Details,Detalles Referencia
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
 ,Billed Amount,Importe facturado
+DocType: Asset,Double Declining Balance,Doble saldo decreciente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,orden cerrado no se puede cancelar. Unclose para cancelar.
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
@@ -2363,6 +2425,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,Estando totalmente amortizados
 ,Stock Projected Qty,Cantidad de inventario proyectado
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia marcado HTML
@@ -2370,25 +2433,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Número de serie y de lote
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Pedidos producciones no pueden ser criados para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Pedidos producciones no pueden ser criados para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Detallista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,En desactivar Palabras
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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 +180,Bank Overdraft Account,Cuenta de sobre-giros
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Prestamos en garantía
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, establece las cuentas relacionadas de depreciación de activos en Categoría {0} o de su empresa {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,APERTURA DE CAPITAL
 DocType: Appraisal,Appraisal,Evaluación
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},El correo electrónico enviado al proveedor {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Repetir fecha
 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 +187,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
@@ -2396,7 +2462,7 @@
 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
 DocType: Item Price,Bulk Import Help,Ayuda de importación en masa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Seleccione cantidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleccione cantidad
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensaje enviado
@@ -2424,6 +2490,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margen total
 DocType: Supplier,Supplier Details,Detalles del proveedor
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
@@ -2437,7 +2504,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Payment Gateway Account,Default Payment Request Message,Defecto de solicitud de pago del mensaje
 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/config/accounts.py +118,Banking and Payments,De bancos y pagos
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,De bancos y pagos
 ,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
@@ -2445,17 +2512,17 @@
 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 +199,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 +201,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
 DocType: Notification Control,Quotation Message,Mensaje de cotización
 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/config/hr.py +55,Leaves and Holiday,Las hojas y las vacaciones
 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/stock/doctype/warehouse/warehouse.py +115,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
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 DocType: Time Log,Batched for Billing,Lotes para facturar
@@ -2471,15 +2538,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Fecha de compra de activos {0} no coincide con la fecha de compra de la factura
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Almacén {0}: El nombre de la compañia es obligatoria
 ,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}
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Account,Payable,Pagadero
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Deudores ({0})
-DocType: Project,Margin,Margen
+DocType: Pricing Rule,Margin,Margen
 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,Nuevos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Beneficio Bruto%
@@ -2487,20 +2556,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
 DocType: Newsletter,Newsletter List,Boletínes de noticias
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si desea enviar la nómina salarial por correo a cada empleado, cuando valide la planilla de pagos"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
 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 +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 DocType: Stock Entry Detail,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Activos no pertenece a la empresa {2}
 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: Account,Accumulated Depreciation,Depreciación acumulada
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Payment Request,Email To,Email para
 DocType: Lead,Lead Owner,Propietario de la iniciativa
 DocType: Bin,Requested Quantity,Cantidad requerida
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Se requiere el almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2508,11 +2580,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Entregado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {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,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Mismo proveedor se ha introducido varias veces
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2522,13 +2595,14 @@
 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.
 DocType: Payment Request,Payment Details,Detalles del pago
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
+DocType: Asset,Journal Entry for Scrap,Entrada de diario de la chatarra
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones: correo electrónico, teléfono, chats, visitas, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados en artículos
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Crear
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2541,7 +2615,7 @@
 ,Stock Ledger,Mayor de Inventarios
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Calificación: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Seleccione primero un nodo de grupo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Seleccione primero un nodo de grupo
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Y asistencia de empleados
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminar la referencia del cliente, proveedor, distribuidor y plomo, ya que es la dirección de la empresa"
@@ -2563,13 +2637,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Siguiente fecha debe ser mayor que la fecha de publicación
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mostrar impuesto fragmentado
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Formulario / artículo / {0}) está agotado
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Siguiente fecha debe ser mayor que la fecha de publicación
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/accounts/party.py +289,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'"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fecha de la factura de envío
@@ -2584,7 +2659,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},{0} no es un Número de lote válido para el artículo {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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."
@@ -2598,7 +2673,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2607,7 +2682,7 @@
 DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 DocType: Warranty Claim,Item and Warranty Details,Objeto y de garantía Detalles
 DocType: Sales Team,Contribution (%),Margen (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
@@ -2618,7 +2693,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
@@ -2627,11 +2702,12 @@
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Cuenta de activo fijo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Inversión en la banca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Precio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
@@ -2639,7 +2715,7 @@
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,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 +204,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
@@ -2647,17 +2723,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banco
 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 +612,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citas
 DocType: Hub Settings,Access Token,Token de acceso
 DocType: Sales Invoice Item,Serial No,Número de serie
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
-DocType: Item,Is Fixed Asset Item,Es un activo fijo
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
 DocType: Purchase Invoice,Print Language,Lenguaje de impresión
 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"
+DocType: Asset,Number of Depreciations,Número de Depreciaciones
 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
@@ -2665,13 +2741,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Solicitud de Citas
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo Factura
 DocType: Purchase Invoice Item,Image View,Vista de imagen
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
+DocType: Asset,Partially Depreciated,parcialmente depreciables
 DocType: Issue,Opening Time,Hora de apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
@@ -2687,13 +2765,13 @@
 DocType: Quotation,Maintenance Manager,Gerente de mantenimiento
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde la última orden' debe ser mayor que o igual a cero
-DocType: C-Form,Amended From,Modificado Desde
+DocType: Asset,Amended From,Modificado Desde
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,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 +484,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 +325,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
@@ -2706,21 +2784,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"¡Por favor, &#39;Cuenta / Pérdida de beneficios por enajenaciones de activos&#39; en la empresa"
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Los pagos de los partidos con las facturas
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Los pagos de los partidos con las facturas
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Añadir a la Cesta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 DocType: Production Planning Tool,Get Material Request,Obtener Solicitud de materiales
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Total Presente
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Las declaraciones de contabilidad
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Las declaraciones de contabilidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2739,15 +2818,16 @@
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
 DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Iniciar terminal de punto de venta (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Reporte de visitas para mantenimiento
 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 +169,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,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/report/cash_flow/cash_flow.py +40,Net Change in Equity,Cambio en el Patrimonio Neto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,"Por favor, cancelar Factura de Compra {0} primera"
 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
@@ -2755,12 +2835,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Error: {0}&gt; {1}
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obtener artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/accounts/doctype/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: C-Form,C-Form,C - Forma
@@ -2772,18 +2853,18 @@
 DocType: Purchase Invoice,Mobile No,Nº Móvil
 DocType: Payment Tool,Make Journal Entry,Crear asiento contable
 DocType: Leave Allocation,New Leaves Allocated,Nuevas vacaciones asignadas
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Comercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Error: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Todos los productos o servicios.
 DocType: Supplier Quotation,Supplier Address,Dirección de proveedor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2794,10 +2875,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
 DocType: Tax Rule,Billing State,Región de facturación
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferencia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,La fecha de vencimiento es obligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
@@ -2817,20 +2898,22 @@
 DocType: GL Entry,Remarks,Observaciones
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
 DocType: Features Setup,POS View,Vista POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,El registro de la instalación para un número de serie
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Al día siguiente de la fecha y Repetir en el día del mes debe ser igual
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Al día siguiente de la fecha y Repetir en el día del mes debe ser igual
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Hora de registro ha sido calificada
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
@@ -2840,12 +2923,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de costos es obligatorio para el artículo {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obtener elementos del paquete del producto
+DocType: Asset,Straight Line,Línea recta
+DocType: Project User,Project User,usuario proyecto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Descuentos sobre ventas
@@ -2859,39 +2943,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Agregar elemento
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Valor de apertura
 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,Comisiones sobre ventas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: el elemento {1} no puede ser presentado, lo que ya es {2}"
 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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Solicitudes de ausencia.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,GASTOS LEGALES
 DocType: Sales Invoice,Posting Time,Hora de contabilización
 DocType: Sales Order,% Amount Billed,% importe facturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Cuenta telefonica
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Cuenta telefonica
 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.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ningún producto con numero de serie {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ningún producto con numero de serie {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abrir notificaciones
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos directos
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Gastos directos
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} es una dirección de email inválida en 'Notificación \ Dirección de email'
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Gastos de viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
@@ -2908,7 +2993,7 @@
 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/public/js/setup_wizard.js +275,We sell this Item,Vendemos este producto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID de Proveedor
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Cantidad debe ser mayor que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Cantidad debe ser mayor que 0
 DocType: Journal Entry,Cash Entry,Entrada de caja
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
@@ -2919,11 +3004,12 @@
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Proveedor de activos {0} no coincide con el proveedor de la factura de compra
 DocType: Newsletter,Test Email Id,Prueba de Email
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plantilla maestra de nómina salarial
@@ -2939,12 +3025,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {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 +44,Account {0}: Parent account {1} does not exist,Cuenta {0}: la 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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,moneda de facturación debe ser igual a la moneda ya sea por defecto de comapany o divisa de la cuenta del partido payble
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivado, &quot;en las palabras de campo no será visible en cualquier transacción"
@@ -2954,13 +3041,13 @@
 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 +164,Creditors,Acreedores
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/stock.py +97,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
@@ -2980,15 +3067,14 @@
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} contra la Factura de ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
-DocType: Project,Project Name,Nombre de proyecto
+DocType: Request for Quotation Item,Project Name,Nombre de proyecto
 DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
 DocType: 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
@@ -3018,6 +3104,7 @@
 DocType: Sales Invoice,End Date,Fecha final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Las transacciones de valores
 DocType: Employee,Internal Work History,Historial de trabajo interno
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,La depreciación acumulada Importe
 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
@@ -3025,7 +3112,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Company es obligatoria, ya que es la dirección de la empresa"
 DocType: Item Attribute,From Range,De Gama
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
 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.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
 DocType: Company,Domain,Rubro
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Trabajos
@@ -3037,6 +3124,7 @@
 DocType: Time Log,Additional Cost,Costo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3053,6 +3141,7 @@
 DocType: Sales Order,Delivery Date,Fecha de entrega
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
+DocType: Request for Quotation Item,Request for Quotation Item,Solicitud de Cotización de artículos
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
@@ -3067,11 +3156,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
 DocType: Accounts Settings,Accounts Settings,Configuración de cuentas
 DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Ajuste &#39;Cuenta de Liquidación de Bienes&#39; en su empresa {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,PLANTEL Y MAQUINARIA
 DocType: Sales Partner,Partner's Website,Sitio web de socio
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Cuentas temporales
 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
@@ -3080,21 +3170,22 @@
 DocType: Pricing Rule,Disable,Desactivar
 DocType: Project Task,Pending Review,Pendiente de revisar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Haga clic aquí para pagar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Activos {0} no puede ser desechada, como ya lo es {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marcos Ausente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Agregar elementos de
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Agregar elementos de
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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}
 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/public/js/setup_wizard.js +20,"e.g. ""MC""","por ejemplo ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,El almacén {0} no existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3109,6 +3200,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Elemento {0} ha sido desactivado
 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
@@ -3120,7 +3212,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 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
 ,Cash Flow,Flujo de fondos
@@ -3134,7 +3226,7 @@
 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 +132,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Equilibrio extracto bancario según Contabilidad General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de artículo
@@ -3150,19 +3242,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
 DocType: BOM Replace Tool,Current BOM,Lista de materiales (LdM) actual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Agregar No. de serie
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantía
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,IMPRESIONES Y PAPELERÍA
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Agrupar por nota
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Actualizar mercancía terminada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Actualizar mercancía terminada
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Adquisitivo
 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.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Total Pagado
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
@@ -3192,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +177,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 +179,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 +220,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
@@ -3205,9 +3296,11 @@
 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/projects/doctype/project/project.py +133,Join,Unirse
 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 +564,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 +569,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
+DocType: Pricing Rule,Margin Rate or Amount,Tasa de margen o Monto
 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
@@ -3217,7 +3310,7 @@
 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 +782,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3225,14 +3318,13 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},No válida {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
@@ -3250,14 +3342,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Balance general
 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"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Por favor, establece una lista predeterminada de fiesta por Empleado {0} o de su empresa {0}"
 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>
@@ -3289,23 +3382,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cant. real (en origen/destino)
 DocType: Item Customer Detail,Ref Code,Código de referencia
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de los empleados.
 DocType: Payment Gateway,Payment Gateway,Pasarela de Pago
 DocType: HR Settings,Payroll Settings,Configuración de nómina
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Realizar pedido
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,la tabla raíz no puede tener un centro de costes padre / principal
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleccione una marca ...
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Almacén es obligatorio
 DocType: Supplier,Address and Contacts,Dirección y contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3323,7 +3416,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Moneda de la transacción debe ser la misma que la moneda de pago de puerta de enlace
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Recibir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3331,14 +3424,14 @@
 DocType: Purchase Invoice,Submit on creation,Presentar en la creación
 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 exitosamente a nuestro Boletín de noticias.
-apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mis pedidos
@@ -3359,10 +3452,10 @@
 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"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Perfiles de punto de venta (POS)
+apps/erpnext/erpnext/config/accounts.py +258,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 +179,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 +63,Total Paid Amt,Monto total pagado
@@ -3374,11 +3467,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Proveedor de parte
 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
@@ -3387,12 +3481,12 @@
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Payment Reconciliation,From Invoice Date,Desde Fecha de la factura
@@ -3401,7 +3495,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Encabezado de cuenta
@@ -3414,7 +3508,7 @@
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
@@ -3428,15 +3522,15 @@
 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 +576,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Actividad del proyecto / tarea.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
 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: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3456,8 +3550,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Año fecha de inicio o fecha de finalización se coloque por encima de {0}. Para evitar configure empresa
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
 DocType: 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.","Ejemplo:. ABCD ##### 
  Si la serie se establece y el número de serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco."
@@ -3469,11 +3564,11 @@
 ,Sales Analytics,Análisis de ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de producción
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de correo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Por favor, ingrese la divisa por defecto en la compañía principal"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalles de entrada de inventario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Recordatorios diarios
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nombre de nueva cuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
@@ -3483,11 +3578,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Porcentaje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3495,11 +3591,12 @@
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
 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 +385,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 (por lo general Fuente de los fondos actuales&gt;&gt; Pasivos de impuestos, derechos y crear una nueva cuenta (haciendo clic en Add Child) de tipo &quot;Impuestos&quot; y hacer hablar de la tasa de impuestos."
 DocType: Production Order,Production Order,Orden de producción
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
 DocType: Quotation Item,Against Docname,Contra Docname
@@ -3518,18 +3615,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Reconciliado exitosamente
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
+DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
 apps/erpnext/erpnext/config/projects.py +55,Reports,Informes
 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 +508,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
 ,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
@@ -3539,10 +3637,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Direcciones de email para notificación' no ha sido especificado para %s recurrentes
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Direcciones de email para notificación' no ha sido especificado para %s recurrentes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
 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 +455,Change,Cambio
@@ -3550,6 +3648,7 @@
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Nombre de la categoría de activos
 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)
@@ -3561,16 +3660,16 @@
 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 +559,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 final real (mediante registros de tiempo)
 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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Lotes de producto
+DocType: Batch,Batch,Lote
 apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
 DocType: Journal Entry,Debit Note,Nota de débito
@@ -3581,7 +3680,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedores
 DocType: Sales Invoice,Cold Calling,Llamadas en frío
 DocType: SMS Parameter,SMS Parameter,Parámetros SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Presupuesto y de centros de coste
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Presupuesto y de centros de coste
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
@@ -3612,9 +3711,9 @@
 DocType: Purchase Common,Purchase Common,Compra común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualice.
 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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Cita Proveedor {0} creado
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3622,7 +3721,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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'"
 DocType: Account,Parent Account,Cuenta principal
@@ -3638,7 +3737,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Asientos en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
@@ -3653,6 +3752,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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,Monitorear esta órden de venta sobre cualquier proyecto
+DocType: Sales Invoice Item,Discount and Margin,Descuento y Margen
 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: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
@@ -3673,7 +3773,7 @@
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
-apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
+apps/erpnext/erpnext/accounts/party.py +234,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
 ,Monthly Salary Register,Registar salario mensual
 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)
@@ -3681,22 +3781,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pago URL Mensaje
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total impagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,La gestión de tiempos no se puede facturar
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
+DocType: Asset,Asset Category,Categoría activos
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiales de Proveedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Impuestos Especiales Factura
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
 DocType: Employee Attendance Tool,Marked Attendance,Asistencia Marcada
-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 +162,Current Liabilities,Pasivo circulante
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,La Cantidad real es obligatoria
@@ -3717,17 +3818,16 @@
 DocType: Item Attribute,Numeric Values,Valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analítica
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carrito esta vacío.
 DocType: Production Order,Actual Operating Cost,Costo de operación real
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No se encontró la plantilla de direcciones predeterminada. Por favor, crear una nueva desde Configuración&gt; Prensa y Branding&gt; plantilla de dirección."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital de inventario
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Payment Gateway Account,Payment Gateway Account,Cuenta Pasarela de Pago
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Después de la realización del pago redirigir el usuario a la página seleccionada.
@@ -3736,20 +3836,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
+DocType: Asset,Current Value (After Depreciation),Valor actual (después de la depreciación)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Por favor, introduzca los pedidos de cliente en la tabla anterior"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca los pedidos de cliente en la tabla anterior"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Fecha Ref.
@@ -3757,6 +3858,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index c058a42..0c15539 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Üürikorter
 DocType: POS Profile,Applicable for User,Rakendatav Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuuta on vajalik Hinnakiri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kas arvestatakse tehingu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR seaded
 DocType: Purchase Order,Customer Contact,Klienditeenindus Kontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Tööotsija
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Vaikimisi 10 minutit
 DocType: Leave Type,Leave Type Name,Jäta Tüüp Nimi
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Näita avatud
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seeria edukalt uuendatud
 DocType: Pricing Rule,Apply On,Kandke
 DocType: Item Price,Multiple Item prices.,Mitu punkti hindadega.
 ,Purchase Order Items To Be Received,"Ostutellimuse Esemed, mis saadakse"
 DocType: SMS Center,All Supplier Contact,Kõik Tarnija Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameeter
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
+apps/erpnext/erpnext/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,New Jäta ostusoov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Pangaveksel
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Näita variandid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Kvantiteet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Laenudega (kohustused)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Kvantiteet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Kontode tabeli saa olla tühi.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Laenudega (kohustused)
 DocType: Employee Education,Year of Passing,Aasta Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Laos
 DocType: Designation,Designation,Määramine
@@ -64,7 +66,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Tervishoid
 DocType: Purchase Invoice,Monthly,Kuu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Makseviivitus (päevad)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Invoice,Arve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Arve
 DocType: Maintenance Schedule Item,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -81,7 +83,7 @@
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Company,Phone No,Telefon ei
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logi tegevustel kasutajate vastu Ülesanded, mida saab kasutada jälgimise ajal arve."
-apps/erpnext/erpnext/controllers/recurring_document.py +131,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Müük Partnerid Komisjon
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
 DocType: Payment Request,Payment Request,Maksenõudekäsule
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Abielus
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei ole lubatud {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Võta esemed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
 DocType: Payment Reconciliation,Reconcile,Sobita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toiduained
 DocType: Quality Inspection Reading,Reading 1,Lugemine 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activity Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Kinnisvara
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoteatis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaatsia
+DocType: Item,Is Fixed Asset,Kas Põhivarade
 DocType: Expense Claim Detail,Claim Amount,Nõude suurus
 DocType: Employee,Mr,härra
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tarnija tüüp / tarnija
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Kõik Contact
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Aastapalka
 DocType: Period Closing Voucher,Closing Fiscal Year,Sulgemine Fiscal Year
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock kulud
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} on külmutatud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock kulud
 DocType: Newsletter,Email Sent?,E-mail saadetud?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Palgid
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Paigaldamine staatus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aktsepteeritud + Tõrjutud Kogus peab olema võrdne saadud koguse Punkt {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply tooraine ostmiseks
-apps/erpnext/erpnext/stock/get_item_details.py +140,Item {0} must be a Purchase Item,Punkt {0} peab olema Ostu toode
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Punkt {0} peab olema Ostu toode
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Punkt {0} ei ole aktiivne või elu lõpuni jõutud
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Uuendatakse pärast müügiarve esitatakse.
-apps/erpnext/erpnext/controllers/accounts_controller.py +507,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
 apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,Seaded HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,New Bom
@@ -208,11 +212,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiisor
 DocType: Production Order Operation,Updated via 'Time Log',Uuendatud kaudu &quot;Aeg Logi &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},Konto {0} ei kuulu Company {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saadud
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Palun sisestage Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Rahavood finantseerimistegevusest
 DocType: Lead,Address & Contact,Aadress ja Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisa kasutamata lehed eelmisest eraldised
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Järgmine Korduvad {0} loodud {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Järgmine Korduvad {0} loodud {1}
 DocType: Newsletter List,Total Subscribers,Kokku Tellijaid
 ,Contact Name,kontaktisiku nimi
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Loob palgaleht eespool nimetatud kriteeriume.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 DocType: Payment Tool,Reference No,Viitenumber
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Sissekanded
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Item,Publish in Hub,Avaldab Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Punkt {0} ei leitud &quot;tarnitud tooraine&quot; tabelis Ostutellimuse {1}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Märguannete juhtimiskeskuse
 DocType: Lead,Suggestions,Ettepanekud
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Määra Punkt Group tark eelarved selle ala. Te saate ka sesoonsus seades Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Palun sisestage vanema konto rühma ladu {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Palun sisestage vanema konto rühma ladu {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Makse vastu {0} {1} ei saa olla suurem kui tasumata summa {2}
 DocType: Supplier,Address HTML,Aadress HTML
 DocType: Lead,Mobile No.,Mobiili number.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Max 5 tähemärki
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Esimene Jäta Approver nimekirjas on vaikimisi Jäta Approver
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Õpi
+DocType: Asset,Next Depreciation Date,Järgmine kulum kuupäev
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiivsus töötaja kohta
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Tarnija Arve nr olemas ostuarve {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Manage Sales Person Tree.
 DocType: Job Applicant,Cover Letter,kaaskiri
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Tasumata tšekke ja hoiused selge
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Vale parool
 DocType: Item,Variant Of,Variant Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
 DocType: Period Closing Voucher,Closing Account Head,Konto sulgemise Head
 DocType: Employee,External Work History,Väline tööandjad
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Ringviide viga
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sõnades (Export) ilmuvad nähtavale kui salvestate saateleht.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} ühikut [{1}] (# Vorm / punkt / {1}) leitud [{2}] (# Vorm / Warehouse / {2})
 DocType: Lead,Industry,Tööstus
 DocType: Employee,Job Profile,Ametijuhendite
 DocType: Newsletter,Newsletter,Infobülletään
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,"Soovin e-postiga loomiseks, automaatne Material taotlus"
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Arve Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Toimetaja märkus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Workstation,Rent Cost,Üürile Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Palun valige kuu ja aasta
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kokku Tellimus Peetakse
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,Palun sisestage &quot;Korda päev kuus väljale väärtus
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Palun sisestage &quot;Korda päev kuus väljale väärtus
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hinda kus Klient Valuuta teisendatakse kliendi baasvaluuta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Saadaval Bom, saateleht, ostuarve, tootmise Order, ostutellimuse, ostutšekk, müügiarve, Sales Order, Stock Entry, Töögraafik"
 DocType: Item Tax,Tax Rate,Maksumäär
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} on juba eraldatud Töötaja {1} ajaks {2} et {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Vali toode
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,Select Item,Vali toode
 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","Punkt: {0} õnnestus osakaupa, ei saa ühildada kasutades \ Stock leppimise asemel kasutada Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ei kuulu saatelehele {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Punkt kvaliteedi kontroll Parameeter
 DocType: Leave Application,Leave Approver Name,Jäta Approver nimi
-,Schedule Date,Ajakava kuupäev
+DocType: Depreciation Schedule,Schedule Date,Ajakava kuupäev
 DocType: Packed Item,Packed Item,Pakitud toode
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Vaikimisi seadete osta tehinguid.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Vaikimisi seadete osta tehinguid.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Tegevus Maksumus olemas Töötaja {0} vastu Tegevuse liik - {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.,Palun ärge kontosid luua klientidele ja tarnijatele. Nad on loodud otse kliendi / tarnija meistrid.
 DocType: Currency Exchange,Currency Exchange,Valuutavahetus
@@ -346,6 +353,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kreeditsaldo
 DocType: Employee,Widowed,Lesk
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Esemed, mida tuleb taotleda mis on &quot;Out of Stock&quot; arvestades kõiki laod põhineb prognoositud tk ja minimaalse tellimuse tk"
+DocType: Request for Quotation,Request for Quotation,Hinnapäring
 DocType: Workstation,Working Hours,Töötunnid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
-DocType: Material Request Item,Required Date,Vajalik kuupäev
+DocType: Request for Quotation Item,Required Date,Vajalik kuupäev
 DocType: Delivery Note,Billing Address,Arve Aadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Palun sisestage Kood.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,Please enter Item Code.,Palun sisestage Kood.
 DocType: BOM,Costing,Kuluarvestus
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",Märkimise korral on maksusumma loetakse juba lisatud Prindi Hinda / Print summa
+DocType: Request for Quotation,Message for Supplier,Sõnum Tarnija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kokku Kogus
 DocType: Employee,Health Concerns,Terviseprobleemid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Palgata
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Ei eksisteeri
 DocType: Pricing Rule,Valid Upto,Kehtib Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Otsene tulu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,Otsene tulu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Haldusspetsialist
 DocType: Payment Tool,Received Or Paid,Saadud või makstud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,Please select Company,Palun valige Company
 DocType: Stock Entry,Difference Account,Erinevus konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Serial No Garantii lõppemine
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Erinevus (Dr - Cr)
 DocType: Account,Profit and Loss,Kasum ja kahjum
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Tegevjuht Alltöövõtt
+DocType: Project,Project will be accessible on the website to these users,Projekt on kättesaadav veebilehel nendele kasutajatele
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mööblitööstuse
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hinda kus Hinnakiri valuuta konverteeritakse ettevõtte baasvaluuta
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Kasvamine ei saa olla 0
 DocType: Production Planning Tool,Material Requirement,Materjal nõue
 DocType: Company,Delete Company Transactions,Kustuta tehingutes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Punkt {0} ei Ostu toode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Punkt {0} ei Ostu toode
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Klienditeenindus Lisa / uuenda maksud ja tasud
 DocType: Purchase Invoice,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Kuni Kogus
 DocType: Company,Ignore,Ignoreerima
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS saadetakse järgmised numbrid: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tarnija Warehouse kohustuslik allhanked ostutšekk
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tarnija Warehouse kohustuslik allhanked ostutšekk
 DocType: Pricing Rule,Valid From,Kehtib alates
 DocType: Sales Invoice,Total Commission,Kokku Komisjoni
 DocType: Pricing Rule,Sales Partner,Müük Partner
@@ -467,13 +477,13 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Kuu Distribution ** aitab teil levitada oma eelarve üle kuu, kui teil on sesoonsusest oma äri. Jaotada eelarves selle jaotuse seada see ** Kuu Distribution ** ka ** Cost Center **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
-apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,Financial / eelarveaastal.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Financial / eelarveaastal.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kogunenud väärtused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
 DocType: C-Form Invoice Detail,Grand Total,Üldtulemus
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Year Start Date ei tohiks olla suurem kui Fiscal Year End Date
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Year Start Date ei tohiks olla suurem kui Fiscal Year End Date
 DocType: Warranty Claim,Resolution,Lahendamine
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Tarnitakse: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Võlgnevus konto
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Jätka Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Korrake klientidele
 DocType: Leave Control Panel,Allocate,Eraldama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Müügitulu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Müügitulu
 DocType: Item,Delivered by Supplier (Drop Ship),Andis Tarnija (Drop Laev)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Palk komponendid.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Andmebaas potentsiaalseid kliente.
@@ -490,7 +500,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
@@ -500,7 +510,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Ettepanek kirjutamine
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Teine Sales Person {0} on olemas sama Töötaja id
 apps/erpnext/erpnext/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Uuenda pangaarveldustel kuupäevad
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Uuenda pangaarveldustel kuupäevad
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiivne Stock Error ({6}) jaoks Punkt {0} kesklaos {1} kohta {2} {3} on {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Palun sisestage ostutšeki esimene
 DocType: Buying Settings,Supplier Naming By,Tarnija nimetamine By
 DocType: Activity Type,Default Costing Rate,Vaikimisi ületaksid
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Hoolduskava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Hoolduskava
 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.","Siis Hinnakujundusreeglid on välja filtreeritud põhineb kliendi, kliendi nimel, Territory, Tarnija, Tarnija tüüp, kampaania, Sales Partner jms"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Net muutus Varude
 DocType: Employee,Passport Number,Passi number
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Juhataja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Sama objekt on kantud mitu korda.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Sama objekt on kantud mitu korda.
 DocType: SMS Settings,Receiver Parameter,Vastuvõtja Parameeter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Tuleneb&quot; ja &quot;Group By&quot; ei saa olla sama
 DocType: Sales Person,Sales Person Targets,Sales Person Eesmärgid
 DocType: Production Order Operation,In minutes,Minutiga
 DocType: Issue,Resolution Date,Resolutsioon kuupäev
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Palun määrata Holiday nimekiri kas töötaja või ettevõtte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
 DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
+DocType: Depreciation Schedule,Depreciation Amount,Põhivara summa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Teisenda Group
 DocType: Activity Cost,Activity Type,Tegevuse liik
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Tarnitakse summa
 DocType: Supplier,Fixed Days,Fikseeritud päeva
 DocType: Quotation Item,Item Balance,Punkt Balance
 DocType: Sales Invoice,Packing List,Pakkimisnimekiri
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Ostutellimuste antud Tarnijatele.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ostutellimuste antud Tarnijatele.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kirjastamine
 DocType: Activity Cost,Projects User,Projektid Kasutaja
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tarbitud
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operation aeg
 DocType: Pricing Rule,Sales Manager,Müügijuht
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Group Group
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Minu projektid
 DocType: Journal Entry,Write Off Amount,Kirjutage Off summa
 DocType: Journal Entry,Bill No,Bill pole
+DocType: Company,Gain/Loss Account on Asset Disposal,Gain / kulude aruandes varade realiseerimine
 DocType: Purchase Invoice,Quarterly,Kord kvartalis
 DocType: Selling Settings,Delivery Note Required,Toimetaja märkus Vajalikud
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (firma Valuuta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Makse Entry juba loodud
 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.,"Kui soovite jälgida objekti müügi ja ostu dokumente, mis põhineb nende seerianumber nos. See on ka kasutada jälgida garantii üksikasjad toote."
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
+apps/erpnext/erpnext/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Kokku arvete sel aastal
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
 DocType: Employee,Provide email id registered in company,Pakkuda email id registreeritud ettevõte
 DocType: Hub Settings,Seller City,Müüja City
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} ei ole laos toode
 DocType: Mode of Payment Account,Default Account,Vaikimisi konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Palun valige iganädalane off päev
 DocType: Production Order Operation,Planned End Time,Planeeritud End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Dispersioon Punkt Group-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kuupalga avalduse.
 DocType: Item Group,Website Specifications,Koduleht erisused
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Seal on viga teie Aadress malli {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,New Account
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {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.,Raamatupidamise kanded saab teha peale tipud. Sissekanded vastu grupid ei ole lubatud.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Opportunity,Maintenance,Hooldus
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ostutšekk number vajalik Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},Ostutšekk number vajalik Punkt {0}
 DocType: Item Attribute Value,Item Attribute Value,Punkt omadus Value
 apps/erpnext/erpnext/config/crm.py +84,Sales campaigns.,Müügikampaaniad.
 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.
@@ -645,17 +659,17 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Kuluhüvitussüsteeme Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Vaikimisi seaded Ostukorv
-apps/erpnext/erpnext/controllers/accounts_controller.py +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Päevikusissekanne {0} on seotud vastu Tellimus {1}, siis kontrollige, kas tuleb tõmmata nii eelnevalt antud arve."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Päevikusissekanne {0} on seotud vastu Tellimus {1}, siis kontrollige, kas tuleb tõmmata nii eelnevalt antud arve."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnoloogia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Büroo ülalpidamiskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Büroo ülalpidamiskulud
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Palun sisestage Punkt esimene
 DocType: Account,Liability,Vastutus
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
 DocType: Company,Default Cost of Goods Sold Account,Vaikimisi müüdud toodangu kulu konto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Hinnakiri ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Process Payroll,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei Luba
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Esemed kõrgema weightage kuvatakse kõrgem
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank leppimise Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +666,My Invoices,Minu arved
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Minu arved
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ükski töötaja leitud
 DocType: Supplier Quotation,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Laadi laoseisu kaudu csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Saada nüüd
 ,Support Analytics,Toetus Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Loogikaviga: tuleb leida kattuvad
 DocType: Item,Website Warehouse,Koduleht Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimaalne Arve summa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score peab olema väiksem või võrdne 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form arvestust
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form arvestust
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kliendi ja tarnija
 DocType: Email Digest,Email Digest Settings,Email Digest Seaded
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Toetus päringud klientidelt.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
 DocType: Newsletter,Newsletter Manager,Uudiskiri Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Avamine&quot;
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
 DocType: Expense Claim,Expenses,Kulud
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Alltöödena
 DocType: Item Attribute,Item Attribute Values,Punkt atribuudi väärtusi
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Vaata Tellijaid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Ostutšekk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Ostutšekk
 ,Received Items To Be Billed,Saadud objekte arve
 DocType: Employee,Ms,Prl
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Valuuta vahetuskursi kapten.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Valuuta vahetuskursi kapten.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Müük Partnerid ja territoorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Bom {0} peab olema aktiivne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Bom {0} peab olema aktiivne
+DocType: Journal Entry,Depreciation Entry,Põhivara Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Palun valige dokumendi tüüp esimene
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Mine ostukorvi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Tühista Material Külastusi {0} enne tühistades selle Hooldus Külasta
@@ -762,7 +779,7 @@
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Features Setup,Item Barcode,Punkt Triipkood
-apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
 DocType: Address,Shop,Kauplus
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,Alaline aadress
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation lõpule mitu valmistoodang?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Brand
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Ebatõenäoliselt üle- {0} ületati Punkt {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Ebatõenäoliselt üle- {0} ületati Punkt {1}.
 DocType: Employee,Exit Interview Details,Exit Intervjuu Üksikasjad
 DocType: Item,Is Purchase Item,Kas Ostu toode
-DocType: Journal Entry Account,Purchase Invoice,Ostuarve
+DocType: Asset,Purchase Invoice,Ostuarve
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Ei
 DocType: Stock Entry,Total Outgoing Value,Kokku Väljuv Value
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Avamine ja lõpu kuupäev peaks jääma sama Fiscal Year
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Ooteaeg kuupäev
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Palun täpsustage Serial No Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
 DocType: Job Opening,Publish on website,Avaldab kodulehel
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Saadetised klientidele.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
 DocType: Purchase Invoice Item,Purchase Order Item,Ostu Telli toode
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Kaudne tulu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Kaudne tulu
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Määra Makse summa = tasumata summa
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Dispersioon
 ,Company Name,firma nimi
 DocType: SMS Center,Total Message(s),Kokku Sõnum (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Vali toode for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Täiendav allahindlusprotsendi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vaata nimekirja kõigi abiga videod
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Select konto juht pank, kus check anti hoiule."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Luba kasutajal muuta hinnakirja hind tehingutes
 DocType: Pricing Rule,Max Qty,Max Kogus
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rida {0}: Arve {1} on kehtetu, siis võib tühistada / ei eksisteeri. \ Palun sisesta korrektne arve"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: tasumises Müük / Ostutellimuse peaks alati olema märgistatud varem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Keemilised
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ärge saatke Töötaja Sünnipäev meeldetuletused
 ,Employee Holiday Attendance,Töötaja Holiday osavõtt
 DocType: Opportunity,Walk In,Sisse astuma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock kanded
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock kanded
 DocType: Item,Inspection Criteria,Inspekteerimiskriteeriumitele
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Siirdus
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Valge
 DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
 DocType: Purchase Invoice,Get Advances Paid,Saa makstud ettemaksed
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Tee
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Tee
 DocType: Journal Entry,Total Amount in Words,Kokku summa sõnadega
 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.,"Seal oli viga. Üks tõenäoline põhjus võib olla, et sa ei ole salvestatud kujul. Palun võtke ühendust support@erpnext.com kui probleem ei lahene."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Minu ostukorv
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Kuluhüvitussüsteeme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},Kogus eest {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Kas te tõesti soovite taastada seda lammutatakse vara?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Kogus eest {0}
 DocType: Leave Application,Leave Application,Jäta ostusoov
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Jäta jaotamine Tool
 DocType: Leave Block List,Leave Block List Dates,Jäta Block loetelu kuupäevad
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Raha / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei tohi olla negatiivne
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Soodus
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Ostutšekk toode
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveeritud Warehouse Sales Order / valmistoodang Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Müügi summa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Aeg kajakad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Aeg kajakad
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Olete kulul Approver selle kirje. Palun uuendage &quot;Status&quot; ja Save
 DocType: Serial No,Creation Document No,Loomise dokument nr
 DocType: Issue,Issue,Probleem
+DocType: Asset,Scrapped,lammutatakse
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto ei ühti Company
 apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.","Atribuudid Punkt variandid. näiteks suuruse, värvi jne"
 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 +181,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,värbamine
 DocType: BOM Operation,Operation,Operation
 DocType: Lead,Organization Name,Organisatsiooni nimi
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Müügikulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Müügikulud
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard ostmine
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date saa olla väiksem kui alguskuupäev
 DocType: Sales Person,Select company name first.,Vali firma nimi esimesena.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,uuendatud kaudu Time Palgid
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskmine vanus
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Vaikimisi Valuuta
 DocType: Contact,Enter designation of this Contact,Sisesta määramise see Kontakt
 DocType: Expense Claim,From Employee,Tööalasest
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
 DocType: Journal Entry,Make Difference Entry,Tee Difference Entry
 DocType: Upload Attendance,Attendance From Date,Osavõtt From kuupäev
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
@@ -900,7 +922,7 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja aasta:
 DocType: Email Digest,Annual Expense,Aastane Expense
 DocType: SMS Center,Total Characters,Kokku Lõbu
-apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Palun valige Bom Bom valdkonnas Punkt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},Palun valige Bom Bom valdkonnas Punkt {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Arve Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Makse leppimise Arve
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Panus%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Tootmine Tellimus {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vali aeg kajakad ja esitab loo uus müügiarve.
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projektikoostööd Kutse
 DocType: Salary Slip,Deductions,Mahaarvamised
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,See aeg Logi Partii on tasulised.
 DocType: Salary Slip,Leave Without Pay,Palgata puhkust
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning viga
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacity Planning viga
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Tulu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Lõppenud Punkt {0} tuleb sisestada Tootmine tüübist kirje
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Avamine Raamatupidamine Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Müügiarve Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Midagi nõuda
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Midagi nõuda
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Tegelik Start Date&quot; ei saa olla suurem kui &quot;Tegelik End Date&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Juhtimine
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Tüübid tegevusi Ajatabelid
@@ -935,18 +958,18 @@
 DocType: Purchase Invoice,Is Return,Kas Tagasi
 DocType: Price List Country,Price List Country,Hinnakiri Riik
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Lisaks sõlmed saab ainult loodud töörühm tüüpi sõlmed
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Palun määra Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Palun määra Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kood ei saa muuta 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} on juba loodud kasutaja: {1} ja ettevõtete {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Tarnija andmebaasis.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tarnija andmebaasis.
 DocType: Account,Balance Sheet,Eelarve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Teie müügi isik saab meeldetuletus sellest kuupäevast ühendust kliendi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Maksu- ja teiste palk mahaarvamisi.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Võlad
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Puhkus
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Jäta tühjaks, kui arvestada kõigis valdkondades"
 ,Daily Time Log Summary,Daily aeg Logi kokkuvõte
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-vormi ei kehti Arve: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Makse andmed
 DocType: Global Defaults,Current Fiscal Year,Jooksva eelarveaasta
 DocType: Global Defaults,Disable Rounded Total,Keela Ümardatud kokku
@@ -973,19 +997,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Teadustöö
 DocType: Maintenance Visit Purpose,Work Done,Töö
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Palun täpsustage vähemalt üks atribuut atribuudid tabelis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
 DocType: Contact,User ID,kasutaja ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Vaata Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Vaata Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 DocType: Production Order,Manufacture against Sales Order,Tootmine vastu Sales Order
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +412,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 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,"Dividende,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,"Dividende,"
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Raamatupidamine Ledger
 DocType: Stock Reconciliation,Difference Amount,Erinevus summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Jaotamata tulem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Jaotamata tulem
 DocType: BOM Item,Item Description,Toote kirjeldus
 DocType: Payment Tool,Payment Mode,Makserežiim
 DocType: Purchase Invoice,Is Recurring,Kas Korduvad
@@ -993,7 +1018,7 @@
 DocType: Production Order,Qty To Manufacture,Kogus toota
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Säilitada samas tempos kogu ostutsükkel
 DocType: Opportunity Item,Opportunity Item,Opportunity toode
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ajutine avamine
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Ajutine avamine
 ,Employee Leave Balance,Töötaja Jäta Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Balance Konto {0} peab alati olema {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Tasumata arved kokkuvõte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Väike
@@ -1017,7 +1042,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
 ,Invoiced Amount (Exculsive Tax),Arve kogusumma (Exculsive Maksu-)
 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 pea {0} loodud
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Konto pea {0} loodud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Green
 DocType: Item,Auto re-order,Auto ümber korraldada
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kokku Saavutatud
@@ -1025,12 +1050,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Leping
 DocType: Email Digest,Add Quote,Lisa Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tegur vajalik UOM: {0} punktis: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Kaudsed kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Kaudsed kulud
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Kogus on kohustuslikuks
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Põllumajandus
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Oma tooteid või teenuseid
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
 DocType: Journal Entry Account,Purchase Order,Ostutellimuse
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,Serial No Üksikasjad
 DocType: Purchase Invoice Item,Item Tax Rate,Punkt Maksumäär
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital seadmed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
 DocType: Hub Settings,Seller Website,Müüja Koduleht
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Tootmine Tellimuse staatus on {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Tootmine Tellimuse staatus on {0}
 DocType: Appraisal Goal,Goal,Eesmärk
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Oodatud Toimetaja kuupäev on väiksem kui kavandatav alguskuupäev.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Tarnija
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Oodatud Toimetaja kuupäev on väiksem kui kavandatav alguskuupäev.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Tarnija
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setting Konto tüüp aitab valides selle konto tehingud.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (firma Valuuta)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Ei leidnud ühtegi objekti nimega {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Kokku Väljuv
 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""",Seal saab olla ainult üks kohaletoimetamine Reegel seisukord 0 või tühi väärtus &quot;Value&quot;
 DocType: Authorization Rule,Transaction,Tehing
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Koduleht Punkt Groups
 DocType: Purchase Invoice,Total (Company Currency),Kokku (firma Valuuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
-DocType: Journal Entry,Journal Entry,Päevikusissekanne
+DocType: Depreciation Schedule,Journal Entry,Päevikusissekanne
 DocType: Workstation,Workstation Name,Workstation nimi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,See on mitmeid viimase loodud tehingu seda prefiksit
@@ -1072,6 +1098,7 @@
 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'","Kokku {0} ja kõik esemed on null, võib teil peaks muutuma &quot;Jaota põhinevad maksud&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Maksude ja tasude arvutamine
 DocType: BOM Operation,Workstation,Workstation
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Hinnapäring Tarnija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Riistvara
 DocType: Sales Order,Recurring Upto,korduvad Upto
 DocType: Attendance,HR Manager,personalijuht
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Hinnang Mall Goal
 DocType: Salary Slip,Earning,Tulu
 DocType: Payment Tool,Party Account Currency,Partei konto Valuuta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Praegune väärtus pärast kulum peab olema väiksem kui võrdne {0}
 ,BOM Browser,Bom Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Lisa või Lahutada
 DocType: Company,If Yearly Budget Exceeded (for expense account),Kui aastaeelarve ületatud (eest kulu konto)
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuuta sulgemise tuleb arvesse {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa võrra kõik eesmärgid peaksid olema 100. On {0}
 DocType: Project,Start and End Dates,Algus- ja lõppkuupäev
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operations ei saa tühjaks jätta.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,Operations ei saa tühjaks jätta.
 ,Delivered Items To Be Billed,Tarnitakse punkte arve
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Ladu ei saa muuta Serial No.
 DocType: Authorization Rule,Average Discount,Keskmine Soodus
 DocType: Address,Utilities,Kommunaalteenused
 DocType: Purchase Invoice Item,Accounting,Raamatupidamine
 DocType: Features Setup,Features Setup,Omadused Setup
+DocType: Asset,Depreciation Schedules,Kulumi
 DocType: Item,Is Service Item,Kas Service toode
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
 DocType: Payment Request,Transaction Currency,tehing Valuuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Siit {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Siit {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Tööpõhimõte
 DocType: Item,Will also apply to variants,Kohaldatakse ka variandid
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ei saa muuta Fiscal Year Alguse kuupäev ja Fiscal Year End Date kui majandusaasta on salvestatud.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ei saa muuta Fiscal Year Alguse kuupäev ja Fiscal Year End Date kui majandusaasta on salvestatud.
 DocType: Quotation,Shopping Cart,Ostukorv
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Keskm Daily Väljuv
 DocType: Pricing Rule,Campaign,Kampaania
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock kanded juba loodud Production Telli
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Net Change põhivarade
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt 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,Siit Date
 DocType: Email Digest,For Company,Sest Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Side log.
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,Kohaletoimetamine Aadress Nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ei saa olla üle 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Oleneb palgata puhkust
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,Töötaja ei saa aru ise.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, kanded on lubatud piiratud kasutajatele."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,No aktiivne Palgastruktuur leitud töötaja {0} ja kuu
 DocType: Job Opening,"Job profile, qualifications required etc.","Ametijuhendite, nõutav kvalifikatsioon jms"
 DocType: Journal Entry Account,Account Balance,Kontojääk
-apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,Maksu- reegli tehingud.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Maksu- reegli tehingud.
 DocType: Rename Tool,Type of document to rename.,Dokumendi liik ümber.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Ostame see toode
 DocType: Address,Billing,Arved
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Näidud
 DocType: Stock Entry,Total Additional Costs,Kokku Lisakulud
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assemblies
+DocType: Asset,Asset Name,Asset Nimi
 DocType: Shipping Rule Condition,To Value,Hindama
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Pakkesedel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office rent
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Pakkesedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Office rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS gateway seaded
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Hinnapäring võib olla juurdepääs klõpsates järgmist linki
+DocType: Asset,Number of Months in a Period,Kuude arv perioodi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ebaõnnestus!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No aadress lisatakse veel.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation töötunni
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valitsus
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Punkt variandid
 DocType: Company,Services,Teenused
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Kokku ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Kokku ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost Center
 DocType: Sales Invoice,Source,Allikas
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Näita suletud
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Salvestusi ei leitud Makseinfo tabelis
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Financial alguskuupäev
 DocType: Employee External Work History,Total Experience,Kokku Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakkesedel (s) tühistati
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Rahavood investeerimistegevusest
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude
 DocType: Item Group,Item Group Name,Punkt Group Nimi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Võtnud
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Transfer Materjalid Tootmine
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer Materjalid Tootmine
 DocType: Pricing Rule,For Price List,Sest hinnakiri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Ostu määr kirje: {0} ei leitud, mis on vajalik, et broneerida raamatupidamiskirjendi (kulu). Palume mainida toode Hind vastu ostu hinnakirjale."
@@ -1212,7 +1245,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Ei
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Täiendav Allahindluse summa (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Palun uusi konto kontoplaani.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Hooldus Külasta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Hooldus Külasta
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Saadaval Partii Kogus lattu
 DocType: Time Log Batch Detail,Time Log Batch Detail,Aeg Logi Partii Detail
 DocType: Landed Cost Voucher,Landed Cost Help,Maandus Cost Abi
@@ -1226,7 +1259,6 @@
 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.,See tööriist aitab teil värskendada või määrata koguse ja väärtuse hindamine varude süsteemi. See on tavaliselt kasutatakse sünkroonida süsteemi väärtused ja mida tegelikult olemas oma laod.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Sõnades on nähtav, kui salvestate saateleht."
 apps/erpnext/erpnext/config/stock.py +196,Brand master.,Brand kapten.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
 DocType: Sales Invoice Item,Brand Name,Brändi nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Üksikasjad
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Box
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lugemine 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Nõuded firma kulul.
 DocType: Company,Default Holiday List,Vaikimisi Holiday nimekiri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Kohustused
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Kohustused
 DocType: Purchase Receipt,Supplier Warehouse,Tarnija Warehouse
 DocType: Opportunity,Contact Mobile No,Võta Mobiilne pole
 ,Material Requests for which Supplier Quotations are not created,"Materjal taotlused, mis Tarnija tsitaadid ei ole loodud"
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Teised aruanded
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vaata
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Net muutus Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Palgastruktuur mahaarvamine
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Eelmisel majandusaastal ei ole suletud
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vanus (päevad)
 DocType: Quotation Item,Quotation Item,Tsitaat toode
 DocType: Account,Account Name,Kasutaja nimi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Siit kuupäev ei saa olla suurem kui kuupäev
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial nr {0} kogust {1} ei saa olla vaid murdosa
-apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,Tarnija Type kapten.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tarnija Type kapten.
 DocType: Purchase Order Item,Supplier Part Number,Tarnija osa number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Ümberarvestuskursi ei saa olla 0 või 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Ümberarvestuskursi ei saa olla 0 või 1
 DocType: Purchase Invoice,Reference Document,ViitedokumenDI
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1} on tühistatud või peatatud
 DocType: Accounts Settings,Credit Controller,Krediidi Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Sõidukite Dispatch Date
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Ostutšekk {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,Ostutšekk {0} ei ole esitatud
 DocType: Company,Default Payable Account,Vaikimisi on tasulised konto
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Seaded online ostukorv nagu laevandus reeglid, hinnakirja jm"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Maksustatakse
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Seaded online ostukorv nagu laevandus reeglid, hinnakirja jm"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{0}% Billed,{0}% Maksustatakse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Kogus
 DocType: Party Account,Party Account,Partei konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Inimressursid
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Net Change kreditoorse võlgnevuse
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Palun kontrollige oma e-posti id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kliendi vaja &quot;Customerwise Discount&quot;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Uuenda panga maksepäeva ajakirjadega.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Uuenda panga maksepäeva ajakirjadega.
 DocType: Quotation,Term Details,Term Details
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} peab olema suurem kui 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Maht planeerimist (päevad)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ükski esemed on mingeid muutusi kogus või väärtus.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantiinõudest
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,püsiaadress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Ettemaks, vastase {0} {1} ei saa olla suurem \ kui Grand Total {2}"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Palun valige objekti kood
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Palun valige objekti kood
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Vähendada mahaarvamine eest palgata puhkust (LWP)
 DocType: Territory,Territory Manager,Territoorium Manager
 DocType: Packed Item,To Warehouse (Optional),Et Warehouse (valikuline)
@@ -1343,15 +1377,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Oksjonid
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Palun täpsustage kas Kogus või Hindamine Rate või nii
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Ettevõte, Kuu ja majandusaasta on kohustuslik"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Turundus kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
 apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,Single üksuse objekt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Aeg Logi Partii {0} tuleb &quot;Esitatud&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',Aeg Logi Partii {0} tuleb &quot;Esitatud&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tee Raamatupidamine kirje Iga varude liikumist
 DocType: Leave Allocation,Total Leaves Allocated,Kokku Lehed Eraldatud
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},Ladu nõutav Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Ladu nõutav Row No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,Palun sisesta kehtivad majandusaasta algus- ja lõppkuupäev
 DocType: Employee,Date Of Retirement,Kuupäev pensionile
 DocType: Upload Attendance,Get Template,Võta Mall
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},Partei tüüp ja partei on vajalik laekumata / maksmata konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Kui see toode on variandid, siis ei saa valida müügi korraldusi jms"
 DocType: Lead,Next Contact By,Järgmine kontakteeruda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
 DocType: Quotation,Order Type,Tellimus Type
 DocType: Purchase Invoice,Notification Email Address,Teavitamine e-posti aadress
 DocType: Payment Tool,Find Invoices to Match,Leia Arved Match
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
+DocType: Asset,Gross Purchase Amount,Gross ostusumma
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",nt &quot;XYZ National Bank&quot;
+DocType: Asset,Depreciation Method,Amortisatsioonimeetod
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,See sisaldab käibemaksu Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Kokku Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Ostukorv on lubatud
 DocType: Job Applicant,Applicant for a Job,Taotleja Töö
 DocType: Production Plan Material Request,Production Plan Material Request,Tootmise kava Materjal taotlus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,No Tootmistellimused loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No Tootmistellimused loodud
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,Salary Slip of employee {0} already created for this month,Palgatõend töötaja {0} on juba loodud sel kuul
 DocType: Stock Reconciliation,Reconciliation JSON,Leppimine JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Sales Invoice Item,Batch No,Partii ei
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Eraldatud summa
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kliendi Kood
 DocType: Stock Reconciliation,Stock Reconciliation,Stock leppimise
 DocType: Territory,Territory Name,Territoorium nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Taotleja tööd.
 DocType: Purchase Order Item,Warehouse and Reference,Lao- ja seletused
 DocType: Supplier,Statutory info and other general information about your Supplier,Kohustuslik info ja muud üldist infot oma Tarnija
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Aadressid
+apps/erpnext/erpnext/hooks.py +91,Addresses,Aadressid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,hindamisest
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Tingimuseks laevandus reegel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Punkt ei ole lubatud omada Production Order.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Punkt ei ole lubatud omada Production Order.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Netokaal selle paketi. (arvutatakse automaatselt summana netokaal punkte)
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Aeg kajakad tootmine.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Bom {0} tuleb esitada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Aeg Logi ülesannete.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Makse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Payment,Makse
 DocType: Production Order Operation,Actual Time and Cost,Tegelik aeg ja maksumus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materjal Request maksimaalselt {0} ei tehta Punkt {1} vastu Sales Order {2}
 DocType: Employee,Salutation,Tervitus
 DocType: Pricing Rule,Brand,Põletusmärk
 DocType: Item,Will also apply for variants,Kehtib ka variandid
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle esemed müümise ajal.
 DocType: Quotation Item,Actual Qty,Tegelik Kogus
 DocType: Sales Invoice Item,References,Viited
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Väärtus {0} jaoks Oskus {1} ei eksisteeri nimekirja kehtib Punkt atribuudi väärtusi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Punkt {0} ei ole seeriasertide toode
+DocType: Request for Quotation Supplier,Send Email to Supplier,Saada e Tarnija
 DocType: SMS Center,Create Receiver List,Loo vastuvõtja loetelu
 DocType: Packing Slip,To Package No.,Pakendada No.
 DocType: Production Planning Tool,Material Requests,Materjal taotlused
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Toimetaja Warehouse
 DocType: Stock Settings,Allowance Percent,Allahindlus protsent
 DocType: SMS Settings,Message Parameter,Sõnum Parameeter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Puu rahalist kuluallikad.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Puu rahalist kuluallikad.
 DocType: Serial No,Delivery Document No,Toimetaja dokument nr
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Võta esemed Ostutšekid
 DocType: Serial No,Creation Date,Loomise kuupäev
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Summa pakkuda
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Toode või teenus
 DocType: Naming Series,Current Value,Praegune väärtus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} loodud
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} loodud
 DocType: Delivery Note Item,Against Sales Order,Vastu Sales Order
 ,Serial No Status,Serial No staatus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Punkt tabelis ei tohi olla tühi
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",Row {0}: seadmiseks {1} perioodilisuse vahe alates ja siiani \ peab olema suurem või võrdne {2}
 DocType: Pricing Rule,Selling,Müük
 DocType: Employee,Salary Information,Palk Information
 DocType: Sales Person,Name and Employee ID,Nimi ja Töötaja ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Lõivud ja maksud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Lõivud ja maksud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Palun sisestage Viitekuupäev
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway konto ei ole seadistatud
 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} makse kanded ei saa filtreeritud {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel toode, mis kuvatakse Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Komplektis Kogus
-DocType: Production Order,Material Request Item,Materjal taotlus toode
+DocType: Request for Quotation Item,Material Request Item,Materjal taotlus toode
 apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,Tree of Punkt grupid.
 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,Kas ei viita rea number on suurem või võrdne praeguse rea number selle Charge tüübist
+DocType: Asset,Sold,müüdud
 ,Item-wise Purchase History,Punkt tark ost ajalugu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
 DocType: Account,Frozen,Külmunud
 ,Open Production Orders,Avatud Tootmistellimused
 DocType: Installation Note,Installation Time,Paigaldamine aeg
 DocType: Sales Invoice,Accounting Details,Raamatupidamine Üksikasjad
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Kustuta kõik tehingud selle firma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeeringud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
 DocType: Quality Inspection Reading,Acceptance Criteria,Vastuvõetavuse kriteeriumid
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
 DocType: Item Group,Show In Website,Show Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Group
@@ -1527,6 +1567,7 @@
 ,Qty to Order,Kogus tellida
 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","Kui soovite jälgida kaubamärk järgmised dokumendid saateleht, Opportunity, Materjal Hankelepingu punkt, ostutellimuse, ost Voucher, ostja laekumine, tsitaat, müügiarve, Product Bundle, Sales Order, Serial No"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantti diagramm kõik ülesanded.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,Töötajate Nimi
 DocType: Holiday List,Clear Table,Clear tabel
 DocType: Features Setup,Brands,Brands
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa kohaldada / tühistatud enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
 DocType: Activity Cost,Costing Rate,Ületaksid
 ,Customer Addresses And Contacts,Kliendi aadressid ja kontaktid
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Rida # {0}: vara on kohustuslik vastu põhivara objektile
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numeratsiooni seeria osavõtt Setup&gt; numbrite seeria
 DocType: Employee,Resignation Letter Date,Ametist kiri kuupäev
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Korrake Kliendi tulu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Paar
+DocType: Asset,Depreciation Schedule,amortiseerumise kava
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
 DocType: Maintenance Schedule Detail,Actual Date,Tegelik kuupäev
 DocType: Item,Has Batch No,Kas Partii ei
 DocType: Delivery Note,Excise Page Number,Aktsiisi Page Number
+DocType: Asset,Purchase Date,Ostu kuupäev
 DocType: Employee,Personal Details,Isiklikud detailid
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Palun määra &quot;Vara amortisatsioonikulu Center&quot; Company {0}
 ,Maintenance Schedules,Hooldusgraafikud
 ,Quotation Trends,Tsitaat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
 DocType: Shipping Rule Condition,Shipping Amount,Kohaletoimetamine summa
 ,Pending Amount,Kuni Summa
 DocType: Purchase Invoice Item,Conversion Factor,Tulemus Factor
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Kaasa Lepitatud kanded
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Jäta tühjaks, kui arvestada kõikide töötajate tüübid"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Jaota põhinevatest tasudest
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} peab olema tüübiga &quot;Põhivarade&quot; nagu Punkt {1} on varade kirje
 DocType: HR Settings,HR Settings,HR Seaded
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Kuluhüvitussüsteeme kinnituse ootel. Ainult Kulu Approver saab uuendada staatus.
 DocType: Purchase Invoice,Additional Discount Amount,Täiendav Allahindluse summa
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kokku Tegelik
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Ühik
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Palun täpsustage Company
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Palun täpsustage Company
 ,Customer Acquisition and Loyalty,Klientide võitmiseks ja lojaalsus
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Ladu, kus hoiad varu tagasi teemad"
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,Your financial year ends on,Teie majandusaasta lõpeb
 DocType: POS Profile,Price List,Hinnakiri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} on nüüd vaikimisi eelarveaastal. Palun värskendage brauserit muudatuse jõustumist.
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Kuluaruanded
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Kuluaruanded
 DocType: Issue,Support,Support
 ,BOM Search,Bom Otsing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Sulgemine (Opening + Summad)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide funktsioone, nagu Serial nr, POS jms"
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pärast Material taotlused on tõstatatud automaatselt vastavalt objekti ümber korraldada tasemel
-apps/erpnext/erpnext/controllers/accounts_controller.py +249,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Ümberarvutustegur on vaja järjest {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Kliirens kuupäev ei saa olla enne saabumist kuupäev järjest {0}
 DocType: Salary Slip,Deduction,Kinnipeetav
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
 DocType: Address Template,Address Template,Aadress Mall
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Palun sisestage Töötaja Id selle müügi isik
 DocType: Territory,Classification of Customers by region,Klientide liigitamine piirkonniti
 DocType: Project,% Tasks Completed,% Ülesanded Valminud
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Palun sisestage Production Punkt esimene
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Palun sisestage Production Punkt esimene
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Arvutatud Bank avaldus tasakaalu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,puudega kasutaja
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Tsitaat
 DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
 DocType: Quotation,Maintenance User,Hooldus Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kulude Uuendatud
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kulude Uuendatud
 DocType: Employee,Date of Birth,Sünniaeg
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR seaded
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Kogus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock kanded olemas vastu ladu {0}, seega sa ei saa uuesti määrata või muuta Warehouse"
 DocType: Appraisal,Calculate Total Score,Arvuta üldskoor
-DocType: Supplier Quotation,Manufacturing Manager,Tootmine Manager
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
+DocType: Request for Quotation,Manufacturing Manager,Tootmine Manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split saateleht pakendites.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Saadetised
 DocType: Purchase Order Item,To be delivered to customer,Et toimetatakse kliendile
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} ei kuulu ühtegi Warehouse
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Sõnades (firma Valuuta)
-DocType: Pricing Rule,Supplier,Tarnija
+DocType: Asset,Supplier,Tarnija
 DocType: C-Form,Quarter,Kvartal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Muud kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Muud kulud
 DocType: Global Defaults,Default Company,Vaikimisi Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Kulu või Difference konto on kohustuslik Punkt {0}, kuna see mõjutab üldist laos väärtus"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ei liigtasu jaoks Punkt {0} järjest {1} rohkem kui {2}. Et võimaldada tegelikust suuremad arved, palun seatud Laoseadistused"
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ei liigtasu jaoks Punkt {0} järjest {1} rohkem kui {2}. Et võimaldada tegelikust suuremad arved, palun seatud Laoseadistused"
 DocType: Employee,Bank Name,Panga nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,Kasutaja {0} on keelatud
@@ -1643,7 +1689,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Valige ettevõtte ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Jäta tühjaks, kui arvestada kõik osakonnad"
 apps/erpnext/erpnext/config/hr.py +175,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
 DocType: Currency Exchange,From Currency,Siit Valuuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Palun valige eraldatud summa, arve liik ja arve number atleast üks rida"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Sales Order vaja Punkt {0}
@@ -1653,11 +1699,11 @@
 DocType: POS Profile,Taxes and Charges,Maksud ja tasud
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Toode või teenus, mida osta, müüa või hoida laos."
 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 saa valida tasuta tüübiks &quot;On eelmise rea summa&quot; või &quot;On eelmise rea kokku&quot; esimese rea
+apps/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Rida # {0}: Kogus peab olema 1, kui objekt on seotud vara"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapse toode ei tohiks olla Toote Bundle. Palun eemalda kirje `{0}` ja säästa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Pangandus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Palun kliki &quot;Loo Ajakava&quot; saada ajakava
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,New Cost Center
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Mine sobiv grupp (tavaliselt ollarahastamisel&gt; lühiajalised kohustused&gt; maksude ja lõivude ning luua uus konto (klõpsates Lisa Child) tüüpi &quot;Tax&quot; ja teha rääkimata maksumäär.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,New Cost Center
 DocType: Bin,Ordered Quantity,Tellitud Kogus
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",nt &quot;Ehita vahendid ehitajad&quot;
 DocType: Quality Inspection,In Process,Teoksil olev
@@ -1670,10 +1716,11 @@
 DocType: Activity Type,Default Billing Rate,Vaikimisi Arved Rate
 DocType: Time Log Batch,Total Billing Amount,Arve summa
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Nõue konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Sales Order maksmine
 DocType: Expense Claim Detail,Expense Claim Detail,Kuluhüvitussüsteeme Detail
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Aeg Logid loodud:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Aeg Logid loodud:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Palun valige õige konto
 DocType: Item,Weight UOM,Kaal UOM
 DocType: Employee,Blood Group,Veregrupp
@@ -1691,13 +1738,13 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Kui olete loonud standard malli Müük maksud ja tasud Mall, valige neist üks ja klõpsa nuppu allpool."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Palun täpsustage riik seda kohaletoimetamine eeskirja või vaadake Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Kanne on vajalik
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
 DocType: Offer Letter Term,Offer Term,Tähtajaline
 DocType: Quality Inspection,Quality Manager,Kvaliteedi juht
 DocType: Job Applicant,Job Opening,Vaba töökoht
 DocType: Payment Reconciliation,Payment Reconciliation,Makse leppimise
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Palun valige incharge isiku nimi
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Palun valige incharge isiku nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloogia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Paku kiri
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Loo Material taotlused (MRP) ja Tootmistellimused.
@@ -1705,22 +1752,22 @@
 DocType: Time Log,To Time,Et aeg
 DocType: Authorization Rule,Approving Role (above authorized value),Kinnitamine roll (üle lubatud väärtuse)
 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.","Lisada tütartippu uurida puude ja klõpsake sõlme, mille soovite lisada rohkem tippe."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Krediidi konto peab olema tasulised konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Krediidi konto peab olema tasulised konto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
 DocType: Production Order Operation,Completed Qty,Valminud Kogus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Sest {0}, ainult deebetkontode võib olla seotud teise vastu kreeditlausend"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Hinnakiri {0} on keelatud
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Hinnakiri {0} on keelatud
 DocType: Manufacturing Settings,Allow Overtime,Laske Ületunnitöö
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} seerianumbrid vajalik Eseme {1}. Sa andsid {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Praegune Hindamine Rate
 DocType: Item,Customer Item Codes,Kliendi Punkt Koodid
 DocType: Opportunity,Lost Reason,Kaotatud Reason
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Loo maksmine kanded vastu Tellimused või arved.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Loo maksmine kanded vastu Tellimused või arved.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,All items have already been invoiced,Kõik esemed on juba arve
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Palun täpsustage kehtiv &quot;From Juhtum nr&quot;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,Further cost centers can be made under Groups but entries can be made against non-Groups,"Lisaks kuluallikad on võimalik teha rühma all, kuid kanded saab teha peale mitte-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +303,Further cost centers can be made under Groups but entries can be made against non-Groups,"Lisaks kuluallikad on võimalik teha rühma all, kuid kanded saab teha peale mitte-Groups"
 DocType: Project,External,Väline
 DocType: Features Setup,Item Serial Nos,Punkt Serial nr
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kasutajad ja reeglid
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No palgatõend leitud kuus:
 DocType: Bin,Actual Quantity,Tegelik Kogus
 DocType: Shipping Rule,example: Next Day Shipping,Näiteks: Järgmine päev kohaletoimetamine
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Serial No {0} ei leitud
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} ei leitud
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Sinu kliendid
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
 DocType: Leave Block List Date,Block Date,Block kuupäev
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Rakendatakse kohe
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Rakendatakse kohe
 DocType: Sales Order,Not Delivered,Ei ole esitanud
 ,Bank Clearance Summary,Bank Kliirens kokkuvõte
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Tööhõive Üksikasjad
 DocType: Employee,New Workplace,New Töökoht
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Pane suletud
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},No Punkt Triipkood {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},No Punkt Triipkood {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa 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,Kui teil on meeskond ja müük Partners (Kanal Partnerid) neid saab kodeeritud ja säilitada oma panuse müügitegevus
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
@@ -1774,10 +1822,10 @@
 DocType: Rename Tool,Rename Tool,Nimeta Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Värskenda Cost
 DocType: Item Reorder,Item Reorder,Punkt Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Materjal
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Punkt {0} peab olema Sales toode on {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Palun määra korduvate pärast salvestamist
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
 DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -1791,12 +1839,13 @@
 DocType: Quality Inspection,Purchase Receipt No,Ostutšekk pole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
 DocType: Process Payroll,Create Salary Slip,Loo palgatõend
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Vahendite allika (Kohustused)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Source of Funds (Liabilities),Vahendite allika (Kohustused)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kogus järjest {0} ({1}) peab olema sama, mida toodetakse kogus {2}"
 DocType: Appraisal,Employee,Töötaja
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import e-posti
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Kutsu Kasutaja
 DocType: Features Setup,After Sale Installations,Pärast Müük seadmed
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Palun määra {0} Company {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} on täielikult arve
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Lepingu tüüptingimused Müük või ost.
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nõutav
 DocType: Sales Invoice,Mass Mailing,Masspostitust
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Tellimisnumber vaja Punkt {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Tellimisnumber vaja Punkt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Hoolduskava {0} tuleb tühistada enne tühistades selle Sales Order
 DocType: Notification Control,Expense Claim Approved,Kuluhüvitussüsteeme Kinnitatud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Osalemine kuupäev
 DocType: Warranty Claim,Raised By,Tõstatatud
 DocType: Payment Gateway Account,Payment Account,Maksekonto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Palun täpsustage Company edasi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Palun täpsustage Company edasi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Net muutus Arved
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Tasandusintress Off
 DocType: Quality Inspection Reading,Accepted,Lubatud
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Palun veendu, et sa tõesti tahad kustutada kõik tehingud selle firma. Teie kapten andmed jäävad, nagu see on. Seda toimingut ei saa tagasi võtta."
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Vale viite {0} {1}
 DocType: Payment Tool,Total Payment Amount,Makse kogusumma
-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 saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
 DocType: Shipping Rule,Shipping Rule Label,Kohaletoimetamine Reegel Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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'","Nagu on olemasolevate varude tehingute selle objekt, \ sa ei saa muuta väärtused &quot;Kas Serial No&quot;, &quot;Kas Partii ei&quot;, &quot;Kas Stock toode&quot; ja &quot;hindamismeetod&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +449,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
 DocType: Stock Entry,For Quantity,Sest Kogus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ei ole esitatud
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Taotlused esemeid.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Eraldi tootmise Selleks luuakse iga valmistoote hea objekt.
@@ -1851,7 +1900,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti staatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Vaata seda keelata fraktsioonid. (NOS)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Uudiskiri meililistiga
 DocType: Delivery Note,Transporter Name,Vedaja Nimi
 DocType: Authorization Rule,Authorized Value,Lubatud Value
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} on suletud
 DocType: Email Digest,How frequently?,Kui sageli?
 DocType: Purchase Receipt,Get Current Stock,Võta Laoseis
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Mine sobiv grupp (tavaliselt vahendite taotlemise&gt; Käibevarad&gt; Pangakontod ja luua uus konto (klõpsates Lisa Child) tüüpi &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark olevik
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
 DocType: Production Order,Actual End Date,Tegelik End Date
 DocType: Authorization Rule,Applicable To (Role),Suhtes kohaldatava (Role)
 DocType: Stock Entry,Purpose,Eesmärk
+DocType: Company,Fixed Asset Depreciation Settings,Põhivara kulum seaded
 DocType: Item,Will also apply for variants unless overrridden,"Kehtib ka variante, kui overrridden"
 DocType: Purchase Invoice,Advances,Edasiminek
 DocType: Production Order,Manufacture against Material Request,Tootmine vastu Materjal taotlus
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Ei taotletud SMS
 DocType: Campaign,Campaign-.####,Kampaania -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Järgmised sammud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Kolmas isik levitaja / edasimüüja / vahendaja / partner / edasimüüja, kes müüb ettevõtted tooted vahendustasu."
 DocType: Customer Group,Has Child Node,Kas Järglassõlme
@@ -1914,12 +1964,14 @@
 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 maksu mall, mida saab rakendada kõigi ostutehingute. See mall võib sisaldada nimekirja maksu juhid ja ka teiste kulul juhid nagu &quot;Shipping&quot;, &quot;Kindlustus&quot;, &quot;Handling&quot; jt #### Märkus maksumäär Siin määratud olla hariliku maksumäära kõigile ** Kirjed * *. Kui on ** Kirjed **, mis on erineva kiirusega, tuleb need lisada ka ** Oksjoni Maksu- ** tabeli ** Oksjoni ** kapten. #### Kirjeldus veerud arvutamine 1. tüüpi: - See võib olla ** Net Kokku ** (mis on summa põhisummast). - ** On eelmise rea kokku / Summa ** (kumulatiivse maksud või maksed). Kui valite selle funktsiooni, maksu rakendatakse protsentides eelmise rea (maksu tabel) summa või kokku. - ** Tegelik ** (nagu mainitud). 2. Konto Head: Konto pearaamatu, mille alusel see maks broneeritud 3. Kulude Center: Kui maks / lõiv on sissetulek (nagu laevandus) või kulutustega tuleb kirjendada Cost Center. 4. Kirjeldus: Kirjeldus maksu (mis trükitakse arved / jutumärkideta). 5. Hinda: Maksumäär. 6. Summa: Maksu- summa. 7. Kokku: Kumulatiivne kokku selles küsimuses. 8. Sisestage Row: Kui põhineb &quot;Eelmine Row Kokku&quot; saate valida rea number, mida võtta aluseks selle arvutamine (default on eelmise rea). 9. Mõtle maksu, et: Selles sektsioonis saab määrata, kui maks / lõiv on ainult hindamise (ei kuulu kokku) või ainult kokku (ei lisa väärtust kirje) või nii. 10. Lisa või Lahutada: Kas soovite lisada või maksu maha arvata."
 DocType: Purchase Receipt Item,Recd Quantity,KONTOLE Kogus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
+DocType: Asset Category Account,Asset Category Account,Põhivarakategoori konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash konto
 DocType: Tax Rule,Billing City,Arved City
 DocType: Global Defaults,Hide Currency Symbol,Peida Valuuta Sümbol
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","nt Bank, Raha, Krediitkaart"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","nt Bank, Raha, Krediitkaart"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Mine sobiv grupp (tavaliselt vahendite taotlemise&gt; Käibevarad&gt; Pangakontod ja luua uus konto (klõpsates Lisa Child) tüüpi &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Kreeditaviis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Valminud Kogus ei saa olla rohkem kui {0} tööks {1}
 DocType: Features Setup,Quality,Kvaliteet
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Minu aadressid
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisatsiooni haru meister.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,või
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,Utility kulud
 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,Vaikimisi ostmine hinnakiri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ükski töötaja eespool valitud kriteeriumid või palgatõend juba loodud
@@ -1972,7 +2024,7 @@
 DocType: Product Bundle,Parent Item,Eellaselement
 DocType: Account,Account Type,Konto tüüp
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Jäta tüüp {0} ei saa läbi-edasi
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
 ,To Produce,Toota
 apps/erpnext/erpnext/config/hr.py +93,Payroll,palgafond
 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","Juba rida {0} on {1}. Lisada {2} Punkti kiirus, rida {3} peab olema ka"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostutšekk Esemed
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Kohandamine vormid
 DocType: Account,Income Account,Tulukonto
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Vaike Aadress Mall leitud. Palun loo uus Setup&gt; Trükkimine ja Branding&gt; Aadress mall.
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,Delivery,Tarne
 DocType: Stock Reconciliation Item,Current Qty,Praegune Kogus
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vt &quot;määr materjalide põhjal&quot; on kuluarvestus jaos
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Kõik aadressid.
 DocType: Company,Stock Settings,Stock Seaded
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Hallata klientide Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,New Cost Center nimi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,New Cost Center nimi
 DocType: Leave Control Panel,Leave Control Panel,Jäta Control Panel
 DocType: Appraisal,HR User,HR Kasutaja
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
-apps/erpnext/erpnext/config/support.py +7,Issues,Issues
+apps/erpnext/erpnext/hooks.py +90,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status peab olema üks {0}
 DocType: Sales Invoice,Debit To,Kanne
 DocType: Delivery Note,Required only for sample item.,Vajalik ainult proovi objekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
 ,Pending SO Items For Purchase Request,Kuni SO Kirjed osta taotlusel
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Väga suur
 ,Profit and Loss Statement,Kasumiaruanne
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Võlgnikud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suur
 DocType: C-Form Invoice Detail,Territory,Territoorium
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,Palume mainida ei külastuste vaja
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Palume mainida ei külastuste vaja
 DocType: Stock Settings,Default Valuation Method,Vaikimisi hindamismeetod
 DocType: Production Order Operation,Planned Start Time,Planeeritud Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Sulge Bilanss ja raamatu kasum või kahjum.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Sulge Bilanss ja raamatu kasum või kahjum.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Täpsustada Vahetuskurss vahetada üks valuuta teise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Tsitaat {0} on tühistatud
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tasumata kogusumma
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Atleast üks element peab olema kantud negatiivse koguse vastutasuks 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} kauem kui ükski saadaval töötundide tööjaama {1}, murda operatsiooni mitmeks toimingud"
 ,Requested,Taotletud
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,No Märkused
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,No Märkused
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Tähtajaks tasumata
 DocType: Account,Stock Received But Not Billed,"Stock kätte saanud, kuid ei maksustata"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root Account must be a group,Juur tuleb arvesse rühm
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutopalgast + arrear summa + Inkassatsioon Summa - Kokku mahaarvamine
 DocType: Monthly Distribution,Distribution Name,Distribution nimi
 DocType: Features Setup,Sales and Purchase,Müük ja ost
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Põhivara objektile peab olema mitte-laoartikkel
 DocType: Supplier Quotation Item,Material Request No,Materjal taotlus pole
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hinda kus kliendi valuuta konverteeritakse ettevõtte baasvaluuta
@@ -2119,7 +2174,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Võta Vastavad kanded
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Sales Invoice,Sales Team1,Müük Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Punkt {0} ei ole olemas
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
 DocType: Payment Request,Recipient and Message,Saaja ja Message
 DocType: Purchase Invoice,Apply Additional Discount On,Rakendada täiendavaid soodustust
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Vali Tarnija Aadress
 DocType: Quality Inspection,Quality Inspection,Kvaliteedi kontroll
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Mikroskoopilises
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Konto {0} on külmutatud
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juriidilise isiku / tütarettevõtte eraldi kontoplaani kuuluv organisatsioon.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Tarkvara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Värv
 DocType: Maintenance Visit,Scheduled,Plaanitud
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Hinnapäring.
 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","Palun valige Punkt, kus &quot;Kas Stock Punkt&quot; on &quot;Ei&quot; ja &quot;Kas Sales Punkt&quot; on &quot;jah&quot; ja ei ole muud Toote Bundle"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vali Kuu jaotamine ebaühtlaselt jaotada eesmärkide üle kuu.
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Hinnakiri Valuuta ole valitud
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 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,Punkt Row {0}: ostutšekk {1} ei eksisteeri üle &quot;Ostutšekid&quot; tabelis
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti alguskuupäev
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Dokumentide vastu pole
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Manage Sales Partners.
 DocType: Quality Inspection,Inspection Type,Ülevaatus Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Palun valige {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Palun valige {0}
 DocType: C-Form,C-Form No,C-vorm pole
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Märkimata osavõtt
@@ -2183,6 +2239,7 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For mugavuse klientidele, neid koode saab kasutada print formaadid nagu arved ja Saatekirjad"
 DocType: Employee,You can enter any date manually,Saate sisestada mis tahes kuupäeva käsitsi
 DocType: Sales Invoice,Advertisement,Kuulutus
+DocType: Asset Category Account,Depreciation Expense Account,Amortisatsioonikulu konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Katseaeg
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Ainult tipud on lubatud tehingut
 DocType: Expense Claim,Expense Approver,Kulu Approver
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Kinnitatud
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; saab esitada
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sisesta nimi kampaania kui allikas uurimine on kampaania
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Aktsepteeritud Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Postitamise kuupäev
 DocType: Item,Valuation Method,Hindamismeetod
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Ei leia vahetuskursi {0} kuni {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Ei leia vahetuskursi {0} kuni {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Pool päeva
 DocType: Sales Invoice,Sales Team,Sales Team
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate kirje
 DocType: Serial No,Under Warranty,Garantii alla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Sõnades on nähtav, kui salvestate Sales Order."
 ,Employee Birthday,Töötaja Sünnipäev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Kliendi Warehouse (valikuline)
 DocType: Pricing Rule,Discount Percentage,Allahindlusprotsendi
 DocType: Payment Reconciliation Invoice,Invoice Number,Arve number
@@ -2247,14 +2305,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vali tehingu liik
 DocType: GL Entry,Voucher No,Voucher ei
 DocType: Leave Allocation,Leave Allocation,Jäta jaotamine
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materjal Taotlused {0} loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materjal Taotlused {0} loodud
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Mall terminite või leping.
 DocType: Purchase Invoice,Address and Contact,Aadress ja Kontakt
 DocType: Supplier,Last Day of the Next Month,Viimane päev järgmise kuu
 DocType: Employee,Feedback,Tagasiside
 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äta ei saa eraldada enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
+DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
+DocType: Asset,Expected Value After Useful Life,Oodatud väärtus pärast Kasulik Elu
 DocType: Item,Reorder level based on Warehouse,Reorder tasandil põhineb Warehouse
 DocType: Activity Cost,Billing Rate,Arved Rate
 ,Qty to Deliver,Kogus pakkuda
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} on tühistatud või suletud
 DocType: Delivery Note,Track this Delivery Note against any Project,Jälgi seda saateleht igasuguse Project
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Rahavood investeerimistegevusest
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root konto ei saa kustutada
 ,Is Primary Address,Kas esmane aadress
 DocType: Production Order,Work-in-Progress Warehouse,Lõpetamata Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} tuleb esitada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Viide # {0} dateeritud {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Manage aadressid
-DocType: Pricing Rule,Item Code,Asja kood
+DocType: Asset,Item Code,Asja kood
 DocType: Production Planning Tool,Create Production Orders,Loo Tootmistellimused
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
 DocType: Journal Entry,User Remark,Kasutaja Märkus
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Loo Material taotlused
 DocType: Employee Education,School/University,Kool / Ülikool
 DocType: Payment Request,Reference Details,Viide Üksikasjad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Saadaval Kogus lattu
 ,Billed Amount,Arve summa
+DocType: Asset,Double Declining Balance,Double Degressiivne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Suletud tellimust ei ole võimalik tühistada. Avanema tühistada.
 DocType: Bank Reconciliation,Bank Reconciliation,Bank leppimise
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Saada värskendusi
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +131,Purchase Order number required for Item {0},Ostutellimuse numbri vaja 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;From Date&quot; tuleb pärast &quot;To Date&quot;
+DocType: Asset,Fully Depreciated,täielikult amortiseerunud
 ,Stock Projected Qty,Stock Kavandatav Kogus
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Märkimisväärne osavõtt HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Järjekorra number ja partii
 DocType: Warranty Claim,From Company,Allikas: Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Väärtus või Kogus
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostu maksud ja tasud
 ,Qty to Receive,Kogus Receive
 DocType: Leave Block List,Leave Block List Allowed,Jäta Block loetelu Lubatud
 DocType: Sales Partner,Retailer,Jaemüüja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Kõik Tarnija liigid
 DocType: Global Defaults,Disable In Words,Keela sõnades
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kood on kohustuslik, sest toode ei ole automaatselt nummerdatud"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,Quotation {0} not of type {1},Tsitaat {0} ei tüübiga {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Hoolduskava toode
 DocType: Sales Order,%  Delivered,% Tarnitakse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank arvelduskrediidi kontot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank arvelduskrediidi kontot
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Sirvi Bom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Tagatud laenud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Tagatud laenud
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Palun määra kulum seotud arvepidamise Põhivarakategoori {0} või ettevõtte {1}
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome tooted
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Algsaldo Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Algsaldo Equity
 DocType: Appraisal,Appraisal,Hinnang
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E saadetakse tarnija {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Allkirjaõiguslik
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
@@ -2344,7 +2410,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
 DocType: Workstation Working Hour,Start Time,Algusaeg
 DocType: Item Price,Bulk Import Help,Bulk Import Abi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Vali Kogus
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vali Kogus
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Kinnitamine roll ei saa olla sama rolli õigusriigi kohaldatakse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Lahku sellest Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sõnum saadetud
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,My Shipments,Minu Saadetised
 DocType: Journal Entry,Bill Date,Bill kuupäev
 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:","Isegi kui on mitu Hinnakujundusreeglid esmajärjekorras, siis järgmised sisemised prioriteedid on rakendatud:"
+DocType: Sales Invoice Item,Total Margin,Kogukasuminorm
 DocType: Supplier,Supplier Details,Tarnija Üksikasjad
 DocType: Expense Claim,Approval Status,Kinnitamine Staatus
 DocType: Hub Settings,Publish Items to Hub,Avalda tooteid Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kliendi Group / Klienditeenindus
 DocType: Payment Gateway Account,Default Payment Request Message,Vaikimisi maksenõudekäsule Message
 DocType: Item Group,Check this if you want to show in website,"Märgi see, kui soovid näha kodulehel"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Pank ja maksed
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Pank ja maksed
 ,Welcome to ERPNext,Tere tulemast ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail arv
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Viia Tsitaat
@@ -2393,17 +2460,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Kutsub
 DocType: Project,Total Costing Amount (via Time Logs),Kokku kuluarvestus summa (via aeg kajakad)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Ostutellimuse {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Ostutellimuse {0} ei ole esitatud
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Kavandatav
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} ei kuulu Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Märkus: Süsteem ei kontrolli üle-tarne ja üle-broneerimiseks Punkt {0}, kuna maht või kogus on 0"
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Märkus: Süsteem ei kontrolli üle-tarne ja üle-broneerimiseks Punkt {0}, kuna maht või kogus on 0"
 DocType: Notification Control,Quotation Message,Tsitaat Message
 DocType: Issue,Opening Date,Avamise kuupäev
 DocType: Journal Entry,Remark,Märkus
 DocType: Purchase Receipt Item,Rate and Amount,Määr ja summa
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lehed ja vaba
 DocType: Sales Order,Not Billed,Ei maksustata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No kontakte lisada veel.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Maandus Cost Voucher summa
 DocType: Time Log,Batched for Billing,Jaotatud Arved
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Päevikusissekanne konto
 DocType: Shopping Cart Settings,Quotation Series,Tsitaat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
+DocType: Company,Asset Depreciation Cost Center,Vara amortisatsioonikulu Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Tarnitakse Kogus
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Ladu {0}: Firma on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Ostu kuupäev vara {0} ei ühti ostuarve kuupäev
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Ladu {0}: Firma on kohustuslik
 ,Payment Period Based On Invoice Date,Makse kindlaksmääramisel tuginetakse Arve kuupäev
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Kadunud Valuutavahetus ALLAHINDLUSED {0}
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Maksmisele kuuluv
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Nõuded ({0})
-DocType: Project,Margin,varu
+DocType: Pricing Rule,Margin,varu
 DocType: Salary Slip,Arrear Amount,Arrear summa
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uutele klientidele
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brutokasum%
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Kliirens kuupäev
 DocType: Newsletter,Newsletter List,Uudiskiri loetelu
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontrollige, kas soovid saata palgatõend postis igale töötajale, samas esitades palgatõend"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
 DocType: Lead,Address Desc,Aadress otsimiseks
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast üks müümine või ostmine tuleb valida
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kus tootmistegevus viiakse.
 DocType: Stock Entry Detail,Source Warehouse,Allikas Warehouse
 DocType: Installation Note,Installation Date,Paigaldamise kuupäev
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
 DocType: Employee,Confirmation Date,Kinnitus kuupäev
 DocType: C-Form,Total Invoiced Amount,Kokku Arve kogusumma
 DocType: Account,Sales User,Müük Kasutaja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Kogus ei saa olla suurem kui Max Kogus
+DocType: Account,Accumulated Depreciation,akumuleeritud kulum
 DocType: Stock Entry,Customer or Supplier Details,Klienditeenindus ja tarnijate andmed
 DocType: Payment Request,Email To,Saada
 DocType: Lead,Lead Owner,Plii Omanik
 DocType: Bin,Requested Quantity,taotletud Kogus
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Ladu on vajalik
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Ladu on vajalik
 DocType: Employee,Marital Status,Perekonnaseis
 DocType: Stock Settings,Auto Material Request,Auto Material taotlus
 DocType: Time Log,Will be updated when billed.,"Uuendatakse, kui arve."
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Praegune BOM ja Uus BOM saa olla samad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
 DocType: Sales Invoice,Against Income Account,Sissetuleku konto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Tarnitakse
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Tarnitakse
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
 DocType: Territory,Territory Targets,Territoorium Eesmärgid
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Sama tarnija on sisestatud mitu korda
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ostutellimuse tooteühiku
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,Firma nimi ei saa olla ettevõte
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kiri Heads print malle.
@@ -2470,13 +2543,14 @@
 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.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 DocType: Payment Request,Payment Details,Makse andmed
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
+DocType: Asset,Journal Entry for Scrap,Päevikusissekanne Vanametalli
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Palun tõmmake esemed Saateleht
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Päevikukirjed {0} on un-seotud
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Record kogu suhtlust tüüpi e-posti, telefoni, chat, külastada jms"
 DocType: Manufacturer,Manufacturers used in Items,Tootjad kasutada Esemed
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Palume mainida ümardada Cost Center Company
 DocType: Purchase Invoice,Terms,Tingimused
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Loo uus
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Loo uus
 DocType: Buying Settings,Purchase Order Required,Ostutellimuse Nõutav
 ,Item-wise Sales History,Punkt tark Sales ajalugu
 DocType: Expense Claim,Total Sanctioned Amount,Kokku Sanctioned summa
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Laožurnaal
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Hinda: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Palgatõend mahaarvamine
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Vali rühm sõlme esimene.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Vali rühm sõlme esimene.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Töötaja ja osavõtt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Eesmärk peab olema üks {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eemalda viide kliendi, tarnija, müük partner ja pliid, sest see on teie ettevõte aadress"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: From {1}
 DocType: Task,depends_on,oleneb
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Soodus Fields valmib Ostutellimuse, ostutšekk, ostuarve"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uue konto. Märkus: Palun ärge kontosid luua klientide ja hankijate
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uue konto. Märkus: Palun ärge kontosid luua klientide ja hankijate
 DocType: BOM Replace Tool,BOM Replace Tool,Bom Vahetage Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Riik tark default Aadress Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Järgmine kuupäev peab olema suurem kui Postitamise kuupäev
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Näita maksu break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# vorm / Punkt / {0}) on otsas
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Järgmine kuupäev peab olema suurem kui Postitamise kuupäev
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/accounts/party.py +289,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Kui teil kaasata tootmistegevus. Võimaldab Punkt &quot;toodetakse&quot;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Arve Postitamise kuupäev
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (mitte kliendi või hankija) kapten.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Palun sisestage &quot;Oodatud Toimetaja Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Saatekirjad {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui Grand Total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} ei ole kehtiv Partii number jaoks Punkt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {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.","Märkus: Kui makset ei tehta vastu mingit viidet, et päevikusissekanne käsitsi."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Avalda saadavust
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Saada automaatne kirju Kontaktid esitamine tehinguid.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Klienditeenindus Kontakt E-
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
 DocType: Sales Team,Contribution (%),Panus (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Vastutus
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,Šabloon
 DocType: Sales Person,Sales Person Name,Sales Person Nimi
@@ -2566,7 +2641,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Kokku Deebetkaart peab olema võrdne Kokku Credit. Erinevus on {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autod
+DocType: Asset Category Account,Fixed Asset Account,Põhivarade konto
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Siit Saateleht
 DocType: Time Log,From Time,Time
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investeerimispanganduse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Raha või pangakonto on kohustuslik makstes kirje
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Cash or Bank Account is mandatory for making payment entry,Raha või pangakonto on kohustuslik makstes kirje
 DocType: Purchase Invoice,Price List Exchange Rate,Hinnakiri Vahetuskurss
 DocType: Purchase Invoice Item,Rate,Määr
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,Siit Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Põhiline
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Stock tehingud enne {0} on külmutatud
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Palun kliki &quot;Loo Ajakava&quot;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Palun kliki &quot;Loo Ajakava&quot;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Kuupäev peaks olema sama From Kuupäev Pool päeva puhkust
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","nt kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Palgastruktuur
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Lennukompanii
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Väljaanne Material
 DocType: Material Request Item,For Warehouse,Sest Warehouse
 DocType: Employee,Offer Date,Pakkuda kuupäev
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tsitaadid
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Seerianumber
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Palun sisestage Maintaince Detailid esimene
-DocType: Item,Is Fixed Asset Item,Kas põhivara objektile
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Palun sisestage Maintaince Detailid esimene
 DocType: Purchase Invoice,Print Language,Prindi keel
 DocType: Stock Entry,Including items for sub assemblies,Sealhulgas esemed sub komplektid
 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","Kui teil on pikad printimisformaadid, seda funktsiooni saab kasutada jagada leht trükitakse mitu lehekülge kõik päised ja jalused igal leheküljel"
+DocType: Asset,Number of Depreciations,Arv Amortisatsiooniaruanne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Kõik aladel
 DocType: Purchase Invoice,Items,Esemed
 DocType: Fiscal Year,Year Name,Aasta nimi
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Seal on rohkem puhkuse kui tööpäeva sel kuul.
 DocType: Product Bundle Item,Product Bundle Item,Toote Bundle toode
 DocType: Sales Partner,Sales Partner Name,Müük Partner nimi
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Taotlus tsitaadid
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimaalne Arve summa
 DocType: Purchase Invoice Item,Image View,Pilt Vaata
 apps/erpnext/erpnext/config/selling.py +23,Customers,kliendid
+DocType: Asset,Partially Depreciated,osaliselt Amortiseerunud
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Hindamine ja kokku
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Hooldus Manager
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kokku ei saa olla null
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Päeva eelmisest Order&quot; peab olema suurem või võrdne nulliga
-DocType: C-Form,Amended From,Muudetud From
+DocType: Asset,Amended From,Muudetud From
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Toormaterjal
 DocType: Leave Application,Follow via Email,Järgige e-posti teel
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Maksusumma Pärast Allahindluse summa
-apps/erpnext/erpnext/accounts/doctype/account/account.py +198,Child account exists for this account. You can not delete this account.,Lapse konto olemas selle konto. Sa ei saa selle konto kustutada.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Child account exists for this account. You can not delete this account.,Lapse konto olemas selle konto. Sa ei saa selle konto kustutada.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Kas eesmärk Kogus või Sihtsummaks on kohustuslik
-apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
 DocType: Leave Control Panel,Carry Forward,Kanda
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Attach Letterhead,Kinnita Letterhead
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"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.","Nimekiri oma maksu juhid (nt käibemaksu, tolli jne, nad peaksid olema unikaalsed nimed) ja nende ühtsed määrad. See loob standard malli, mida saab muuta ja lisada hiljem."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Palume mainida &quot;kasum / kahjum konto kohta varade realiseerimine&quot; seltskonnas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial nr Nõutav SERIALIZED Punkt {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Maksed arvetega
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Maksed arvetega
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Suhtes kohaldatava (määramine)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Lisa ostukorvi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Võimalda / blokeeri valuutades.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Võimalda / blokeeri valuutades.
 DocType: Production Planning Tool,Get Material Request,Saada Materjal taotlus
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postikulude
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Postikulude
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kokku (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Meelelahutus ja vaba aeg
 DocType: Quality Inspection,Item Serial No,Punkt Järjekorranumber
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} tuleb vähendada {1} või sa peaks suurendama ülevoolu sallivus
+apps/erpnext/erpnext/controllers/status_updater.py +145,{0} must be reduced by {1} or you should increase overflow tolerance,{0} tuleb vähendada {1} või sa peaks suurendama ülevoolu sallivus
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Kokku olevik
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,raamatupidamise aastaaruanne
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,raamatupidamise aastaaruanne
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Tund
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",SERIALIZED Punkt {0} ei saa uuendada \ kasutades Stock leppimise
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Arved
 DocType: Job Opening,Job Title,Töö nimetus
 DocType: Features Setup,Item Groups in Details,Punkt Grupid Üksikasjad
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
 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 +32,Visit report for maintenance call.,Külasta aruande hooldus kõne.
 DocType: Stock Entry,Update Rate and Availability,Värskenduskiirus ja saadavust
 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.,"Osakaal teil on lubatud vastu võtta või pakkuda rohkem vastu tellitav kogus. Näiteks: Kui olete tellinud 100 ühikut. ja teie toetus on 10%, siis on lubatud saada 110 ühikut."
 DocType: Pricing Rule,Customer Group,Kliendi Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: Item,Website Description,Koduleht kirjeldus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Net omakapitali
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
 ,Sales Register,Müügiregister
 DocType: Quotation,Quotation Lost Reason,Tsitaat Lost Reason
@@ -2703,12 +2783,13 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei ole midagi muuta.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
 DocType: Customer Group,Customer Group Name,Kliendi Group Nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
 DocType: GL Entry,Against Voucher Type,Vastu Voucher Type
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Viga: {0}&gt; {1}
 DocType: Item,Attributes,Näitajad
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Võta Esemed
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Palun sisestage maha konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Võta Esemed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Palun sisestage maha konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimati Order Date
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
 DocType: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobiili number
 DocType: Payment Tool,Make Journal Entry,Tee päevikusissekanne
 DocType: Leave Allocation,New Leaves Allocated,Uus Lehed Eraldatud
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
+apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
 DocType: Project,Expected End Date,Oodatud End Date
 DocType: Appraisal Template,Appraisal Template Title,Hinnang Mall Pealkiri
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +343,Commercial,Kaubanduslik
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Viga: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Teenused
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Kõik tooted või teenused.
 DocType: Supplier Quotation,Supplier Address,Tarnija Aadress
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kogus
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
+apps/erpnext/erpnext/config/accounts.py +259,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finantsteenused
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Väärtus Oskus {0} peab olema vahemikus {1} on {2} et kaupa {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Vaikimisi võlgnevus konto
 DocType: Tax Rule,Billing State,Arved riik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Tähtaeg on kohustuslik
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay / KONTOLE From
 DocType: Naming Series,Setup Series,Setup Series
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Märkused
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Kood
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Saada Tarnija kirjad
 DocType: Features Setup,POS View,POS Vaata
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Paigaldamine rekord Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Palun täpsustada
 DocType: Offer Letter,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ülal
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Aeg Logi ole Maksustatakse
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määra nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 DocType: Salary Slip,Earning & Deduction,Teenimine ja mahaarvamine
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} ei saa Group
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Valikuline. See seadistus filtreerida erinevate tehingute.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,Optional. This setting will be used to filter in various transactions.,Valikuline. See seadistus filtreerida erinevate tehingute.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",Sest näiteks 2012. 2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tagasi Against müügiarve
 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},Palun määra vaikeväärtus {0} Company {1}
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,Kuu osavõtt Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kirjet ei leitud
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numeratsiooni seeria osavõtt Setup&gt; numbrite seeria
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+DocType: Asset,Straight Line,Sirgjoon
+DocType: Project User,Project User,projekti Kasutaja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,Konto {0} ei ole aktiivne
 DocType: GL Entry,Is Advance,Kas Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Osavõtt From kuupäev ja kohalolijate kuupäev on kohustuslik
-apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Palun sisestage &quot;on sisse ostetud&quot; kui jah või ei
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,Palun sisestage &quot;on sisse ostetud&quot; kui jah või ei
 DocType: Sales Team,Contact No.,Võta No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Tulude ja kulude tüüpi konto {0} ei tohi avamine Entry
 DocType: Features Setup,Sales Discounts,Müük Allahindlused
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Järjekorranumber
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner mis näitavad peal toodet nimekirja.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Täpsustada tingimused arvutada laevandus summa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Lisa Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,Lisa Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role lubatud kehtestada külmutatud kontode ja Edit Külmutatud kanded
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ei saa teisendada Cost Center pearaamatu, sest see on tütartippu"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Seis
 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,Müügiprovisjon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Müügiprovisjon
 DocType: Offer Letter Term,Value / Description,Väärtus / Kirjeldus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
 DocType: Tax Rule,Billing Country,Arved Riik
 ,Customers Not Buying Since Long Time,Kliendid ei osta juba ammu aeg
 DocType: Production Order,Expected Delivery Date,Oodatud Toimetaja kuupäev
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Esinduskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Esinduskulud
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Müügiarve {0} tuleb tühistada enne tühistades selle Sales Order
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ajastu
 DocType: Time Log,Billing Amount,Arved summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Vale kogus määratud kirje {0}. Kogus peaks olema suurem kui 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Puhkuseavalduste.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Kohtukulude
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Kohtukulude
 DocType: Sales Invoice,Posting Time,Foorumi aeg
 DocType: Sales Order,% Amount Billed,% Arve summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefoni kulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefoni kulud
 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.,"Märgi see, kui soovid sundida kasutajal valida rida enne salvestamist. Ei toimu vaikimisi, kui te vaadata seda."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},No Punkt Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Punkt Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Avatud teated
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Otsesed kulud
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Otsesed kulud
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} ei ole korrektne e-posti aadress &quot;Teavitamine \ e-posti aadress&quot;
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uus klient tulud
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Sõidukulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Sõidukulud
 DocType: Maintenance Visit,Breakdown,Lagunema
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Arve summa (via aeg kajakad)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Müüme see toode
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Tarnija Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
 DocType: Journal Entry,Cash Entry,Raha Entry
 DocType: Sales Partner,Contact Desc,Võta otsimiseks
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tüüp lehed nagu juhuslik, haige vms"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Tegevuse kogukuludest
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Märkus: Punkt {0} sisestatud mitu korda
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Kõik kontaktid.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Pakkuja vara {0} ei ühti tarnija ostuarve
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Company Abbreviation,Ettevõte lühend
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Kui te järgite kvaliteedi kontroll. Võimaldab Punkt QA Vajalik ja QA No ostutšekk
 DocType: GL Entry,Party Type,Partei Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,Tooraine ei saa olla sama peamine toode
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,Raw material cannot be same as main Item,Tooraine ei saa olla sama peamine toode
 DocType: Item Attribute Value,Abbreviation,Lühend
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized kuna {0} ületab piirid
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Palk malli kapten.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Lubatud muuta külmutatud laos
 ,Territory Target Variance Item Group-Wise,Territoorium Target Dispersioon Punkt Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Kõik kliendigruppide
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinnakiri Rate (firma Valuuta)
 DocType: Account,Temporary,Ajutine
 DocType: Address,Preferred Billing Address,Eelistatud Arved Aadress
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või isiku võlgnevusi konto valuuta
 DocType: Monthly Distribution Percentage,Percentage Allocation,Protsentuaalne jaotus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretär
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Kui keelata, &quot;sõnadega&quot; väli ei ole nähtav ühtegi tehingut"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,See aeg Logi Partii on tühistatud.
 ,Reqd By Date,Reqd By Date
 DocType: Salary Slip Earning,Salary Slip Earning,Palgatõend teenimine
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Võlausaldajad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Võlausaldajad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Serial No on kohustuslik
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Punkt Wise Maksu- Detail
 ,Item-wise Price List Rate,Punkt tark Hinnakiri Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 DocType: Lead,Add to calendar on this date,Lisa kalendrisse selle kuupäeva
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Sündmused
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Plii
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Hub Settings,Name Token,Nimi Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 DocType: Serial No,Out of Warranty,Out of Garantii
 DocType: BOM Replace Tool,Replace,Vahetage
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} vastu müügiarve {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Palun sisestage Vaikemõõtühik
-DocType: Project,Project Name,Projekti nimi
+DocType: Request for Quotation Item,Project Name,Projekti nimi
 DocType: Supplier,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kuluna
 DocType: Features Setup,Item Batch Nos,Punkt Partii nr
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock tehingud
 DocType: Employee,Internal Work History,Sisemine tööandjad
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumuleeritud kulum summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kliendi tagasiside
 DocType: Account,Expense,Kulu
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Firma on kohustuslik, kui see on teie ettevõte aadress"
 DocType: Item Attribute,From Range,Siit Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Punkt {0} ignoreerida, sest see ei ole laoartikkel"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Saada see Production Tellimus edasiseks töötlemiseks.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Saada see Production Tellimus edasiseks töötlemiseks.
 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.","Et ei kohaldata Hinnakujundus reegel konkreetne tehing, kõik kohaldatavad Hinnakujundusreeglid tuleks keelata."
 DocType: Company,Domain,Domeeni
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Tööturg
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Lisakulu
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Financial Year End Date,Majandusaasta lõpus kuupäev
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Tee Tarnija Tsitaat
 DocType: Quality Inspection,Incoming,Saabuva
 DocType: BOM,Materials Required (Exploded),Vajalikud materjalid (Koostejoonis)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Vähendada teenides palgata puhkust (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Toimetaja kuupäev
 DocType: Opportunity,Opportunity Date,Opportunity kuupäev
 DocType: Purchase Receipt,Return Against Purchase Receipt,Tagasi Against ostutšekk
+DocType: Request for Quotation Item,Request for Quotation Item,Hinnapäring toode
 DocType: Purchase Order,To Bill,Et Bill
 DocType: Material Request,% Ordered,% Tellitud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Tükitöö
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Punkt {0} ei ole setup Serial nr. Kolonn peab olema tühi
 DocType: Accounts Settings,Accounts Settings,Kontod Seaded
 DocType: Customer,Sales Partner and Commission,Müük Partner ja komisjoni
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Palun määra &quot;Vara võõrandamine konto Company {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Taimede ja masinad
 DocType: Sales Partner,Partner's Website,Partner Koduleht
 DocType: Opportunity,To Discuss,Arutama
 DocType: SMS Settings,SMS Settings,SMS seaded
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Ajutise konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Ajutise konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Explosion toode
 DocType: Account,Auditor,Audiitor
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Keela
 DocType: Project Task,Pending Review,Kuni Review
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Vajuta siia, et maksta"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei saa lammutada, sest see on juba {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kliendi ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark leidu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,Et aeg peab olema suurem kui Time
 DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Lisa esemed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Ladu {0}: Parent konto {1} ei BoLong ettevõtte {2}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Lisa esemed
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Ladu {0}: Parent konto {1} ei BoLong ettevõtte {2}
 DocType: BOM,Last Purchase Rate,Viimati ostmise korral
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Ülesanne nr
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",nt &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,"Stock saa esineda Punkt {0}, kuna on variandid"
 ,Sales Person-wise Transaction Summary,Müük isikuviisilist Tehing kokkuvõte
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Ladu {0} ei ole olemas
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,Warehouse {0} does not exist,Ladu {0} ei ole olemas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registreeru For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Kuu jaotusprotsentide
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Valitud parameetrit ei ole partii
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvaliteedijuhtimine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Punkt {0} on keelatud
 DocType: Payment Tool Detail,Against Voucher No,Vastu lehe nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Palun sisestage koguse Punkt {0}
 DocType: Employee External Work History,Employee External Work History,Töötaja Väline tööandjad
@@ -3068,7 +3160,7 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hinda kus tarnija valuuta konverteeritakse ettevõtte baasvaluuta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: ajastus on vastuolus rea {1}
 DocType: Opportunity,Next Contact,Järgmine Kontakt
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Gateway kontosid.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Gateway kontosid.
 DocType: Employee,Employment Type,Tööhõive tüüp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Põhivara
 ,Cash Flow,Rahavoog
@@ -3082,7 +3174,7 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Vaikimisi Tegevus Maksumus olemas Tegevuse liik - {0}
 DocType: Production Order,Planned Operating Cost,Planeeritud töökulud
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nimi
-apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},Saadame teile {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Saadame teile {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
 DocType: Job Applicant,Applicant Name,Taotleja nimi
 DocType: Authorization Rule,Customer / Item Name,Klienditeenindus / Nimetus
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Palun täpsustage, kust / ulatuda"
 DocType: Serial No,Under AMC,Vastavalt AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Punkt hindamise ümberarvutamise arvestades maandus kulude voucher summa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Vaikimisi seadete müügitehinguid.
 DocType: BOM Replace Tool,Current BOM,Praegune Bom
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Lisa Järjekorranumber
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantii
 DocType: Production Order,Warehouses,Laod
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Prindi ja Statsionaarne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Prindi ja Statsionaarne
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Värskenda valmistoodang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Värskenda valmistoodang
 DocType: Workstation,per hour,tunnis
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ostmine
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto lattu (Perpetual Inventory) luuakse käesoleva konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ladu ei saa kustutada, kuna laožurnaal kirjet selle lattu."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ladu ei saa kustutada, kuna laožurnaal kirjet selle lattu."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Makstud summa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektijuht
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Kuupäev peaks jääma eelarveaastal. Eeldades, et Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Siin saate säilitada pikkus, kaal, allergia, meditsiini muresid etc"
 DocType: Leave Block List,Applies to Company,Kehtib Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
 DocType: Purchase Invoice,In Words,Sõnades
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Täna on {0} &#39;s sünnipäeva!
 DocType: Production Planning Tool,Material Request For Warehouse,Materjal kutse Warehouse
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saajad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Tehing ei ole lubatud vastu lõpetas tootmise Tellimus {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki &quot;Set as Default&quot;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,liituma
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Salary Slip,Salary Slip,Palgatõend
+DocType: Pricing Rule,Margin Rate or Amount,Varu määra või summat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"&quot;Selleks, et kuupäev&quot; on vajalik"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Loo pakkimine libiseb paketid saadetakse. Kasutatud teatama paketi number, pakendi sisu ning selle kaalu."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order toode
@@ -3165,7 +3258,7 @@
 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.","Kui mõni kontrollida tehinguid &quot;Esitatud&quot;, talle pop-up automaatselt avada saata e-kiri seotud &quot;kontakt&quot;, et tehing, mille tehing manusena. Kasutaja ei pruugi saata e."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Töötajate haridus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +782,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Salary Slip,Net Pay,Netopalk
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} on juba saanud
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Sales Team Üksikasjad
 DocType: Expense Claim,Total Claimed Amount,Kokku nõutav summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentsiaalne võimalusi müüa.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Vale {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Vale {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Haiguslehel
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Arved Aadress Nimi
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määra nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaubamajad
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Säästa dokumendi esimene.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Säästa dokumendi esimene.
 DocType: Account,Chargeable,Maksustatav
 DocType: Company,Change Abbreviation,Muuda lühend
 DocType: Expense Claim Detail,Expense Date,Kulu kuupäev
@@ -3198,14 +3290,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Hooldus Külasta Purpose
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periood
-,General Ledger,General Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,General Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vaata Leads
 DocType: Item Attribute Value,Attribute Value,Omadus Value
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id peab olema unikaalne, juba olemas {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email id peab olema unikaalne, juba olemas {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Soovitatav Reorder Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Palun valige {0} Esimene
 DocType: Features Setup,To get Item Group in details table,Et saada Punkt Group üksikasjad tabelis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {0}
 DocType: Sales Invoice,Commission,Vahendustasu
 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>
@@ -3226,23 +3319,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
 ,Project wise Stock Tracking,Projekti tark Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Hoolduskava {0} on olemas vastu {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Hoolduskava {0} on olemas vastu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tegelik Kogus (tekkekohas / target)
 DocType: Item Customer Detail,Ref Code,Ref kood
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Töötaja arvestust.
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,Palga Seaded
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Match mitte seotud arved ja maksed.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Match mitte seotud arved ja maksed.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Esita tellimus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Juur ei saa olla vanem kulukeskus
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Vali brändi ...
 DocType: Sales Invoice,C-Form Applicable,C-kehtival kujul
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Ladu on kohustuslik
 DocType: Supplier,Address and Contacts,Aadress ja Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Hoidke see web sõbralik 900px (w) poolt 100px (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti
 DocType: Payment Tool,Get Outstanding Vouchers,Võta Tasumata vautšerid
 DocType: Warranty Claim,Resolved By,Lahendatud
@@ -3260,7 +3353,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Eemalda kirje, kui makse ei kohaldata selle objekti"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Nt. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Tehingu vääring peab olema sama Payment Gateway valuuta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Saama
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Saama
 DocType: Maintenance Visit,Fully Completed,Täielikult täidetud
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Haridustsensus
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Esitada kohta loomine
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on edukalt lisatud meie uudiskiri nimekirja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Ostu Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Graafik kulukeskuste
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,Minu Tellimused
@@ -3296,10 +3389,10 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Palun sisestage kehtiv mobiiltelefoni nos
 DocType: Budget Detail,Budget Detail,Eelarve Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Palun sisesta enne saatmist
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale profiili
+apps/erpnext/erpnext/config/accounts.py +258,Point-of-Sale Profile,Point-of-Sale profiili
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Palun uuendage SMS seaded
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Aeg Logi {0} on juba arve
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Tagatiseta laenud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Tagatiseta laenud
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
 DocType: Maintenance Schedule Detail,Scheduled Date,Tähtajad
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Kokku Paide Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,Sa ei saa deebet- ja sama konto korraga
 DocType: Naming Series,Help HTML,Abi HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Ebatõenäoliselt üle- {0} ületati Punkt {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},Ebatõenäoliselt üle- {0} ületati Punkt {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Isiku nimi või organisatsioon, kes sellele aadressile kuulub."
 apps/erpnext/erpnext/public/js/setup_wizard.js +234,Your Suppliers,Sinu Tarnijad
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
 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.,Teine Palgastruktuur {0} on aktiivne töötaja {1}. Palun tehke oma staatuse aktiivne &#39;jätkata.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Tarnija osa pole
 DocType: Purchase Invoice,Contact,Kontakt
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Saadud
 DocType: Features Setup,Exports,Eksport
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Palun kontrollige Multi Valuuta võimalust anda kontosid muus valuutas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Eseme: {0} ei eksisteeri süsteemis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Eseme: {0} ei eksisteeri süsteemis
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Teil ei ole seada Külmutatud väärtus
 DocType: Payment Reconciliation,Get Unreconciled Entries,Võta unreconciled kanded
 DocType: Payment Reconciliation,From Invoice Date,Siit Arve kuupäev
@@ -3338,7 +3432,7 @@
 DocType: Delivery Note,To Warehouse,Et 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} on kantud rohkem kui üks kord majandusaasta {1}
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Kliendi kood
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
 DocType: Buying Settings,Naming Series,Nimetades Series
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
@@ -3365,15 +3459,15 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Konto sulgemise {0} tüüp peab olema vastutus / Equity
 DocType: Authorization Rule,Based On,Põhineb
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekti tegevus / ülesanne.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Loo palgalehed
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Palun määra {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Korda päev kuus
@@ -3393,8 +3487,9 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampaania nimi on nõutav
 DocType: Maintenance Visit,Maintenance Date,Hooldus kuupäev
 DocType: Purchase Receipt Item,Rejected Serial No,Tagasilükatud Järjekorranumber
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Aasta alguses või lõppkuupäev kattub {0}. Et vältida määrake ettevõte
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New uudiskiri
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Alguskuupäev peab olema väiksem kui lõppkuupäev Punkt {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Alguskuupäev peab olema väiksem kui lõppkuupäev Punkt {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Näide: ABCD. ##### Kui seeria on seatud ja Serial No ei ole nimetatud tehingute, siis automaatne seerianumber luuakse põhineb selles sarjas. Kui tahad alati mainitaks Serial nr selle objekt. jäta tühjaks."
 DocType: Upload Attendance,Upload Attendance,Laadi Osavõtt
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Müük Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tootmine Seaded
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Seadistamine E-
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Palun sisesta vaikimisi valuuta Company Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Palun sisesta vaikimisi valuuta Company Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daily meeldetuletused
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Maksueeskiri Konfliktid {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Account Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tarnitud tooraine kulu
 DocType: Selling Settings,Settings for Selling Module,Seaded Müük Module
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kasutajatugi
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Pakkuda kandidaat tööd.
 DocType: Notification Control,Prompt for Email on Submission of,Küsiks Email esitamisel
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Kokku eraldatakse lehed on rohkem kui päeva võrra
+DocType: Pricing Rule,Percentage,protsent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Punkt {0} peab olema laoartikkel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Vaikimisi Work In Progress Warehouse
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Vaikimisi seadete raamatupidamistehingute.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Vaikimisi seadete raamatupidamistehingute.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Oodatud kuupäev ei saa olla enne Material taotlus kuupäev
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Punkt {0} peab olema Sales toode
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Punkt {0} peab olema Sales toode
 DocType: Naming Series,Update Series Number,Värskenda seerianumbri
 DocType: Account,Equity,Omakapital
 DocType: Sales Order,Printing Details,Printimine Üksikasjad
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,Toodetud kogus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Insener
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Otsi Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Kood nõutav Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kood nõutav Row No {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Tegelik
 DocType: Authorization Rule,Customerwise Discount,Customerwise Soodus
 DocType: Purchase Invoice,Against Expense Account,Vastu ärikohtumisteks
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Mine sobiv grupp (tavaliselt ollarahastamisel&gt; lühiajalised kohustused&gt; maksude ja lõivude ning luua uus konto (klõpsates Lisa Child) tüüpi &quot;Tax&quot; ja teha rääkimata maksumäär.
 DocType: Production Order,Production Order,Tootmine Telli
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Paigaldamine Märkus {0} on juba esitatud
 DocType: Quotation Item,Against Docname,Vastu Docname
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Jae- ja hulgimüük
 DocType: Issue,First Responded On,Esiteks vastas
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Risti noteerimine Punkt mitu rühmad
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiscal Year Alguse kuupäev ja Fiscal Year End Date on juba eelarveaastal {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiscal Year Alguse kuupäev ja Fiscal Year End Date on juba eelarveaastal {0}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,Edukalt Lepitatud
 DocType: Production Order,Planned End Date,Planeeritud End Date
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Kus esemed hoitakse.
 DocType: Tax Rule,Validity,Kehtivus
+DocType: Request for Quotation,Supplier Detail,tarnija Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Arve kogusumma
 DocType: Attendance,Attendance,Osavõtt
 apps/erpnext/erpnext/config/projects.py +55,Reports,Teated
 DocType: BOM,Materials,Materjalid
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Kui ei kontrollita, nimekirja tuleb lisada iga osakond, kus tuleb rakendada."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,Postitamise kuupäev ja postitad aega on kohustuslik
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Maksu- malli osta tehinguid.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Maksu- malli osta tehinguid.
 ,Item Prices,Punkt Hinnad
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Sõnades on nähtav, kui salvestate tellimusele."
 DocType: Period Closing Voucher,Period Closing Voucher,Periood sulgemine Voucher
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net kokku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,Target ladu rida {0} peab olema sama Production Telli
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Ei luba kasutada maksmine Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,&quot;Teavitamine e-posti aadressid&quot; määratlemata korduvad% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;Teavitamine e-posti aadressid&quot; määratlemata korduvad% s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,Currency can not be changed after making entries using some other currency,Valuuta ei saa muuta pärast kande tegemiseks kasutada mõne muu valuuta
 DocType: Company,Round Off Account,Ümardada konto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Halduskulud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Halduskulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsulteeriv
 DocType: Customer Group,Parent Customer Group,Parent Kliendi Group
 apps/erpnext/erpnext/public/js/pos/pos.js +455,Change,Muuda
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Skoor Teenitud
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",nt &quot;Minu Company LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Etteteatamistähtaeg
+DocType: Asset Category,Asset Category Name,Põhivarakategoori Nimi
 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.,See on root territooriumil ja seda ei saa muuta.
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
@@ -3497,13 +3596,13 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kogus punkti saadi pärast tootmise / pakkimise etteantud tooraine kogused
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 DocType: Task,Actual End Date (via Time Logs),Tegelik End Date (via aeg kajakad)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Palun sisestage vanem kulukeskus
 DocType: Delivery Note,Print Without Amount,Trüki Ilma summa
-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,"Maksu- Kategooria ei saa olla &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;, sest kõik teemad on mitte-laos toodet"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Maksu- Kategooria ei saa olla &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;, sest kõik teemad on mitte-laos toodet"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Üldskoor (Out of 5)
 DocType: Batch,Batch,Partii
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Cold calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameeter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Eelarve ja Kulukeskus
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Eelarve ja Kulukeskus
 DocType: Maintenance Schedule Item,Half Yearly,Pooleaastane
 DocType: Lead,Blog Subscriber,Blogi Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Loo reeglite piirata tehingud, mis põhinevad väärtustel."
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Ostu ühise
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} on muudetud. Palun värskenda.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Peatus kasutajad tegemast Jäta Rakendused järgmistel päevadel.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Töövõtjate hüvitised
 DocType: Sales Invoice,Is POS,Kas POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Production Order,Manufactured Qty,Toodetud Kogus
 DocType: Purchase Receipt Item,Accepted Quantity,Aktsepteeritud Kogus
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Arveid tõstetakse klientidele.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} tellijatele lisatud
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0} tellijatele lisatud
 DocType: Maintenance Schedule,Schedule,Graafik
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Määra eelarves selleks Cost Center. Et määrata eelarve tegevuse kohta vt &quot;Firmade kataloog&quot;
 DocType: Account,Parent Account,Parent konto
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,Haridus
 DocType: Selling Settings,Campaign Naming By,Kampaania nimetamine By
 DocType: Employee,Current Address Is,Praegune aadress
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Valikuline. Lavakujundus ettevõtte default valuutat, kui ei ole täpsustatud."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Valikuline. Lavakujundus ettevõtte default valuutat, kui ei ole täpsustatud."
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Partii Inventory
 DocType: Employee,Contract End Date,Leping End Date
 DocType: Sales Order,Track this Sales Order against any Project,Jälgi seda Sales Order igasuguse Project
+DocType: Sales Invoice Item,Discount and Margin,Soodus ja Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Pull müügitellimuste (kuni anda), mis põhineb eespool nimetatud kriteeriumidele"
 DocType: Deduction Type,Deduction Type,Kinnipeetav Type
 DocType: Attendance,Half Day,Pool päeva
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Hub Seaded
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Mis Operations
-apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
+apps/erpnext/erpnext/accounts/party.py +234,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
 ,Monthly Salary Register,Kuupalga Registreeri
 DocType: Warranty Claim,If different than customer address,Kui teistsugune kui klient aadress
 DocType: BOM Operation,BOM Operation,Bom operatsiooni
@@ -3617,22 +3717,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Palun sisestage maksesumma atleast üks rida
 DocType: POS Profile,POS Profile,POS profiili
 DocType: Payment Gateway Account,Payment URL Message,Makse URL Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Hooajalisus jaoks eelarveid, eesmärgid jms"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Hooajalisus jaoks eelarveid, eesmärgid jms"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Makse summa ei saa olla suurem kui tasumata summa
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Kokku Palgata
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Aeg Logi pole tasustatavate
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
+DocType: Asset,Asset Category,Põhivarakategoori
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Ostja
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Netopalk ei tohi olla negatiivne
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,Please enter the Against Vouchers manually,Palun sisesta maksedokumentide käsitsi
 DocType: SMS Settings,Static Parameters,Staatiline parameetrid
 DocType: Purchase Order,Advance Paid,Advance Paide
 DocType: Item,Item Tax,Punkt Maksu-
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materjal Tarnija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Aktsiisi Arve
 DocType: Expense Claim,Employees Email Id,Töötajad Post Id
 DocType: Employee Attendance Tool,Marked Attendance,Märkimisväärne osavõtt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Lühiajalised kohustused
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Lühiajalised kohustused
 apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,Saada mass SMS oma kontaktid
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Mõtle maksu, sest"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +59,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Arvväärtuste
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Kinnita Logo
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block puhkuse taotluste osakonda.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostukorv on tühi
 DocType: Production Order,Actual Operating Cost,Tegelik töökulud
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Vaike Aadress Mall leitud. Palun loo uus Setup&gt; Trükkimine ja Branding&gt; Aadress mall.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,Juur ei saa muuta.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Eraldatud summa ei ole suurem kui unadusted summa
 DocType: Manufacturing Settings,Allow Production on Holidays,Laske Production Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Kliendi ostutellimuse kuupäev
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Aktsiakapitali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Aktsiakapitali
 DocType: Packing Slip,Package Weight Details,Pakendi kaal Üksikasjad
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pärast makse lõpetamist suunata kasutaja valitud leheküljele.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projekteerija
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Tingimused Mall
 DocType: Serial No,Delivery Details,Toimetaja detailid
+DocType: Asset,Current Value (After Depreciation),Praegune väärtus (pärast amortisatsiooni)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Cost Center on vaja järjest {0} maksude tabel tüüp {1}
 ,Item-wise Purchase Register,Punkt tark Ostu Registreeri
 DocType: Batch,Expiry Date,Aegumisaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
 ,Supplier Addresses and Contacts,Tarnija aadressid ja kontaktid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Palun valige kategooria esimene
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekti kapten.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +409, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,Get Items from BOM,Võta Kirjed Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ooteaeg päeva
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Materjaliandmik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party tüüp ja partei on vajalik laekumata / maksmata konto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref kuupäev
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktsioneeritud summa
 DocType: GL Entry,Is Opening,Kas avamine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Konto {0} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} ei ole olemas
 DocType: Account,Cash,Raha
 DocType: Employee,Short biography for website and other publications.,Lühike elulugu kodulehel ja teistes väljaannetes.
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 9e71e02..13edfc6 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -5,7 +5,7 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,آیتم ها در حال حاضر همگام سازی
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,لغو مواد مشاهده {0} قبل از لغو این ادعا گارانتی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,محصولات قابل فروش
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,محصولات مصرفی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,لطفا ابتدا حزب نوع را انتخاب کنید
 DocType: Item,Customer Items,آیتم های مشتری
 DocType: Project,Costing and Billing,هزینه یابی و حسابداری
@@ -13,15 +13,15 @@
 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: SMS Center,All Sales Partner Contact,اطلاعات تماس تمام شرکای فروش
 DocType: Employee,Leave Approvers,ترک Approvers
 DocType: Sales Partner,Dealer,دلال
 DocType: Employee,Rented,اجاره
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,آیا شما واقعا می خواهید به قراضه این دارایی؟
 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.,* * * * آیا می شود در معامله محاسبه می شود.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,درخواستگر کار
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,نشان می دهد باز
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,جدید مرخصی استفاده
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,نمایش انواع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),وام (بدهی)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,در انبار
 DocType: Designation,Designation,تعیین
@@ -64,7 +66,7 @@
 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 +642,Invoice,فاکتور
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},جدید {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},جدید {0}: # {1}
 ,Sales Partners Commission,کمیسیون همکاران فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,مخفف می توانید بیش از 5 کاراکتر ندارد
 DocType: Payment Request,Payment Request,درخواست پرداخت
@@ -102,14 +104,14 @@
 DocType: Employee,Married,متاهل
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,گرفتن اقلام از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 DocType: Process Payroll,Make Bank Entry,را بانک ورودی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
-DocType: SMS Center,All Sales Person,همه فرد از فروش
+DocType: SMS Center,All Sales Person,تمام ماموران فروش
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
 DocType: Account,Credit,اعتبار
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,هدف در
 DocType: BOM,Total Cost,هزینه کل
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,گزارش فعالیت:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
+DocType: Item,Is Fixed Asset,است دارائی های ثابت
 DocType: Expense Claim Detail,Claim Amount,مقدار ادعا
 DocType: Employee,Mr,آقای
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,نوع منبع / تامین کننده
@@ -156,7 +159,8 @@
 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,هزینه سهام
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} منجمد است
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,هزینه سهام
 DocType: Newsletter,Email Sent?,ایمیل فرستاده شده است؟
 DocType: Journal Entry,Contra Entry,کنترا ورود
 DocType: Production Order Operation,Show Time Logs,نمایش زمان گزارش ها
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,مورد {0} باید مورد خرید است
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: BOM Replace Tool,New BOM,BOM جدید
@@ -204,24 +208,24 @@
 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,به طور پیش فرض سرزمین
+DocType: Selling Settings,Default Territory,منطقه پیش فرض
 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 +79,Account {0} does not belong to Company {1},حساب {0} به شرکت تعلق ندارد {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,لطفا شرکت وارد
-DocType: Delivery Note Item,Against Sales Invoice Item,در برابر مورد فاکتور فروش
+DocType: Delivery Note Item,Against Sales Invoice Item,در برابر آیتم فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,نقدی خالص از تامین مالی
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
 DocType: Newsletter List,Total Subscribers,مجموع مشترکین
 ,Contact Name,تماس با نام
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 DocType: Payment Tool,Reference No,مرجع بدون
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,مطالب بانک
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,کنترل هشدار از طریق
 DocType: Lead,Suggestions,پیشنهادات
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,مجموعه ای مورد بودجه گروه عاقلانه در این سرزمین. شما همچنین می توانید با تنظیم توزیع شامل فصلی.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},لطفا گروه حساب پدر و مادر برای انبار وارد {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},لطفا گروه حساب پدر و مادر برای انبار وارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
 DocType: Supplier,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,حداکثر 5 کاراکتر
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 apps/erpnext/erpnext/config/desktop.py +83,Learn,فرا گرفتن
+DocType: Asset,Next Depreciation Date,بعدی تاریخ استهلاک
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},کننده فاکتور بدون در خرید فاکتور وجود دارد {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,فروش شخص درخت را مدیریت کند.
 DocType: Job Applicant,Cover Letter,جلد نامه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,چک برجسته و سپرده برای روشن
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
 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.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} واحد از [{1}] (فرم # / کالا / {1}) در [{2}] (فرم # / انبار / {2})
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,نمایش شغلی
 DocType: 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,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,رسید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,رسید
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,لطفا ماه و سال را انتخاب کنید
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,انتخاب مورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سریال بدون {0} به تحویل توجه تعلق ندارد {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,پارامتر بازرسی کیفیت مورد
 DocType: Leave Application,Leave Approver Name,ترک نام تصویب
-,Schedule Date,برنامه زمانبندی عضویت
+DocType: Depreciation Schedule,Schedule Date,برنامه زمانبندی عضویت
 DocType: Packed Item,Packed Item,مورد بسته بندی شده
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,تنظیمات پیش فرض برای خرید معاملات.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,تنظیمات پیش فرض برای خرید معاملات.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},هزینه فعالیت برای کارکنان {0} در برابر نوع فعالیت وجود دارد - {1}
 apps/erpnext/erpnext/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,صرافی
@@ -346,6 +353,7 @@
 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; با توجه به تمام انبارها بر اساس تعداد پیش بینی شده و حداقل تعداد سفارش
+DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
 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.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
@@ -364,7 +372,7 @@
 DocType: Purchase Invoice,Yearly,سالیانه
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,لطفا وارد مرکز هزینه
 DocType: Journal Entry Account,Sales Order,سفارش فروش
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,اوسط نرخ فروش
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,میانگین نرخ فروش
 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,٪ نصب
@@ -375,7 +383,7 @@
 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/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','به شماره پرونده' نمی تواند کمتر از 'از شماره پرونده' باشد
+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,کانال شریک
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
-DocType: Material Request Item,Required Date,تاریخ مورد نیاز
+DocType: Request for Quotation Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,پیام برای عرضه
 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,پرداخت نشده
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 ,Serial No Warranty Expiry,سریال بدون گارانتی انقضاء
@@ -435,18 +444,19 @@
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
+DocType: Project,Project will be accessible on the website to these users,پروژه در وب سایت به این کاربران در دسترس خواهد بود
 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 +53,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,مخفف در حال حاضر برای یک شرکت دیگر مورد استفاده قرار گیرد
-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",اگر غیر فعال کردن، درست &quot;گرد مجموع خواهد در هر معامله قابل نمایش باشد
 DocType: BOM,Operating Cost,هزینه های عملیاتی
 DocType: Sales Order Item,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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,مورد {0} است خرید مورد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,مورد {0} است خرید مورد
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,انتظار تعداد
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
 DocType: Pricing Rule,Valid From,معتبر از
 DocType: Sales Invoice,Total Commission,کمیسیون ها
 DocType: Pricing Rule,Sales Partner,شریک فروش
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,مالی سال / حسابداری.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ارزش انباشته
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,سال مالی تاریخ شروع نباید بیشتر از سال مالی پایان تاریخ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,سال مالی تاریخ شروع نباید بیشتر از سال مالی پایان تاریخ
 DocType: Warranty Claim,Resolution,حل
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},تحویل: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,قابل پرداخت حساب
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,پیوست رزومه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,بازگشت فروش
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,برگشت فروش
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,قطعات حقوق و دستمزد.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,پایگاه داده از مشتریان بالقوه است.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,کارشناسی ارشد
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,تاریخ به روز رسانی بانک معامله
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,تاریخ به روز رسانی بانک معامله
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,پیگیری زمان
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
@@ -508,7 +518,7 @@
 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: Sales Invoice,Sales Taxes and Charges,مالیات فروش و هزینه ها
 DocType: Employee,Organization Profile,نمایش سازمان
 DocType: Employee,Reason for Resignation,دلیل استعفای
 apps/erpnext/erpnext/config/hr.py +151,Template for performance appraisals.,الگو برای ارزیابی عملکرد.
@@ -518,27 +528,27 @@
 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,به طور پیش فرض هزینه یابی نرخ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,برنامه نگهداری و تعمیرات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,برنامه نگهداری و تعمیرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",مشاهده قوانین سپس قیمت گذاری بر اساس مشتری، مشتری گروه، منطقه، تامین کننده، تامین کننده نوع، کمپین، فروش شریک و غیره فیلتر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,تغییر خالص در پرسشنامه
 DocType: Employee,Passport Number,شماره پاسپورت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدیر
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,اهداف فرد از فروش
+DocType: Sales Person,Sales Person Targets,اهداف فروشنده
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,لطفا یک لیست تعطیلات مجموعه برای هر کارمند یا شرکت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
+DocType: Depreciation Schedule,Depreciation Amount,مقدار استهلاک
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,روز ثابت
 DocType: Quotation Item,Item Balance,تعادل مورد
 DocType: Sales Invoice,Packing List,فهرست بسته بندی
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,سفارشات خرید به تولید کنندگان داده می شود.
+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,مصرف
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,زمان عمل
 DocType: Pricing Rule,Sales Manager,مدیر فروش
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,گروه به گروه
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,پروژه های من
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
 DocType: Journal Entry,Bill No,شماره صورتحساب
+DocType: Company,Gain/Loss Account on Asset Disposal,حساب کاهش / افزایش در دفع دارایی
 DocType: Purchase Invoice,Quarterly,فصلنامه
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
 DocType: Sales Order Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,صدور صورت حساب کل این سال
 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 +529,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع درخت
@@ -592,9 +605,10 @@
 ,Reserved,رزرو شده
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
 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 +91,{0} is not a stock Item,{0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0}  یک آیتم انباری نیست
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بیانیه حقوق ماهانه.
 DocType: Item Group,Website Specifications,مشخصات وب سایت
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},یک خطا در آدرس الگو شما وجود دارد {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,حساب جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,حساب جدید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قوانین هزینه های متعدد را با معیارهای همان وجود دارد، لطفا حل و فصل درگیری با اختصاص اولویت است. قوانین قیمت: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قوانین هزینه های متعدد را با معیارهای همان وجود دارد، لطفا حل و فصل درگیری با اختصاص اولویت است. قوانین قیمت: {0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,25 +659,26 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",مجله ورودی {0} است و مخالف نظم مرتبط {1}، بررسی کنید که آیا باید آن را به عنوان پیش در این فاکتور کشیده.
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,هزینه نگهداری و تعمیرات دفتر
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Account,Liability,مسئوليت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
 DocType: Company,Default Cost of Goods Sold Account,به طور پیش فرض هزینه از حساب کالاهای فروخته شده
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,لیست قیمت انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Process Payroll,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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/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 +272,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 +666,My Invoices,فاکتورها من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,فاکتورها من
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,بدون کارمند یافت
 DocType: Supplier Quotation,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,تعادل سهام از طریق CSV را بارگذاری کنید.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,در حال حاضر ارسال
 ,Support Analytics,تجزیه و تحلیل ترافیک پشتیبانی
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,خطای منطقی: باید با هم تداخل دارند پیدا
 DocType: Item,Website Warehouse,انبار وب سایت
 DocType: Payment Reconciliation,Minimum Invoice Amount,حداقل مبلغ فاکتور
 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 +267,C-Form records,سوابق C-فرم
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,سوابق C-فرم
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,مشتری و تامین کننده
 DocType: Email Digest,Email Digest Settings,ایمیل تنظیمات خلاصه
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,نمایش داده شد پشتیبانی از مشتریان.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,مخارج
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,آیا واگذار شده
 DocType: Item Attribute,Item Attribute Values,مقادیر ویژگی مورد
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,مشخصات مشترکین
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,رسید خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
 DocType: Employee,Ms,خانم
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
-apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,شرکای فروش و قلمرو
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} باید فعال باشد
+apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,شرکای فروش و منطقه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} باید فعال باشد
+DocType: Journal Entry,Depreciation Entry,ورود استهلاک
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,رفتن به سبد خرید
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,فاکتور خرید پیشرفته
 DocType: Address,Shop,فروشگاه
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,آدرس دائمی است
 DocType: Production Order Operation,Operation completed for how many finished goods?,عملیات برای چند کالا به پایان رسید به پایان؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,نام تجاری
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
 DocType: Employee,Exit Interview Details,جزییات خروج مصاحبه
 DocType: Item,Is Purchase Item,آیا مورد خرید
-DocType: Journal Entry Account,Purchase Invoice,فاکتورخرید
+DocType: Asset,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,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;محصولات بسته نرم افزاری &quot;هستند، این ارزش ها را می توان در جدول آیتم های اصلی وارد شده، ارزش خواهد شد کپی شده به&#39; بسته بندی فهرست جدول.
 DocType: Job Opening,Publish on website,انتشار در وب سایت
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,محموله به مشتریان.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,تاریخ عرضه فاکتور نمی تواند بیشتر از ارسال تاریخ
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,درآمد غیر مستقیم
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,انتخاب مورد انتقال
 DocType: Purchase Invoice,Additional Discount Percentage,تخفیف اضافی درصد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",ردیف {0}: فاکتور {1} نامعتبر است، ممکن است لغو شود / وجود ندارد. \ لطفا یک فاکتور معتبر وارد کنید
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
 ,Employee Holiday Attendance,کارمند حضور و غیاب تعطیلات
 DocType: Opportunity,Walk In,راه رفتن در
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,مطالب سهام
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,مطالب سهام
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,انتقال
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,ساخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,سبد من
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
 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 +180,Qty for {0},تعداد برای {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
+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 +80,Leave Allocation Tool,ترک ابزار تخصیص
 DocType: Leave Block List,Leave Block List Dates,ترک فهرست بلوک خرما
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,تخفیف
@@ -853,23 +874,24 @@
 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 +69,Selling Amount,فروش مقدار
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,زمان ثبت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,زمان ثبت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
+DocType: Asset,Scrapped,اوراق
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,حساب با شرکت مطابقت ندارد
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,استخدام
 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,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,هزینه فروش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,هزینه فروش
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
-DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
+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,اطلاعات تماس
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
+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,میانگین سن
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,به طور پیش فرض ارز
 DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
 DocType: Expense Claim,From Employee,از کارمند
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,منطقه کلیدی کارایی
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,پرداخت آشتی فاکتور
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,سهم٪
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,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,به طور پیش فرض جهانی
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,پروژه دعوت همکاری
 DocType: Salary Slip,Deductions,کسر
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,این زمان ورود دسته ای است صورتحساب شده است.
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ظرفیت خطا برنامه ریزی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ظرفیت خطا برنامه ریزی
 ,Trial Balance for Party,تعادل دادگاه برای حزب
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,درامد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,باز کردن تعادل حسابداری
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,هیچ چیز برای درخواست
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,هیچ چیز برای درخواست
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,اداره
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,نوع فعالیت برای ورق های زمان
@@ -935,18 +958,18 @@
 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; ایجاد
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,لطفا ایمیل ID تنظیم
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,لطفا ایمیل ID تنظیم
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {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,UOM عامل تبدیل
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,پایگاه داده تامین کننده.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,مالیاتی و دیگر کسورات حقوق و دستمزد.
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,روز تعطیل
 DocType: Leave Control Panel,Leave blank if considered for all branches,خالی بگذارید اگر برای تمام شاخه های در نظر گرفته
 ,Daily Time Log Summary,روزانه زمان ورود خلاصه
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-فرم قابل اجرا نیست برای فاکتور: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,مشخصات پرداخت Unreconciled
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
@@ -973,19 +997,20 @@
 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,لطفا حداقل یک ویژگی در جدول صفات مشخص
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
 DocType: Contact,User ID,ID کاربر
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,مشخصات لجر
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,مشخصات لجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,سود سهام پرداخت
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,سود انباشته
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,سود انباشته
 DocType: BOM Item,Item Description,مورد توضیحات
 DocType: Payment Tool,Payment Mode,حالت پرداخت
 DocType: Purchase Invoice,Is Recurring,تکرارشونده است
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,افتتاح موقت
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},نرخ ارزش گذاری مورد نیاز برای مورد در ردیف {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 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 +165,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,کوچک
@@ -1017,20 +1042,20 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,سر حساب {0} ایجاد
 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,اضافه کردن نقل قول
+DocType: Email Digest,Add Quote,افزودن پیشنهاد قیمت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; درست است که می تواند مورد، مورد گروه و یا تجاری.
 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},وضعیت سفارش تولید {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,منبع
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},هیچ مورد به نام پیدا کنید {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,خروجی ها
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",فقط یک قانون حمل و نقل شرط با 0 یا مقدار خالی برای &quot;به ارزش&quot;
 DocType: Authorization Rule,Transaction,معامله
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,گروه مورد وب سایت
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,شماره سریال {0} وارد بیش از یک بار
-DocType: Journal Entry,Journal Entry,ورودی دفتر
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
 DocType: Salary Slip,Bank Account No.,شماره حساب بانکی
 DocType: Naming Series,This is the number of the last created transaction with this prefix,این تعداد از آخرین معامله ایجاد شده با این پیشوند است
@@ -1072,6 +1098,7 @@
 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,ایستگاه های کاری
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,درخواست برای عرضه دیگر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,سخت افزار
 DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,هدف ارزیابی الگو
 DocType: Salary Slip,Earning,سود
 DocType: Payment Tool,Party Account Currency,حزب حساب ارز
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},ارزش فعلی پس از استهلاک باید کمتر از برابر شود {0}
 ,BOM Browser,BOM مرورگر
 DocType: Purchase Taxes and Charges,Add or Deduct,اضافه کردن و یا کسر
 DocType: Company,If Yearly Budget Exceeded (for expense account),اگر بودجه سالانه بیش از (برای حساب هزینه)
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
 DocType: Project,Start and End Dates,تاریخ شروع و پایان
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,ویژگی های راه اندازی
+DocType: Asset,Depreciation Schedules,برنامه استهلاک
 DocType: Item,Is Service Item,آیا مورد خدمات
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
 DocType: Payment Request,Transaction Currency,معامله ارز
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},از {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},از {0} | {1} {2}
 DocType: BOM Operation,Operation Description,عملیات توضیحات
 DocType: Item,Will also apply to variants,همچنین به انواع اعمال می شود
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,آیا می توانم مالی سال تاریخ شروع و تاریخ پایان سال مالی تغییر نه یک بار سال مالی ذخیره شده است.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,کمپین
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},حداکثر: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,برای شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ورود به سیستم ارتباطات.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
 DocType: Rename Tool,Type of document to rename.,نوع سند به تغییر نام دهید.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ما خرید این مورد
 DocType: Address,Billing,صدور صورت حساب
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,خوانش
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,مجامع زیر
+DocType: Asset,Asset Name,نام دارایی
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Supplier,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,بسته بندی لغزش
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر اجاره
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,دفتر اجاره
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,درخواست برای نقل قول می تواند دسترسی با کلیک روی لینک زیر
+DocType: Asset,Number of Months in a Period,تعداد ماه در یک دوره
 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,ایستگاه های کاری کار یک ساعت
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,دولت
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
 DocType: Sales Invoice,Source,منبع
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,نمایش بسته
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,مالی سال تاریخ شروع
 DocType: Employee External Work History,Total Experience,تجربه ها
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 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 +86,Transfer Materials for Manufacture,انتقال مواد برای تولید
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,انتقال مواد برای تولید
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} یافت نشد، که لازم است به کتاب ثبت حسابداری (هزینه). لطفا قیمت مورد را با لیست قیمت خرید ذکر است.
@@ -1212,7 +1245,7 @@
 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.,لطفا حساب جدید را از نمودار از حساب ایجاد کنید.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,نگهداری و تعمیرات مشاهده
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,نگهداری و تعمیرات مشاهده
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,دسته موجود در انبار تعداد
 DocType: Time Log Batch Detail,Time Log Batch Detail,زمان ورود دسته ای جزئیات
 DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,استاد با نام تجاری.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,جعبه
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +131,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,بدهی سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,بدهی سهام
 DocType: Purchase Receipt,Supplier Warehouse,انبار عرضه کننده کالا
 DocType: Opportunity,Contact Mobile No,تماس با موبایل بدون
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ارسال مجدد ایمیل پرداخت
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,سایر گزارش
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,توقف تولد یادآوری
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} نمایش
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,تغییر خالص در نقدی
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,قبلی سال مالی بسته نشده است
 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 +40,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 +38,Supplier Type master.,نوع منبع کارشناسی ارشد.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
 DocType: Purchase Invoice,Reference Document,سند مرجع
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ صورتحساب
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,تغییر خالص در حساب های پرداختنی
 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&#39;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,به روز رسانی تاریخ های پرداخت بانک با مجلات.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,به روز رسانی تاریخ های پرداخت بانک با مجلات.
 DocType: Quotation,Term Details,جزییات مدت
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} باید بزرگتر از 0 باشد
 DocType: Manufacturing Settings,Capacity Planning For (Days),برنامه ریزی ظرفیت برای (روز)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,ادعای گارانتی
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,آدرس دائمی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",پیشرفت در برابر {0} {1} نمی تواند بیشتر پرداخت می شود \ از جمع کل {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,لطفا کد مورد را انتخاب کنید
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,لطفا کد مورد را انتخاب کنید
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),کاهش کسر برای مرخصی بدون حقوق (LWP)
 DocType: Territory,Territory Manager,مدیر منطقه
 DocType: Packed Item,To Warehouse (Optional),به انبار (اختیاری)
@@ -1343,15 +1377,15 @@
 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,هزینه های بازاریابی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
@@ -1361,40 +1395,42 @@
 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 +155,Please select {0} first.,لطفا {0} انتخاب کنید.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,تماس جدید
-DocType: Territory,Parent Territory,سرزمین پدر و مادر
+DocType: Territory,Parent Territory,منطقه مرجع
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
 apps/erpnext/erpnext/public/js/setup_wizard.js +268,Products,محصولات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {0}
 DocType: 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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,مورد عاقلانه فروش ثبت نام
+DocType: Asset,Gross Purchase Amount,مبلغ خرید خالص
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",به عنوان مثال &quot;XYZ بانک ملی&quot;
+DocType: Asset,Depreciation Method,روش استهلاک
 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 +29,Shopping Cart is enabled,سبد خرید فعال است
 DocType: Job Applicant,Applicant for a Job,متقاضی برای شغل
 DocType: Production Plan Material Request,Production Plan Material Request,تولید درخواست پاسخ به طرح مواد
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,بدون سفارشات تولید ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,بدون سفارشات تولید ایجاد
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,اصلی
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
@@ -1402,32 +1438,33 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,متقاضی برای یک کار.
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,نشانی ها
+apps/erpnext/erpnext/hooks.py +91,Addresses,نشانی ها
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,ارزیابی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,مورد مجاز به سفارش تولید.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,مورد مجاز به سفارش تولید.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,لطفا فیلتر بر اساس مورد یا انبار مجموعه
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص از اقلام محاسبه)
 DocType: Sales Order,To Deliver and Bill,برای ارائه و بیل
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,سیاههها زمان برای تولید.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,زمان ورود برای انجام وظایف.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,پرداخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,مارک
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,موارد نرم افزاری در زمان فروش.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,آیتم های همراه  در زمان فروش.
 DocType: Quotation Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
+DocType: Request for Quotation Supplier,Send Email to Supplier,ارسال ایمیل به عرضه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 DocType: Packing Slip,To Package No.,برای بسته بندی شماره
 DocType: Production Planning Tool,Material Requests,درخواست مواد
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,انبار تحویل
 DocType: Stock Settings,Allowance Percent,درصد کمک هزینه
 DocType: SMS Settings,Message Parameter,پیام پارامتر
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,درخت مراکز هزینه مالی.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,درخت مراکز هزینه مالی.
 DocType: Serial No,Delivery Document No,تحویل اسناد بدون
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,گرفتن اقلام از دریافت خرید
 DocType: Serial No,Creation Date,تاریخ ایجاد
@@ -1479,47 +1517,49 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +201,e.g. 5,به عنوان مثال 5
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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,آیا مورد فروش
+DocType: Item,Is Sales Item,آیا آیتم فروش است
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
 DocType: Maintenance Visit,Maintenance Time,زمان نگهداری
 ,Amount to Deliver,مقدار برای ارائه
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,یک محصول یا خدمت
 DocType: Naming Series,Current Value,ارزش فعلی
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} ایجاد شد
-DocType: Delivery Note Item,Against Sales Order,علیه سفارش فروش
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ایجاد شد
+DocType: Delivery Note Item,Against Sales Order,در برابر سفارش فروش
 ,Serial No Status,سریال نیست
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,جدول مورد نمیتواند خالی باشد
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",ردیف {0}: برای تنظیم دوره تناوب {1}، تفاوت بین از و تا به امروز \ باید بزرگتر یا مساوی به صورت {2}
 DocType: Pricing Rule,Selling,فروش
 DocType: Employee,Salary Information,اطلاعات حقوق و دستمزد
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,وظایف و مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,لطفا تاریخ مرجع وارد
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,پرداخت حساب دروازه پیکربندی نشده است
 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: Production Order,Material Request Item,مورد درخواست مواد
+DocType: Request for Quotation Item,Material Request Item,مورد درخواست مواد
 apps/erpnext/erpnext/config/stock.py +85,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,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
+DocType: Asset,Sold,فروخته شده
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
 DocType: Sales Invoice,Accounting Details,جزئیات حسابداری
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,حذف تمام معاملات این شرکت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,سرمایه گذاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیص
 DocType: Quality Inspection Reading,Acceptance Criteria,ملاک پذیرش
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,لطفا درخواست مواد در جدول فوق را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,لطفا درخواست مواد در جدول فوق را وارد کنید
 DocType: Item Attribute,Attribute Name,نام مشخصه
 DocType: Item Group,Show In Website,نمایش در وب سایت
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,گروه
@@ -1527,6 +1567,7 @@
 ,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",برای پیگیری نام تجاری در مدارک زیر را تحویل توجه داشته باشید، فرصت، درخواست مواد، مورد، سفارش خرید، خرید کوپن، دریافت مشتری، نقل قول، فاکتور فروش، محصولات بسته نرم افزاری، سفارش فروش، سریال بدون
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,گانت چارت از همه وظایف.
+DocType: Pricing Rule,Margin Type,نوع حاشیه
 DocType: Appraisal,For Employee Name,نام کارمند
 DocType: Holiday List,Clear Table,جدول پاک کردن
 DocType: Features Setup,Brands,علامت های تجاری
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,آدرس و اطلاعات تماس و ضوابط
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,ردیف # {0}: دارایی در برابر یک آیتم دارایی ثابت الزامی است
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,جفت
+DocType: Asset,Depreciation Schedule,برنامه استهلاک
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
 DocType: Item,Has Batch No,دارای دسته ای بدون
 DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
+DocType: Asset,Purchase Date,تاریخ خرید
 DocType: Employee,Personal Details,اطلاعات شخصی
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا دارایی مرکز استهلاک هزینه در شرکت راه {0}
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,شامل مطالب آشتی
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,مجموع واقعی
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,واحد
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,لطفا شرکت مشخص
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ادعاهای هزینه
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
 ,BOM Search,BOM جستجو
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),بسته شدن (باز مجموع +)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارز باید {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},تاریخ ترخیص کالا از نمی تواند قبل از تاریخ چک در ردیف شود {0}
 DocType: Salary Slip,Deduction,کسر
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 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 +137,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,محاسبه تعادل بیانیه بانک
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,کاربر غیر فعال
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,نقل قول
 DocType: Salary Slip,Total Deduction,کسر مجموع
 DocType: Quotation,Maintenance User,کاربر نگهداری
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,هزینه به روز رسانی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,هزینه به روز رسانی
 DocType: Employee,Date of Birth,تاریخ تولد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO تعداد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
+DocType: Request for Quotation,Manufacturing Manager,ساخت مدیر
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
 apps/erpnext/erpnext/hooks.py +71,Shipments,محموله
 DocType: Purchase Order Item,To be delivered to customer,به مشتری تحویل
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ردیف #
 DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز)
-DocType: Pricing Rule,Supplier,تامین کننده
+DocType: Asset,Supplier,تامین کننده
 DocType: C-Form,Quarter,ربع
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,هزینه های متفرقه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,هزینه های متفرقه
 DocType: Global Defaults,Default Company,به طور پیش فرض شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,کاربر {0} غیر فعال است
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} برای مورد الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
 DocType: Currency Exchange,From Currency,از ارز
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",ردیف # {0}: تعداد باید 1 باشد، به عنوان آیتم به یک دارایی مرتبط
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,مورد کودک باید یک بسته نرم افزاری محصولات. لطفا آیتم های حذف `{0}` و صرفه جویی در
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداری
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,مرکز هزینه جدید
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; و انجام ذکر نرخ مالیات.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,مرکز هزینه جدید
 DocType: Bin,Ordered Quantity,تعداد دستور داد
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
 DocType: Quality Inspection,In Process,در حال انجام
@@ -1670,10 +1716,11 @@
 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,حساب دریافتنی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
 DocType: Quotation Item,Stock Balance,تعادل سهام
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,سفارش فروش به پرداخت
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,زمان ثبت ایجاد:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,زمان ثبت ایجاد:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Employee,Blood Group,گروه خونی
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,بدهکاری به مورد نیاز است
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
 DocType: Offer Letter Term,Offer Term,مدت پیشنهاد
 DocType: Quality Inspection,Quality Manager,مدیر کیفیت
 DocType: Job Applicant,Job Opening,افتتاح شغلی
 DocType: Payment Reconciliation,Payment Reconciliation,آشتی پرداخت
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ارائه نامه
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,تولید مواد درخواست (MRP) و سفارشات تولید.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
 DocType: Production Order Operation,Completed Qty,تکمیل تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,نرخ گذاری کنونی
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
 DocType: Opportunity,Lost Reason,از دست داده دلیل
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,ایجاد مطالب پرداخت در برابر دستورات و یا فاکتورها.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ایجاد مطالب پرداخت در برابر دستورات و یا فاکتورها.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,کاربران و ویرایش
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,سریال بدون {0} یافت نشد
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,سریال بدون {0} یافت نشد
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,مشتریان شما
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
 DocType: Leave Block List Date,Block Date,بلوک عضویت
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,درخواست کن
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,درخواست کن
 DocType: Sales Order,Not Delivered,تحویل داده است
 ,Bank Clearance Summary,بانک ترخیص کالا از خلاصه
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
@@ -1746,7 +1794,7 @@
 DocType: SMS Log,Sender Name,نام فرستنده
 DocType: POS Profile,[Select],[انتخاب]
 DocType: SMS Log,Sent To,فرستادن به
-DocType: Payment Request,Make Sales Invoice,را فاکتور فروش
+DocType: Payment Request,Make Sales Invoice,ایجاد فاکتور فروش
 DocType: Company,For Reference Only.,برای مرجع تنها.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},نامعتبر {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,جستجوی پیشرفته مقدار
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,جزییات استخدام
 DocType: Employee,New Workplace,جدید محل کار
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,تنظیم به عنوان بسته
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},آیتم با بارکد بدون {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},آیتم با بارکد بدون {0}
 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,نمایش تصاویر به صورت خودکار در بالای صفحه
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,مواد انتقال
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},مورد {0} باید یک مورد فروش در {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),منابع درآمد (بدهی)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,کارمند
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,واردات از ایمیل
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,دعوت به عنوان کاربر
-DocType: Features Setup,After Sale Installations,پس از نصب فروش
+DocType: Features Setup,After Sale Installations,نصب پس از فروش
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},لطفا {0} مجموعه ای در شرکت {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 DocType: Workstation Working Hour,End Time,پایان زمان
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش و یا خرید.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,دارویی
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Gateway Account,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 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 +206,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ثبت نشده است
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,عضویت در خبرنامه لیست پستی
 DocType: Delivery Note,Transporter Name,نام حمل و نقل
 DocType: Authorization Rule,Authorized Value,ارزش مجاز
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} است بسته
 DocType: Email Digest,How frequently?,چگونه غالبا؟
 DocType: Purchase Receipt,Get Current Stock,دریافت سهام کنونی
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",رفتن به گروه مناسب (معمولا استفاده از منابع مالی&gt; دارایی های جاری&gt; حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن فرزند) از نوع &quot;بانک&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,درخت بیل از مواد
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,علامت گذاری به عنوان در حال حاضر
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,هدف
+DocType: Company,Fixed Asset Depreciation Settings,تنظیمات استهلاک دارائی های ثابت
 DocType: Item,Will also apply for variants unless overrridden,همچنین برای انواع اعمال می شود مگر اینکه overrridden
 DocType: Purchase Invoice,Advances,پیشرفت
 DocType: Production Order,Manufacture against Material Request,ساخت در برابر درخواست پاسخ به مواد
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
 DocType: Campaign,Campaign-.####,کمپین - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,دارای گره فرزند
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd تعداد
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
+DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",به عنوان مثال بانکی، پول نقد، کارت اعتباری
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",رفتن به گروه مناسب (معمولا استفاده از منابع مالی&gt; دارایی های جاری&gt; حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن فرزند) از نوع &quot;بانک&quot;
 DocType: Journal Entry,Credit Note,اعتبار توجه داشته باشید
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},تکمیل تعداد نمی تواند بیش از {0} برای عملیات {1}
 DocType: Features Setup,Quality,کیفیت
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,آدرس من
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,شاخه سازمان کارشناسی ارشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,به طور پیش فرض لیست قیمت خرید
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,هیچ یک از کارکنان برای معیارهای فوق انتخاب شده و یا لغزش حقوق و دستمزد در حال حاضر ایجاد
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 apps/erpnext/erpnext/config/hr.py +93,Payroll,لیست حقوق
 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} نیز باید گنجانده شود
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خرید
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,فرم سفارشی
 DocType: Account,Income Account,حساب درآمد
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,بدون آدرس پیش فرض الگو پیدا شده است. لطفا یکی از جدید از راه اندازی&gt; چاپ و تبلیغات تجاری&gt; آدرس الگو ایجاد کنید.
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,منطقه مسئولیت های کلیدی
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
-apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,مدیریت مشتری گروه درخت.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,نام مرکز هزینه
+apps/erpnext/erpnext/accounts/doctype/account/account.py +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
+apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,مدیریت درختواره گروه مشتری
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
 DocType: Appraisal,HR User,HR کاربر
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیات و هزینه کسر
-apps/erpnext/erpnext/config/support.py +7,Issues,مسائل مربوط به
+apps/erpnext/erpnext/hooks.py +90,Issues,مسائل مربوط به
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید یکی از است {0}
 DocType: Sales Invoice,Debit To,بدهی به
 DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,خیلی بزرگ
 ,Profit and Loss Statement,بیانیه سود و زیان
@@ -2032,11 +2086,11 @@
 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 +139,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
+DocType: C-Form Invoice Detail,Territory,منطقه
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,مشخص نرخ ارز برای تبدیل یک ارز به ارز را به یکی دیگر
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,نقل قول {0} لغو
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,مجموع مقدار برجسته
@@ -2092,19 +2146,20 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}، شکستن عملیات به عملیات های متعدد
 ,Requested,خواسته
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,بدون شرح
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,فروش و خرید
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,مورد دارائی های ثابت باید یک آیتم غیر سهام شود
 DocType: Supplier Quotation Item,Material Request No,درخواست مواد بدون
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,مدیریت درخت منطقه.
+apps/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,مدیریت درختواره منطقه
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
 DocType: Sales Invoice Item,Time Log Batch,زمان ورود دسته ای
@@ -2119,7 +2174,7 @@
 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 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 DocType: Payment Request,Recipient and Message,گیرنده و پیام
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,کنید] را انتخاب کنید
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,حساب {0} منجمد است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,برای نقل قول درخواست.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا آیتم را انتخاب کنید که در آن &quot;آیا مورد سهام&quot; است &quot;نه&quot; و &quot;آیا مورد فروش&quot; است &quot;بله&quot; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,پروژه تاریخ شروع
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,در برابر سند بدون
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,فروش همکاران مدیریت.
 DocType: Quality Inspection,Inspection Type,نوع بازرسی
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},لطفا انتخاب کنید {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,حضور و غیاب بینام
@@ -2183,6 +2239,7 @@
 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,اعلان
+DocType: Asset Category Account,Depreciation Expense Account,حساب استهلاک هزینه
 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,تصویب هزینه
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,تایید شده
 DocType: Payment Gateway,Gateway,دروازه
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,انبار پذیرفته شده
 DocType: Bank Reconciliation Detail,Posting Date,تاریخ ارسال
 DocType: Item,Valuation Method,روش های ارزش گذاری
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},قادر به پیدا کردن نرخ ارز برای {0} به {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},قادر به پیدا کردن نرخ ارز برای {0} به {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,روز علامت نیم
 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 +410,[Error],[خطا]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 DocType: Sales Invoice Item,Customer Warehouse (Optional),انبار و ضوابط (اختیاری)
 DocType: Pricing Rule,Discount Percentage,درصد تخفیف
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,درخواست مواد {0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,درخواست مواد {0} ایجاد
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,الگو از نظر و یا قرارداد.
 DocType: Purchase Invoice,Address and Contact,آدرس و تماس با
 DocType: Supplier,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Employee,Feedback,باز خورد
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",می توانید قبل از ترک نمی اختصاص داده شود {0}، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
+DocType: Asset,Expected Value After Useful Life,مقدار مورد انتظار پس از زندگی مفید
 DocType: Item,Reorder level based on Warehouse,سطح تغییر مجدد ترتیب بر اساس انبار
 DocType: Activity Cost,Billing Rate,نرخ صدور صورت حساب
 ,Qty to Deliver,تعداد برای ارائه
@@ -2264,15 +2324,15 @@
 DocType: Quality Inspection,Outgoing,خروجی
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
-apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} لغو یا بسته
+apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1}    لغو یا بسته شده است
 DocType: Delivery Note,Track this Delivery Note against any Project,پیگیری این تحویل توجه داشته باشید در مقابل هر پروژه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,نقدی خالص از سرمایه گذاری
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,دارایی {0} باید ارائه شود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,مدیریت آدرس
-DocType: Pricing Rule,Item Code,کد مورد
+DocType: Asset,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
 DocType: Journal Entry,User Remark,نکته کاربری
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
 DocType: Employee Education,School/University,مدرسه / دانشگاه
 DocType: Payment Request,Reference Details,اطلاعات مرجع
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
 DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
 ,Billed Amount,مقدار فاکتور شده
+DocType: Asset,Double Declining Balance,دو موجودی نزولی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,سفارش بسته نمی تواند لغو شود. باز کردن به لغو.
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,دریافت به روز رسانی
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
+DocType: Asset,Fully Depreciated,به طور کامل مستهلک
 ,Stock Projected Qty,سهام بینی تعداد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,سریال نه و دسته ای
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ارزش و یا تعداد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 ,Qty to Receive,تعداد دریافت
 DocType: Leave Block List,Leave Block List Allowed,ترک فهرست بلوک های مجاز
 DocType: Sales Partner,Retailer,خرده فروش
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
 DocType: Global Defaults,Disable In Words,غیر فعال کردن در کلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,بانک حساب چک بی محل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,وام
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا حساب مربوط استهلاک در دارایی رده {0} یا شرکت {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
 DocType: Appraisal,Appraisal,ارزیابی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},ایمیل ارسال شده به منبع {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,امضای مجاز
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
@@ -2344,7 +2410,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیام های ارسال شده
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,مجموع حاشیه
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
 DocType: Expense Claim,Approval Status,وضعیت تایید
 DocType: Hub Settings,Publish Items to Hub,انتشار مطلبی برای توپی
@@ -2382,10 +2449,10 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,بررسی همه
 DocType: Sales Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,مشتری گروه / مشتریان
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,گروه مشتری / مشتری
 DocType: Payment Gateway Account,Default Payment Request Message,به طور پیش فرض درخواست پرداخت پیام
 DocType: Item Group,Check this if you want to show in website,بررسی این اگر شما می خواهید برای نشان دادن در وب سایت
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,بانکداری و پرداخت
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,بانکداری و پرداخت
 ,Welcome to ERPNext,به ERPNext خوش آمدید
 DocType: Payment Reconciliation Payment,Voucher Detail Number,جزئیات شماره کوپن
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,منجر به عبارت
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,برگ و تعطیلات
 DocType: Sales Order,Not Billed,صورتحساب نه
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,هر دو انبار باید به همان شرکت تعلق
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,بسته بندی های کوچک برای صدور صورت حساب
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-DocType: Sales Order Item,Sales Order Date,سفارش فروش تاریخ
+DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
+DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
 DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,تاریخ خرید دارایی {0} با تاریخ خرید فاکتور مطابقت ندارد
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Account,Payable,قابل پرداخت
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),بدهکاران ({0})
-DocType: Project,Margin,حاشیه
+DocType: Pricing Rule,Margin,حاشیه
 DocType: Salary Slip,Arrear Amount,مقدار تعویق وام
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,مشتریان جدید
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,سود ناخالص٪
@@ -2435,20 +2504,23 @@
 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,بررسی کنید که آیا می خواهید برای ارسال لغزش حقوق و دستمزد در پست الکترونیکی به هر یک از کارکنان در هنگام ارسال لغزش حقوق و دستمزد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
 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 +57,Where manufacturing operations are carried.,که در آن عملیات ساخت در حال انجام شده است.
 DocType: Stock Entry Detail,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
 DocType: Employee,Confirmation Date,تایید عضویت
 DocType: C-Form,Total Invoiced Amount,کل مقدار صورتحساب
 DocType: Account,Sales User,فروش کاربر
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,حداقل تعداد نمی تواند بیشتر از حداکثر تعداد
+DocType: Account,Accumulated Depreciation,استهلاک انباشته
 DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
 DocType: Payment Request,Email To,ارسال ایمیل به
 DocType: Lead,Lead Owner,مالک راهبر
 DocType: Bin,Requested Quantity,تعداد درخواست
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,انبار مورد نیاز است
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,انبار مورد نیاز است
 DocType: Employee,Marital Status,وضعیت تاهل
 DocType: Stock Settings,Auto Material Request,درخواست مواد خودکار
 DocType: Time Log,Will be updated when billed.,خواهد شد که در صورتحساب یا لیست به روز شد.
@@ -2456,11 +2528,12 @@
 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 +115,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 +84,{0}% Delivered,{0}٪ تحویل داده شد
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,منبع همان وارد شده است چندین بار
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,خرید سفارش مورد عرضه
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,نام شرکت می تواند شرکت نیست
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,سران نامه برای قالب چاپ.
@@ -2470,13 +2543,14 @@
 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: Payment Request,Payment Details,جزئیات پرداخت
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
+DocType: Asset,Journal Entry for Scrap,ورودی مجله برای ضایعات
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.",ضبط تمام ارتباطات از نوع ایمیل، تلفن، چت،، و غیره
 DocType: Manufacturer,Manufacturers used in Items,تولید کنندگان مورد استفاده در موارد
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,لطفا دور کردن مرکز هزینه در شرکت ذکر
 DocType: Purchase Invoice,Terms,شرایط
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,ایجاد جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,ایجاد جدید
 DocType: Buying Settings,Purchase Order Required,خرید سفارش مورد نیاز
 ,Item-wise Sales History,تاریخچه فروش آیتم و زرنگ
 DocType: Expense Claim,Total Sanctioned Amount,کل مقدار تحریم
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,سهام لجر
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},نرخ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,حقوق و دستمزد کسر لغزش
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,اولین انتخاب یک گره گروه.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,اولین انتخاب یک گره گروه.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,کارمند و حضور و غیاب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},هدف باید یکی از است {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",حذف مرجع مشتری، تامین کننده، شریک فروش و سرب، آن را به عنوان آدرس شرکت شما است
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: از {1}
 DocType: Task,depends_on,بستگی دارد به
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
 DocType: BOM Replace Tool,BOM Replace Tool,BOM به جای ابزار
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,کشور به طور پیش فرض عاقلانه آدرس قالب
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,تاریخ بعدی باید بزرگتر از ارسال تاریخ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,نمایش مالیاتی تجزیه
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (فرم # / کالا / {0}) خارج از بورس
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,تاریخ بعدی باید بزرگتر از ارسال تاریخ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/accounts/party.py +289,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',اگر شما در فعالیت های تولید باشد. را قادر می سازد آیتم های تولیدی است
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,فاکتور های ارسال و ویرایش تاریخ
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",توجه: در صورت پرداخت در مقابل هر مرجع ساخته شده است، را مجله ورودی دستی.
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
 ,Stock Ageing,سهام سالمندی
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,10 +2630,10 @@
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,قالب
-DocType: Sales Person,Sales Person Name,فروش نام شخص
+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 +161,Add Users,اضافه کردن کاربران
 DocType: Pricing Rule,Item Group,مورد گروه
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
+DocType: Asset Category Account,Fixed Asset Account,حساب دارایی ثابت
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,انترن
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,از BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,ساختار حقوق و دستمزد
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,نقل قول
 DocType: Hub Settings,Access Token,نشانه دسترسی
 DocType: Sales Invoice Item,Serial No,شماره سریال
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
-DocType: Item,Is Fixed Asset Item,آیا مورد دارائی های ثابت
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
 DocType: Purchase Invoice,Print Language,چاپ زبان
 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 در هر صفحه چاپ شود
+DocType: Asset,Number of Depreciations,تعداد Depreciations
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 DocType: Fiscal Year,Year Name,نام سال
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
 DocType: Product Bundle Item,Product Bundle Item,محصولات بسته نرم افزاری مورد
 DocType: Sales Partner,Sales Partner Name,نام شریک فروش
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,درخواست نرخ
 DocType: Payment Reconciliation,Maximum Invoice Amount,حداکثر مبلغ فاکتور
 DocType: Purchase Invoice Item,Image View,تصویر مشخصات
 apps/erpnext/erpnext/config/selling.py +23,Customers,مشتریان
+DocType: Asset,Partially Depreciated,نیمه مستهلک
 DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,از و به تاریخ های الزامی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,مدیر نگهداری و تعمیرات
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,مجموع نمیتواند صفر باشد
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""روز پس از آخرین سفارش"" باید بزرگتر یا مساوی صفر باشد"
-DocType: C-Form,Amended From,اصلاح از
+DocType: Asset,Amended From,اصلاح از
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,حمل به جلو
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,لطفا &quot;به دست آوردن حساب / از دست دادن در دفع دارایی، ذکر در شرکت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,پرداخت بازی با فاکتورها
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,پرداخت بازی با فاکتورها
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,اضافه کردن به سبد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروه توسط
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
 DocType: Production Planning Tool,Get Material Request,دریافت درخواست مواد
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,هزینه پستی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,هزینه پستی
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,در حال حاضر مجموع
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,بیانیه های حسابداری
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,بیانیه های حسابداری
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ساعت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
@@ -2687,28 +2766,30 @@
 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 +346,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),شروع نقطه از فروش (POS)
 apps/erpnext/erpnext/config/support.py +32,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,مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
+DocType: Pricing Rule,Customer Group,گروه مشتری
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: Item,Website Description,وب سایت توضیحات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
-,Sales Register,فروش ثبت نام
+,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,نام مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+DocType: Customer Group,Customer Group Name,نام گروه مشتری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,در برابر نوع کوپن
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},خطا: {0}&gt; {1}
 DocType: Item,Attributes,ویژگی های
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,گرفتن اقلام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,لطفا وارد حساب فعال
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,گرفتن اقلام
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},حساب {0} می کند به شرکت تعلق نمی {1}
 DocType: C-Form,C-Form,C-فرم
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,موبایل بدون
 DocType: Payment Tool,Make Journal Entry,مجله را ورود
 DocType: Leave Allocation,New Leaves Allocated,برگ جدید اختصاص داده شده
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,تجاری
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},خطا: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 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 +52,All Products or Services.,همه محصولات یا خدمات.
 DocType: Supplier Quotation,Supplier Address,تامین کننده آدرس
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,از تعداد
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
+apps/erpnext/erpnext/config/accounts.py +259,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,خدمات مالی
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروم
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,انتقال
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,تاریخ الزامی است
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
@@ -2765,21 +2846,23 @@
 DocType: GL Entry,Remarks,سخنان
 DocType: Purchase Order Item Supplied,Raw Material Item Code,مواد اولیه کد مورد
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,ارسال ایمیل کننده
 DocType: Features Setup,POS View,POS مشخصات
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,روز تاریخ بعدی و تکرار در روز ماه باید برابر باشد
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,روز تاریخ بعدی و تکرار در روز ماه باید برابر باشد
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,لطفا مشخص کنید
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,در بالا
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,زمان ورود تا صورتحساب شده است
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),موقت سود / زیان (اعتباری)
-DocType: Sales Invoice,Return Against Sales Invoice,بازگشت علیه فاکتور فروش
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},لطفا مقدار پیش فرض {0} در شرکت راه {1}
 DocType: Serial No,Creation Time,زمان ایجاد
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,جدول ماهانه حضور و غیاب
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,موردی یافت
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+DocType: Asset,Straight Line,خط مستقیم
+DocType: Project User,Project User,پروژه کاربر
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
 DocType: Sales Team,Contact No.,تماس با شماره
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
 DocType: Features Setup,Sales Discounts,تخفیف فروش
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,تعداد سفارش
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بنر که در بالای لیست محصولات نشان خواهد داد.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,مشخص شرایط برای محاسبه مقدار حمل و نقل
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,اضافه کردن کودک
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,ارزش باز
 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,کمیسیون فروش
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,کمیسیون فروش
 DocType: Offer Letter Term,Value / Description,ارزش / توضیحات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 ,Customers Not Buying Since Long Time,مشتریان خرید از آنجا که زمان طولانی
 DocType: Production Order,Expected Delivery Date,انتظار می رود تاریخ تحویل
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,هزینه سرگرمی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,هزینه سرگرمی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,برنامه های کاربردی برای مرخصی.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,هزینه های قانونی
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,هزینه های قانونی
 DocType: Sales Invoice,Posting Time,مجوز های ارسال و زمان
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,هزینه تلفن
 DocType: Sales Partner,Logo,آرم
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,بررسی این اگر شما می خواهید به زور کاربر برای انتخاب یک سری قبل از ذخیره. خواهد شد وجود ندارد به طور پیش فرض اگر شما این تیک بزنید.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},آیتم با سریال بدون هیچ {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,گسترش اطلاعیه
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,هزینه های مستقیم
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,هزینه های مستقیم
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} آدرس ایمیل نامعتبر در هشدار از طریق \ آدرس ایمیل است
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,هزینه های سفر
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),کل مقدار حسابداری (از طریق زمان سیاههها)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,ما فروش این مورد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,تامین کننده کد
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
 DocType: Journal Entry,Cash Entry,نقدی ورودی
 DocType: Sales Partner,Contact Desc,تماس با محصول،
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع برگ مانند گاه به گاه، بیمار و غیره
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,همه اطلاعات تماس.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,تامین کننده از دارایی {0} را با عرضه کننده در خرید فاکتور مطابقت ندارد
 DocType: Newsletter,Test Email Id,تست ایمیل کد
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,مواد اولیه را نمی توان همان آیتم های اصلی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,کارشناسی ارشد قالب حقوق و دستمزد.
@@ -2883,16 +2969,17 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,مخفف الزامی است
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,تشکر از شما برای منافع خود را در اشتراک به روز رسانی ما
 ,Qty to Transfer,تعداد می توان به انتقال
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,به نقل از به آگهی یا مشتریان.
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,ترجیح آدرس صورت حساب
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,ارز صورتحساب باید به ارز یا به طور پیش فرض comapany یا ارز حساب payble حزب برابر باشد
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,دبیر
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",اگر غیر فعال کردن، »به عبارت&quot; درست نخواهد بود در هر معامله قابل مشاهده
@@ -2902,13 +2989,13 @@
 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,طلبکاران
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,طلبکاران
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,ردیف # {0}: سریال نه اجباری است
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات حکیم مالیات
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Hub Settings,Name Token,نام رمز
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
-DocType: Project,Project Name,نام پروژه
+DocType: Request for Quotation 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,دسته مورد شماره
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,تاریخ پایان
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,معاملات سهام
 DocType: Employee,Internal Work History,تاریخچه کار داخلی
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,انباشته مبلغ استهلاک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",شرکت اجباری است، آن را به عنوان آدرس شرکت شما است
 DocType: Item Attribute,From Range,از محدوده
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,مورد {0} از آن نادیده گرفته است یک آیتم سهام نمی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ارسال این سفارش تولید برای پردازش بیشتر است.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,ارسال این سفارش تولید برای پردازش بیشتر است.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",برای رد درخواست قیمت گذاری در یک معامله خاص نیست، همه قوانین قیمت گذاری قابل اجرا باید غیر فعال باشد.
 DocType: Company,Domain,دامنه
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,شغل ها
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),کاهش سود برای مرخصی بدون حقوق (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,تاریخ تحویل
 DocType: Opportunity,Opportunity Date,فرصت تاریخ
 DocType: Purchase Receipt,Return Against Purchase Receipt,بازگشت علیه رسید خرید
+DocType: Request for Quotation Item,Request for Quotation Item,درخواست برای مورد دیگر
 DocType: Purchase Order,To Bill,به بیل
 DocType: Material Request,% Ordered,مرتب٪
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,کار از روی مقاطعه
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
 DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
 DocType: Customer,Sales Partner and Commission,شریک فروش و کمیسیون
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},لطفا &quot;حساب دفع دارایی، مجموعه ای در شرکت {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,حساب موقت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,سیاه
 DocType: BOM Explosion Item,BOM Explosion Item,BOM مورد انفجار
 DocType: Account,Auditor,ممیز
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,از کار انداختن
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,برای پرداخت اینجا را کلیک کنید
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}",دارایی {0} نمی تواند اوراق شود، آن است که در حال حاضر {1}
 DocType: Task,Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,شناسه مشتری
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,علامت گذاری به عنوان غایب
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,به زمان باید بیشتر از از زمان است
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,اضافه کردن آیتم از
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,اضافه کردن آیتم از
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""",به عنوان مثال &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,سهام نمی تواند برای مورد وجود داشته باشد {0} از انواع است
 ,Sales Person-wise Transaction Summary,فروش شخص عاقل خلاصه معامله
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,انبار {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,آیتم انتخاب شده می تواند دسته ای ندارد
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,مدیریت کیفیت
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,مورد {0} غیرفعال شده است
 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,کارمند خارجی سابقه کار
@@ -3068,7 +3160,7 @@
 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,بعد تماس
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,راه اندازی حساب های دروازه.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,راه اندازی حساب های دروازه.
 DocType: Employee,Employment Type,نوع استخدام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,دارایی های ثابت
 ,Cash Flow,جریان وجوه نقد
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,تعادل بیانیه بانک به عنوان در هر لجر عمومی
 DocType: Job Applicant,Applicant Name,نام متقاضی
 DocType: Authorization Rule,Customer / Item Name,مشتری / نام آیتم
@@ -3098,19 +3190,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,تنظیمات پیش فرض برای فروش معاملات.
 DocType: BOM Replace Tool,Current BOM,BOM کنونی
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,اضافه کردن سریال بدون
 apps/erpnext/erpnext/config/support.py +43,Warranty,گارانتی
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,چاپ و ثابت
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,گره گروه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,به روز رسانی به پایان رسید کالا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,به روز رسانی به پایان رسید کالا
 DocType: Workstation,per hour,در ساعت
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,خرید
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,مبلغ پرداخت شده
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
 DocType: Leave Block List,Applies to Company,امر به شرکت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
 DocType: Purchase Invoice,In Words,به عبارت
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,امروز {0} تولد است!
 DocType: Production Planning Tool,Material Request For Warehouse,درخواست مواد ذخیره سازی
@@ -3153,19 +3244,21 @@
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
+DocType: Pricing Rule,Margin Rate or Amount,نرخ حاشیه و یا مقدار
 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: 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 +782,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} در حال حاضر دریافت شده است
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,جزییات تیم فروش
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},نامعتبر {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,فروشگاه های گروه
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ذخیره سند اول است.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,ذخیره سند اول است.
 DocType: Account,Chargeable,پرشدنی
 DocType: Company,Change Abbreviation,تغییر اختصار
 DocType: Expense Claim Detail,Expense Date,هزینه عضویت
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,لجر عمومی
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,مشخصات آگهی
 DocType: Item Attribute Value,Attribute Value,موجودیت مقدار
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",شناسه ایمیل باید منحصر به فرد، در حال حاضر وجود دارد برای {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",شناسه ایمیل باید منحصر به فرد، در حال حاضر وجود دارد برای {0}
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 DocType: Features Setup,To get Item Group in details table,برای دریافت مورد گروه در جدول جزئیات
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {0}
 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>
@@ -3226,23 +3319,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),تعداد واقعی (در منبع / هدف)
 DocType: Item Customer Detail,Ref Code,کد
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سوابق کارکنان.
 DocType: Payment Gateway,Payment Gateway,دروازه پرداخت
 DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,محل سفارش
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ریشه می تواند یک مرکز هزینه پدر و مادر ندارد
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,انتخاب نام تجاری ...
 DocType: Sales Invoice,C-Form Applicable,C-فرم قابل استفاده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,انبار الزامی است
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,حل
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,ارز معامله باید به عنوان دروازه پرداخت ارز باشد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,دريافت كردن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,دريافت كردن
 DocType: Maintenance Visit,Fully Completed,طور کامل تکمیل شده
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ کامل
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,ارسال در ایجاد
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,افزودن / ویرایش قیمتها
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,سفارشهای من
@@ -3296,10 +3389,10 @@
 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 +250,Point-of-Sale Profile,نقطه از فروش مشخصات
+apps/erpnext/erpnext/config/accounts.py +258,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} در حال حاضر در صورتحساب یا لیست
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,نا امن وام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,نا امن وام
 DocType: Cost Center,Cost Center Name,هزینه نام مرکز
 DocType: Maintenance Schedule Detail,Scheduled Date,تاریخ برنامه ریزی شده
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,مجموع پرداخت AMT
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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;به عنوان خوانده شده
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,کننده قسمت بدون
 DocType: Purchase Invoice,Contact,تماس
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,دریافت شده از
 DocType: Features Setup,Exports,صادرات
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: از {0} برای {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
 DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,سر حساب
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,دارایی های سهام
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,فعالیت پروژه / وظیفه.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تولید حقوق و دستمزد ورقه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",خرید باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,تکرار در روز از ماه
@@ -3384,7 +3478,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,مطالبات
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,تاریخ شروع سال یا تاریخ پایان است با هم تداخل دارند با {0}. برای جلوگیری از به مدیر مجموعه شرکت
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,عضویت در خبرنامه جدید
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",مثال: ABCD ##### اگر سری قرار است و سریال بدون در معاملات ذکر نشده است، پس از آن به صورت خودکار شماره سریال بر اساس این مجموعه ایجاد شده است. اگر شما همیشه می خواهید سریال شماره به صراحت ذکر برای این آیتم. این را خالی بگذارید.
 DocType: Upload Attendance,Upload Attendance,بارگذاری حضور و غیاب
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,لطفا ارز به طور پیش فرض در شرکت استاد وارد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},درگیری قانون مالیاتی با {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,نام حساب
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,خدمات مشتریان
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,پیشنهاد نامزد یک کار.
 DocType: Notification Control,Prompt for Email on Submission of,اعلان برای ایمیل در ارسال مقاله از
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,مجموع برگ اختصاص داده بیش از روز در دوره
+DocType: Pricing Rule,Percentage,در صد
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,مورد {0} باید مورد فروش می شود
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,مورد {0} باید مورد فروش می شود
 DocType: Naming Series,Update Series Number,به روز رسانی سری شماره
 DocType: Account,Equity,انصاف
 DocType: Sales Order,Printing Details,اطلاعات چاپ
@@ -3431,11 +3527,12 @@
 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,مجامع جستجو فرعی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,علیه صورتحساب
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; و انجام ذکر نرخ مالیات.
 DocType: Production Order,Production Order,سفارش تولید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
 DocType: Quotation Item,Against Docname,علیه Docname
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,موفقیت آشتی
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,که در آن موارد ذخیره می شود.
 DocType: Tax Rule,Validity,اعتبار
+DocType: Request for Quotation,Supplier Detail,جزئیات کننده
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مقدار صورتحساب
 DocType: Attendance,Attendance,حضور
 apps/erpnext/erpnext/config/projects.py +55,Reports,گزارش ها
 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 +508,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,قالب های مالیاتی برای خرید معاملات.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,قالب های مالیاتی برای خرید معاملات.
 ,Item Prices,قیمت مورد
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
 DocType: Period Closing Voucher,Period Closing Voucher,دوره کوپن اختتامیه
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,تغییر
@@ -3486,24 +3584,25 @@
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
+DocType: Asset Category,Asset Category Name,دارایی رده نام
 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,علیه فاکتور فروش
+DocType: Delivery Note Item,Against Sales Invoice,در برابر فاکتور فروش
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,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 +559,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,دسته
@@ -3514,10 +3613,10 @@
 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 +74,Sales Person,فرد از فروش
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,فروشنده
 DocType: Sales Invoice,Cold Calling,تلفن سرد
 DocType: SMS Parameter,SMS Parameter,پارامتر SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,بودجه و هزینه مرکز
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,بودجه و هزینه مرکز
 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.,ایجاد قوانین برای محدود کردن معاملات بر اساس ارزش.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,خرید مشترک
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,پدر و مادر حساب
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,آموزش و پرورش
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
 DocType: Address,Office,دفتر
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,دسته پرسشنامه
 DocType: Employee,Contract End Date,پایان دادن به قرارداد تاریخ
 DocType: Sales Order,Track this Sales Order against any Project,پیگیری این سفارش فروش در مقابل هر پروژه
+DocType: Sales Invoice Item,Discount and Margin,تخفیف و حاشیه
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سفارشات فروش کشش (در انتظار برای ارائه) بر اساس معیارهای فوق
 DocType: Deduction Type,Deduction Type,نوع کسر
 DocType: Attendance,Half Day,نیم روز
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,ماهانه حقوق ثبت نام
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
 DocType: BOM Operation,BOM Operation,عملیات BOM
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,پرداخت URL پیام
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ردیف {0}: مبلغ پرداخت نمی تواند بیشتر از مقدار برجسته
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,مجموع پرداخت نشده
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,زمان ورود است قابل پرداخت نیست
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
+DocType: Asset,Asset Category,دارایی رده
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,لطفا علیه کوپن دستی وارد کنید
 DocType: SMS Settings,Static Parameters,پارامترهای استاتیک
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,مواد به کننده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,فاکتور مالیات کالاهای داخلی
 DocType: Expense Claim,Employees Email Id,کارکنان پست الکترونیکی شناسه
 DocType: Employee Attendance Tool,Marked Attendance,حضور و غیاب مشخص شده
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,بدهی های جاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,بدهی های جاری
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,تعداد واقعی الزامی است
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,مقادیر عددی
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,ضمیمه لوگو
 DocType: Customer,Commission Rate,کمیسیون نرخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,سبد خرید خالی است
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,بدون آدرس پیش فرض الگو پیدا شده است. لطفا یکی از جدید از راه اندازی&gt; چاپ و تبلیغات تجاری&gt; آدرس الگو ایجاد کنید.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,سرمایه سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,سرمایه سهام
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
 DocType: Payment Gateway Account,Payment Gateway Account,پرداخت حساب دروازه
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,پس از اتمام پرداخت هدایت کاربر به صفحه انتخاب شده است.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
+DocType: Asset,Current Value (After Depreciation),ارزش فعلی (پس از استهلاک)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,بیل از مواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,کد عکس تاریخ
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,حساب {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,حساب {0} وجود ندارد
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index d4e3d14..02b6b85 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,jakaja
 DocType: Employee,Rented,Vuokrattu
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
 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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} puu
 DocType: Job Applicant,Job Applicant,Työnhakija
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,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/templates/pages/projects.js +81,Show open,Näytä auki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,sarja päivitetty onnistuneesti
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,uusi poistumissovellus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,näytä mallivaihtoehdot
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Määrä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),lainat (vastattavat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,nimeäminen
@@ -64,7 +66,7 @@
 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 +642,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Uusi {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Uusi {0}: # {1}
 ,Sales Partners Commission,myyntikumppanit provisio
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
 DocType: Payment Request,Payment Request,Maksupyyntö
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Naimisissa
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei saa {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Saamaan kohteita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,aktiivisuus loki:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,Onko käyttöomaisuusosakkeet
 DocType: Expense Claim Detail,Claim Amount,vaatimuksen arvomäärä
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,kaikki yhteystiedot
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} on jäädytetty
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,varaston kulut
 DocType: Newsletter,Email Sent?,sähköposti lähetetty?
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Production Order Operation,Show Time Logs,näytä aikalokit
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,asennus tila
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,tuotteen {0} tulee olla ostotuote
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
 DocType: BOM Replace Tool,New BOM,uusi BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
 DocType: Naming Series,Series List for this Transaction,sarjalistaus tähän tapahtumaan
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Anna Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettokassavirta Rahoituksen
 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 +217,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
 DocType: Newsletter List,Total Subscribers,alihankkijat yhteensä
 ,Contact Name,"yhteystiedot, nimi"
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
 DocType: Payment Tool,Reference No,Viitenumero
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank merkinnät
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Ilmoittaminen Ohjaus
 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/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},syötä emotiliryhmä varastolle {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,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.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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ä
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Oppia
+DocType: Asset,Next Depreciation Date,Seuraava Poistot Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,tilien asetukset
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Toimittaja laskun nro olemassa Ostolasku {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,hallitse myyjäpuuta
 DocType: Job Applicant,Cover Letter,Saatekirje
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Erinomainen Sekkejä ja Talletukset tyhjentää
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,väärä salasana
 DocType: Item,Variant Of,mallista
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen"
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} yksikköä [{1}] (# Form / Kohde / {1}) löytyi [{2}] (# Form / Varasto / {2})
 DocType: Lead,Industry,teollisuus
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Tiedote
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,verojen perusmääritykset
 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 +381,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,pidetään kokonaistilauksena
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,valitse tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},sarjanumero {0} ei kuulu lähetteeseen {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,tuotteen laatutarkistus parametrit
 DocType: Leave Application,Leave Approver Name,poistumis hyväksyjän nimi
-,Schedule Date,"aikataulu, päivä"
+DocType: Depreciation Schedule,Schedule Date,"aikataulu, päivä"
 DocType: Packed Item,Packed Item,pakattu tuote
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,valuuttaoston oletusasetukset
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,valuuttaoston oletusasetukset
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},aktiviteettikustannukset per työntekijä {0} / aktiviteetin muoto - {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.,"älä luo asiakas-, tai toimittajatilejä, ne laaditaan suoraan asiakas- / toimittaja valvonnassa"
 DocType: Currency Exchange,Currency Exchange,valuutanvaihto
@@ -346,6 +353,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Tarjouspyyntö
 DocType: Workstation,Working Hours,työaika
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
-DocType: Material Request Item,Required Date,pyydetty päivä
+DocType: Request for Quotation Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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
+DocType: Request for Quotation,Message for Supplier,Viesti toimittaja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
 DocType: Employee,Health Concerns,"terveys, huolenaiheet"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,palkaton
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Toimitusjohtaja Alihankinta
+DocType: Project,Project will be accessible on the website to these users,Hanke on nähtävissä sivustolla näille käyttäjille
 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 +53,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Lisäys voi olla 0
 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 +86,Item {0} is not Purchase Item,tuote {0} ei ole ostotuote
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,tuote {0} ei ole ostotuote
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,tili- / kirjanpitokausi
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,tili- / kirjanpitokausi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kertyneet Arvot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,vihje tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,tilikauden aloituspäivä tule olla suurempi kuin tilikauden päättymispäivä
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Toimitettu: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,maksettava tili
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Jatka Attachment
 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/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Myynti Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Myynti Return
 DocType: Item,Delivered by Supplier (Drop Ship),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,palkkakomponentteja
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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"
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Päivitys Bank Transaction Päivämäärät
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Päivitys Bank Transaction Päivämäärät
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,aika seuranta
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Anna ostokuitti ensin
 DocType: Buying Settings,Supplier Naming By,toimittajan nimennyt
 DocType: Activity Type,Default Costing Rate,Oletus Kustannuslaskenta Hinta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,huoltoaikataulu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettomuutos Inventory
 DocType: Employee,Passport Number,passin numero
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,hallinta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Aseta Holiday List joko työntekijä tai Yhtiö
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Poistot Määrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,aktiviteettimuoto
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,toimitettu arvomäärä
 DocType: Supplier,Fixed Days,säädetyt päivät
 DocType: Quotation Item,Item Balance,Kohta Balance
 DocType: Sales Invoice,Packing List,pakkausluettelo
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Ostotilaukset annetaan Toimittajat.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ostotilaukset annetaan Toimittajat.
 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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operation Time
 DocType: Pricing Rule,Sales Manager,myynninhallinta
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Group Group
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Omat projektit
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
 DocType: Journal Entry,Bill No,Bill No
+DocType: Company,Gain/Loss Account on Asset Disposal,Gain / tuloslaskelma Omaisuudenhoitoalan Hävittäminen
 DocType: Purchase Invoice,Quarterly,Neljännesvuosittain
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
 DocType: Sales Order Item,Basic Rate (Company Currency),perustaso (yrityksen valuutta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Maksu käyttö on jo luotu
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Yhteensä laskutus tänä vuonna
 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 +529,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunnitellut End Time
 ,Sales Person Target Variance Item Group-Wise,"tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,kuukausipalkka tosite
 DocType: Item Group,Website Specifications,Verkkosivujen tiedot
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},On virhe osoittekirjassasi Template {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,uusi tili
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,uusi tili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {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.,"kirjanpidon kirjaukset voidaan kodistaa jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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/manufacturing/doctype/bom/bom.py +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,toimitilan huoltokulut
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Anna Kohta ensin
 DocType: Account,Liability,vastattavat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Hinnasto ei valittu
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,omat laskut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,omat laskut
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Yhtään työntekijää ei löytynyt
 DocType: Supplier Quotation,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,lataa varastotase .csv-tiedoston kautta
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,lähetä nyt
 ,Support Analytics,tuki Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Looginen virhe: Must löytää päällekkäisiä
 DocType: Item,Website Warehouse,verkkosivujen varasto
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,pisteet on oltava pienempi tai yhtä suuri kuin 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-muoto tietue
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-muoto tietue
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,asiakas ja toimittaja
 DocType: Email Digest,Email Digest Settings,sähköpostitiedotteen asetukset
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,asiakkaan tukikyselyt
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,on alihankittu
 DocType: Item Attribute,Item Attribute Values,"tuotetuntomerkki, arvot"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,näytä tilaajia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Ostokuitti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,valuuttataso valvonta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,valuuttataso valvonta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Myynnin Partners ja Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+DocType: Journal Entry,Depreciation Entry,Poistot Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Siirry ostoskoriin
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,ostolasku
+DocType: Asset,Purchase Invoice,ostolasku
 DocType: Stock Ledger Entry,Voucher Detail No,tosite lisätiedot nro
 DocType: Stock Entry,Total Outgoing Value,"kokonaisarvo, lähtevä"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,"virtausaika, päiväys"
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
 DocType: Job Opening,Publish on website,Julkaise verkkosivusto
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,toimitukset asiakkaille
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,välilliset tulot
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Aseta Maksusumma = jäljellä
 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 +672,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,talitse siirrettävä tuote
 DocType: Purchase Invoice,Additional Discount Percentage,Muita alennusprosenttia
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rivi {0}: Laskun {1} on virheellinen, se voidaan peruuttaa / ei ole olemassa. \ Anna kelvollinen Lasku"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työntekijälle syntymäpäivämuistutuksia
 ,Employee Holiday Attendance,Työntekijän Holiday Läsnäolo
 DocType: Opportunity,Walk In,kävele sisään
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Viestit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock Viestit
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,siirretty
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 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 +5,My Cart,Ostoskori
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 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 +180,Qty for {0},yksikkömäärään {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
+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 +80,Leave Allocation Tool,poistumiskohdistus työkalu
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
 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 +547,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,alennus
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Ostokuitti Kohde
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,myynnin arvomäärä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,aikalokit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,aikalokit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,Scrapped
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},sarjanumero {0} on huoltokannassa {1} asti
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},sarjanumero {0} on huoltokannassa {1} asti
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,rekrytointi
 DocType: BOM Operation,Operation,Toiminta
 DocType: Lead,Organization Name,Organisaation nimi
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,myynnin kulut
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,perusostaminen
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
 DocType: Sales Person,Select company name first.,valitse yrityksen nimi ensin.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,€
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,toimittajan tarjous vastaanotettu
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,toimittajan tarjous vastaanotettu
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},(lle) {0} | {1} {2}
 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ä
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,oletusvaluutta
 DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
 DocType: Expense Claim,From Employee,työntekijästä
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,panostus %
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Project Collaboration Kutsu
 DocType: Salary Slip,Deductions,vähennykset
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,tämä aikaloki erä on laskutettu
 DocType: Salary Slip,Leave Without Pay,"poistu, ilman palkkaa"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,kapasiteetin suunnittelu virhe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,kapasiteetin suunnittelu virhe
 ,Trial Balance for Party,Koetase Party
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Mitään pyytää
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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än tarvitsee olla ennen päättymispäivää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,hallinto
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,aikalomakkeen aktiviteetti tyyppit
@@ -935,18 +958,18 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Aseta Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Aseta Email ID
 DocType: Item,UOMs,UOM:n
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,sarjanumeron tuotekoodia ei voi vaihtaa
 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/config/buying.py +33,Supplier database.,toimittaja tietokanta
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,verot- ja muut palkan vähennykset
 DocType: Lead,Lead,vihje
 DocType: Email Digest,Payables,maksettavat
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,loma
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-muoto ei sovelleta lasku: {0}
 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ä
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Kohta {0} on oltava ei-varastotuote
 DocType: Contact,User ID,käyttäjätunnus
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,näytä tilikirja
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,näytä tilikirja
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,maksetut osingot
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,maksetut osingot
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kirjanpito Ledger
 DocType: Stock Reconciliation,Difference Amount,eron arvomäärä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Kertyneet voittovarat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Kertyneet voittovarat
 DocType: BOM Item,Item Description,tuotteen kuvaus
 DocType: Payment Tool,Payment Mode,maksutila
 DocType: Purchase Invoice,Is Recurring,on toistuva
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,tilapäinen avaus
 ,Employee Leave Balance,työntekijän poistumistase
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Arvostus Luokitus vaaditaan Tuote rivillä {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,maksettava tilien yhteenveto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Yhteensä Issue / Transfer määrä {0} in Material pyyntö {1} \ ei voi olla suurempi kuin pyydetty määrä {2} alamomentin {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,pieni
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,tilin otsikko {0} luotu
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,"yhteensä, saavutettu"
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Maatalous
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
 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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/stock/get_item_details.py +142,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"
 DocType: Hub Settings,Seller Website,myyjä verkkosivut
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,myyntitiimin kohdennettu prosenttiosuus tulee olla 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},tuotannon tilauksen tila on {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},tuotannon tilauksen tila on {0}
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,toimittajalle
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Ei löytänyt mitään kohde nimeltä {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,tuoteryhmien verkkosivu
 DocType: Purchase Invoice,Total (Company Currency),yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,sarjanumero {0} kirjattu useammin kuin kerran
-DocType: Journal Entry,Journal Entry,päiväkirjakirjaus
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,"toimitus, tavoitteet"
 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ä
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Tarjouspyyntö Toimittaja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
 DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Attendance,HR Manager,henkilöstön hallinta
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,"arviointi, mallipohja tavoite"
 DocType: Salary Slip,Earning,ansio
 DocType: Payment Tool,Party Account Currency,PartyAccount Valuutta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Nykyinen arvo poistojen jälkeen on oltava pienempi tai yhtä suuri kuin {0}
 ,BOM Browser,BOM selain
 DocType: Purchase Taxes and Charges,Add or Deduct,lisää tai vähennä
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jos vuotuinen talousarvio ylitetty (varten kululaskelma)
@@ -1096,21 +1124,22 @@
 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}"
 DocType: Project,Start and End Dates,Alkamis- ja päättymisajankohta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Keskimääräinen alennus
 DocType: Address,Utilities,hyödykkeet
 DocType: Purchase Invoice Item,Accounting,Kirjanpito
 DocType: Features Setup,Features Setup,ominaisuuksien määritykset
+DocType: Asset,Depreciation Schedules,Poistot aikataulut
 DocType: Item,Is Service Item,on palvelutuote
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 DocType: Payment Request,Transaction Currency,valuuttakoodi
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},alkaen {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},alkaen {0} | {1} {2}
 DocType: BOM Operation,Operation Description,toiminnon kuvaus
 DocType: Item,Will also apply to variants,sovelletaan myös muissa malleissa
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,tilikauden alkamis- tai päättymispäivää ei voi muuttaa sen jälkeen kun tilikausi tallennetaan
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,tilikauden alkamis- tai päättymispäivää ei voi muuttaa sen jälkeen kun tilikausi tallennetaan
 DocType: Quotation,Shopping Cart,ostoskori
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Lähtevä
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,viestintä loki
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,toimitusosoitteen nimi
 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 +472,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Verosääntöön liiketoimia.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Verosääntöön liiketoimia.
 DocType: Rename Tool,Type of document to rename.,asiakirjan tyyppi uudelleenimeä
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ostamme tätä tuotetta
 DocType: Address,Billing,Laskutus
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Lukemat
 DocType: Stock Entry,Total Additional Costs,Lisäkustannusten kokonaismäärää
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,alikokoonpanot
+DocType: Asset,Asset Name,Asset Name
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Supplier,Stock Manager,varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,pakkauslappu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Toimisto Rent
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,pakkauslappu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Toimisto Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,tekstiviestin reititinmääritykset
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Tarjouspyyntö voi olla pääsy klikkaamalla seuraavaa linkkiä
+DocType: Asset,Number of Months in a Period,Kuukausien määrä on Period
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,hallinto
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),yhteensä ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),yhteensä ({0})
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
 DocType: Sales Invoice,Source,lähde
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Näytäsuljetut
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,tilikauden aloituspäivä
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Investointien rahavirta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Item Group,Item Group Name,"tuoteryhmä, nimi"
 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 +86,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
 DocType: Pricing Rule,For Price List,hinnastoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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"
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"tee uusi tili, tilikartasta"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,"huolto, käynti"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,"huolto, käynti"
 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: Landed Cost Voucher,Landed Cost Help,"kohdistetut kustannukset, ohje"
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,brändin valvonta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,pl
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,yrityksen kuluvaatimukset
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,varasto vastattavat
 DocType: Purchase Receipt,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Muut raportit
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} näytä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Rahavarojen muutos
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Määrä saa olla enintään {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Edellisen tilikauden ei ole suljettu
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,toimittajatyypin valvonta
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,toimittajan osanumero
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,muuntotaso ei voi olla 0 tai 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,muuntotaso ei voi olla 0 tai 1
 DocType: Purchase Invoice,Reference Document,vertailuasiakirja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% laskutettu
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettomuutos ostovelat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Tarkista sähköpostisi id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',asiakkaalla tulee olla 'asiakaskohtainen alennus'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
 DocType: Quotation,Term Details,ehdon lisätiedot
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,takuuvaatimus
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,pysyvä osoite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"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}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,valitse tuotekoodi
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,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
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,tuotteet vähissä raportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,tuotteen yksittäisyksikkö
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},vaadittu tuotemäärä {0} rivillä {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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"
+DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","esim, ""XYZ kansallinen pankki"""
+DocType: Asset,Depreciation Method,Poistot Menetelmä
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
 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 +29,Shopping Cart is enabled,Ostoskori on käytössä
 DocType: Job Applicant,Applicant for a Job,työn hakija
 DocType: Production Plan Material Request,Production Plan Material Request,Tuotanto Plan Materiaali Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,tuotannon tilauksia ei ole tehty
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,tuotannon tilauksia ei ole tehty
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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ä
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
 DocType: Territory,Territory Name,alue nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,osoitteet
+apps/erpnext/erpnext/hooks.py +91,Addresses,osoitteet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,Kehityskeskustelut
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,tuotteella ei voi olla tuotannon tilausta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,tuotteella ei voi olla tuotannon tilausta
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
 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: 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 +27,Time Logs for manufacturing.,aikaloki valmistukseen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} tulee lähettää
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,aikaloki tehtävät
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,brändi
 DocType: Item,Will also apply for variants,sovelletaan myös muissa malleissa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,kokoa tuotteet myyntihetkellä
 DocType: Quotation Item,Actual Qty,todellinen yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,kolleega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote
+DocType: Request for Quotation Supplier,Send Email to Supplier,Lähetä sähköpostilla Toimittaja
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 DocType: Packing Slip,To Package No.,pakkausnumeroon
 DocType: Production Planning Tool,Material Requests,materiaali pyynnöt
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
 DocType: Stock Settings,Allowance Percent,Päästöoikeuden Prosenttia
 DocType: SMS Settings,Message Parameter,viestiparametri
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
 DocType: Serial No,Delivery Document No,Toimitus Document No
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,hae tuotteet ostokuiteista
 DocType: Serial No,Creation Date,tekopäivä
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,toimitettava arvomäärä
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,tehnyt {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,tehnyt {0}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
 ,Serial No Status,sarjanumero tila
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,tuote taulukko ei voi olla tyhjä
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",rivi {0}: asettaaksesi {1} kausituksen aloitus ja päättymispäivän ero \ tulee olla suurempi tai yhtä suuri kuin {2}
 DocType: Pricing Rule,Selling,myynti
 DocType: Employee,Salary Information,palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,tullit ja verot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Anna Viiteajankohta
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Maksu Gateway tili ei ole määritetty
 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: Production Order,Material Request Item,tuote materiaalipyyntö
+DocType: Request for Quotation Item,Material Request Item,tuote materiaalipyyntö
 apps/erpnext/erpnext/config/stock.py +85,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ä"
+DocType: Asset,Sold,myyty
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,punainen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,asennus aika
 DocType: Sales Invoice,Accounting Details,Kirjanpito Lisätiedot
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,poista kaikki tapahtumat tältä yritykseltä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,määrärahat
 DocType: Quality Inspection Reading,Acceptance Criteria,hyväksymiskriteerit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Syötä Materiaali pyytää edellä olevassa taulukossa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Syötä Materiaali pyytää edellä olevassa taulukossa
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 DocType: Item Group,Show In Website,näytä verkkosivustossa
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,ryhmä
@@ -1527,6 +1567,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,gantt kaavio kaikista tehtävistä
+DocType: Pricing Rule,Margin Type,marginaali Tyyppi
 DocType: Appraisal,For Employee Name,työntekijän nimeen
 DocType: Holiday List,Clear Table,tyhjennä taulukko
 DocType: Features Setup,Brands,brändit
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Rivi # {0}: Asset on pakollinen vasten käyttö- omaisuuserän
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi kohdassa Setup&gt; numerointi Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toista Asiakas Liikevaihto
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pari
+DocType: Asset,Depreciation Schedule,Poistot aikataulu
 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: Asset,Purchase Date,Ostopäivä
 DocType: Employee,Personal Details,henkilökohtaiset lisätiedot
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Aseta &quot;Asset Poistot Kustannuspaikka&quot; in Company {0}
 ,Maintenance Schedules,huoltoaikataulut
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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ä
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Ryhmä Non-ryhmän
 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/public/js/setup_wizard.js +272,Unit,yksikkö
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Ilmoitathan Company
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
 ,BOM Search,BOM haku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),sulku (avaus + summat)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Hinta lisätty {0} ja hinnasto {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Hinta lisätty {0} ja hinnasto {1}
 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
 DocType: Territory,Classification of Customers by region,asiakkaiden luokittelu alueittain
 DocType: Project,% Tasks Completed,% tehtävät valmis
 DocType: Project,Gross Margin,bruttokate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,syötä ensin tuotantotuote
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,syötä ensin tuotantotuote
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Laskennallinen Tiliote tasapaino
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,käyttäjä poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,kustannukset päivitetty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,syntymäpäivä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
 DocType: Production 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ää
@@ -1620,8 +1666,8 @@
 ,SO Qty,myyntitilaukset yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
+DocType: Request for Quotation,Manufacturing Manager,valmistuksenhallinta
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
 apps/erpnext/erpnext/hooks.py +71,Shipments,toimitukset
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,sekalaiset kulut
 DocType: Global Defaults,Default Company,oletus yritys
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,käyttäjä {0} on poistettu käytöstä
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Rivi # {0}: Määrä on 1, kun kohde liittyy hyödykkeen"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapsi Tuote ei pitäisi olla tuote Bundle. Poista toiminto `{0}` ja säästä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,pankkitoiminta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,uusi kustannuspaikka
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Siirry kyseistä ryhmää (yleensä rahoituslähteen&gt; lyhytaikaiset velat&gt; Verot ja tehtävät ja luo uusi tili (klikkaamalla Add Child) tyyppiä &quot;Vero&quot; ja tehdä mainita veroprosentti.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,uusi kustannuspaikka
 DocType: Bin,Ordered Quantity,tilattu määrä
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Quality Inspection,In Process,prosessissa
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
 DocType: Quotation Item,Stock Balance,varastotase
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,aikaloki on luotu:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,aikaloki on luotu:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,paino UOM
 DocType: Employee,Blood Group,Veriryhmä
@@ -1691,13 +1738,13 @@
 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
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ilmoitathan maa tälle toimitus säännön tai tarkistaa Postikuluja
 DocType: Stock Entry,Total Incoming Value,"kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Veloituksen tarvitaan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 DocType: Offer Letter Term,Offer Term,Tarjous Term
 DocType: Quality Inspection,Quality Manager,laatuhallinta
 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 +141,Please select Incharge Person's name,valitse vastuuhenkilön nimi
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,valitse vastuuhenkilön nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,teknologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tarjoa Kirje
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,muodosta materiaalipyymtö (MRP) ja tuotantotilaus
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuote {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,nykyinen arvotaso
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 DocType: Opportunity,Lost Reason,hävitty syy
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,kohdista maksukirjaukset tilauksiin tai laskuihin
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,kohdista maksukirjaukset tilauksiin tai laskuihin
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,näytteen koko
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,palkkalaskelmaa ei löydy kuukaudelle:
 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 +175,Serial No {0} not found,sarjanumeroa {0} ei löydy
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,sarjanumeroa {0} ei löydy
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Omat asiakkaat
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyötä hankkeen: {0}
 DocType: Leave Block List Date,Block Date,estopäivä
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Hae nyt
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Hae nyt
 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"
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,"työsopimus, lisätiedot"
 DocType: Employee,New Workplace,Uusi Työpaikka
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,aseta suljetuksi
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ei Item kanssa Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,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
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,materiaalisiirto
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Kohta {0} on oltava myynti alkio {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Määritä toistuva tallentamisen jälkeen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Määritä toistuva tallentamisen jälkeen
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,tee palkkalaskelma
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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ä
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,tuo sähköposti mistä
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Kutsu Käyttäjä
 DocType: Features Setup,After Sale Installations,jälkimarkkinointi asennukset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Aseta {0} in Company {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Workstation Working Hour,End Time,ajan loppu
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,"perussopimusehdot, myynti tai osto"
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,uudelleennimettävä tiedosto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,maksutili
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Nopea Päiväkirjakirjaus
 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 +206,Please enter Planned Qty for Item {0} at row {1},syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ei ole lähetetty
 apps/erpnext/erpnext/config/stock.py +27,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
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Seuraavat Tuotanto Tilaukset luotiin:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Seuraavat Tuotanto Tilaukset luotiin:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Uutiskirje Postituslista
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
 DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} on suljettu
 DocType: Email Digest,How frequently?,kuinka usein
 DocType: Purchase Receipt,Get Current Stock,hae nykyinen varasto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Siirry kyseistä ryhmää (yleensä soveltaminen Sijoitusrahastot&gt; Lyhytaikaiset varat&gt; Pankkitilit ja luo uusi tili (klikkaamalla Add Child) tyypin &quot;pankki&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,materiaalilaskupuu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Nykyinen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
 DocType: Production Order,Actual End Date,todellinen päättymispäivä
 DocType: Authorization Rule,Applicable To (Role),sovellettavissa (rooli)
 DocType: Stock Entry,Purpose,Tarkoitus
+DocType: Company,Fixed Asset Depreciation Settings,Poistoaikojen Settings
 DocType: Item,Will also apply for variants unless overrridden,"sovelletaan myös muissa malleissa, ellei kumota"
 DocType: Purchase Invoice,Advances,ennakot
 DocType: Production Order,Manufacture against Material Request,Valmistus vastaan Materiaali Request
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Ei annettu Pyydetty SMS
 DocType: Campaign,Campaign-.####,kampanja -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,RECD Määrä
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Luokka Account
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,Pankki-tai Kassatili
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Siirry kyseistä ryhmää (yleensä soveltaminen Sijoitusrahastot&gt; Lyhytaikaiset varat&gt; Pankkitilit ja luo uusi tili (klikkaamalla Add Child) tyypin &quot;pankki&quot;
 DocType: Journal Entry,Credit Note,hyvityslasku
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,omat osoitteet
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,"organisaatio, toimiala valvonta"
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Yksikään työntekijä ei edellä valitut kriteerit TAI palkkakuitin jo luotu
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Payroll
 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ää"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostokuitti Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,muotojen muokkaus
 DocType: Account,Income Account,tulotili
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ei oletus Osoitemallin löydetty. Luo uusi Setup&gt; Tulostus ja Branding&gt; Address Template.
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,jäljitä vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,uuden kustannuspaikan nimi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,"poistu, ohjauspaneeli"
 DocType: Appraisal,HR User,henkilöstön käyttäjä
 DocType: Purchase Invoice,Taxes and Charges Deducted,verot ja maksut vähennetty
-apps/erpnext/erpnext/config/support.py +7,Issues,aiheet
+apps/erpnext/erpnext/hooks.py +90,Issues,aiheet
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},tilan tulee olla yksi {0}:sta
 DocType: Sales Invoice,Debit To,debet (lle)
 DocType: Delivery Note,Required only for sample item.,vain demoerä on pyydetty
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
 ,Pending SO Items For Purchase Request,"ostettavat pyyntö, odottavat myyntitilaukset"
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,erittäin suuri
 ,Profit and Loss Statement,tuloslaskelma selvitys
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
 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 +139,Please mention no of visits required,vierailujen määrä vaaditaan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,vierailujen määrä vaaditaan
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 DocType: Production Order Operation,Planned Start Time,Suunnitellut Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
 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 +142,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ä
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Pyydetty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ei Huomautuksia
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Kiinteä erä tulee olla ei-varastotuote
 DocType: Supplier Quotation Item,Material Request No,materiaalipyyntö nro
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2119,7 +2174,7 @@
 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
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
 DocType: Payment Request,Recipient and Message,Vastaanottaja ja Viesti
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittaja Osoite
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin pieni
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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"
 DocType: Payment Request,Mute Email,Mute Sähköposti
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Pyydä tarjous.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
 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 +294,Price List Currency not selected,"hinnasto, valuutta ole valittu"
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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ä
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,asiakirjan nro kohdistus
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,hallitse myyntikumppaneita
 DocType: Quality Inspection,Inspection Type,tarkistus tyyppi
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Ole hyvä ja valitse {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,merkitsemätön Läsnäolo
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Poistot edustusravintolat
 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ä
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Vahvistettu
 DocType: Payment Gateway,Gateway,Portti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Syötä lievittää päivämäärä.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,pankkipääte
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,pankkipääte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Ei löydy valuuttakurssin {0} on {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Ei löydy valuuttakurssin {0} on {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,myyntitiimi
 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 +410,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,sarjanumeroa {0} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Asiakkaan Warehouse (valinnainen)
 DocType: Pricing Rule,Discount Percentage,alennusprosentti
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
@@ -2247,14 +2305,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,valitse tapahtuman tyyppi
 DocType: GL Entry,Voucher No,tosite nro
 DocType: Leave Allocation,Leave Allocation,poistumiskohdistus
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,materiaalipyynnön tekijä {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,materiaalipyynnön tekijä {0}
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,sopimustaehtojen mallipohja
 DocType: Purchase Invoice,Address and Contact,Osoite ja yhteystiedot
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneet poistot Account
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
+DocType: Asset,Expected Value After Useful Life,Odotusarvo jälkeen käyttöiän
 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ä
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} on peruutettu tai suljettu
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettokassavirta Investointien
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,kantaa ei voi poistaa
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} on toimitettava
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Hallitse Osoitteet
-DocType: Pricing Rule,Item Code,tuotekoodi
+DocType: Asset,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
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,tee materiaalipyyntö
 DocType: Employee Education,School/University,koulu/yliopisto
 DocType: Payment Request,Reference Details,Viite Tietoja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
 DocType: Sales Invoice Item,Available Qty at Warehouse,saatava varaston yksikkömäärä
 ,Billed Amount,laskutettu arvomäärä
+DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Suljettu järjestys ei voi peruuttaa. Unclose peruuttaa.
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,hae päivitykset
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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än tulee olla ennen päättymispäivää
+DocType: Asset,Fully Depreciated,täydet poistot
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Sarjanumero ja Erä
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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"
 DocType: Sales Partner,Retailer,Jälleenmyyjä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Poista In Sanat
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,pankin tilinylitystili
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Item Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,taatut lainat
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Aseta poistot liittyvät tilien instrumenttikohtaisilla {0} tai Company {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,avaa oman pääoman tase
 DocType: Appraisal,Appraisal,arviointi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Sähköposti lähetetään toimittaja {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,päivä toistetaan
 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 +187,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
@@ -2344,7 +2410,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
 DocType: Item Price,Bulk Import Help,"massatuonti, ohje"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,valitse yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,valitse yksikkömäärä
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,hyväksyvä rooli ei voi olla sama kuin käytetyssä säännössä oleva
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Peruuttaa tämän Sähköposti Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Viesti lähetetty
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Yhteensä Margin
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,asiakasryhmä / asiakas
 DocType: Payment Gateway Account,Default Payment Request Message,Oletus maksupyyntö Viesti
 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/config/accounts.py +118,Banking and Payments,Pankit ja maksut
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Pankit ja maksut
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,"tarjous, viesti"
 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/config/hr.py +55,Leaves and Holiday,Lehdet ja Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,"kohdistetut kustannukset, arvomäärä"
 DocType: Time Log,Batched for Billing,Annosteltiin for Billing
@@ -2419,15 +2486,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Poistot Kustannuspaikka
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Ostopäivä omaisuuserien {0} ei vastaa Ostolasku päivämäärä
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
 ,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}
 DocType: Journal Entry,Stock Entry,varaston kirjaus
 DocType: Account,Payable,maksettava
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Velalliset ({0})
-DocType: Project,Margin,Marginaali
+DocType: Pricing Rule,Margin,Marginaali
 DocType: Salary Slip,Arrear Amount,jäännös arvomäärä
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,bruttovoitto %
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
 DocType: Newsletter,Newsletter List,Uutiskirje List
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,täppää jos haluat jokaisen työntekijän saavan palkkalaskelman samalla kun lähetät sen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
 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 +57,Where manufacturing operations are carried.,missä valmistus tapahtuu
 DocType: Stock Entry Detail,Source Warehouse,lähde varasto
 DocType: Installation Note,Installation Date,asennuspäivä
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
 DocType: Employee,Confirmation Date,vahvistuspäivä
 DocType: C-Form,Total Invoiced Amount,kokonaislaskutus arvomäärä
 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: Account,Accumulated Depreciation,Kertyneet poistot
 DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
 DocType: Payment Request,Email To,Email To
 DocType: Lead,Lead Owner,vihjeen omistaja
 DocType: Bin,Requested Quantity,pyydetty Määrä
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,varastolta vaaditaan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% toimitettu
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Sama toimittaja on syötetty useita kertoja
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,tuote ostotilaus toimitettu
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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
@@ -2470,13 +2543,14 @@
 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"
 DocType: Payment Request,Payment Details,Maksutiedot
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
+DocType: Asset,Journal Entry for Scrap,Journal Entry for Romu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,siirrä tuotteita lähetteeltä
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Kirjaa kaikista viestinnän tyypin sähköposti, puhelin, chatti, käynti, jne."
 DocType: Manufacturer,Manufacturers used in Items,Valmistajat käytetään Items
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,tee uusi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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ä
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,varaston tilikirja
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Hinta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,"palkkalaskelma, vähennys"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,valitse ensin ryhmä sidos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,valitse ensin ryhmä sidos
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Työntekijän ja läsnäoloa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Poista viittaus asiakkaan, toimittajan, myynti kumppani ja lyijyä, koska se on yrityksen osoite"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}:stä
 DocType: Task,depends_on,riippuu
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Seuraava Päivämäärä on oltava suurempi kuin julkaisupäivämäärä
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Näytä vero hajottua
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) on loppunut
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Seuraava Päivämäärä on oltava suurempi kuin julkaisupäivämäärä
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/accounts/party.py +289,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"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Laskun julkaisupäivä
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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"
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Kiinteä tasetilille
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,lähetteestä
 DocType: Time Log,From Time,ajasta
 DocType: Notification Control,Custom Message,oma viesti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,taso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,harjoitella
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,BOM:sta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,palkkarakenne
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Ehdota päivää
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,sarjanumero
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,syötä ylläpidon lisätiedot ensin
-DocType: Item,Is Fixed Asset Item,on pitkaikaiset vastaavat tuote
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,syötä ylläpidon lisätiedot ensin
 DocType: Purchase Invoice,Print Language,Tulosta Kieli
 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
+DocType: Asset,Number of Depreciations,Lukumäärä Poistot
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Pyyntö Lainaukset
 DocType: Payment Reconciliation,Maximum Invoice Amount,Suurin Laskun summa
 DocType: Purchase Invoice Item,Image View,kuvanäkymä
 apps/erpnext/erpnext/config/selling.py +23,Customers,asiakkaat
+DocType: Asset,Partially Depreciated,osittain poistoja
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,huoltohallinto
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,yhteensä ei voi olla nolla
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,muutettu mistä
+DocType: Asset,Amended From,muutettu mistä
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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ä
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Ole hyvä mainita &quot;Gain / tuloslaskelma Omaisuudenhoitoalan hävittämisestä&quot; in Company
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},sarjanumero edelyttää sarjoitettua tuotetta {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Maksut Laskut
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Maksut Laskut
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Lisää koriin
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ryhmän
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 DocType: Production Planning Tool,Get Material Request,Get Materiaali Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,postituskulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,postituskulut
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (pankkipääte)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,esillä yhteensä
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,tilinpäätöksen
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,tilinpäätöksen
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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ä
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
 DocType: Features Setup,Item Groups in Details,"tuoteryhmä, lisätiedot"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 +169,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: Item,Website Description,verkkosivujen kuvaus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettomuutos Equity
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 ,Sales Register,myyntirekisteri
 DocType: Quotation,Quotation Lost Reason,"tarjous hävitty, syy"
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Virhe: {0}&gt; {1}
 DocType: Item,Attributes,tuntomerkkejä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,hae tuotteet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,syötä poistotili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Päivämäärä
 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: C-Form,C-Form,C-muoto
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,tee päiväkirjakirjaus
 DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,kaupallinen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Virhe: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,kaikki tavarat tai palvelut
 DocType: Supplier Quotation,Supplier Address,toimittajan osoite
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,talouspalvelu
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
 DocType: Tax Rule,Billing State,Laskutus valtion
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,siirto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,siirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,eräpäivä vaaditaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,sarjojen määritys
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Huomautuksia
 DocType: Purchase Order Item Supplied,Raw Material Item Code,raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,poisto perustuu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Lähetä toimittaja Sähköpostit
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,sarjanumeron asennustietue
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Aika Log on laskutetaan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset&gt; Asetukset&gt; nimeäminen Series
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,tili {0} ei voi ryhmä
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Aseta oletusarvo {0} in Company {1}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi kohdassa Setup&gt; numerointi Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+DocType: Asset,Straight Line,Suora viiva
+DocType: Project User,Project User,Project Käyttäjä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä tai ei)"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,'Tuloslaskelma' tili {0} ei ole sallittu avauskirjauksessa
 DocType: Features Setup,Sales Discounts,myynnin alennukset
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,lisää alasidos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Opening Arvo
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
 DocType: Tax Rule,Billing Country,Laskutusmaa
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,edustuskulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,edustuskulut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,poistumishakemukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,juridiset kulut
 DocType: Sales Invoice,Posting Time,Kirjoittamisen aika
 DocType: Sales Order,% Amount Billed,% laskutettu arvomäärä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,puhelinkulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,puhelinkulut
 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.,"täppää mikäli haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta, täpästä ei synny oletusta"
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ei Kohta Serial Ei {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ei Kohta Serial Ei {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Avaa Ilmoitukset
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,suorat kulut
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,suorat kulut
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} on virheellinen sähköpostiosoitteen &quot;Ilmoitus \ sähköpostiosoite &#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),laskutuksen kokomaisarvomäärä (aikaloki)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,myymme tätä tuotetta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,toimittaja tunnus
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
 DocType: Journal Entry,Cash Entry,kassakirjaus
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","poistumissyy, kuten vapaa, sairas jne"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,kaikki yhteystiedot
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Toimittaja hyödykkeen {0} ei vastaa toimittajalle Ostolaskujen
 DocType: Newsletter,Test Email Id,testi sähköposti
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,raaka-aine ei voi olla päätuote
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,palkka mallipohja valvonta
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuolen siirtyvät korot tilivaluutta
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jos poistaa käytöstä, &quot;In Sanat&quot; kentässä ei näy missään kauppa"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,tämä aikaloki erä on peruutettu
 ,Reqd By Date,Reqd Päivämäärä
 DocType: Salary Slip Earning,Salary Slip Earning,"palkkalaskelma, ansio"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,luotonantajat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,luotonantajat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, verotiedot"
 ,Item-wise Price List Rate,"tuote työkalu, hinnasto taso"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,toimittajan tarjouskysely
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,syötä oletus mittayksikkö
-DocType: Project,Project Name,Hankkeen nimi
+DocType: Request for Quotation Item,Project Name,Hankkeen nimi
 DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
 DocType: Journal Entry Account,If Income or Expense,mikäli tulot tai kulut
 DocType: Features Setup,Item Batch Nos,tuote erä nro
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,päättymispäivä
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transactions
 DocType: Employee,Internal Work History,sisäinen työhistoria
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Kertyneet poistot Määrä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,kulu
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Yhtiö on pakollista, koska se on yrityksen osoite"
 DocType: Item Attribute,From Range,Alkaen Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,tuote {0} ohitetaan sillä se ei ole varastotuote
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,lähetä tuotannon tilaus eteenpäin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,lähetä tuotannon tilaus eteenpäin
 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.",kaikki sovellettavat hinnoittelusäännöt tulee poistaa käytöstä ettei hinnoittelusääntöjä käytetä tähän tapahtumaan
 DocType: Company,Domain,domain
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Työpaikat
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,toimituspäivä
 DocType: Opportunity,Opportunity Date,tilaisuus päivä
 DocType: Purchase Receipt,Return Against Purchase Receipt,palautus kohdistettuna ostokuittin
+DocType: Request for Quotation Item,Request for Quotation Item,Tarjouspyyntö Tuote
 DocType: Purchase Order,To Bill,laskutukseen
 DocType: Material Request,% Ordered,% Järjestetty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"tuotteella {0} ei ole määritettyä sarjanumeroa, sarake on tyhjä"
 DocType: Accounts Settings,Accounts Settings,tilien asetukset
 DocType: Customer,Sales Partner and Commission,Myynti Partner ja komission
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Aseta &quot;Asset Hävittäminen tili in Company {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Kasvien ja koneet
 DocType: Sales Partner,Partner's Website,Partnerin Verkkosivujen
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,väliaikaiset tilit
 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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,poista käytöstä
 DocType: Project Task,Pending Review,odottaa näkymä
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Maksa tästä
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei voida romuttaa, koska se on jo {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Lisää kohteita
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Lisää kohteita
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
 DocType: Account,Asset,vastaavat
 DocType: Project Task,Task ID,tehtävätunnus
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","esim, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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ä
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Gateway tilejä.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Gateway tilejä.
 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
 ,Cash Flow,Kassavirta
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Ohessa {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ohessa {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
 DocType: Job Applicant,Applicant Name,hakijan nimi
 DocType: Authorization Rule,Customer / Item Name,asiakas / tuotteen nimi
@@ -3099,19 +3191,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ilmoitathan mistä / vaihtelevan
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,myynnin oletusasetukset
 DocType: BOM Replace Tool,Current BOM,nykyinen BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,lisää sarjanumero
 apps/erpnext/erpnext/config/support.py +43,Warranty,Takuu
 DocType: Production Order,Warehouses,varastot
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Tulosta ja Paikallaan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Tulosta ja Paikallaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,sidoksen ryhmä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,päivitä valmiit tavarat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,päivitä valmiit tavarat
 DocType: Workstation,per hour,tunnissa
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,osto-
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,maksettu arvomäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
@@ -3141,7 +3232,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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ä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
 DocType: Purchase Invoice,In Words,sanat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,tänään on {0}:n syntymäpäivä
 DocType: Production Planning Tool,Material Request For Warehouse,varaston materiaalipyyntö
@@ -3154,9 +3245,11 @@
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Liittyä seuraan
 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 +564,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
+DocType: Pricing Rule,Margin Rate or Amount,Marginaali nopeuteen tai määrään
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Päättymispäivä' on pakollinen
 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"
@@ -3166,7 +3259,7 @@
 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 +782,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3174,14 +3267,13 @@
 DocType: Customer,Sales Team Details,myyntitiimin lisätiedot
 DocType: Expense Claim,Total Claimed Amount,vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,myynnin potentiaalisia tilaisuuksia
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Virheellinen {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset&gt; Asetukset&gt; nimeäminen Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,tallenna ensimmäinen asiakirja
 DocType: Account,Chargeable,veloitettava
 DocType: Company,Change Abbreviation,muutos lyhennys
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
@@ -3199,14 +3291,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,päätilikirja
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,näytä vihjeet
 DocType: Item Attribute Value,Attribute Value,"tuntomerkki, arvo"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","sähköpostitunnus tulee olla uniikki, tunnus on jo olemassa {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","sähköpostitunnus tulee olla uniikki, tunnus on jo olemassa {0}"
 ,Itemwise Recommended Reorder Level,"tuote työkalu, uuden ostotilauksen suositusarvo"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,erä {0} tuotteesta {1} on vanhentunut
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Aseta oletus Holiday List Työntekijä {0} tai Company {0}
 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>
@@ -3227,23 +3320,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,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 +12,Employee records.,työntekijä tietue
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,palkanlaskennan asetukset
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Tee tilaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,kannalla ei voi olla pääkustannuspaikkaa
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Valitse Merkki ...
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Varasto on pakollinen
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM muunto lisätiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3261,7 +3354,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Maksuvälineenä on oltava sama kuin Payment Gateway valuutta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Vastaanottaa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3269,14 +3362,14 @@
 DocType: Purchase Invoice,Submit on creation,Jättää ehdotus luomiseen
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Omat tilaukset
@@ -3297,10 +3390,10 @@
 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ä
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,vakuudettomat lainat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
 DocType: Maintenance Schedule Detail,Scheduled Date,"aikataulutettu, päivä"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,"maksettu, pankkipääte yhteensä"
@@ -3312,11 +3405,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Toimittaja osanumero
 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
@@ -3325,12 +3419,12 @@
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
 DocType: Payment Reconciliation,From Invoice Date,Alkaen Laskun päiväys
@@ -3339,7 +3433,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'Sarjanumero' ei voi olla kyllä ei-varastonimikkeelle
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Sarjanumero' ei voi olla kyllä ei-varastonimikkeelle
 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
@@ -3352,7 +3446,7 @@
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
@@ -3366,15 +3460,15 @@
 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 +576,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Hanketoimintaa / tehtävä.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,muodosta palkkalaskelmat
 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: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3394,8 +3488,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Vuoden aloituspäivä tai lopetuspäivä on päällekkäinen {0}. Välttämiseksi aseta yritys
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Uusi uutiskirje
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","esim ABCD. ##### mikäli sarjat on määritetty ja sarjanumeroa ei ole mainittu toiminnossa, tällöin automaattinen sarjanumeron teko pohjautuu tähän sarjaan, mikäli haluat tälle tuotteelle aina nimenomaisen sarjanumeron jätä tämä kohta tyhjäksi."
 DocType: Upload Attendance,Upload Attendance,lataa osallistuminen
@@ -3406,11 +3501,11 @@
 ,Sales Analytics,myyntianalyysi
 DocType: Manufacturing Settings,Manufacturing Settings,valmistuksen asetukset
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,sähköpostin perusmääritykset
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,syötä oletusvaluutta yritys valvonnassa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,syötä oletusvaluutta yritys valvonnassa
 DocType: Stock Entry Detail,Stock Entry Detail,varaston kirjausen yksityiskohdat
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Päivittäinen Muistutukset
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Vero sääntö Ristiriidat {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,nimeä uusi tili
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
@@ -3420,11 +3515,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tarjoa ehdokkaalle töitä
 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
+DocType: Pricing Rule,Percentage,prosenttimäärä
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
 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ä
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,tuotteen {0} tulee olla myyntituote
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3432,11 +3528,12 @@
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
 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 +385,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
 DocType: Purchase Taxes and Charges,Actual,todellinen
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
 DocType: Purchase Invoice,Against Expense Account,kulutilin kohdistus
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Siirry kyseistä ryhmää (yleensä rahoituslähteen&gt; lyhytaikaiset velat&gt; Verot ja tehtävät ja luo uusi tili (klikkaamalla Add Child) tyyppiä &quot;Vero&quot; ja tehdä mainita veroprosentti.
 DocType: Production Order,Production Order,tuotannon tilaus
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
 DocType: Quotation Item,Against Docname,asiakirjan nimi kohdistus
@@ -3455,18 +3552,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Production Order,Planned End Date,Suunnitellut Päättymispäivä
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,missä tuotteet varastoidaan
 DocType: Tax Rule,Validity,Voimassaolo
+DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,laskutettu arvomäärä
 DocType: Attendance,Attendance,osallistuminen
 apps/erpnext/erpnext/config/projects.py +55,Reports,raportit
 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 +508,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,veromallipohja ostotapahtumiin
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,veromallipohja ostotapahtumiin
 ,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
@@ -3476,10 +3574,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,netto yhteensä:ssä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,hallinnolliset kulut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,hallinnolliset kulut
 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 +455,Change,muutos
@@ -3487,6 +3585,7 @@
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
+DocType: Asset Category,Asset Category Name,Asset Luokan nimi
 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
@@ -3498,13 +3597,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,erä
@@ -3518,7 +3617,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,myyjä
 DocType: Sales Invoice,Cold Calling,kylmä pyyntö
 DocType: SMS Parameter,SMS Parameter,tekstiviesti parametri
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Talousarvio ja Kustannuspaikka
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Talousarvio ja Kustannuspaikka
 DocType: Maintenance Schedule Item,Half Yearly,puolivuosittain
 DocType: Lead,Blog Subscriber,Blogi Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,tee tapahtumien arvoon perustuvia rajoitussääntöjä
@@ -3549,9 +3648,9 @@
 DocType: Purchase Common,Purchase Common,Osto Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Item Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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ä
@@ -3559,7 +3658,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,emotili
@@ -3575,7 +3674,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 DocType: Address,Office,Toimisto
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
@@ -3590,6 +3689,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Alennus ja marginaali
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
 DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
@@ -3610,7 +3710,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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"
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
 DocType: BOM Operation,BOM Operation,BOM käyttö
@@ -3618,22 +3718,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Maksu URL Viesti
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,maksamattomat yhteensä
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,aikaloki ei ole laskutettavissa
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
+DocType: Asset,Asset Category,Asset Luokka
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiaalin Toimittaja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiaalin Toimittaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Valmistevero Lasku
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostitunnus
 DocType: Employee Attendance Tool,Marked Attendance,Merkitty Läsnäolo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,lyhytaikaiset vastattavat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,lyhytaikaiset vastattavat
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
@@ -3654,17 +3755,16 @@
 DocType: Item Attribute,Numeric Values,Numeroarvot
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Kiinnitä Logo
 DocType: Customer,Commission Rate,provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostoskori on tyhjä
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ei oletus Osoitemallin löydetty. Luo uusi Setup&gt; Tulostus ja Branding&gt; Address Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,osakepääoma
 DocType: Packing Slip,Package Weight Details,"pakkauspaino, lisätiedot"
 DocType: Payment Gateway Account,Payment Gateway Account,Maksu Gateway tili
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Maksun jälkeen valmistumisen ohjata käyttäjän valitulle sivulle.
@@ -3673,20 +3773,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
+DocType: Asset,Current Value (After Depreciation),Nykyinen arvo (poistojen jälkeen)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,materiaalien lasku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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
@@ -3694,6 +3795,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,tiliä {0} ei löydy
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,lyhyt historiikki verkkosivuille ja muihin julkaisuihin
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 0a44aab..4f82e16 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,5 +1,5 @@
 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: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Sélectionnez une répartition mensuelle, si vous souhaitez effectuer le suivi basé sur la saisonnalité"
 DocType: Employee,Divorced,Divorcé
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,Warning: Same item has been entered multiple times.,Attention : le 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
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Employee,Rented,Loué
 DocType: POS Profile,Applicable for User,Applicable pour l&#39;utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Voulez-vous vraiment supprimer cet actif?
 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 la liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,S&#39;il vous plaît configurer Employee Naming System en ressources humaines&gt; Paramètres RH
 DocType: Purchase Order,Customer Contact,Contact client
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Demandeur d&#39;emploi
@@ -41,30 +41,32 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Exceptionnelle pour {0} ne peut pas être inférieur à zéro ({1})
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
 DocType: Leave Type,Leave Type Name,Nom du Type de Congé
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Afficher ouverte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,prix règle
 DocType: Pricing Rule,Apply On,Appliquer sur
 DocType: Item Price,Multiple Item prices.,Prix articles 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Nouvelle Demande de Congés
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Voir les variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Quantité
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prêts ( passif)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Comptes table ne peut pas être vide.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Désignation
 DocType: Production Plan Item,Production Plan Item,Élément du plan de production
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +146,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/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faire un nouveau profil POS
 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 +642,Invoice,Facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Exercice {0} est nécessaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,défense
@@ -81,8 +83,8 @@
 DocType: Cost Center,Stock User,Intervenant/Chargé des Stocks
 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 +131,New {0}: #{1},Nouveau {0}: # {1}
-,Sales Partners Commission,Partenaires Sales Commission
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nouveau {0}: # {1}
+,Sales Partners Commission,Commission des partenaires commerciaux
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
 DocType: Payment Request,Payment Request,Requête de paiement
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Marié
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obtenir des éléments de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},désactiver
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour par rapport au bon de livraison {0}
 DocType: Payment Reconciliation,Reconcile,réconcilier
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Journal d'activité:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,Item {0} does not exist in the system or has expired,L'article {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/setup_wizard/industry_type.py +41,Pharmaceuticals,médicaments
+DocType: Item,Is Fixed Asset,Est-Fixed Asset
 DocType: Expense Claim Detail,Claim Amount,Montant réclamé
 DocType: Employee,Mr,M.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur Type / Fournisseur
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Tout contact
 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,Dépenses stock
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} est gelée
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Dépenses stock
 DocType: Newsletter,Email Sent?,Courriel envoyés?
 DocType: Journal Entry,Contra Entry,Contra Entrée
 DocType: Production Order Operation,Show Time Logs,Show Time Logs
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Etat de l&#39;installation
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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'article {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 +140,Item {0} must be a Purchase Item,Parent Site Route
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Parent Site Route
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Télécharger le modèle, remplissez les données appropriées et joindre le fichier modifié.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Réglages pour le Module des ressources humaines
 DocType: SMS Center,SMS Center,Centre SMS
 DocType: BOM Replace Tool,New BOM,Nouvelle nomenclature
@@ -185,7 +189,7 @@
 DocType: Serial No,Maintenance Status,Statut d&#39;entretien
 apps/erpnext/erpnext/config/stock.py +62,Items and Pricing,Articles et Prix
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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.
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Sélectionnez l'employé pour lequel vous créez une évaluation.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,Cost Center {0} does not belong to Company {1},Numéro de commande requis pour objet {0}
 DocType: Customer,Individual,Individuel
 apps/erpnext/erpnext/config/support.py +27,Plan for maintenance visits.,Plan pour les visites de maintenance.
@@ -198,7 +202,7 @@
 DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valeur hors
 DocType: Production Planning Tool,Sales Orders,Commandes clients
-DocType: Purchase Taxes and Charges,Valuation,Évaluation
+DocType: Purchase Taxes and Charges,Valuation,Valorisation
 ,Purchase Order Trends,Bon de commande Tendances
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Allouer des congés pour l'année.
 DocType: Earning Type,Earning Type,Type de Revenus
@@ -209,26 +213,26 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
 DocType: Production Order Operation,Updated via 'Time Log',Mis à jour via 'Log Time'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette transaction
 DocType: 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,Pour l’entrepôt est nécessaire avant Soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,For Warehouse is required before Submit,Pour l’entrepôt 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 +24,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
+,Production Orders in Progress,Ordres de production en cours
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Encaisse nette de financement
 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 +217,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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
 ,Contact Name,Contact Nom
 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/templates/generators/item.html +30,No description given,Pas de description indiquée
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Demande d&#39;achat.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,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 +196,Only the selected Leave Approver can submit this Leave Application,Seul l'approbateur de congé sélectionné peut soumettre cette demande de congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,La date de relève doit être postérieure à la date de l'adhésion
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Congés par Année
 DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots.
@@ -236,21 +240,21 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
 DocType: Payment Tool,Reference No,No de référence
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Laisser verouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Laisser verouillé
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},dépenses
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,entrées bancaires
 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,Qté min. de commande
 DocType: Lead,Do Not Contact,Ne pas contacter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Developeur logiciel
 DocType: Item,Minimum Order Qty,Qté minimum de commande
 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 +592,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Demande de matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -259,48 +263,51 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Commandes confirmées des clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantité rejetée
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Champ disponible dans bon de livraison, devis, facture de vente, commande"
-DocType: SMS Settings,SMS Sender Name,SMS Sender Nom
-DocType: Contact,Is Primary Contact,Est-ressource principale
+DocType: SMS Settings,SMS Sender Name,SMS Nom expéditeur
+DocType: Contact,Is Primary Contact,Personne de contact
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +36,Time Log has been Batched for Billing,Heure du journal a été dosé pour la facturation
 DocType: Notification Control,Notification Control,Contrôle de notification
 DocType: Lead,Suggestions,Suggestions
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Point du Groupe sages budgets sur ce territoire. Vous pouvez également inclure la saisonnalité en réglant la distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},S'il vous plaît entrer parent groupe compte pour l'entrepôt {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},S'il vous plaît entrer parent groupe compte pour l'entrepôt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
-DocType: Maintenance Schedule,Generate Schedule,Générer annexe
+DocType: Maintenance Schedule,Generate Schedule,Créer un programme
 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/public/js/setup_wizard.js +20,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 approbateur de congé dans la liste sera définie comme approbateur par défaut
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Apprendre
+DocType: Asset,Next Depreciation Date,Suivant Amortissements date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activité Coût par employé
 DocType: Accounts Settings,Settings for Accounts,Réglages pour les comptes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Fournisseur facture n ° existe dans la facture d&#39;achat {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Gérer l'arborescence des vendeurs
 DocType: Job Applicant,Cover Letter,Lettre de motivation
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Les chèques et les dépôts pour effacer circulation
 DocType: Item,Synced With Hub,Synchronisé avec Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Mauvais Mot De Passe
 DocType: Item,Variant Of,Variante du
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En Toutes Lettres (Exportation) Sera visible une fois que vous enregistrerez le bon de livraison.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unités de [{1}] (# Form / article / {1}) trouvés dans [{2}] (# Form / Entrepôt / {2})
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profil de l'emplois
 DocType: Newsletter,Newsletter,Info-lettres
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notification par E-mail lors de la création de la demande de matériel automatique
 DocType: Journal Entry,Multi Currency,Multi-devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de facture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Bon de livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Bon de livraison
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Mise en place d&#39;impôts
 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 +381,{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/stock/doctype/item/item.py +386,{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é de la semaine et activités en suspens
+DocType: Workstation,Rent Cost,Coût Location
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
 DocType: Employee,Company Email,E-mail société
 DocType: GL Entry,Debit Amount in Account Currency,Montant de débit en compte Devises
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,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/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la commande Considéré
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Intitulé de Poste (par exemple Directeur Général, Directeur...)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,S'il vous plaît entrez la valeur 'Répéter le jour du mois'
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,S'il vous plaît entrez la valeur 'Répéter le jour du mois'
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taux à laquelle la devise du client est converti en devise de base
 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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour les employés {1} pour la période {2} pour {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Sélectionner un élément
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,Select Item,Sélectionner un article
 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é"
@@ -324,7 +331,7 @@
 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
 apps/erpnext/erpnext/config/stock.py +118,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
+DocType: GL Entry,Debit Amount,Montant du débit
 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 adresse Email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +213,Please see attachment,S'il vous plaît voir la pièce jointe
@@ -334,12 +341,12 @@
 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 +59,Serial No {0} does not belong to Delivery Note {1},N ° de série {0} ne fait pas partie de la livraison Remarque {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No de série {0} ne fait pas partie du bon de livraison {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d&#39;inspection Article de qualité
 DocType: Leave Application,Leave Approver Name,Nom de l'approbateur d'absence
-,Schedule Date,calendrier Date
+DocType: Depreciation Schedule,Schedule Date,calendrier Date
 DocType: Packed Item,Packed Item,Article emballé
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Paramètres par défaut pour les transactions d'achat.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Paramètres par défaut pour les transactions d'achat.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Des couts de personnel existe pour l'employé {0} dans le type d'activité - {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.,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
@@ -348,6 +355,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Appel d&#39;offre
 DocType: Workstation,Working Hours,Heures de travail
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs règles de tarification continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité à résoudre les conflits."
@@ -367,8 +375,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
 DocType: Journal Entry Account,Sales Order,Bon de commande
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Moy. Taux de vente
-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
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},La quantité ne peut pas être une fraction à la ligne {0}
+DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Prix
 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
 DocType: BOM,Item Desription,Description de l'article
@@ -388,19 +396,20 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes gelés jusqu'au
 DocType: SMS Log,Sent On,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le tableau de 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 +70,Holiday master.,Débit doit être égal à crédit . La différence est {0}
-DocType: Material Request Item,Required Date,Requis Date
+DocType: Request for Quotation Item,Required Date,Requis Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Message pour Fournisseur
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantité totale
 DocType: Employee,Health Concerns,Préoccupations pour la santé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Impayé
-DocType: Packing Slip,From Package No.,De Ensemble numéro
+DocType: Packing Slip,From Package No.,Du No de colis
 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
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas"
 DocType: Pricing Rule,Valid Upto,Valide jusqu'au
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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,Revenu direct
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,Revenu direct
 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/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 +308,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 une tâche tant qu'une tâche dépendante {0} est pas fermée.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,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é
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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/setup_wizard/industry_type.py +20,Cosmetics,Produits de beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et profits
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gestion de la sous-traitance
+DocType: Project,Project will be accessible on the website to these users,Projet sera accessible sur le site Web à ces utilisateurs
 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 +53,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incrément ne peut pas être 0
 DocType: Production Planning Tool,Material Requirement,Exigence Matériel
 DocType: Company,Delete Company Transactions,Supprimer Transactions Société
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
 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
@@ -459,25 +469,25 @@
 DocType: Production Plan Item,Pending Qty,Qté en attente
 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 +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»
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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,Valide à partir de
 DocType: Sales Invoice,Total Commission,Total de la Commission
-DocType: Pricing Rule,Sales Partner,Sales Partner
+DocType: Pricing Rule,Sales Partner,Partenaire commerciaux
 DocType: Buying Settings,Purchase Receipt Required,Réception achat requis
 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**","** Distribution mensuelle ** vous aide à distribuer votre budget à travers les mois si vous avez la saisonnalité dans votre entreprise.
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** répartition mensuelle ** vous aide à répartir 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 **"
+ Pour répartir un budget en utilisant cette fonction, définissez ** répartition mensuelle ** ** dans le centre de coûts **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier
-apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,Exercice comptable / financier annuel
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Exercice comptable / financier annuel
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Les valeurs accumulées
 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é"
 DocType: Project Task,Project Task,Tâche projet
 ,Lead Id,Id prospect
 DocType: C-Form Invoice Detail,Grand Total,Total Général
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Livré: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Comptes créditeurs
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Retour de Ventes
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Éléments du salaire.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,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/stock/doctype/item/item.py +707,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.
@@ -504,9 +514,9 @@
 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/config/accounts.py +70,Masters,Maîtres
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Dates de transaction de mise à jour de la Banque
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Dates de transaction de mise à jour de la Banque
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
-apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
+apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Suivi du temps
 DocType: Fiscal Year Company,Fiscal Year Company,Exercice Société
 DocType: Packing Slip Item,DN Detail,Détail DN
 DocType: Time Log,Billed,Facturé
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,S'il vous plaît entrer Reçu d'achat en premier
 DocType: Buying Settings,Supplier Naming By,Fournisseur de nommage par
 DocType: Activity Type,Default Costing Rate,Coût de revient par défaut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Calendrier d&#39;entretien
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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 des client, par groupe de clients, région, fournisseur, le type de fournisseur, campagne, vendeur etc..."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Variation nette des stocks
 DocType: Employee,Passport Number,Numéro de passeport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Directeur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Le même article a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
 DocType: Production Order Operation,In minutes,En minutes
 DocType: Issue,Resolution Date,Date de Résolution
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,S&#39;il vous plaît définir une liste de vacances pour l&#39;employé ou la Société
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,amortissement Montant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Jours fixes
 DocType: Quotation Item,Item Balance,Point Solde
 DocType: Sales Invoice,Packing List,Liste de colisage
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Achetez commandes faites aux fournisseurs.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Achetez commandes faites aux fournisseurs.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,édition
 DocType: Activity Cost,Projects User,Utilisateur/Intervenant Projets
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consommé
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Temps de fonctionnement
 DocType: Pricing Rule,Sales Manager,Responsable Ventes
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Groupe Groupe
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mes projets
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
 DocType: Journal Entry,Bill No,Numéro de la facture
+DocType: Company,Gain/Loss Account on Asset Disposal,Compte Gain / Perte sur aliénation des biens
 DocType: Purchase Invoice,Quarterly,Trimestriel
 DocType: Selling Settings,Delivery Note Required,Remarque livraison requise
 DocType: Sales Order Item,Basic Rate (Company Currency),Taux de base (Monnaie de la Société )
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Paiement entrée est déjà créé
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne pas liée à l&#39;article {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,La facturation totale de cette année
-DocType: Account,Expenses Included In Valuation,Frais inclus dans l&#39;évaluation
+DocType: Account,Expenses Included In Valuation,Frais inclus dans la valorisation
 DocType: Employee,Provide email id registered in company,Fournir E-mail enregistrée dans la société
 DocType: Hub Settings,Seller City,Vendeur Ville
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
-DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,L'article a des variantes.
+DocType: Offer Letter Term,Offer Letter Term,Terme lettre de proposition
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,L'article a des variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -599,8 +612,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,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
+DocType: Production Order Operation,Planned End Time,Heure de fin prévue
 ,Sales Person Target Variance Item Group-Wise,S'il vous plaît entrer un message avant de l'envoyer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,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,Numéro bon de commande du client
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de salaire mensuel.
 DocType: Item Group,Website Specifications,Site Web Spécifications
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Il y a une erreur dans votre Modèle d&#39;adresse {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nouveau Compte
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nouveau Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Du {0} de type {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Règles multiples de prix qui est avec les mêmes critères, s&#39;il vous plaît résoudre les conflits en attribuant des priorités. Règles de prix: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Règles multiples de prix qui est avec les mêmes critères, s&#39;il vous plaît résoudre les conflits en attribuant des priorités. Règles de prix: {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.,Les écritures comptables ne peuvent être faites sur les nœuds feuilles. Les entrées dans les groupes ne sont pas autorisées.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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,Valeur de l'attribut de l'article
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 DocType: Address,Personal,Personnel
 DocType: Expense Claim Detail,Expense Claim Type,Type de Frais
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Les paramètres par défaut pour Panier
-apps/erpnext/erpnext/controllers/accounts_controller.py +320,"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/controllers/accounts_controller.py +333,"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,Entretient et dépense bureau
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Entretient et dépense bureau
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le montant approuvé ne peut pas être supérieur au montant réclamé en ligne {0}.
 DocType: Company,Default Cost of Goods Sold Account,Par défaut Coût des marchandises vendues compte
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Liste des prix non sélectionnée
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Liste des prix non sélectionnée
 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 +147,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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 par défaut
 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"
@@ -686,25 +700,27 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Nos,Nos
 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 +666,My Invoices,Mes factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mes factures
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} Asset doit être soumise
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Aucun employé trouvé
 DocType: Supplier Quotation,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Sélectionnez BOM pour commencer
 DocType: SMS Center,All Customer Contact,Tous les contacts clients
-apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Téléchargez solde disponible via csv.
+apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Chargez solde disponible via csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Envoyer maintenant
 ,Support Analytics,Analyse du support
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Erreur logique: Il faut trouver chevauchement
 DocType: Item,Website Warehouse,Entrepôt site web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant minimum de facturation
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Formulaire - C Enregistrements
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Formulaire - C Enregistrements
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Clients et Fournisseurs
-DocType: Email Digest,Email Digest Settings,Paramètres de messagerie Digest
+DocType: Email Digest,Email Digest Settings,Paramètres pour le compte rendu par Email
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,En charge les requêtes des clients.
 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
+DocType: Production Planning Tool,Select Items,Sélectionner des articles
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{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: Production Order,Target Warehouse,Entrepôt cible
@@ -719,10 +735,10 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
 DocType: Shopping Cart Settings,Enable Checkout,Activer Checkout
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Achetez commande au paiement
-DocType: Quotation Item,Projected Qty,Qté projeté
+DocType: Quotation Item,Projected Qty,Qté projetée
 DocType: Sales Invoice,Payment Due Date,Date d'échéance de paiement
 DocType: Newsletter,Newsletter Manager,Responsable de l'info-lettre
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,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 +227,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,Message du bon de livraison
 DocType: Expense Claim,Expenses,Dépenses
@@ -732,9 +748,9 @@
 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'inscription
-DocType: Item Reorder,Re-Order Qty,Re-commande Quantité
+DocType: Item Reorder,Re-Order Qty,Qté Re-commande
 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}
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Agendé pour envoyer à {0}
 DocType: Pricing Rule,Price or Discount,Frais d'administration
 DocType: Sales Team,Incentives,Incitations
 DocType: SMS Log,Requested Numbers,Numéros demandés
@@ -759,19 +775,20 @@
 DocType: Supplier Quotation,Is Subcontracted,Est en sous-traitance
 DocType: Item Attribute,Item Attribute Values,Point valeurs d'attribut
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Voir abonnés
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Achat Réception
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Achat Réception
 ,Received Items To Be Billed,Articles reçus à facturer
 DocType: Employee,Ms,Mme
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Taux de change de maître.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Taux de change de maître.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1}
 DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles
-apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Partenaires de vente et Territoire
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} doit être actif
+apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Partenaires commerciaux et régions
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} doit être actif
+DocType: Journal Entry,Depreciation Entry,amortissement Entrée
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,S&#39;il vous plaît sélectionner le type de document premier
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Aller au panier
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les visites matériaux {0} avant d'annuler cette visite de maintenance
 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
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},No de série {0} n'appartient pas à l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantité requise
 DocType: Bank Reconciliation,Total Amount,Montant total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
@@ -785,22 +802,22 @@
 DocType: Supplier,Default Payable Accounts,Comptes de créances fournisseur par défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Features Setup,Item Barcode,Code barre article
-apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
+DocType: Address,Shop,Magasin
 DocType: Hub Settings,Sync Now,Synchroniser maintenant
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
 DocType: Employee,Exit Interview Details,Entretient de démission
 DocType: Item,Is Purchase Item,Est-Item
-DocType: Journal Entry Account,Purchase Invoice,Facture achat
+DocType: Asset,Purchase Invoice,Facture achat
 DocType: Stock Ledger Entry,Voucher Detail No,Détail volet n °
-DocType: Stock Entry,Total Outgoing Value,Valeur totale sortant
+DocType: Stock Entry,Total Outgoing Value,Valeur totale sortante
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Date d'ouverture et date de clôture devraient être dans le même exercice
 DocType: Lead,Request for Information,Demande de renseignements
 DocType: Payment Request,Paid,Payé
@@ -808,21 +825,24 @@
 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 +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Publier sur le site Web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Les livraisons aux clients.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la facture ne peut pas être supérieure à Date de publication
 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,Revenu indirect
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Revenu indirect
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Réglez montant du paiement = Encours
 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 +672,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Sélectionner un élément à transferer
 DocType: Purchase Invoice,Additional Discount Percentage,Pourcentage de réduction supplémentaire
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Invoice {1} est invalide, il pourrait être annulé / n&#39;existe pas. \ S&#39;il vous plaît entrer une facture valide"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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/setup_wizard/industry_type.py +16,Chemical,chimique
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,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.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer de rappel pour le jour d'anniversaire des employés
 ,Employee Holiday Attendance,Employé vacances Participation
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock entrées
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock entrées
 DocType: Item,Inspection Criteria,Critères d&#39;inspection
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transféré
-apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/public/js/setup_wizard.js +140,Upload your letter head and logo. (you can edit them later).,Chargez votre entête et logo. (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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Faire
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Faire
 DocType: Journal Entry,Total Amount in Words,Montant Total En Toutes Lettres
 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 +5,My Cart,Mon panier
@@ -848,11 +868,12 @@
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
 DocType: Journal Entry Account,Expense Claim,Note de frais
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},Qté pour {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Voulez-vous vraiment restaurer cet actif mis au rebut?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qté pour {0}
 DocType: Leave Application,Leave Application,Demande de Congés
 apps/erpnext/erpnext/config/hr.py +80,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)
+DocType: Company,If Monthly Budget Exceeded (for expense account),Si le budget mensuel est dépassé (pour compte de dépenses)
 DocType: Workstation,Net Hour Rate,Taux Horaire Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost reçu d&#39;achat
 DocType: Company,Default Terms,Conditions contractuelles par défaut
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Compte caisse / banque
 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,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Remise
@@ -876,21 +897,22 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Achat d&#39;article de réception
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt réservé à des commandes clients / entrepôt de produits finis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Montant de vente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Time Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Time Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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 mettez à jour le «Status» et Enregistrez
 DocType: Serial No,Creation Document No,Création document n
 DocType: Issue,Issue,Question
+DocType: Asset,Scrapped,demantelé
 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 société
 apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les variantes de l'article. Par ex. 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 +181,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutement
 DocType: BOM Operation,Operation,Opération
-DocType: Lead,Organization Name,Nom de l'organisme
+DocType: Lead,Organization Name,Nom de l'organisation
 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/setup_wizard/setup_wizard.py +106,Standard Buying,achat standard
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Frais de vente
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,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
@@ -903,10 +925,10 @@
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condition règle de livraison
 DocType: Features Setup,Miscelleneous,Divers
 DocType: Holiday List,Get Weekly Off Dates,Obtenez hebdomadaires Dates Off
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Évaluation de l'objet mis à jour
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,La date de fin ne peut pas être inférieur à la Date de début
 DocType: Sales Person,Select company name first.,Sélectionnez en premier le nom de la société.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Devis reçus des fournisseurs.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des fournisseurs.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},A {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,mis à jour via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,âge moyen
@@ -915,15 +937,15 @@
 DocType: Company,Default Currency,Devise par défaut
 DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
 DocType: Expense Claim,From Employee,De l'employé
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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: Upload Attendance,Attendance From Date,Présence Depuis
 DocType: Appraisal Template Goal,Key Performance Area,Domaine essentiel de performance
 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 +130,Please select BOM in BOM field for Item {0},S'il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},S'il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Formulaire - C Détail de la 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 +42,Contribution %,Contribution%
@@ -932,22 +954,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
 ,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.
 DocType: Global Defaults,Global Defaults,Valeurs par défaut globales
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Invitation de collaboration de projet
 DocType: Salary Slip,Deductions,Déductions
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Connexion lot a été facturé.
 DocType: Salary Slip,Leave Without Pay,Congé sans solde
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Erreur planification de capacité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Erreur planification de capacité
 ,Trial Balance for Party,Balance pour le Parti
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Bénéfices
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Point Fini {0} doit être saisi pour le type de Fabrication entrée
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
-DocType: Sales Invoice Advance,Sales Invoice Advance,Advance facture de vente
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Pas de requête à demander
+DocType: Sales Invoice Advance,Sales Invoice Advance,Avance facture de vente
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,gestion
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Types d'activités pour les relevés de temps.
@@ -958,18 +981,18 @@
 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éés que sous les nœuds de type 'Groupe'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,S'il vous plaît définissez ID Email
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,S'il vous plaît définissez ID Email
 DocType: Item,UOMs,Unités de mesure
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code article ne peut pas être modifié pour le numéro de série
 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 Unité de mesure
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Base de données fournisseurs.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centre de coûts pour article ayant un code article '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centre de coûts pour article ayant un code article '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre commercial recevra un rappel à cette date pour contacter le client
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être faits dans les groupes, mais les écritures ne peuvent être faites que dans les comptes individuels"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être faits dans les groupes, mais les écritures ne peuvent être faites que dans les comptes individuels"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,De l&#39;impôt et autres déductions salariales.
 DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
@@ -982,7 +1005,8 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
 DocType: Holiday,Holiday,Vacances
 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
+,Daily Time Log Summary,Journal du résumé quotidien
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forme est pas applicable pour la facture: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Détail des paiements non rapprochés
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver le Total arrondi
@@ -993,22 +1017,23 @@
 apps/erpnext/erpnext/config/hr.py +242,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,S'il vous plaît sélectionner préfixe en premier
-apps/erpnext/erpnext/setup/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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} doit être un élément non disponible
 DocType: Contact,User ID,ID utilisateur
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Voir Grand Livre
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Voir Grand Livre
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Au plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Reste du monde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendes payés
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendes payés
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Livre des comptes
 DocType: Stock Reconciliation,Difference Amount,Différence Montant
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Bénéfices non répartis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Bénéfices non répartis
 DocType: BOM Item,Item Description,Description de l'article
 DocType: Payment Tool,Payment Mode,Mode de paiement
 DocType: Purchase Invoice,Is Recurring,Est récurrent
@@ -1016,7 +1041,7 @@
 DocType: Production Order,Qty To Manufacture,Quantité à fabriquer
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le même taux tout au long du cycle d'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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Ouverture temporaire
 ,Employee Leave Balance,Balance des jours de congés de l'employé
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Évaluation Taux requis pour le point à la ligne {0}
@@ -1030,9 +1055,9 @@
 DocType: Item,Lead Time in days,Délai en jours
 ,Accounts Payable Summary,Le résumé des comptes à payer
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0}
-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,Bon de commande {0} invalide
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
+DocType: Journal Entry,Get Outstanding Invoices,Obtenez les factures impayées
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Bon de commande {0} invalide
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité Problème / transfert total {0} dans Material Request {1} \ ne peut pas être supérieure à la quantité demandée {2} pour le poste {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
@@ -1040,7 +1065,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},No de dossier en fonction. Essayez dès No de dossier {0}
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt 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,Responsable du compte {0} a été crée
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Responsable du compte {0} a été crée
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Vert
 DocType: Item,Auto re-order,Re-commande Auto
 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
@@ -1048,34 +1073,35 @@
 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 +493,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,Dépenses indirectes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Dépenses indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ligne {0}: Qté est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Vos produits ou services
 DocType: Mode of Payment,Mode of Payment,Mode de paiement
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
 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
 DocType: Address,City/Town,Ville
 DocType: Address,Is Your Company Address,Votre entreprise est Adresse
 DocType: Email Digest,Annual Income,Revenu annuel
-DocType: Serial No,Serial No Details,Détails Pas de série
+DocType: Serial No,Serial No Details,Détails No 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 +118,"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 +482,Delivery Note {0} is not submitted,Bon de livraison {0} n'est pas soumis
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Exercice Date de début
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Bon de livraison {0} n'est pas soumis
+apps/erpnext/erpnext/stock/get_item_details.py +142,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,Capitaux immobilisés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","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."
 DocType: Hub Settings,Seller Website,Site Vendeur
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Pourcentage total alloué à l'équipe de vente devrait être de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Feuilles alloué avec succès pour {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Feuilles alloué avec succès pour {0}
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,pour fournisseur
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},N&#39;a pas trouvé d&#39;élément appelé {0}
 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
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Groupes d&#39;articles Site web
 DocType: Purchase Invoice,Total (Company Currency),Total (Société devise)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
-DocType: Journal Entry,Journal Entry,Journal d'écriture
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
 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,Numéro de la dernière transaction créée avec ce préfixe
@@ -1095,16 +1121,18 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Appel d&#39;offre Fournisseur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,récurrent Upto
-DocType: Attendance,HR Manager,Responsable des Ressources Humaines
+DocType: Attendance,HR Manager,Responsable du RH
 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/setup_wizard/install_fixtures.py +50,Privilege Leave,Congé Privilège
 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 le panier
-DocType: Appraisal Template Goal,Appraisal Template Goal,Objectif modèle d&#39;évaluation
+DocType: Appraisal Template Goal,Appraisal Template Goal,But du modèle d'évaluation
 DocType: Salary Slip,Earning,Revenus
 DocType: Payment Tool,Party Account Currency,Compte Parti devise
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valeur actuelle Après amortissement doit être inférieur ou égal à {0}
 ,BOM Browser,Navigateur BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Ajouter ou déduire
 DocType: Company,If Yearly Budget Exceeded (for expense account),Si le budget annuel dépassé (pour compte de dépenses)
@@ -1113,29 +1141,30 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ordre Valeur totale
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Repas
 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 +136,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
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,Vous pouvez faire un journal de temps seulement contre une ordonnance de production soumis
 DocType: Maintenance Schedule Item,No of Visits,Nombre de Visites
 apps/erpnext/erpnext/config/crm.py +68,"Newsletters to contacts, leads.","Info-lettres 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}
-DocType: Project,Start and End Dates,Début et fin Dates
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
+DocType: Project,Start and End Dates,Dates début et fin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
 ,Delivered Items To Be Billed,Articles livrés à facturer
 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: Authorization Rule,Average Discount,Remise moyenne
 DocType: Address,Utilities,Utilitaires
 DocType: Purchase Invoice Item,Accounting,Comptabilité
 DocType: Features Setup,Features Setup,Paramètre en vedette
+DocType: Asset,Depreciation Schedules,Horaires d&#39;amortissement
 DocType: Item,Is Service Item,Est-Point de service
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,Devise de la transaction
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Du {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Du {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Description de l&#39;opération
 DocType: Item,Will also apply to variants,Se appliquera également aux variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
 DocType: Quotation,Shopping Cart,Panier
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Jour moyen sortant
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Moyenne quotidienne sortant
 DocType: Pricing Rule,Campaign,Campagne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +28,Approval Status must be 'Approved' or 'Rejected',Le statut d'approbation doit être 'Approuvé' ou 'Rejeté'
 DocType: Purchase Invoice,Contact Person,Personne à contacter
@@ -1147,17 +1176,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Variation nette de l&#39;actif fixe
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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 le prix de l'article
+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 l'heure de la date
 DocType: Email Digest,For Company,Pour l&#39;entreprise
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Journal des communications.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Montant d&#39;achat
 DocType: Sales Invoice,Shipping Address Name,Adresse Nom d'expédition
 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 +472,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Article {0} n'est pas un article du stock
+DocType: Material Request,Terms and Conditions Content,Contenu des termes et conditions
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ne peut pas être supérieure à 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Article {0} n'est pas un article du stock
 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é
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,L'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 ne sont autorisés que pour les utilisateurs ayant droit ."
 DocType: Email Digest,Bank Balance,Solde bancaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,Aucune Structure Salariale actif trouvé pour l'employé {0} et le mois
 DocType: Job Opening,"Job profile, qualifications required etc.",Profile de l’emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du compte
-apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,Règle d&#39;impôt pour les transactions.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Nous achetons cet article
 DocType: Address,Billing,Facturation
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,sous assemblages
+DocType: Asset,Asset Name,Nom de l&#39;actif
 DocType: Shipping Rule Condition,To Value,To Value
 DocType: Supplier,Stock Manager,Responsable des Stocks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Entrepôt Source est obligatoire à la ligne {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Bordereau de livraison
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Loyer du bureau
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Bordereau de livraison
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Loyer du bureau
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Demande de devis peut être l&#39;accès en cliquant sur le lien suivant
+DocType: Asset,Number of Months in a Period,Nombre de mois dans une période
 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
@@ -1212,32 +1244,33 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Qté
 DocType: Notification Control,Expense Claim Rejected,Note de Frais Rejetée
 DocType: Item Attribute,Item Attribute,Attribut de l'article
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gouvernement
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Des variantes de l&#39;article
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
 DocType: Sales Invoice,Source,Source
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bordereau(x) annulé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie des investissements
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Frais de fret et d'expédition
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Frais de fret et d'expédition
 DocType: Item Group,Item Group Name,Nom du groupe d&#39;article
 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 +86,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
 DocType: Pricing Rule,For Price List,Pour liste de prix
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recherche de cadre
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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). S'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/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 .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visite de maintenance
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lot Quantité à Entrepôt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visite de maintenance
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qté de lot disponible à entrepôt
 DocType: Time Log Batch Detail,Time Log Batch Detail,Temps connecter Détail du lot
 DocType: Landed Cost Voucher,Landed Cost Help,Aide coûts logistiques
 DocType: Purchase Invoice,Select Shipping Address,Sélectionnez l&#39;adresse d&#39;expédition
@@ -1250,20 +1283,19 @@
 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.,En Toutes Lettres. Sera visible une fois que vous enregistrez le bon de livraison.
 apps/erpnext/erpnext/config/stock.py +196,Brand master.,Marque Principale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Sales Invoice Item,Brand Name,Nom de la marque
 DocType: Purchase Receipt,Transporter Details,Transporter Détails
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,boîte
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,The Organization,l'Organisation
-DocType: Monthly Distribution,Monthly Distribution,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: Monthly Distribution,Monthly Distribution,Répartition mensuelle
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Liste des destinataires est vide. S'il vous plaît créez en une
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de Production Ventes Ordre
-DocType: Sales Partner,Sales Partner Target,Cible Sales Partner
+DocType: Sales Partner,Sales Partner Target,Objectif
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +106,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabie pour {0} ne peut être effectué qu'en devise: {1}
 DocType: Pricing Rule,Pricing Rule,Règle de tarification
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Demande de Matériel à Bon de commande
+apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Demande de matériel au bon d'achat
 DocType: Shopping Cart Settings,Payment Success URL,Paiement Succès URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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/controllers/sales_and_purchase_return.py +77,Row # {0}: Returned Item {1} does not exists in {2} {3},Ligne # {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 prospect
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Notes de frais de la société
 DocType: Company,Default Holiday List,Liste de vacances par défaut
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passif stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Passif stock
 DocType: Purchase Receipt,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,Contact No portable
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
@@ -1287,36 +1319,37 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Paiement E-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Autres rapports
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'unité de mesure par défaut doit être 1 dans la ligne {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
+DocType: SMS Center,Receiver List,Liste des destinataires
 DocType: Payment Tool Detail,Payment Amount,Montant du paiement
 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 +520,{0} View,{0} Voir
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Variation nette des espèces
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,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 la Table de facteur de Conversion
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 la Table de facteur de Conversion
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Demande de paiement existe déjà {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût de documents publiés
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Précédent Année financière est pas fermé
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Âge (jours)
 DocType: Quotation Item,Quotation Item,Article de la soumission
 DocType: Account,Account Name,Nom du compte
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Date début ne peut pas être supérieur à celle de fin
 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 +38,Supplier Type master.,Type de fournisseur principal
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Type de fournisseur principal
 DocType: Purchase Order Item,Supplier Part Number,Numéro de pièce fournisseur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
 DocType: Purchase Invoice,Reference Document,Document de référence
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,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 +205,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte de créances fournisseur 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 telles que les règles d'expédition, liste de prix, etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturé
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier telles que les règles d'expédition, liste de prix, etc."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variation nette des comptes créditeurs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,S'il vous plaît vérifier votre courriel id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Colonne inconnu : {0}
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
 DocType: Quotation,Term Details,Détails terme
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de capacité pendant (jours)
 apps/erpnext/erpnext/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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Déclaration de garantie
@@ -1357,8 +1391,8 @@
 DocType: Employee,Permanent Address,Adresse permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avance versée contre {0} {1} ne peut pas être supérieure \ que Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Etes-vous sûr de vouloir unstop
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Réduire la déduction de congé sans solde (PLT)
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Etes-vous sûr de vouloir unstop
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Réduire la déduction de congé sans solde (CSS)
 DocType: Territory,Territory Manager,Responsable Régional
 DocType: Packed Item,To Warehouse (Optional),A l'entrepôt (Facultatif)
 DocType: Sales Invoice,Paid Amount (Company Currency),Montant payé (Devise Société)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Dépenses de marketing
 ,Item Shortage Report,Point Pénurie rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'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 +53,Single unit of an Item.,Une seule unité d&#39;un élément.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Entrepôt nécessaire au rang {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Entrepôt nécessaire au rang {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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 départ à la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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,Contact suivant par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Quantity required for Item {0} in row {1},Quantité requise pour l'article {0} à la ligne {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Quantité requise pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {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
+DocType: Asset,Gross Purchase Amount,Achat Montant brut
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","Ex. ""XYZ Banque Nationale """
+DocType: Asset,Depreciation Method,Méthode d&#39;amortissement
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base?
 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 +29,Shopping Cart is enabled,Le panier est activé
 DocType: Job Applicant,Applicant for a Job,Candidat à un emploi
 DocType: Production Plan Material Request,Production Plan Material Request,Plan de production Demande de Matériel
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Pas d'Ordre de Production créé
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Pas d'Ordre de Production créé
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Les employés HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,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/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Faire un bon de commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Faire un bon de commande
 DocType: SMS Center,Send To,Envoyer à
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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é
@@ -1426,32 +1462,33 @@
 DocType: Sales Invoice Item,Customer's Item Code,Code article clients
 DocType: Stock Reconciliation,Stock Reconciliation,Stock réconciliation
 DocType: Territory,Territory Name,Nom de la région
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,L'entrepôt des travaux en cours est nécessaire avant de soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,L'entrepôt des travaux en cours est nécessaire avant de soumettre
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidat à un emploi.
 DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et Référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresses
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresses
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,Appraisals
+apps/erpnext/erpnext/config/hr.py +141,Appraisals,Évaluation
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N ° de série pour l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une règle de livraison
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Item est pas autorisé à avoir ordre de fabrication.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,S&#39;il vous plaît définir filtre basé sur le point ou l&#39;entrepôt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item est pas autorisé à avoir ordre de fabrication.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,S'il vous plaît définir filtre basé sur l'article ou l'entrepôt
 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: Sales Order,To Deliver and Bill,Pour livrer et facturer
 DocType: GL Entry,Credit Amount in Account Currency,Montant de crédit en compte Devises
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Temps pour la fabrication des journaux.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} doit être soumis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} doit être soumis
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Relevés de temps passés par tâches.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Paiement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} par rapport au bon de commande {2}
 DocType: Employee,Salutation,Titre
 DocType: Pricing Rule,Brand,Marque
 DocType: Item,Will also apply for variants,Se appliquera également pour les variantes
-apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Regrouper des envois au moment de la vente.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset ne peut être annulé, car il est déjà {0}"
+apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Regrouper les articles au moment de la vente.
 DocType: Quotation Item,Actual Qty,Quantité réelle
 DocType: Sales Invoice Item,References,Références
 DocType: Quality Inspection Reading,Reading 10,Lecture 10
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,associé
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} is not a serialized Item
+DocType: Request for Quotation Supplier,Send Email to Supplier,Envoyer un email au fournisseur
 DocType: SMS Center,Create Receiver List,Créer une liste Receiver
 DocType: Packing Slip,To Package No.,Pour Emballer n °
 DocType: Production Planning Tool,Material Requests,Les demandes de matériel
@@ -1478,18 +1516,18 @@
 DocType: Sales Order Item,Delivery Warehouse,Entrepôt de livraison
 DocType: Stock Settings,Allowance Percent,Pourcentage allocation
 DocType: SMS Settings,Message Parameter,Paramètre message
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Arbre des centres de coûts financiers.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Arbre des centres de coûts financiers.
 DocType: Serial No,Delivery Document No,Pas de livraison de documents
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir des éléments de reçus d'achat
 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},L'article {0} apparaît plusieurs fois dans la liste de prix {1}
 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: Production Plan Material Request,Material Request Date,Matériau Date de la demande
+DocType: Production Plan Material Request,Material Request Date,Date de demande de Matériel
 DocType: Purchase Order Item,Supplier Quotation Item,Article Estimation Fournisseur
 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
 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;.
-DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribution mensuelle
+DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la répartition 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,S'il vous plaît spécifier la devise par défaut dans la Société principal et réglages globaux
 DocType: Purchase Invoice,Recurring Invoice,Facture récurrente
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,Nombre à livrer
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} créé
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,exercices multiples existent pour la date {0}. S&#39;il vous plaît définir entreprise dans l&#39;exercice
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} créé
 DocType: Delivery Note Item,Against Sales Order,Sur la commande
-,Serial No Status,N ° de série Statut
+,Serial No Status,Statut du No de série
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,La liste des Articles ne peut être vide
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Pour régler {1} périodicité, différence entre partir et à ce jour \
  doit être supérieur ou égal à {2}"
 DocType: Pricing Rule,Selling,Vente
 DocType: Employee,Salary Information,Information sur le salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID employé
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Frais et taxes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,S'il vous plaît entrer Date de référence
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Paiement Gateway Account est pas configuré
 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: Production Order,Material Request Item,Article demande de matériel
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour l'article qui sera affiché dans le site Web
+DocType: Purchase Order Item Supplied,Supplied Qty,Qté fournie
+DocType: Request for Quotation Item,Material Request Item,Article demande de matériel
 apps/erpnext/erpnext/config/stock.py +85,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}
+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,Vous ne pouvez vous referez au numéro de la ligne supérieure ou égale de la ligne courante pour ce type de charge
+DocType: Asset,Sold,Vendu
 ,Item-wise Purchase History,Historique des achats (par Article)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rouge
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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,Gelé
 ,Open Production Orders,Commandes ouverte de production
 DocType: Installation Note,Installation Time,Temps d&#39;installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Supprimer toutes les transactions pour cette Société
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'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,Investissements
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investissements
 DocType: Issue,Resolution Details,Détails de la résolution
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Allocations
 DocType: Quality Inspection Reading,Acceptance Criteria,Critères d&#39;acceptation
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,S&#39;il vous plaît entrer les demandes de matériel dans le tableau ci-dessus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,S&#39;il vous plaît entrer les demandes de matériel dans le tableau ci-dessus
 DocType: Item Attribute,Attribute Name,Nom de l'attribut
 DocType: Item Group,Show In Website,Afficher dans le site Web
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Groupe
@@ -1552,6 +1592,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
+DocType: Pricing Rule,Margin Type,Type de marge
 DocType: Appraisal,For Employee Name,Pour nom de l'employé
 DocType: Holiday List,Clear Table,Effacer le tableau
 DocType: Features Setup,Brands,Marques
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset est obligatoire contre un actif fixe Point
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,S&#39;il vous plaît configuration série de numérotation pour les présences via Configuration&gt; Série Numérotation
 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/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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de frais'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Paire
+DocType: Asset,Depreciation Schedule,Calendrier d&#39;amortissement
 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: Asset,Purchase Date,date d&#39;achat
 DocType: Employee,Personal Details,Données personnelles
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},S&#39;il vous plaît set &#39;Asset Centre Amortissement des coûts »dans l&#39;entreprise {0}
 ,Maintenance Schedules,Programmes d&#39;entretien
 ,Quotation Trends,Soumission Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rapprochées
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,La note de frais est en attente d'approbation. Seul l'approbateur des frais peut mettre à jour le statut.
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Groupe non-groupe
-apps/erpnext/erpnext/setup/setup_wizard/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,Total réel
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Unité
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,S'il vous plaît préciser la société
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,S'il vous plaît préciser la société
 ,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 conservez le stock d'objets refusés
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,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.
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Notes de Frais
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
 ,BOM Search,BOM Recherche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fermeture (ouverture + totaux)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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.",Afficher / Masquer fonctionnalités telles que No de serie. POS ect.
 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 +249,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Facteur de conversion UOM est obligatoire dan la ligne {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Prix de l'article ajouté pour {0} dans la liste de prix {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Prix de l'article ajouté pour {0} dans la liste de prix {1}
 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
 DocType: Territory,Classification of Customers by region,Classification des clients par région
 DocType: Project,% Tasks Completed,% des tâches terminées
 DocType: Project,Gross Margin,Marge brute
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,S'il vous plaît entrer en production l'article premier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,S'il vous plaît entrer en production l'article premier
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Solde calculé du relevé bancaire
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilisateur désactivé
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Devis
 DocType: Salary Slip,Total Deduction,Déduction totale
 DocType: Quotation,Maintenance User,Maintenance utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Mise à jour coût
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Mise à jour coût
 DocType: Employee,Date of Birth,Date de naissance
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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,Adresse Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,S&#39;il vous plaît configurer Employee Naming System en ressources humaines&gt; Paramètres RH
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable à (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
@@ -1645,21 +1691,21 @@
 ,SO Qty,SO Quantité
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 résultat total
-DocType: Supplier Quotation,Manufacturing Manager,Responsable Fabrication
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1}
+DocType: Request for Quotation,Manufacturing Manager,Responsable Fabrication
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},No de Série {0} est sous garantie jusqu'au {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
 apps/erpnext/erpnext/hooks.py +71,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 +44,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/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No de série {0} ne fait partie de aucun entrepôt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rangée #
 DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise société)
-DocType: Pricing Rule,Supplier,Fournisseur
+DocType: Asset,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,Dépenses diverses
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Dépenses diverses
 DocType: Global Defaults,Default Company,Société par défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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, s'il vous plaît situé dans Réglages Stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"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, s'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 +139,User {0} is disabled,Utilisateur {0} est désactivé
@@ -1668,8 +1714,8 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Types d'emploi ( , contrat permanent, stagiaire , etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
-DocType: Currency Exchange,From Currency,De Monnaie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
+DocType: Currency Exchange,From Currency,De la devise
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","S'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 +94,Sales Order required for Item {0},Commande requis pour objet {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Monnaie de la société)
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Quantité doit être 1, comme élément est lié à un actif"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Enfant article ne doit pas être un produit Bundle. S&#39;il vous plaît supprimer l&#39;article `{0}` et économisez
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancaire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Nouveau Centre de Coût
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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é (habituellement source de fonds&gt; Passif à court terme&gt; Impôts et taxes et créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «taxe» et faire mentionner le taux d&#39;imposition.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nouveau Centre de Coût
 DocType: Bin,Ordered Quantity,Quantité commandée
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","Ex. ""Construire des outils pour les constructeurs"""
 DocType: Quality Inspection,In Process,En cours
@@ -1691,14 +1737,15 @@
 DocType: Purchase Order Item,Reference Document Type,Référence Type de document
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{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 +305,Serialized Inventory,Stocks en série
+apps/erpnext/erpnext/config/stock.py +305,Serialized Inventory,Inventaire sérialisé
 DocType: Activity Type,Default Billing Rate,Prix facturation par défaut
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde Stock
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Classement des ventes au paiement
 DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Time Logs créé:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Logs créé:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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
@@ -1715,37 +1762,37 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Débit Pour est nécessaire
+DocType: Stock Entry,Total Incoming Value,Valeur entrante total
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Débit Pour est nécessaire
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste prix d'achat
 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 +141,Please select Incharge Person's name,S'il vous plaît sélectionnez le nom de la personne Incharge
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,S'il vous plaît sélectionnez le nom de la personne Incharge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Offrez Lettre
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Lieu à des demandes de matériel (MRP) et de la procédure de production.
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,lettre de proposition
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Générer des demandes de matériel (MRP) et les ordres de fabrication.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser heures supplémentaires
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valorisation Taux actuel
 DocType: Item,Customer Item Codes,Codes article du client
 DocType: Opportunity,Lost Reason,Raison perdu
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Créer des entrées de paiement contre commandes ou factures.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Créer des entrées de paiement contre commandes ou factures.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nouvelle adresse
 DocType: Quality Inspection,Sample Size,Taille de l&#39;échantillon
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1754,23 +1801,24 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Pas de fiche de salaire trouvé pour le mois:
 DocType: Bin,Actual Quantity,Quantité réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple: Livraison le jour suivant
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,N ° de série {0} introuvable
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,N ° de série {0} introuvable
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vos clients
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet: {0}
 DocType: Leave Block List Date,Block Date,Date de bloquer
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Appliquer maintenant
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Appliquer maintenant
 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 résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
 DocType: Appraisal Goal,Appraisal Goal,Objectif d&#39;évaluation
 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
+DocType: Salary Structure,Monthly Earning & Deduction,Revenu mensuel & déduction
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importer en masse
 DocType: Sales Partner,Address & Contacts,Adresse & Coordonnées
 DocType: SMS Log,Sender Name,Nom de l&#39;expéditeur
 DocType: POS Profile,[Select],[Choisir ]
-DocType: SMS Log,Sent To,Envoyé À
+DocType: SMS Log,Sent To,Envoyé à
 DocType: Payment Request,Make Sales Invoice,Faire des factures de vente
 DocType: Company,For Reference Only.,Pour référence seulement.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},invalide {0}: {1}
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Détails de l&#39;emploi
 DocType: Employee,New Workplace,Nouveau lieu de travail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Définir comme Fermé
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Aucun article avec le code barre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Aucun article avec le code barre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No ne peut pas être 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,"Si vous avez équipe de vente et Partenaires Vente (Channel Partners), ils peuvent être marqués et maintenir leur contribution à l&#39;activité commerciale"
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
@@ -1799,40 +1847,41 @@
 DocType: Rename Tool,Rename Tool,Outil de renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Mettre à jour le coût
 DocType: Item Reorder,Item Reorder,Réorganiser les articles
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,transfert de matériel
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} doit être un élément de vente dans {1}
 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 ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,S&#39;il vous plaît définir récurrent après avoir sauvegardé
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,S&#39;il vous plaît définir récurrent après avoir sauvegardé
 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/public/js/setup_wizard.js +190,Add Taxes,Ajouter impôts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flux de trésorerie de la gestion du financement
-,Financial Analytics,Financial Analytics
+,Financial Analytics,Analyse financière
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
 apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Vous ne pouvez pas changer la devise par défaut de l'entreprise, parce qu'il ya des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
 DocType: Quality Inspection,Purchase Receipt No,Quittance d'achat No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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},Quantité alignée {0} ({1}) doit être égale a la quantité fabriquée {2}
 DocType: Appraisal,Employee,Employés
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importer Email De
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Inviter en tant qu&#39;utilisateur
 DocType: Features Setup,After Sale Installations,Installations Après Vente
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},S&#39;il vous plaît mettre {0} dans l&#39;entreprise {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} est entièrement facturé
 DocType: Workstation Working Hour,End Time,Heure de fin
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Date prévue d'achèvement ne peut pas être inférieure à projet Date de début
-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/config/crm.py +6,Sales Pipeline,Pipeline des ventes
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groupe par bon
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Filière des ventes
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requis Sur
 DocType: Sales Invoice,Mass Mailing,Envoi en masse
 DocType: Rename Tool,File to Rename,Fichier à Renommer
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},S&#39;il vous plaît sélectionnez BOM pour le point à la ligne {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numéro de commande requis pour L'article {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},S&#39;il vous plaît sélectionnez BOM pour le point à la ligne {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Numéro de commande requis pour L'article {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme d'entretien {0} doit être annulée avant d'annuler cette commande
 DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
@@ -1841,7 +1890,7 @@
 DocType: Purchase Invoice,Credit To,Crédit Pour
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Pistes ouverte / Clients actifs
 DocType: Employee Education,Post Graduate,Message d&#39;études supérieures
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Détail calendrier d&#39;entretien
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Détail du programme d'entretien
 DocType: Quality Inspection Reading,Reading 9,Lecture 9
 DocType: Supplier,Is Frozen,Est gelé
 DocType: Buying Settings,Buying Settings,Réglages d&#39;achat
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,La participation à ce jour
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de paiement
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Veuillez indiquer la société pour continuer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Veuillez indiquer la société pour continuer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variation nette des comptes débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Congé compensatoire
 DocType: Quality Inspection Reading,Accepted,Accepté
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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/stock/doctype/item/item.py +407,"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 y a des mouvement de stock pour cet article, \ vous ne pouvez pas modifier les valeurs de 'Du No de série',"" Du No de lot','De l'article du stock' et 'Méthode de valorisation'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +449,Quick Journal Entry,Entrée rapide dans le journal
 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 +206,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
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} n'a pas été soumis
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Les ordres de fabrication suivants ont été créés:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Les ordres de fabrication suivants ont été créés:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Liste de diffusion info-lettre
 DocType: Delivery Note,Transporter Name,Nom Transporteur
 DocType: Authorization Rule,Authorized Value,Valeur autorisée
@@ -1888,19 +1937,19 @@
 DocType: Task Depends On,Task Depends On,Tâches dépendent de
 DocType: Lead,Opportunity,Occasion
 DocType: Salary Structure Earning,Salary Structure Earning,Structure salariale Gagner
-,Completed Production Orders,Ordres de fabrication terminés
+,Completed Production Orders,Ordre de production terminés
 DocType: Operation,Default Workstation,Par défaut Workstation
 DocType: Notification Control,Expense Claim Approved Message,Note de Frais Approuvée message
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} est fermé
 DocType: Email Digest,How frequently?,Quelle est la fréquence?
 DocType: Purchase Receipt,Get Current Stock,Obtenez Stock actuel
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (habituellement 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»
-apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre de la Bill of Materials
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre des nomenclatures
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Présent
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Entretien date de début ne peut pas être avant la date de livraison pour série n ° {0}
 DocType: Production Order,Actual End Date,Date de fin réelle
 DocType: Authorization Rule,Applicable To (Role),Applicable à (Rôle)
 DocType: Stock Entry,Purpose,But
+DocType: Company,Fixed Asset Depreciation Settings,Paramètres d&#39;amortissement des immobilisations
 DocType: Item,Will also apply for variants unless overrridden,Se appliquera également pour des variantes moins overrridden
 DocType: Purchase Invoice,Advances,Avances
 DocType: Production Order,Manufacture against Material Request,Fabrication contre Demande de Matériel
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,Nombre de SMS demandés
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines étapes
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,S&#39;il vous plaît fournir les éléments spécifiés aux meilleurs tarifs possibles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Contract End Date must be greater than Date of Joining,La date de fin de contrat doit être supérieure à la date d'embauche
 DocType: 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 un sous nœud
@@ -1959,17 +2009,19 @@
  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: Purchase Receipt Item,Recd Quantity,Quantité reçue
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne peut pas produire plus d'article {0} que de la qté du bon de commande {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
+DocType: Asset Category Account,Asset Category Account,Catégorie d&#39;actif compte
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Ne peut pas produire plus d'article {0} que de la qté du bon de commande {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Entrée stock {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Banque et liquidités
 DocType: Tax Rule,Billing City,Ville de facturation
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","Ex. Cash, Banque, Carte de crédit"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","Ex. Cash, Banque, Carte de crédit"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (habituellement 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: Journal Entry,Credit Note,Note de crédit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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: Warranty Claim,Service Address,Adresse du service
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,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.,Maximum 100 lignes pour réconciliation du stock.
 DocType: Material Request,Manufacture,Fabrication
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,S'il vous plaît Livraison première note
 DocType: Purchase Invoice,Currency and Price List,Devise et liste de prix
@@ -1978,7 +2030,7 @@
 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é)
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
 DocType: Sales Invoice,This Document,Ce document
 DocType: Installation Note Item,Installed Qty,Qté installée
 DocType: Lead,Fax,Fax
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mes adresses
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisation principale des branches.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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,Services publics
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,Services publics
 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,Liste des prix d'achat par défaut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Aucun employé pour les critères ci-dessus sélectionnés ou fiche de salaire déjà créé
@@ -2017,18 +2069,19 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Sélectionnez à télécharger:
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programme d'entretien n'est pas créer pour tous les articles. S'il vous plait clickez sur 'Créer un programme'
 ,To Produce,A Produire
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Paie
 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"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l&#39;emballage pour la livraison (pour l&#39;impression)
 DocType: Bin,Reserved Quantity,Quantité réservée
-DocType: Purchase Invoice,Recurring Ends On,Récurrent Termine
+DocType: Purchase Invoice,Recurring Ends On,Récurrent se termine le
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acheter des articles reçus
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personnalisation des formulaires
 DocType: Account,Income Account,Compte de résultat
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Aucun défaut Modèle d&#39;adresse trouvée. S&#39;il vous plaît créer un nouveau à partir de Configuration&gt; Presse et Branding&gt; Modèle d&#39;adresse.
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Domaine à responsabilités principal
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Prospects clés par Type d'Industrie
 DocType: Item Supplier,Item Supplier,Fournisseur de l'article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,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 +665,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/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Toutes les adresses.
 DocType: Company,Stock Settings,Paramètres de stock
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Gérer l'arborescence de groupe de clients .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nom du Nouveau Centre de Coûts
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Quitter le panneau de configuration
 DocType: Appraisal,HR User,Chargé de Ressources Humaines
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
-apps/erpnext/erpnext/config/support.py +7,Issues,Questions
+apps/erpnext/erpnext/hooks.py +90,Issues,Questions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Le statut doit être l'un des {0}
 DocType: Sales Invoice,Debit To,Débit Pour
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les articles de l&#39;échantillon.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Quantité réelle après transaction
 ,Pending SO Items For Purchase Request,"Articles commandé en attente, pour demande d'achat"
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de facturation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Compte de résultat
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grand
 DocType: C-Form Invoice Detail,Territory,Région
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,Paiement du salaire pour le mois {0} et {1} an
-DocType: Stock Settings,Default Valuation Method,Méthode d&#39;évaluation par défaut
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Paiement du salaire pour le mois {0} et {1} an
+DocType: Stock Settings,Default Valuation Method,Méthode de valorisation par défaut
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
 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 +142,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
@@ -2146,16 +2200,17 @@
 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","Les frais seront distribués proportionnellement en fonction de l'article Quantité ou montant, selon votre sélection"
 DocType: Maintenance Visit,Purposes,Buts
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,Au moins 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"
 ,Requested,demandé
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Pas de remarques
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,Pas de 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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset article doit être un élément non disponible
 DocType: Supplier Quotation Item,Material Request No,Demande matériel No
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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,Taux à laquelle la devise du client est converti en devise de base de la société
@@ -2176,7 +2231,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Article {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Article {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
 DocType: Payment Request,Recipient and Message,Destinataire Message
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer une remise supplémentaire sur
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Sélectionnez Fournisseur Adresse
 DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Requis est inférieure à la Quantité Minimum de Commande
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Requis est inférieure à la Quantité Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,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.
 DocType: Payment Request,Mute Email,Email silencieux
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Demande de devis.
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) contre l&#39;ordonnance {1} ne peut pas être supérieure à la Grand total ({2})
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une distribution mensuelle afin de repartir l'objectif ciblé.
-DocType: Purchase Invoice Item,Valuation Rate,Taux d&#39;évaluation
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Liste des Prix devise sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) contre l&#39;ordonnance {1} ne peut pas être supérieure à la Grand total ({2})
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une répartition mensuelle afin de repartir l'objectif.
+DocType: Purchase Invoice Item,Valuation Rate,Taux de valorisation
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Sur le document n °
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Gérer les partenaires commerciaux.
 DocType: Quality Inspection,Inspection Type,Type d&#39;inspection
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},S'il vous plaît sélectionnez {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},S'il vous plaît sélectionnez {0}
 DocType: C-Form,C-Form No,Formulaire - C No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Participation banalisée
@@ -2236,10 +2292,11 @@
 DocType: Purchase Order Item,Returned Qty,Retourné Quantité
 DocType: Employee,Exit,Quitter
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,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/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No de Série {0} créé
 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é
+DocType: Asset Category Account,Depreciation Expense Account,Compte Amortissement des frais
 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,Approbateur des Frais
@@ -2253,32 +2310,33 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmé
 DocType: Payment Gateway,Gateway,Passerelle
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Type de partie de Parent
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Seulement les demandes avec le statut ""approuvé"" peuvent êtres soumises"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Réorganiser Niveau
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Niveau réapprovisionnement
 DocType: Attendance,Attendance Date,Date de Présence
 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 +127,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,Adresse de livraison préférée
 DocType: Purchase Receipt Item,Accepted Warehouse,Entrepôt accepté
 DocType: Bank Reconciliation Detail,Posting Date,Date de publication
-DocType: Item,Valuation Method,Méthode d&#39;évaluation
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} à {1}
+DocType: Item,Valuation Method,Méthode de valorisation
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} à {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Demi-journée
 DocType: Sales Invoice,Sales Team,Équipe des ventes
 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 +410,[Error],[Erreur]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le bon de commande.
 ,Employee Birthday,Anniversaire de l'employé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Attribution de Congés (en jours)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Maître d'adresses.
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,No de Série {0} n’existe pas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Entrepôt de clientèle (Facultatif)
 DocType: Pricing Rule,Discount Percentage,Remise en pourcentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de facture
@@ -2288,7 +2346,7 @@
 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
+,Issued Items Against Production Order,Articles produit par rapport un ordre de fabrication
 DocType: Pricing Rule,Purchase Manager,Acheteur/Responsable Achats
 DocType: Payment Tool,Payment Tool,Paiement Outil
 DocType: Target Detail,Target Detail,Détail cible
@@ -2304,14 +2362,16 @@
 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,Attribution de Congés
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Les demandes matérielles {0} créés
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Les demandes matérielles {0} créés
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Modèle de termes ou d&#39;un contrat.
 DocType: Purchase Invoice,Address and Contact,Adresse et contact
 DocType: Supplier,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 accordé avant {0}, car le congé a déjà été porté en avant. Ne pas toucher le registre des congés {1}"
-apps/erpnext/erpnext/accounts/party.py +280,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/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Compte Amortissement cumulé
 DocType: Stock Settings,Freeze Stock Entries,Geler entrées en stocks
+DocType: Asset,Expected Value After Useful Life,Valeur attendue Après la vie utile
 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
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} est annulé ou fermé
 DocType: Delivery Note,Track this Delivery Note against any Project,Suivre ce bon de livraison contre tout projet
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Encaisse nette d&#39;Investir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Prix ou à prix réduits
 ,Is Primary Address,Est-Adresse primaire
 DocType: Production Order,Work-in-Progress Warehouse,Travaux en cours Entrepôt
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} doit être soumis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Gérer les adresses
-DocType: Pricing Rule,Item Code,Code de l&#39;article
+DocType: Asset,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 de l'utilisateur
@@ -2337,7 +2397,7 @@
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents professionnels interne de l'employé
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,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/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,No de série {0} n'est pas en stock
 apps/erpnext/erpnext/config/selling.py +163,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
 DocType: Sales Invoice,Write Off Outstanding Amount,Ecrire Off Encours
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Vérifiez si vous avez besoin automatiques factures récurrentes. Après avoir présenté la facture de vente, l&#39;article récurrent sera visible."
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Créer des demandes de matériel
 DocType: Employee Education,School/University,Ecole / Université
 DocType: Payment Request,Reference Details,Référence Détails
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur attendue Après la vie utile doit être inférieure à Achat Montant brut
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qté disponible à l&#39;entrepôt
 ,Billed Amount,Montant facturé
+DocType: Asset,Double Declining Balance,Double amortissement dégressif
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Afin fermé ne peut pas être annulée. Unclose pour annuler.
 DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir les Mises à jour
@@ -2368,32 +2430,36 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,entièrement dépréciées
 ,Stock Projected Qty,Stock projeté Quantité
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,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: Employee Attendance Tool,Marked Attendance HTML,Présence marquée HTML
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
-apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,N ° de série et de lot
+apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,N ° de série et lot
 DocType: Warranty Claim,From Company,De la société
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Les commandes Productions ne peuvent pas être élevés pour:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Les commandes Productions ne peuvent pas être élevés pour:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minute
 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
 DocType: Sales Partner,Retailer,Détaillant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
-DocType: Global Defaults,Disable In Words,Désactiver En mots
+DocType: Global Defaults,Disable In Words,Désactiver en lettre
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Compte du découvert bancaire
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Le groupe d&#39;articles&gt; Marque
 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,Prêts garantis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Prêts garantis
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},S&#39;il vous plaît mettre amortissement Comptes liés à Asset Catégorie {0} ou {1} Société
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Ouverture équité en matière d&#39;équilibre
 DocType: Appraisal,Appraisal,Évaluation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Courriel envoyé au fournisseur {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La date est répétée
 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 +187,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
@@ -2401,14 +2467,14 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk Importer Aide
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Choisir Quantité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Choisir Quantité
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,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 la première rangée
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Désinscrire de cette courriel Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Se désabonner pour ce compte rendu par Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Message envoyé
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,Compte avec des nœuds enfants ne peut pas être défini comme le grand livre
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base du client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant Net (Devise Société)
-DocType: BOM Operation,Hour Rate,Taux horaire
+DocType: BOM Operation,Hour Rate,tarif horaire
 DocType: Stock Settings,Item Naming By,Point de noms en
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Une autre entrée de clôture de la période {0} a été faite après {1}
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
@@ -2429,7 +2495,8 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Marge totale
+DocType: Supplier,Supplier Details,Détails du fournisseur
 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},De la valeur doit être inférieure à la valeur de la ligne {0}
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
 DocType: Payment Gateway Account,Default Payment Request Message,Défaut de demande de paiement message
 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/config/accounts.py +118,Banking and Payments,Bancaires et des paiements
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bancaires et des paiements
 ,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,Délai pour l'offre
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,Bon de commande {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Bon de commande {0} est pas soumis
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No de série {0} ne fait pas partie de l’entrepôt {1}
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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
 DocType: Notification Control,Quotation Message,Message du devis
 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/config/hr.py +55,Leaves and Holiday,Les feuilles et les vacances
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Congés et vacances
 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/stock/doctype/warehouse/warehouse.py +115,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é.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Bon Montant
 DocType: Time Log,Batched for Billing,Par lots pour la facturation
@@ -2476,36 +2543,41 @@
 DocType: Journal Entry Account,Journal Entry Account,Compte pièce comptable
 DocType: Shopping Cart Settings,Quotation Series,Soumission série
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Centre Amortissements
 DocType: Sales Order Item,Sales Order Date,Date du bon 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Date d&#39;achat d&#39;actifs {0} ne correspond pas à la date d&#39;achat Facture
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
 ,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},Taux de change Manquant pour {0}
 DocType: Journal Entry,Stock Entry,Entrée Stock
 DocType: Account,Payable,Impôt sur le revenu
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Débiteurs ({0})
-DocType: Project,Margin,Marge
+DocType: Pricing Rule,Margin,Marge
 DocType: Salary Slip,Arrear Amount,Montant échu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nouveaux clients
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bénéfice Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bénéfice Brut %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date de la clairance
 DocType: Newsletter,Newsletter List,Liste des info-lettres
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Vérifiez si vous voulez envoyer le bulletin de salaire dans le courrier à chaque salarié lors de la soumission bulletin de salaire
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Achat Montant brut est obligatoire
 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/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Au moins une vente ou achat doit être sélectionné
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Lorsque les opérations de fabrication sont réalisées.
 DocType: Stock Entry Detail,Source Warehouse,Entrepôt source
 DocType: Installation Note,Installation Date,Date d&#39;installation
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne fait pas partie à la société {2}
 DocType: Employee,Confirmation Date,Date de confirmation
 DocType: C-Form,Total Invoiced Amount,Montant total facturé
 DocType: Account,Sales User,Intervenant/Chargé de Ventes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Qté min. ne peut être supérieure à Qté max
+DocType: Account,Accumulated Depreciation,Dépréciation accumulée
 DocType: Stock Entry,Customer or Supplier Details,Client ou détails fournisseur
 DocType: Payment Request,Email To,E-mail à
 DocType: Lead,Lead Owner,Responsable du prospect
 DocType: Bin,Requested Quantity,Quantité demandée
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Entrepôt est nécessaire
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Entrepôt est nécessaire
 DocType: Employee,Marital Status,État civil
 DocType: Stock Settings,Auto Material Request,Demande de matérielle automatique
 DocType: Time Log,Will be updated when billed.,Mis à jour lorsqu'ils seront facturés.
@@ -2513,31 +2585,33 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Référence # {0} {1} du
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,La date de départ en retraite doit être supérieure à date d'embauche
 DocType: Sales Invoice,Against Income Account,Sur le compte des revenus
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Livré
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Livré
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Point {0}: Quantité commandée {1} ne peut pas être inférieure à commande minimum qté {2} (défini au point).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage répartition mensuelle
 DocType: Territory,Territory Targets,Les objectifs régional
 DocType: Delivery Note,Transporter Info,Infos Transporteur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Même fournisseur a été saisi plusieurs fois
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Point de commande fourni
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.,En-têtes pour les modèles d'impression..
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas marqué comme inclusive
 DocType: POS Profile,Update Stock,Mettre à jour le 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.,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 .
 DocType: Payment Request,Payment Details,Détails de paiement
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
+DocType: Asset,Journal Entry for Scrap,Journal Entrée pour Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,POS- Cadre . #
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Entrées du journal {0} ne sont pas liées
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Enregistrement de toutes les communications de type de Email, téléphone, conversation, visite, etc."
-DocType: Manufacturer,Manufacturers used in Items,Fabricants utilisés dans Articles
+DocType: Manufacturer,Manufacturers used in Items,Fabricants utilisés dans les articles
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Créer un nouveau
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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 validé
-,Purchase Analytics,Les analyses des achats
+,Purchase Analytics,Analyses des achats
 DocType: Sales Invoice Item,Delivery Note Item,Bon de livraison article
 DocType: Expense Claim,Task,Tâche
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence #
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Livre d'inventaire
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Prix: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Déduction bulletin de salaire
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Sélectionnez premier en un noeud groupe
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Sélectionnez premier en un noeud groupe
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Employé et participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},L'objectif doit être l'un des {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Supprimer la référence du client, fournisseur, partenaire commercial et le plomb, car il est votre adresse de l&#39;entreprise"
@@ -2556,10 +2630,10 @@
 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,En-Tête de courrier par défaut
-DocType: Purchase Order,Get Items from Open Material Requests,Obtenir des éléments de demandes Ouvert Documents
+DocType: Purchase Order,Get Items from Open Material Requests,Obtenir des Articles de Demandes Matérielles Ouvertes
 DocType: Time Log,Billable,Facturable
-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: Account,Rate at which this tax is applied,Taux à laquelle cet impôt est appliqué
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Qté réapprovisionnement
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Possibilités d&#39;emploi actuelles
 DocType: Company,Stock Adjustment Account,Compte d&#39;ajustement de stock
 DocType: Journal Entry,Write Off,Effacer
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
 DocType: Task,depends_on,dépend de
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S'il vous plaît ne créez pas de comptes Clients et Fournisseurs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S'il vous plaît ne créez pas de comptes Clients et Fournisseurs
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Prochaine date doit être supérieure à Date de publication
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Afficher impôt rupture
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / article / {0}) est en rupture de stock
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Prochaine date doit être supérieure à Date de publication
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/accounts/party.py +289,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 et exporter des données
 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.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Facture Date de publication
@@ -2582,14 +2657,14 @@
 DocType: Product Bundle,List items that form the package.,Liste des articles qui composent le paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage d'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
+DocType: Purchase Order Item,Material Request Detail No,No détail demande de matériel
 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,S'il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
 DocType: Company,Default Cash Account,Compte de trésorerie par défaut
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Configuration de l'entreprise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,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 +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Bons de livraison {0} doivent être annulé avant d’effacer cette commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,Note: There is not enough leave balance for Leave Type {0},Remarque: Il n'y a pas assez de compensation de congé pour le type de congé {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.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
@@ -2603,9 +2678,9 @@
 DocType: Hub Settings,Publish Availability,Publier Disponibilité
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Date de naissance ne peut être ultérieur à aujourd'hui.
 ,Stock Ageing,Stock vieillissement
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{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 courriels automatiques aux contacts sur les transactions Soumission.
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 Ouvert
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des Emails automatiques aux contacts sur les transactions soumises.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Quantité pas avalable dans l'entrepôt {1} sur {2} {3}.
  Disponible Quantité: {4}, transfert Quantité: {5}"
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,Email contact client
 DocType: Warranty Claim,Item and Warranty Details,détails article et garantie
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque: Entrée de Paiement créé tant que le compte 'Cash ou bancaire' n'a pas été spécifié
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque: Entrée de Paiement créé tant que le compte 'Cash ou bancaire' n'a pas été spécifié
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom du vendeur
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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,Partiellement facturé
 DocType: Item,Default BOM,Nomenclature par défaut
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Compte Fixed Asset
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Du bon de livraison
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Message personnalisé
 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 +375,Cash or Bank Account is mandatory for making payment entry,Espèces ou compte bancaire est obligatoire pour réaliser une écriture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Cash or Bank Account is mandatory for making payment entry,Espèces ou compte bancaire est obligatoire pour réaliser une écriture
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste
 DocType: Purchase Invoice Item,Rate,Prix
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,interne
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,De BOM
 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 +96,Stock transactions before {0} are frozen,Les transactions du stock avant {0} sont gelés
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,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 +63,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 +186,"e.g. Kg, Unit, Nos, m","Par exemple Kg, Unités, Nombres, Mètres"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,No de  référence est obligatoire si vous avez introduit une date
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Grille des salaires
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,compagnie aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Problème matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Problème matériel
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Soumissions
 DocType: Hub Settings,Access Token,Jeton d'accès
 DocType: Sales Invoice Item,Serial No,N ° de série
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,S'il vous plaît entrer Maintaince Détails première
-DocType: Item,Is Fixed Asset Item,Est- Fixed Asset article
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,S'il vous plaît entrer Maintaince Détails première
 DocType: Purchase Invoice,Print Language,Imprimer Langue
 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"
+DocType: Asset,Number of Depreciations,Nombre de Amortissements
 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
@@ -2671,16 +2747,18 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Il n'y a plus de vacances que de jours de travail ce mois-ci.
 DocType: Product Bundle Item,Product Bundle Item,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Demande de Devis
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant maximal de la facture
 DocType: Purchase Invoice Item,Image View,Voir l&#39;image
 apps/erpnext/erpnext/config/selling.py +23,Customers,Les clients
-DocType: Issue,Opening Time,Ouverture Heure
+DocType: Asset,Partially Depreciated,Partiellement dépréciées
+DocType: Issue,Opening Time,Horaire d'ouverture
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,La date Du Au est exigée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Delivery Note Item,From Warehouse,De l'entrepôt
-DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
+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 +59,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
@@ -2693,18 +2771,18 @@
 DocType: Quotation,Maintenance Manager,Responsable Maintenance
 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/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Modifié depuis
+DocType: Asset,Amended From,Modifié depuis
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivre par E-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Montant de la taxe après le montant de la remise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +198,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 +195,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,Soit Qté ou le montant cible est obligatoire
-apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Pas de nomenclature par défaut existe pour l'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Pas de nomenclature par défaut existe pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centre de coûts de transactions existants ne peut pas être converti pour le grand livre
-DocType: Department,Days for which Holidays are blocked for this department.,Jours fériés pour lesquels sont bloqués pour ce département.
+DocType: Department,Days for which Holidays are blocked for this department.,Jours pour lesquels les vacances sont bloqués pour ce département.
 ,Produced,produit
 DocType: Item,Item Code for Suppliers,Code de l&#39;article pour les fournisseurs
 DocType: Issue,Raised By (Email),Raised By (courriel)
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,S&#39;il vous plaît mentionner «Compte / Perte Gain sur aliénation des biens» dans la société
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Paiements de match avec Factures
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Paiements de match avec Factures
 DocType: Journal Entry,Bank Entry,Entrée de la Banque
 DocType: Authorization Rule,Applicable To (Designation),Applicable à (désignation)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Ajouter au panier
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Par groupe
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Activer / Désactiver la devise
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Activer / Désactiver la devise
 DocType: Production Planning Tool,Get Material Request,Obtenez Demande de Matériel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Frais postaux
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Frais postaux
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Montant)
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertissement et Loisir
 DocType: Quality Inspection,Item Serial No,N° de série
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Présent total
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Déclarations comptables
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Déclarations comptables
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2746,28 +2825,30 @@
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
 DocType: Features Setup,Item Groups in Details,Groupes d'article en détails
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Quantité à fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Quantité à fabriquer doit être supérieur à 0.
 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 +32,Visit report for maintenance call.,Rapport de visite pour l'appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à jour prix 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 +169,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 +171,Expense account is mandatory for item {0},Compte des frais est obligatoire pour item {0}
 DocType: Item,Website Description,Description du site Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Variation nette des capitaux propres
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,S&#39;il vous plaît annuler la facture d&#39;achat {0} premier
 DocType: Serial No,AMC Expiry Date,AMC Date d&#39;expiration
 ,Sales Register,Registre des ventes
 DocType: Quotation,Quotation Lost Reason,Soumission perdu la raison
 DocType: Address,Plant,Plante
 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/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Résumé du mois et activités en suspens
 DocType: Customer Group,Customer Group Name,Nom du groupe client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},S'il vous plaît retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},S'il vous plaît retirez cette Facture {0} du C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Erreur: {0}&gt; {1}
 DocType: Item,Attributes,Attributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obtenir les éléments
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obtenir les éléments
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Dernière date de commande
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
 DocType: C-Form,C-Form,Formulaire - C
@@ -2779,19 +2860,19 @@
 DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Payment Tool,Make Journal Entry,Assurez Journal Entrée
 DocType: Leave Allocation,New Leaves Allocated,Nouvelle Attribution de Congés
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,alloué avec succès
+apps/erpnext/erpnext/controllers/trends.py +265,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
+DocType: Appraisal Template,Appraisal Template Title,Titre du modèle d'évaluation
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +343,Commercial,Reste du monde
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Erreur: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,L'article parent {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Tous les produits ou services.
 DocType: Supplier Quotation,Supplier Address,Adresse du fournisseur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Le compte doit être de type &#39;Asset fixe&#39;
 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 +251,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/config/accounts.py +259,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,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services financiers
 apps/erpnext/erpnext/controllers/item_variant.py +62,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
@@ -2801,43 +2882,45 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Comptes de créances clients par défaut
 DocType: Tax Rule,Billing State,État de facturation
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transférer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transférer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Date d&#39;échéance est obligatoire
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
 DocType: Naming Series,Setup Series,Configuration des Séries
 DocType: Payment Reconciliation,To Invoice Date,Pour Date de la facture
 DocType: Supplier,Contact HTML,Contact HTML
-,Inactive Customers,Les clients inactifs
+,Inactive Customers,Clients inactifs
 DocType: Landed Cost Voucher,Purchase Receipts,Achat reçus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Comment Prix règle est appliquée?
 DocType: Quality Inspection,Delivery Note No,Bon de livraison No
 DocType: Company,Retail,Vente au détail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Bundle de produit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Produit groupé
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Ligne {0}: référence non valide {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modèle de taxe et frais d'achat
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Envoyer Emails Fournisseur
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,N° de série pour un dossier d'installation
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,le jour de la date et suivant Répéter le jour du mois doit être égal
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,le jour de la date et suivant Répéter le jour du mois doit être égal
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Heure du journal a été facturé
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,S&#39;il vous plaît définir Naming Series pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 DocType: Salary Slip,Earning & Deduction,Gains et déduction
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes écritures.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes écritures.
 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","exemple, 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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,Article 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},S'il vous plaît définir la valeur par défaut {0} dans {1} Société
@@ -2847,58 +2930,60 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,S&#39;il vous plaît configuration série de numérotation pour les présences via Configuration&gt; Série Numérotation
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obtenir des éléments de Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obtenir les articles du produit groupé
+DocType: Asset,Straight Line,Ligne droite
+DocType: Project User,Project User,projet utilisateur
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,S'il vous plaît entrez 'Est sous-traitée' Oui ou Non
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,S'il vous plaît entrez 'Est sous-traitée' Oui ou Non
 DocType: Sales Team,Contact No.,Contactez No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'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: Features Setup,Sales Discounts,Escomptes sur ventes
 DocType: Hub Settings,Seller Country,Vendeur Pays
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,De publier des éléments sur le Site
 DocType: Authorization Rule,Authorization Rule,Règle d&#39;autorisation
-DocType: Sales Invoice,Terms and Conditions Details,Termes et Conditions Détails
-apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,caractéristiques
+DocType: Sales Invoice,Terms and Conditions Details,Détails des termes et conditions
+apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,Caractéristiques
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Taxes de vente et frais Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nombre de commande
 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 +117,Add Child,Ajouter un enfant
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,Ajouter un enfant
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à geler des comptes et modifier le contenu
 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/report/stock_balance/stock_balance.py +47,Opening Value,Valeur d&#39;ouverture
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Commission sur les ventes
 DocType: Offer Letter Term,Value / Description,Valeur / Description
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne peut pas être soumis, il est déjà {2}"
 DocType: Tax Rule,Billing Country,Pays de facturation
 ,Customers Not Buying Since Long Time,Clients qui n'ont pas achetés depuis longtemps
 DocType: Production Order,Expected Delivery Date,Date de livraison prévue
 apps/erpnext/erpnext/accounts/general_ledger.py +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Frais de représentation
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Frais de représentation
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Facture de vente {0} doit être annulé avant l'annulation de cette commande client
 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 +60,Applications for leave.,Les demandes de congé.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Frais juridiques
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Frais juridiques
 DocType: Sales Invoice,Posting Time,Affichage Temps
 DocType: Sales Order,% Amount Billed,Montant Facturé en %
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Location de bureaux
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Dépenses téléphonique
 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.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Aucun Item avec le Numéro de Série {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Aucun Item avec le Numéro de Série {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notifications ouvertes
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Dépenses directes
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Dépenses directes
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} est une adresse de courriel valide dans &#39;notification \ Adresse e-mail&#39;
 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,Frais de déplacement
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Frais de déplacement
 DocType: Maintenance Visit,Breakdown,Panne
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la devise: {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la devise: {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 +50,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 +60,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Montant total de la facturation (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Nous vendons cet article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fournisseur Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Quantité doit être supérieure à 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Quantité doit être supérieure à 0
 DocType: Journal Entry,Cash Entry,Entrée caisse
 DocType: Sales Partner,Contact Desc,Contact Desc.
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades"
@@ -2926,15 +3011,16 @@
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Remarque: Article {0} plusieurs fois saisies
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Fournisseur de l&#39;actif {0} ne correspond pas avec le fournisseur dans la facture d&#39;achat
 DocType: Newsletter,Test Email Id,ID Email test
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Company Abbreviation,Abréviation de la société
 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 +71,Raw material cannot be same as main Item,Les matières premières peuvent être similaire que l'article principal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,Raw material cannot be same as main Item,Les matières premières peuvent être similaire que l'article principal
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorisé depuis {0} limites dépassées
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Maître de modèle de salaires .
-DocType: Leave Type,Max Days Leave Allowed,Laisser jours Max admis
+DocType: Leave Type,Max Days Leave Allowed,Jours de congé 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
 DocType: Payment Tool,Set Matching Amounts,Montants assortis Assortiment
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et redevances Ajouté
@@ -2946,28 +3032,29 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock gelé
 ,Territory Target Variance Item Group-Wise,Variance de région cible selon le groupe d'article
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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,Adresse de facturation principale
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,monnaie de facturation doit être égale à la monnaie soit comapany par défaut ou payble monnaie de compte du parti
 DocType: Monthly Distribution Percentage,Percentage Allocation,Allocation en pourcentage
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
-DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si disable, &#39;Dans les mots de champ ne sera pas visible dans toute transaction"
+DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si coché, le champ 'En Lettre' ne sera plus visible dans toute les transactions"
 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 ont été créées par
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Connexion lot a été annulé.
 ,Reqd By Date,Reqd par date
 DocType: Salary Slip Earning,Salary Slip Earning,Slip Salaire Gagner
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Créanciers
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Numéro de série est obligatoire
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Créanciers
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Ligne # {0}: No 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Estimation Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Estimation Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le devis.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,Rules for adding shipping costs.,Règles pour l'ajout de frais de port.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Evénements à venir
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,Du prospect
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,vente standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Vente standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,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: Project,Project Name,Nom du projet
+DocType: Request for Quotation Item,Project Name,Nom du projet
 DocType: Supplier,Mention if non-standard receivable account,Mentionner si créance non standard
 DocType: Journal Entry Account,If Income or Expense,Si les produits ou charges
 DocType: Features Setup,Item Batch Nos,Nos lots d&#39;articles
@@ -3024,8 +3110,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,Payés et non Livré
 DocType: Project,Default Cost Center,Centre de coûts par défaut
 DocType: Sales Invoice,End Date,Date de fin
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions sur actions
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions du stock
 DocType: Employee,Internal Work History,Histoire de travail interne
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Cumul Montant d&#39;amortissement
 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
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Société est obligatoire, car il est votre adresse de l&#39;entreprise"
 DocType: Item Attribute,From Range,De Gamme
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,S'il vous plaît mentionner pas de visites requises
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Envoyer cette ordonnance de production pour un traitement ultérieur .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Envoyer cette ordonnance de production pour un traitement ultérieur .
 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.","De ne pas appliquer la règle Prix dans une transaction particulière, toutes les règles de tarification applicables doivent être désactivés."
 DocType: Company,Domain,Domaine
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Emplois
@@ -3045,11 +3132,12 @@
 DocType: Time Log,Additional Cost,Supplément
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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 du No de coupon, si regroupé par coupon"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +599,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/public/js/setup_wizard.js +162,"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 +100,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/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0}: No de série {1} ne correspond pas à {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Congé occasionnel
 DocType: Batch,Batch ID,ID. du lot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Note: {0}
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,Date de livraison
 DocType: Opportunity,Opportunity Date,Date de possibilité
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retour contre Reçu d&#39;achat
+DocType: Request for Quotation Item,Request for Quotation Item,Appel d&#39;offre Item
 DocType: Purchase Order,To Bill,A facturer
 DocType: Material Request,% Ordered,% Commandé
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Travail à la pièce
@@ -3074,12 +3163,13 @@
 DocType: Customer,Tax ID,Numéro d&#39;identification fiscale
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Point {0} n'est pas configuré pour Serial colonne n ° doit être vide
 DocType: Accounts Settings,Accounts Settings,Paramètres des comptes
-DocType: Customer,Sales Partner and Commission,Sales Partner et de la Commission
+DocType: Customer,Sales Partner and Commission,Partenaire commerciaux et commission
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},S&#39;il vous plaît définir &quot;Compte de cession d&#39;actifs» dans l&#39;entreprise {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Facture d'achat {0} est déjà soumis
 DocType: Sales Partner,Partner's Website,Site web du partenaire
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Comptes provisoires
 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
@@ -3088,23 +3178,24 @@
 DocType: Pricing Rule,Disable,Désactiver
 DocType: Project Task,Pending Review,Attente d&#39;examen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Cliquez ici pour payer
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne peut pas être mis au rebut, car il est déjà {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Frais totaux (via Note de Frais)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Client Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Bon de commande {0} n'a pas été transmis
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Ajouter des articles de
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: le Compte Parent {1} n'appartient pas à la société {2}
-DocType: BOM,Last Purchase Rate,Purchase Rate Dernière
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Bon de commande {0} n'a pas été transmis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Ajouter des articles de
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: le Compte Parent {1} n'appartient pas à la société {2}
+DocType: BOM,Last Purchase Rate,Dernier prix d'achat
 DocType: Account,Asset,atout
 DocType: Project Task,Task ID,Tâche ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","par exemple ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,L'Entrepôt {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,Warehouse {0} does not exist,L'Entrepôt {0} n'existe pas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,S'nscrire ERPNext Hub
-DocType: Monthly Distribution,Monthly Distribution Percentages,Les pourcentages de distribution mensuelle
+DocType: Monthly Distribution,Monthly Distribution Percentages,Pourcentages répartition 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
 DocType: Features Setup,Compact Item Print,Compact article Imprimer
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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é
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} a été désactivé
 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 professionnels de l'employé
@@ -3128,7 +3220,7 @@
 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,Contact suivant
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Les comptes de la passerelle de configuration.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Les comptes de la passerelle de configuration.
 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,Actifs immobilisés
 ,Cash Flow,Flux de trésorerie
@@ -3142,7 +3234,7 @@
 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,Nouveau {0} Nom
-apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},S'il vous plaît trouver ci-joint {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},S'il vous plaît trouver ci-joint {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Solde du relevé bancaire que par General Ledger
 DocType: Job Applicant,Applicant Name,Nom du demandeur
 DocType: Authorization Rule,Customer / Item Name,Client / Nom d&#39;article
@@ -3153,29 +3245,28 @@
 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","Un groupe total d' **Articles** dans un autre **article**. Ceci est utile si vous mettez en place un certains **articles** dans un paquet et vous maintenez l'inventaire des **objets** emballés et non l'ensemble des **articles**. Le paquet d'**Article** aura ""Est objet de stock"" comme ""N°"" et ""Est objet de vente"" à ""Oui"". Par exemple: Si vous vendez des ordinateurs portables et sacs à dos séparément et qu'il y a prix spécial si le client achète à les deux, alors l'ordinateur portable + le sac à dos sera un nouveau groupe d'article. Remarque: BOM = Prix des matériaux"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Pas de série est obligatoire pour objet {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de série est obligatoire pour l'article {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/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,S'il vous plaît préciser la plage de / à
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Paramètres par défaut pour les transactions de vente.
 DocType: BOM Replace Tool,Current BOM,Nomenclature actuelle
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Ajouter Numéro de série
 apps/erpnext/erpnext/config/support.py +43,Warranty,garantie
 DocType: Production Order,Warehouses,Entrepôts
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Impression et papeterie
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Impression et papeterie
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Noeud de groupe
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Marchandises mise à jour terminée
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Marchandises mise à jour terminée
 DocType: Workstation,per hour,par heure
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Achat
 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.,L'Entrepôt ne peut pas être supprimé car une entrée existe dans le Grand Livre de Stocks pour cet Entrepôt.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'Entrepôt ne peut pas être supprimé car une entrée existe dans le Grand Livre de Stocks pour cet Entrepôt.
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Le montant payé
 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%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction maximum autorisée pour l'article: {0} est de {1} %
 DocType: Account,Receivable,Recevable
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,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.
@@ -3187,7 +3278,7 @@
 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é
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
 DocType: Warehouse,Warehouse Name,Nom de l'entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,S'il vous plaît entrer approuver ou approuver Rôle utilisateur
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,S'applique à la société
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'entrée du stock soumis {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'entrée du stock soumis {0} existe
 DocType: Purchase Invoice,In Words,En Toutes Lettres
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,"Aujourd'hui, c'est l’anniversaire de {0} !"
 DocType: Production Planning Tool,Material Request For Warehouse,Demande de matériel pour l&#39;entrepôt
@@ -3213,9 +3304,11 @@
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaction non autorisée contre l'ordre d'arret de production {0}
 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/projects/doctype/project/project.py +133,Join,Joindre
 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 +564,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 +569,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
+DocType: Pricing Rule,Margin Rate or Amount,Taux de marge ou montant
 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 colis à livrer. Utilisé pour indiquer le numéro de colis, le contenu et son poids."
 DocType: Sales Invoice Item,Sales Order Item,Poste de commande client
@@ -3225,22 +3318,21 @@
 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'une des opérations contrôlées sont «soumis», un courriel pop-up s'ouvre automatiquement pour envoyer un courrier électronique à l'associé ""Contact"" dans cette transaction, la transaction en pièce jointe. L'utilisateur peut ou ne peut pas envoyer courriel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation de l'employé
-apps/erpnext/erpnext/public/js/controllers/transaction.js +782,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 +793,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,No de Série {0} a déjà été reçu
 ,Requested Items To Be Transferred,Articles demandé à être transférés
-DocType: Customer,Sales Team Details,Détails équipe de vente
+DocType: Customer,Sales Team Details,Détails équipe des ventes
 DocType: Expense Claim,Total Claimed Amount,Montant total réclamé
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Possibilités pour la vente.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Invalide {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Invalide {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Congé maladie
-DocType: Email Digest,Email Digest,Email Digest
+DocType: Email Digest,Email Digest,Compte rendu par Email
 DocType: Delivery Note,Billing Address Name,Nom de l'adresse de facturation
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,S&#39;il vous plaît définir Naming Series pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grands Magasins
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Enregistrez le document d'abord.
 DocType: Account,Chargeable,À la charge
 DocType: Company,Change Abbreviation,Changer Abréviation
 DocType: Expense Claim Detail,Expense Date,Date de frais
@@ -3251,21 +3343,22 @@
 DocType: BOM,Manufacturing User,Intervenant/Chargé de Fabrication
 DocType: Purchase Order,Raw Materials Supplied,Matières premières fournies
 DocType: Purchase Invoice,Recurring Print Format,Format d&#39;impression récurrent
-DocType: C-Form,Series,série
+DocType: C-Form,Series,Séries
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Date de livraison prévue ne peut pas être avant la  date de commande
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Item Group,Item Classification,Point Classification
 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 de la visite d'entretien
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,période
-,General Ledger,Grand livre général
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Grand livre général
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Voir Prospects
 DocType: Item Attribute Value,Attribute Value,Attribut Valeur
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ID E-mail doit être unique , existe déjà pour {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ID E-mail doit être unique , existe déjà pour {0}"
 ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Lot {0} de l'article {1} a expiré.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},S&#39;il vous plaît définir une valeur par défaut Liste de vacances pour les employés {0} ou Société {0}
 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>
@@ -3297,25 +3390,25 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Achetez modèle impôt
 ,Project wise Stock Tracking,Projet sage Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Programme d'entretien {0} existe contre {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programme d'entretien {0} existe contre {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible)
 DocType: Item Customer Detail,Ref Code,Code de référence
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Dossiers des Employés.
 DocType: Payment Gateway,Payment Gateway,Passerelle de paiement
 DocType: HR Settings,Payroll Settings,Paramètres de la paie
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Correspondre non liées factures et paiements.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Correspondre non liées factures et paiements.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Passer la commande
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Racine ne peut pas avoir un centre de coûts parent
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Sélectionnez une marque ...
 DocType: Sales Invoice,C-Form Applicable,Formulaire - C applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Entrepôt est obligatoire
 DocType: Supplier,Address and Contacts,Adresse et contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Unité de mesure
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web convivial , ex.. 900px par 100px"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,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/manufacturing/doctype/production_order/production_order.py +342,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: Payment Tool,Get Outstanding Vouchers,Obtenez les chèques impayées
 DocType: Warranty Claim,Resolved By,Résolu par
 DocType: Appraisal,Start Date,Date de début
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Compte temporaire ( actif)
@@ -3324,14 +3417,14 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,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: 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 +38,Bill of Materials (BOM),Nomenclature (BOM)
-DocType: Item,Average time taken by the supplier to deliver,Délai moyen par le fournisseur de livrer
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Nomenclatures (BOM)
+DocType: Item,Average time taken by the supplier to deliver,Délai moyen de livraison par le fournisseur
 DocType: Time Log,Hours,Heures
 DocType: Project,Expected Start Date,Date de début prévue
 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'article si les charges ne lui sont pas applicable
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Devise de la transaction doit être la même que la monnaie paiement passerelle
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Recevoir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,Soumettre sur la création
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'employé
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu , parce offre a été faite."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Directeur des Achats
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La date de fin ne peut être avant la date de début
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Ajouter / Modifier Prix
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mes Commandes
@@ -3359,7 +3452,7 @@
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Quelque chose a mal tourné !
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,Attention : la demande d'absence contient les dates bloquées suivantes
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,La facture vente {0} a déjà été  transmise
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Exercice {0} n&#39;existe pas
 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é)
@@ -3367,10 +3460,10 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,S'il vous plaît entrez No mobiles valides
 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 ."
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Prêts non garantis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Prêts non garantis
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
 DocType: Maintenance Schedule Detail,Scheduled Date,Date prévue
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Amt total payé
@@ -3379,28 +3472,29 @@
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
 DocType: Item,Unit of Measure Conversion,Conversion d'Unité de mesure
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,L'employé ne peut pas être modifié
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +272,You cannot credit and debit same account at the same time,Vous ne pouvez pas créditer et débiter le même compte simultanément
 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 +141,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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 la société à qui cette adresse appartient.
 apps/erpnext/erpnext/public/js/setup_wizard.js +234,Your Suppliers,Vos fournisseurs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. S'il vous plaît faire son statut «inactif» pour continuer.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Fournisseur de pièce
 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: Item,Has Serial No,A un No de série
 DocType: Employee,Date of Issue,Date d&#39;émission
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Du {0} pour {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
 DocType: Issue,Content Type,Type de contenu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,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 +105,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à geler des valeurs
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
 DocType: Payment Reconciliation,From Invoice Date,De Date de la facture
@@ -3409,20 +3503,20 @@
 DocType: Delivery Note,To Warehouse,A l'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 +351,'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 +356,'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 +164,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/setup_wizard/install_fixtures.py +111,Electrical,Electrique
-DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale Différence (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
+DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale différence (Sor - En)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Ligne {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 l'Employé {0}
 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 +219,Birthday Reminder for {0},Rappel d'anniversaire pour {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours depuis la dernière commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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éries
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
@@ -3436,15 +3530,15 @@
 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 +576,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Article {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock gelé jusqu'au
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Activité du projet / tâche.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Générer les bulletins de salaire
 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: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3464,12 +3558,13 @@
 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,N° de série rejetés
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Année date de début ou de fin chevauche avec {0}. Pour éviter s&#39;il vous plaît définir la société
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nouvelle info-lettre
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},La date de début doit être inférieure à la date de fin de l'article {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Exemple:. ABCD ##### 
  Si la série est réglé et n ° de série ne est pas mentionné dans les transactions, le numéro de série, puis automatique sera créé sur la base de cette série. Si vous voulez toujours de mentionner explicitement numéros de série pour ce produit. laissez ce champ vide."
-DocType: Upload Attendance,Upload Attendance,Téléchargez Participation
+DocType: Upload Attendance,Upload Attendance,Chargez fréquentation
 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 +451,Amount,Montant
@@ -3477,11 +3572,11 @@
 ,Sales Analytics,Analytics Sales
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de fabrication
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer l'Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,S'il vous plaît entrer la devise par défaut pour la société principale
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,S'il vous plaît entrer la devise par défaut pour la société principale
 DocType: Stock Entry Detail,Stock Entry Detail,Détail d&#39;entrée Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Rappels quotidiens
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Règle fiscale Conflits avec {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nom du nouveau compte
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Service à la clientèle
@@ -3491,23 +3586,25 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Pourcentage
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
 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 la demande de matériel
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
 DocType: Naming Series,Update Series Number,Mettre à jour la Série
 DocType: Account,Equity,Capitaux propres
-DocType: Sales Order,Printing Details,Impression Détails
+DocType: Sales Order,Printing Details,Détails d'Impression
 DocType: Task,Closing Date,Date de clôture
 DocType: Sales Order Item,Produced Quantity,Quantité produite
 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 +385,Item Code required at Row No {0},Code de l'article est requis à la ligne No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Code de l'article est requis à la ligne No {0}
 DocType: Sales Partner,Partner Type,Type de partenaire
 DocType: Purchase Taxes and Charges,Actual,Réel
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
 DocType: Purchase Invoice,Against Expense Account,Sur le compte des dépenses
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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é (habituellement source de fonds&gt; Passif à court terme&gt; Impôts et taxes et créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «taxe» et faire mentionner le taux d&#39;imposition.
 DocType: Production Order,Production Order,Ordre de fabrication
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Note d'installation {0} à déjà été sousmise
 DocType: Quotation Item,Against Docname,Contre docName
@@ -3526,18 +3623,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Réconcilié avec succès
 DocType: Production Order,Planned End Date,Date de fin prévue
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Lorsque des éléments sont stockés.
 DocType: Tax Rule,Validity,Validité
+DocType: Request for Quotation,Supplier Detail,Fournisseur Détail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Montant facturé
 DocType: Attendance,Attendance,Présence
 apps/erpnext/erpnext/config/projects.py +55,Reports,Rapports
 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 +508,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,Date et heure de publication sont obligatoire
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
 ,Item Prices,Prix des articles
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le bon de commande.
 DocType: Period Closing Voucher,Period Closing Voucher,Bon clôture de la période
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Le total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Pas d'autorisation pour utiliser l'Outil Paiement
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Dépenses administratives
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Dépenses administratives
 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 +455,Change,Changement
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,Score gagné
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","Ex "" Mon entreprise LLC """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Période de préavis
+DocType: Asset Category,Asset Category Name,Catégorie d&#39;actif Nom
 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 une région de base et ne peut être modifié.
 DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
@@ -3569,13 +3668,13 @@
 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 +559,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 +564,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 par 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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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 d'Assistance Technique
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
 DocType: Batch,Batch,Lot
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendeur
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Paramètre SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budget et Centre de coûts
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budget et Centre de coûts
 DocType: Maintenance Schedule Item,Half Yearly,Semestriel
 DocType: Lead,Blog Subscriber,Abonné Blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions basées sur les valeurs .
@@ -3606,7 +3705,7 @@
 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: Purchase Order,Get Last Purchase Rate,Obtenir dernier tarif d'achat
 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/hr/doctype/salary_slip/salary_slip.py +216,"Company Email ID not found, hence mail not sent","Société E-mail introuvable, donc E-mail pas envoyé"
@@ -3620,17 +3719,17 @@
 DocType: Purchase Common,Purchase Common,Achat commun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Fournisseur offre {0} créé
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Le groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},quantité emballé doit être égale à la quantité pour l'article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Qté fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises aux clients.
-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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du projet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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»"
 DocType: Account,Parent Account,Compte Parent
@@ -3646,7 +3745,7 @@
 DocType: Employee,Education,Education
 DocType: Selling Settings,Campaign Naming By,Campagne nommée par
 DocType: Employee,Current Address Is,Adresse actuelle
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défaut de la société sera définie si le champ est laissé vide.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défaut de la société sera définie si le champ est laissé vide.
 DocType: Address,Office,Bureau
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantité disponible à partir de l'entrepôt
@@ -3661,13 +3760,14 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Batch Inventaire
 DocType: Employee,Contract End Date,Date de Fin de contrat
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
+DocType: Sales Invoice Item,Discount and Margin,Remise et marge
 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: Deduction Type,Deduction Type,Type de déduction
 DocType: Attendance,Half Day,Demi-journée
 DocType: Pricing Rule,Min Qty,Qté min
 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
+DocType: Production Plan Item,Planned Qty,Qté planifiée
 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 +175,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Qté Fabriqué) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d&#39;entrepôt par défaut
@@ -3679,9 +3779,9 @@
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Gestion des mouvements du stock.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Liste d'abonnés à l'info-lettre
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
-DocType: Project,Gross Margin %,Marge brute%
+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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
@@ -3689,24 +3789,25 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,S'il vous plaît entrez paiement Montant en atleast une rangée
 DocType: POS Profile,POS Profile,Profil POS
 DocType: Payment Gateway Account,Payment URL Message,Paiement URL message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Total non rémunéré
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Heure du journal n'est pas facturable
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"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"
+DocType: Asset,Asset Category,Catégorie d&#39;actif
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Acheteur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salaire Net ne peut pas être négatif
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,Please enter the Against Vouchers manually,S'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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Matériel au fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Matériel au fournisseur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Accise facture
 DocType: Expense Claim,Employees Email Id,Identifiants E-mail des employés
 DocType: Employee Attendance Tool,Marked Attendance,Présence marquée
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Dette courante
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Dette courante
 apps/erpnext/erpnext/config/crm.py +127,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
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenir compte taxe et frais pour
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +59,Actual Qty is mandatory,Quantité réelle est obligatoire
 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
@@ -3725,46 +3826,46 @@
 DocType: Item Attribute,Numeric Values,Valeurs numériques
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Joindre le logo
 DocType: Customer,Commission Rate,Taux de commission
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Faire Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Faire Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquer les demandes d&#39;autorisation par le ministère.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytique
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Le panier est vide
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Aucun défaut Modèle d&#39;adresse trouvée. S&#39;il vous plaît créer un nouveau à partir de Configuration&gt; Presse et Branding&gt; Modèle d&#39;adresse.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Date du bon de commande client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital-actions
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital-actions
 DocType: Packing Slip,Package Weight Details,Détails Poids de l&#39;emballage
 DocType: Payment Gateway Account,Payment Gateway Account,Compte passerelle de paiement
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Après le paiement terminé rediriger l&#39;utilisateur à la page sélectionnée.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,S&#39;il vous plaît sélectionner un fichier csv
 DocType: Purchase Order,To Receive and Bill,Pour recevoir et facturer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Termes et Conditions modèle
+apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Modèle des termes et conditions
 DocType: Serial No,Delivery Details,Détails de la livraison
+DocType: Asset,Current Value (After Depreciation),Valeur actuelle (après amortissement)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 ,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 +408,"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 +413,"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 +13,Project master.,Liste de projets.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne plus afficher le symbole (tel que $, €...) à côté des montants."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +409, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,S&#39;il vous plaît entrer des commandes clients dans le tableau ci-dessus
-apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,S&#39;il vous plaît entrer des commandes clients dans le tableau ci-dessus
+apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Nomenclatures
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 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 approuvé
 DocType: GL Entry,Is Opening,Est l&#39;ouverture
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index cbfae6c..df8e2e3 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,વિક્રેતા
 DocType: Employee,Rented,ભાડાનાં
 DocType: POS Profile,Applicable for User,વપરાશકર્તા માટે લાગુ પડે છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,શું તમે ખરેખર આ એસેટ સ્ક્રેપ કરવા માંગો છો?
 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.,* પરિવહનમાં ગણતરી કરવામાં આવશે.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Purchase Order,Customer Contact,ગ્રાહક સંપર્ક
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} વૃક્ષ
 DocType: Job Applicant,Job Applicant,જોબ અરજદાર
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 મિનિટ મૂળભૂત
 DocType: Leave Type,Leave Type Name,પ્રકાર છોડો નામ
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,ઓપન બતાવો
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,ન્યૂ છોડો અરજી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,બતાવો ચલો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,જથ્થો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,જથ્થો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
 DocType: Employee Education,Year of Passing,પસાર વર્ષ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ઉપલબ્ધ છે
 DocType: Designation,Designation,હોદ્દો
@@ -64,7 +66,7 @@
 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 +642,Invoice,ભરતિયું
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,ભરતિયું
 DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,સંરક્ષણ
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},ન્યૂ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},ન્યૂ {0}: # {1}
 ,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,કરતાં વધુ 5 અક્ષરો છે નથી કરી શકો છો સંક્ષેપનો
 DocType: Payment Request,Payment Request,ચુકવણી વિનંતી
@@ -102,7 +104,7 @@
 DocType: Employee,Married,પરણિત
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},માટે પરવાનગી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,વસ્તુઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 DocType: Payment Reconciliation,Reconcile,સમાધાન
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,કરિયાણા
 DocType: Quality Inspection Reading,Reading 1,1 વાંચન
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,લક્ષ્યાંક પર
 DocType: BOM,Total Cost,કુલ ખર્ચ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,પ્રવૃત્તિ લોગ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} વસ્તુ સિસ્ટમમાં અસ્તિત્વમાં નથી અથવા નિવૃત્ત થઈ ગયેલ છે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
+DocType: Item,Is Fixed Asset,સ્થિર એસેટ છે
 DocType: Expense Claim Detail,Claim Amount,દાવો રકમ
 DocType: Employee,Mr,શ્રીમાન
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
@@ -156,7 +159,8 @@
 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,સ્ટોક ખર્ચ
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} સ્થિર છે
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,સ્ટોક ખર્ચ
 DocType: Newsletter,Email Sent?,ઇમેઇલ મોકલ્યો છે?
 DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
 DocType: Production Order Operation,Show Time Logs,બતાવો સમય લોગ
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,સ્થાપન સ્થિતિ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,વસ્તુ {0} ખરીદી વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: BOM Replace Tool,New BOM,ન્યૂ BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,કંપની દાખલ કરો
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
 DocType: Lead,Address & Contact,સરનામું અને સંપર્ક
 DocType: Leave Allocation,Add unused leaves from previous allocations,અગાઉના ફાળવણી માંથી નહિં વપરાયેલ પાંદડા ઉમેરો
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},આગળ રીકરીંગ {0} પર બનાવવામાં આવશે {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},આગળ રીકરીંગ {0} પર બનાવવામાં આવશે {1}
 DocType: Newsletter List,Total Subscribers,કુલ ઉમેદવારો
 ,Contact Name,સંપર્ક નામ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ઉપર ઉલ્લેખ કર્યો માપદંડ માટે પગાર સ્લીપ બનાવે છે.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
 DocType: Payment Tool,Reference No,સંદર્ભ કોઈ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,બેન્ક પ્રવેશો
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,સૂચના નિયંત્રણ
 DocType: Lead,Suggestions,સૂચનો
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,આ પ્રદેશ પર સેટ વસ્તુ ગ્રુપ મુજબની બજેટ. પણ તમે વિતરણ સુયોજિત કરીને મોસમ સમાવેશ થાય છે.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},વેરહાઉસ માટે પિતૃ એકાઉન્ટ જૂથ દાખલ કરો {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},વેરહાઉસ માટે પિતૃ એકાઉન્ટ જૂથ દાખલ કરો {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},સામે ચુકવણી {0} {1} બાકી રકમ કરતાં વધારે ન હોઈ શકે {2}
 DocType: Supplier,Address HTML,સરનામું HTML
 DocType: Lead,Mobile No.,મોબાઇલ નંબર
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,મેક્સ 5 અક્ષરો
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
 apps/erpnext/erpnext/config/desktop.py +83,Learn,જાણો
+DocType: Asset,Next Depreciation Date,આગળ અવમૂલ્યન તારીખ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},પુરવઠોકર્તા ભરતિયું બોલ પર કોઈ ખરીદી ભરતિયું અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,વેચાણ વ્યક્તિ વૃક્ષ મેનેજ કરો.
 DocType: Job Applicant,Cover Letter,પરબિડીયુ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,ઉત્કૃષ્ટ Cheques અને સાફ ડિપોઝિટ
 DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ખોટો પાસવર્ડ
 DocType: Item,Variant Of,ચલ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
 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.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો (નિકાસ) દૃશ્યમાન થશે.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] એકમો (# ફોર્મ / વસ્તુ / {1}) [{2}] માં જોવા મળે છે (# ફોર્મ / વેરહાઉસ / {2})
 DocType: Lead,Industry,ઉદ્યોગ
 DocType: Employee,Job Profile,જોબ પ્રોફાઇલ
 DocType: 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,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ડિલીવરી નોંધ
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,મહિનો અને વર્ષ પસંદ કરો
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,પસંદ કરો વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},સીરીયલ કોઈ {0} બોલ પર કોઈ નોંધ સંબંધ નથી {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,વસ્તુ ગુણવત્તા નિરીક્ષણ પરિમાણ
 DocType: Leave Application,Leave Approver Name,તાજનો છોડો નામ
-,Schedule Date,સૂચિ તારીખ
+DocType: Depreciation Schedule,Schedule Date,સૂચિ તારીખ
 DocType: Packed Item,Packed Item,ભરેલા વસ્તુ
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,વ્યવહારો ખરીદવા માટે મૂળભૂત સુયોજનો.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,વ્યવહારો ખરીદવા માટે મૂળભૂત સુયોજનો.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},પ્રવૃત્તિ કિંમત પ્રવૃત્તિ પ્રકાર સામે કર્મચારી {0} માટે અસ્તિત્વમાં છે - {1}
 apps/erpnext/erpnext/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,કરન્સી એક્સચેન્જ
@@ -346,6 +353,7 @@
 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; છે વિનંતી કરી
+DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
 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.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,બધા ઉત્પાદન પ્રક્રિયા માટે વૈશ્વિક સુયોજનો.
 DocType: Accounts Settings,Accounts Frozen Upto,ફ્રોઝન સુધી એકાઉન્ટ્સ
 DocType: SMS Log,Sent On,પર મોકલવામાં
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
-DocType: Material Request Item,Required Date,જરૂરી તારીખ
+DocType: Request for Quotation Item,Required Date,જરૂરી તારીખ
 DocType: Delivery Note,Billing Address,બિલિંગ સરનામું
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,પુરવઠોકર્તા માટે સંદેશ
 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,અવેતન
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;અસ્તિત્વમાં નથી
 DocType: Pricing Rule,Valid Upto,માન્ય સુધી
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
 DocType: Shipping Rule,Net Weight,કુલ વજન
 DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
 ,Serial No Warranty Expiry,સીરીયલ કોઈ વોરંટી સમાપ્તિ
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,મેનેજિંગ Subcontracting
+DocType: Project,Project will be accessible on the website to these users,પ્રોજેક્ટ આ વપરાશકર્તાઓ માટે વેબસાઇટ પર સુલભ હશે
 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 +53,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,વસ્તુ {0} ન ખરીદી છે વસ્તુ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,વસ્તુ {0} ન ખરીદી છે વસ્તુ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ સંપાદિત કરો કર અને ખર્ચ ઉમેરો
 DocType: Purchase Invoice,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
 DocType: Territory,For reference,સંદર્ભ માટે
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,બાકી Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,પેટા કોન્ટ્રાક્ટ ખરીદી રસીદ માટે ફરજિયાત પુરવઠોકર્તા વેરહાઉસ
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,પેટા કોન્ટ્રાક્ટ ખરીદી રસીદ માટે ફરજિયાત પુરવઠોકર્તા વેરહાઉસ
 DocType: Pricing Rule,Valid From,થી માન્ય
 DocType: Sales Invoice,Total Commission,કુલ કમિશન
 DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,સંચિત મૂલ્યો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ફિસ્કલ વર્ષ શરૂ તારીખ ફિસ્કલ વર્ષ અંતે તારીખ કરતાં વધારે ન હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ફિસ્કલ વર્ષ શરૂ તારીખ ફિસ્કલ વર્ષ અંતે તારીખ કરતાં વધારે ન હોવી જોઈએ
 DocType: Warranty Claim,Resolution,ઠરાવ
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},આપ્યું હતું {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ચૂકવવાપાત્ર એકાઉન્ટ
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,ફરી શરૂ કરો જોડાણ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,પુનરાવર્તન ગ્રાહકો
 DocType: Leave Control Panel,Allocate,ફાળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,વેચાણ પરત
 DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,પગાર ઘટકો.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,સંભવિત ગ્રાહકો ડેટાબેઝ.
@@ -490,7 +500,7 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,"સ્ટોક પ્રવેશો કરવામાં આવે છે, જે સામે લોજિકલ વેરહાઉસ."
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,સ્નાતકોત્તર
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,સુધારા બેન્ક ટ્રાન્ઝેક્શન તારીખો
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,સુધારા બેન્ક ટ્રાન્ઝેક્શન તારીખો
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},નકારાત્મક સ્ટોક ભૂલ ({6}) વસ્તુ માટે {0} વેરહાઉસ માં {1} પર {2} {3} માં {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,સમયનો ટ્રેકિંગ
 DocType: Fiscal Year Company,Fiscal Year Company,ફિસ્કલ યર કંપની
@@ -518,27 +528,27 @@
 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,મૂળભૂત પડતર દર
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,જાળવણી સૂચિ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,જાળવણી સૂચિ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","પછી કિંમતના નિયમોમાં વગેરે ગ્રાહક, ગ્રાહક જૂથ, પ્રદેશ, સપ્લાયર, પુરવઠોકર્તા પ્રકાર, ઝુંબેશ, વેચાણ ભાગીદાર પર આધારિત બહાર ફિલ્ટર કરવામાં આવે છે"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ઇન્વેન્ટરીમાં કુલ ફેરફાર
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,વ્યવસ્થાપક
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,વેચાણ વ્યક્તિ લક્ષ્યાંક
 DocType: Production Order Operation,In minutes,મિનિટ
 DocType: Issue,Resolution Date,ઠરાવ તારીખ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,ક્યાં કર્મચારીનું અથવા કંપની માટે રજા યાદી સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
 DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
+DocType: Depreciation Schedule,Depreciation Amount,અવમૂલ્યન રકમ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,સ્થિર દિવસો
 DocType: Quotation Item,Item Balance,વસ્તુ બેલેન્સ
 DocType: Sales Invoice,Packing List,પેકિંગ યાદી
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ખરીદી ઓર્ડર સપ્લાયર્સ આપવામાં આવે છે.
+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,કમ્પોનન્ટ
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,ઓપરેશન સમય
 DocType: Pricing Rule,Sales Manager,વેચાણ મેનેજર
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,ગ્રુપ ગ્રુપ
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,મારા પ્રોજેક્ટ્સ
 DocType: Journal Entry,Write Off Amount,રકમ માંડવાળ
 DocType: Journal Entry,Bill No,બિલ કોઈ
+DocType: Company,Gain/Loss Account on Asset Disposal,એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ
 DocType: Purchase Invoice,Quarterly,ત્રિમાસિક
 DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
 DocType: Sales Order Item,Basic Rate (Company Currency),મૂળભૂત દર (કંપની ચલણ)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,આ વર્ષે કુલ બિલિંગ
 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 +529,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,વસ્તુ ચલો છે.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,વૃક્ષ પ્રકાર
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} સ્ટોક વસ્તુ નથી
 DocType: Mode of Payment Account,Default Account,મૂળભૂત એકાઉન્ટ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,સાપ્તાહિક બોલ દિવસ પસંદ કરો
 DocType: Production Order Operation,Planned End Time,આયોજિત સમાપ્તિ સમય
 ,Sales Person Target Variance Item Group-Wise,વેચાણ વ્યક્તિ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,માસિક પગાર નિવેદન.
 DocType: Item Group,Website Specifications,વેબસાઇટ તરફથી
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},તમારા સરનામું ઢાંચો એક ભૂલ છે {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,નવા એકાઉન્ટ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,નવા એકાઉન્ટ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમો જ માપદંડ સાથે અસ્તિત્વ ધરાવે છે, અગ્રતા સોંપણી દ્વારા તકરાર ઉકેલવા કરો. ભાવ નિયમો: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમો જ માપદંડ સાથે અસ્તિત્વ ધરાવે છે, અગ્રતા સોંપણી દ્વારા તકરાર ઉકેલવા કરો. ભાવ નિયમો: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
 DocType: Opportunity,Maintenance,જાળવણી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},વસ્તુ માટે જરૂરી ખરીદી રસીદ નંબર {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},વસ્તુ માટે જરૂરી ખરીદી રસીદ નંબર {0}
 DocType: Item Attribute Value,Item Attribute Value,વસ્તુ કિંમત એટ્રીબ્યુટ
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","જર્નલ પ્રવેશ {0} તે આ ભરતિયું અગાઉથી તરીકે ખેંચી શકાય જોઈએ તો {1}, ચેક ઓર્ડર સામે કડી થયેલ છે."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ઓફિસ જાળવણી ખર્ચ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
 DocType: Account,Liability,જવાબદારી
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.
 DocType: Company,Default Cost of Goods Sold Account,ચીજવસ્તુઓનું વેચાણ એકાઉન્ટ મૂળભૂત કિંમત
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,ભાવ યાદી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Process Payroll,Send Email,ઇમેઇલ મોકલો
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,મારી ઇનવૉઇસેસ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,મારી ઇનવૉઇસેસ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,કોઈ કર્મચારી મળી
 DocType: Supplier Quotation,Stopped,બંધ
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,હવે મોકલો
 ,Support Analytics,આધાર ઍનલિટિક્સ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,લોજિકલ ભૂલ: ઓવરલેપિંગ શોધવા જ જોઈએ
 DocType: Item,Website Warehouse,વેબસાઇટ વેરહાઉસ
 DocType: Payment Reconciliation,Minimum Invoice Amount,ન્યુનત્તમ ભરતિયું રકમ
 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 +267,C-Form records,સી-ફોર્મ રેકોર્ડ
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,સી-ફોર્મ રેકોર્ડ
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ગ્રાહક અને સપ્લાયર
 DocType: Email Digest,Email Digest Settings,ઇમેઇલ ડાયજેસ્ટ સેટિંગ્સ
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ગ્રાહકો પાસેથી આધાર પ્રશ્નો.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,અંદાજિત Qty
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
 DocType: Newsletter,Newsletter Manager,ન્યૂઝલેટર વ્યવસ્થાપક
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ખર્ચ
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted છે
 DocType: Item Attribute,Item Attribute Values,વસ્તુ એટ્રીબ્યુટ મૂલ્યો
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,જુઓ ઉમેદવારો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ખરીદી રસીદ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ખરીદી રસીદ
 ,Received Items To Be Billed,પ્રાપ્ત વસ્તુઓ બિલ કરવા
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,ચલણ વિનિમય દર માસ્ટર.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,ચલણ વિનિમય દર માસ્ટર.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
 DocType: Production Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
+DocType: Journal Entry,Depreciation Entry,અવમૂલ્યન એન્ટ્રી
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,જાઓ કાર્ટ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
 DocType: Address,Shop,દુકાન
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,કાયમી સરનામું
 DocType: Production Order Operation,Operation completed for how many finished goods?,ઓપરેશન કેટલા ફિનિશ્ડ ગૂડ્સ માટે પૂર્ણ?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,આ બ્રાન્ડ
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} વસ્તુ માટે ઓળંગી over- માટે ભથ્થું {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} વસ્તુ માટે ઓળંગી over- માટે ભથ્થું {1}.
 DocType: Employee,Exit Interview Details,બહાર નીકળો મુલાકાત વિગતો
 DocType: Item,Is Purchase Item,ખરીદી વસ્તુ છે
-DocType: Journal Entry Account,Purchase Invoice,ખરીદી ભરતિયું
+DocType: Asset,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,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; આઇટમ માટે બધા પેકિંગ વસ્તુઓ માટે જ છે, તો તે કિંમતો મુખ્ય વસ્તુ ટેબલ દાખલ કરી શકાય, મૂલ્યો મેજની યાદી પેકિંગ &#39;નકલ થશે."
 DocType: Job Opening,Publish on website,વેબસાઇટ પર પ્રકાશિત
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ગ્રાહકો માટે આવેલા શિપમેન્ટની.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,પુરવઠોકર્તા ભરતિયું તારીખ પોસ્ટ તારીખ કરતાં વધારે ન હોઈ શકે
 DocType: Purchase Invoice Item,Purchase Order Item,ઓર્ડર વસ્તુ ખરીદી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,પરોક્ષ આવક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),કુલ સંદેશ (ઓ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
 DocType: Purchase Invoice,Additional Discount Percentage,વધારાના ડિસ્કાઉન્ટ ટકાવારી
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,તમામ મદદ વિડિઓઝ યાદી જુઓ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,વપરાશકર્તા વ્યવહારો ભાવ યાદી દર ફેરફાર કરવા માટે પરવાનગી આપે છે
 DocType: Pricing Rule,Max Qty,મેક્સ Qty
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","રો {0}: ભરતિયું {1} અમાન્ય છે, તેને રદ કરી શકે છે / અસ્તિત્વમાં નથી. \ માન્ય ભરતિયું દાખલ કરો"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
 ,Employee Holiday Attendance,કર્મચારીનું રજા એટેન્ડન્સ
 DocType: Opportunity,Walk In,ચાલવા
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,સ્ટોક પ્રવેશો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,સ્ટોક પ્રવેશો
 DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ટ્રાન્સફર
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,મારા કાર્ટ
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
 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 +180,Qty for {0},માટે Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
+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 +80,Leave Allocation Tool,ફાળવણી સાધન મૂકો
 DocType: Leave Block List,Leave Block List Dates,બ્લોક યાદી તારીખો છોડો
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ડિસ્કાઉન્ટ
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,વેચાણ રકમ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,સમય લોગ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,સમય લોગ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,મુદ્દો
+DocType: Asset,Scrapped,રદ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,એકાઉન્ટ કંપની સાથે મેળ ખાતું નથી
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ભરતી
 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,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,સેલ્સ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,સેલ્સ ખર્ચ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
+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,સરેરાશ ઉંમર
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,મૂળભૂત ચલણ
 DocType: Contact,Enter designation of this Contact,આ સંપર્ક હોદ્દો દાખલ
 DocType: Expense Claim,From Employee,કર્મચારી
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,કી બોનસ વિસ્તાર
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},વસ્તુ માટે BOM ક્ષેત્રમાં BOM પસંદ કરો {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,યોગદાન%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
 ,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,વૈશ્વિક ડિફૉલ્ટ્સ
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
 DocType: Salary Slip,Deductions,કપાત
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,આ સમય લોગ બેચ વર્ણવવામાં આવ્યા છે.
 DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
 ,Trial Balance for Party,પાર્ટી માટે ટ્રાયલ બેલેન્સ
 DocType: Lead,Consultant,સલાહકાર
 DocType: Salary Slip,Earnings,કમાણી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,સમાપ્ત વસ્તુ {0} ઉત્પાદન પ્રકાર પ્રવેશ માટે દાખલ કરવો જ પડશે
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ખુલવાનો હિસાબી બેલેન્સ
 DocType: Sales Invoice Advance,Sales Invoice Advance,સેલ્સ ભરતિયું એડવાન્સ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,કંઈ વિનંતી કરવા
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,મેનેજમેન્ટ
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,સમય શીટ્સ માટે પ્રવૃત્તિઓ પ્રકાર
@@ -935,18 +958,18 @@
 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; પ્રકાર ગાંઠો હેઠળ બનાવી શકાય છે
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ઇમેઇલ ને સુયોજિત કરો
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ઇમેઇલ ને સુયોજિત કરો
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,UOM રૂપાંતર ફેક્ટર
 DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
 DocType: Account,Balance Sheet,સરવૈયા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,કરવેરા અને અન્ય પગાર કપાતો.
 DocType: Lead,Lead,લીડ
 DocType: Email Digest,Payables,ચૂકવણીના
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,હોલિડે
 DocType: Leave Control Panel,Leave blank if considered for all branches,બધી જ શાખાઓ માટે વિચારણા તો ખાલી છોડી દો
 ,Daily Time Log Summary,દૈનિક સમય લોગ સારાંશ
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},સી ફોર્મ ભરતિયું માટે લાગુ પડતી નથી: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ચુકવણી વિગતો
 DocType: Global Defaults,Current Fiscal Year,ચાલુ નાણાકીય વર્ષ
 DocType: Global Defaults,Disable Rounded Total,ગોળાકાર કુલ અક્ષમ કરો
@@ -973,19 +997,20 @@
 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,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
 DocType: Contact,User ID,વપરાશકર્તા ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,જુઓ ખાતાવહી
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,જુઓ ખાતાવહી
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
 ,Budget Variance Report,બજેટ ફેરફાર રિપોર્ટ
 DocType: Salary Slip,Gross Pay,કુલ પે
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,રાખેલી કમાણી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,રાખેલી કમાણી
 DocType: BOM Item,Item Description,વસ્તુ વર્ણન
 DocType: Payment Tool,Payment Mode,ચુકવણી સ્થિતિ
 DocType: Purchase Invoice,Is Recurring,રીકરીંગ છે
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,કામચલાઉ ખુલી
 ,Employee Leave Balance,કર્મચારી રજા બેલેન્સ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},મૂલ્યાંકન દર પંક્તિ માં વસ્તુ માટે જરૂરી {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,એકાઉન્ટ્સ ચૂકવવાપાત્ર સારાંશ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
 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 +165,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,નાના
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,એકાઉન્ટ વડા {0} બનાવવામાં
 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,કુલ પ્રાપ્ત
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,પરોક્ષ ખર્ચ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,કૃષિ
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 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,વેરહાઉસ સંપર્ક માહિતી
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,સીરીયલ કોઈ વિગતો
 DocType: Purchase Invoice Item,Item Tax Rate,વસ્તુ ટેક્સ રેટ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/stock/get_item_details.py +142,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;પર લાગુ પડે છે."
 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},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,અપેક્ષિત બોલ તારીખ આયોજિત પ્રારંભ તારીખ કરતાં ઓછા છે.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,સપ્લાયર માટે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,અપેક્ષિત બોલ તારીખ આયોજિત પ્રારંભ તારીખ કરતાં ઓછા છે.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,સપ્લાયર માટે
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,એકાઉન્ટ પ્રકાર સેટિંગ વ્યવહારો આ એકાઉન્ટ પસંદ કરે છે.
 DocType: Purchase Invoice,Grand Total (Company Currency),કુલ સરવાળો (કંપની ચલણ)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},કોઈ પણ વસ્તુ કહેવાય શોધી શક્યા ન હતા {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,કુલ આઉટગોઇંગ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",માત્ર &quot;કિંમત&quot; 0 અથવા ખાલી કિંમત સાથે એક શીપીંગ નિયમ શરત હોઈ શકે છે
 DocType: Authorization Rule,Transaction,ટ્રાન્ઝેક્શન
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,વેબસાઇટ વસ્તુ જૂથો
 DocType: Purchase Invoice,Total (Company Currency),કુલ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} સીરીયલ નંબર એક કરતા વધુ વખત દાખલ
-DocType: Journal Entry,Journal Entry,જર્નલ પ્રવેશ
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Sales Partner,Target Distribution,લક્ષ્ય વિતરણની
 DocType: Salary Slip,Bank Account No.,બેન્ક એકાઉન્ટ નંબર
 DocType: Naming Series,This is the number of the last created transaction with this prefix,આ ઉપસર્ગ સાથે છેલ્લા બનાવવામાં વ્યવહાર સંખ્યા છે
@@ -1072,6 +1098,7 @@
 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,વર્કસ્ટેશન
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,અવતરણ પુરવઠોકર્તા માટે વિનંતી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,હાર્ડવેર
 DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Attendance,HR Manager,એચઆર મેનેજર
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,મૂલ્યાંકન ઢાંચો ગોલ
 DocType: Salary Slip,Earning,અર્નિંગ
 DocType: Payment Tool,Party Account Currency,પક્ષ એકાઉન્ટ કરન્સી
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},વર્તમાન કિંમત અવમૂલ્યન પછી બરાબર કરતાં ઓછી હોવી જોઈએ {0}
 ,BOM Browser,BOM બ્રાઉઝર
 DocType: Purchase Taxes and Charges,Add or Deduct,ઉમેરો અથવા કપાત
 DocType: Company,If Yearly Budget Exceeded (for expense account),વાર્ષિક બજેટ (ખર્ચ એકાઉન્ટ માટે) વધી જાય તો
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},બંધ એકાઉન્ટ કરન્સી હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},બધા ગોલ માટે પોઈન્ટ રકમ તે 100 હોવું જોઈએ {0}
 DocType: Project,Start and End Dates,શરૂ કરો અને તારીખો અંત
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,લક્ષણો સેટઅપ
+DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યુલ
 DocType: Item,Is Service Item,સેવા વસ્તુ છે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
 DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
 DocType: Payment Request,Transaction Currency,ટ્રાન્ઝેક્શન કરન્સી
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},પ્રતિ {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},પ્રતિ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ઓપરેશન વર્ણન
 DocType: Item,Will also apply to variants,પણ ચલો પર લાગુ થશે
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,નાણાકીય વર્ષ સેવ થઈ જાય ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ બદલી શકતા નથી.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,ઝુંબેશ
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,પહેલેથી જ ઉત્પાદન ઓર્ડર માટે બનાવવામાં સ્ટોક પ્રવેશો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
 DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},મહત્તમ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,કંપની માટે
 apps/erpnext/erpnext/config/support.py +17,Communication log.,કોમ્યુનિકેશન લોગ.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
 DocType: Rename Tool,Type of document to rename.,દસ્તાવેજ પ્રકાર નામ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,અમે આ આઇટમ ખરીદી
 DocType: Address,Billing,બિલિંગ
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,વાંચનો
 DocType: Stock Entry,Total Additional Costs,કુલ વધારાના ખર્ચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,પેટા એસેમ્બલીઝ
+DocType: Asset,Asset Name,એસેટ નામ
 DocType: Shipping Rule Condition,To Value,કિંમત
 DocType: Supplier,Stock Manager,સ્ટોક વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,પેકિંગ કાપલી
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ઓફિસ ભાડે
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ઓફિસ ભાડે
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,અવતરણ માટે વિનંતી નીચેની લિંક પર ક્લિક કરીને ઍક્સેસ હોઈ શકે છે
+DocType: Asset,Number of Months in a Period,મહિના સંખ્યા સમયગાળામાં
 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,વર્કસ્ટેશન કામ કલાક
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,સરકાર
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,વસ્તુ ચલો
 DocType: Company,Services,સેવાઓ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),કુલ ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),કુલ ({0})
 DocType: Cost Center,Parent Cost Center,પિતૃ ખર્ચ કેન્દ્રને
 DocType: Sales Invoice,Source,સોર્સ
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,બતાવો બંધ
 DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,આ ચુકવણી ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,નાણાકીય વર્ષ શરૂ તારીખ
 DocType: Employee External Work History,Total Experience,કુલ અનુભવ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,રોકાણ કેશ ફ્લો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,નૂર અને ફોરવર્ડિંગ સમાયોજિત
 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 +86,Transfer Materials for Manufacture,ઉત્પાદન માટે ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,ઉત્પાદન માટે ટ્રાન્સફર સામગ્રી
 DocType: Pricing Rule,For Price List,ભાવ યાદી માટે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,એક્ઝિક્યુટિવ સર્ચ
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} મળી નથી, એકાઉન્ટિંગ પ્રવેશ (ખર્ચ) પુસ્તક માટે જરૂરી છે. ખરીદ કિંમત યાદી સામે વસ્તુ ભાવ ઉલ્લેખ કરો."
@@ -1212,7 +1245,7 @@
 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.,એકાઉન્ટ્સ ચાર્ટ પરથી નવું એકાઉન્ટ ખોલાવવું કરો.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,જાળવણી મુલાકાત લો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,જાળવણી મુલાકાત લો
 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,ઉતારેલ માલની કિંમત મદદ
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,બ્રાન્ડ માસ્ટર.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 DocType: Sales Invoice Item,Brand Name,બ્રાન્ડ નામ
 DocType: Purchase Receipt,Transporter Details,ટ્રાન્સપોર્ટર વિગતો
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,બોક્સ
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 વાંચન
 apps/erpnext/erpnext/config/hr.py +131,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,સ્ટોક જવાબદારીઓ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,સ્ટોક જવાબદારીઓ
 DocType: Purchase Receipt,Supplier Warehouse,પુરવઠોકર્તા વેરહાઉસ
 DocType: Opportunity,Contact Mobile No,સંપર્ક મોબાઈલ નં
 ,Material Requests for which Supplier Quotations are not created,"પુરવઠોકર્તા સુવાકયો બનાવવામાં આવે છે, જેના માટે સામગ્રી અરજીઓ"
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,અન્ય અહેવાલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} જુઓ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Salary Structure Deduction,Salary Structure Deduction,પગાર માળખું કપાત
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,બહાર પાડેલી વસ્તુઓ કિંમત
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,અગાઉના નાણાકીય વર્ષમાં બંધ છે
 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 +40,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 +38,Supplier Type master.,પુરવઠોકર્તા પ્રકાર માસ્ટર.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,પુરવઠોકર્તા પ્રકાર માસ્ટર.
 DocType: Purchase Order Item,Supplier Part Number,પુરવઠોકર્તા ભાગ સંખ્યા
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,રૂપાંતરણ દર 0 અથવા 1 હોઇ શકે છે નથી કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,રૂપાંતરણ દર 0 અથવા 1 હોઇ શકે છે નથી કરી શકો છો
 DocType: Purchase Invoice,Reference Document,સંદર્ભ દસ્તાવેજ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,ખરીદી રસીદ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ગણાવી
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","આવા શીપીંગ નિયમો, ભાવ યાદી વગેરે શોપિંગ કાર્ટ માટે સુયોજનો"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,માનવ સંસાધન
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ચૂકવવાપાત્ર હિસાબ નેટ બદલો
 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 ડિસ્કાઉન્ટ&#39; માટે જરૂરી ગ્રાહક
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,જર્નલો સાથે બેંક ચુકવણી તારીખો અપડેટ કરો.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,જર્નલો સાથે બેંક ચુકવણી તારીખો અપડેટ કરો.
 DocType: Quotation,Term Details,શબ્દ વિગતો
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 કરતાં મોટી હોવી જ જોઈએ
 DocType: Manufacturing Settings,Capacity Planning For (Days),(દિવસ) માટે ક્ષમતા આયોજન
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,વોરંટી દાવાની
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,કાયમી સરનામું
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",કુલ સરવાળો કરતાં \ {0} {1} વધારે ન હોઈ શકે સામે ચૂકવણી એડવાન્સ {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,આઇટમ કોડ પસંદ કરો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,આઇટમ કોડ પસંદ કરો
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),પગાર વિના રજા માટે કપાત ઘટાડો (LWP)
 DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
 DocType: Packed Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
@@ -1343,15 +1377,15 @@
 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,માર્કેટિંગ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,આઇટમ એક એકમ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',સમય લોગ બેચ {0} &#39;સબમિટ&#39; હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},રો કોઈ જરૂરી વેરહાઉસ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},રો કોઈ જરૂરી વેરહાઉસ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,માન્ય નાણાકીય વર્ષ શરૂઆત અને અંતિમ તારીખ દાખલ કરો
 DocType: Employee,Date Of Retirement,નિવૃત્તિ તારીખ
 DocType: Upload Attendance,Get Template,નમૂના મેળવવા
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
+DocType: Asset,Gross Purchase Amount,કુલ ખરીદી જથ્થો
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",દા.ત. &quot;XYZ નેશનલ બેન્ક&quot;
+DocType: Asset,Depreciation Method,અવમૂલ્યન પદ્ધતિ
 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 +29,Shopping Cart is enabled,શોપિંગ કાર્ટ સક્રિય થયેલ છે
 DocType: Job Applicant,Applicant for a Job,નોકરી માટે અરજી
 DocType: Production Plan Material Request,Production Plan Material Request,ઉત્પાદન યોજના સામગ્રી વિનંતી
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,બનાવવામાં કોઈ ઉત્પાદન ઓર્ડર્સ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,બનાવવામાં કોઈ ઉત્પાદન ઓર્ડર્સ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,મુખ્ય
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,મુખ્ય
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
 DocType: Employee,Leave Encashed?,વટાવી છોડી?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ક્ષેત્રમાં પ્રતિ તક ફરજિયાત છે
 DocType: Item,Variants,ચલો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,નોકરી માટે અરજી.
 DocType: Purchase Order Item,Warehouse and Reference,વેરહાઉસ અને સંદર્ભ
 DocType: Supplier,Statutory info and other general information about your Supplier,તમારા સપ્લાયર વિશે વૈધાિનક માહિતી અને અન્ય સામાન્ય માહિતી
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,સરનામાંઓ
+apps/erpnext/erpnext/hooks.py +91,Addresses,સરનામાંઓ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},સીરીયલ કોઈ વસ્તુ માટે દાખલ ડુપ્લિકેટ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,એક શિપિંગ નિયમ માટે એક શરત
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,વસ્તુ ઉત્પાદન ઓર્ડર હોય મંજૂરી નથી.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,વસ્તુ ઉત્પાદન ઓર્ડર હોય મંજૂરી નથી.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),આ પેકેજની નેટ વજન. (વસ્તુઓ નેટ વજન રકમ તરીકે આપોઆપ ગણતરી)
 DocType: Sales Order,To Deliver and Bill,વિતરિત અને બિલ
 DocType: GL Entry,Credit Amount in Account Currency,એકાઉન્ટ કરન્સી ક્રેડિટ રકમ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,ઉત્પાદન માટે સમય લોગ.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,કાર્યો માટે સમય લોગ.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,ચુકવણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,બ્રાન્ડ
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
 DocType: Quotation Item,Actual Qty,વાસ્તવિક Qty
 DocType: Sales Invoice Item,References,સંદર્ભો
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,{0} વસ્તુ એક શ્રેણીબદ્ધ વસ્તુ નથી
+DocType: Request for Quotation Supplier,Send Email to Supplier,પુરવઠોકર્તા ઇમેઇલ મોકલો
 DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
 DocType: Packing Slip,To Package No.,નં પેકેજ
 DocType: Production Planning Tool,Material Requests,સામગ્રી અરજીઓ
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ડ લવર વેરહાઉસ
 DocType: Stock Settings,Allowance Percent,ભથ્થું ટકા
 DocType: SMS Settings,Message Parameter,સંદેશ પરિમાણ
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,નાણાકીય ખર્ચ કેન્દ્રો વૃક્ષ.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,નાણાકીય ખર્ચ કેન્દ્રો વૃક્ષ.
 DocType: Serial No,Delivery Document No,ડ લવર દસ્તાવેજ કોઈ
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ખરીદી રસીદો વસ્તુઓ મેળવો
 DocType: Serial No,Creation Date,સર્જન તારીખ
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,જથ્થો પહોંચાડવા માટે
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ઉત્પાદન અથવા સેવા
 DocType: Naming Series,Current Value,વર્તમાન કિંમત
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} બનાવવામાં
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} બનાવવામાં
 DocType: Delivery Note Item,Against Sales Order,સેલ્સ આદેશ સામે
 ,Serial No Status,સીરીયલ કોઈ સ્થિતિ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,વસ્તુ ટેબલ ખાલી ન હોઈ શકે
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","રો {0}: સુયોજિત કરવા માટે {1} સમયગાળાના, અને તારીખ \ વચ્ચે તફાવત કરતાં વધારે અથવા સમાન હોવો જોઈએ {2}"
 DocType: Pricing Rule,Selling,વેચાણ
 DocType: Employee,Salary Information,પગાર માહિતી
 DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,કર અને વેરામાંથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,પેમેન્ટ ગેટવે એકાઉન્ટ રૂપરેખાંકિત થયેલ છે
 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: Production Order,Material Request Item,સામગ્રી વિનંતી વસ્તુ
+DocType: Request for Quotation Item,Material Request Item,સામગ્રી વિનંતી વસ્તુ
 apps/erpnext/erpnext/config/stock.py +85,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,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
+DocType: Asset,Sold,વેચાઈ
 ,Item-wise Purchase History,વસ્તુ મુજબના ખરીદ ઈતિહાસ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
 DocType: Account,Frozen,ફ્રોઝન
 ,Open Production Orders,ઓપન ઉત્પાદન ઓર્ડર્સ
 DocType: Installation Note,Installation Time,સ્થાપન સમયે
 DocType: Sales Invoice,Accounting Details,હિસાબી વિગતો
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,આ કંપની માટે તમામ વ્યવહારો કાઢી નાખો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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} Qty માટે પૂર્ણ નથી ઓર્ડર # {3}. સમય લોગ મારફતે કામગીરી સ્થિતિ અપડેટ કરો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,રોકાણો
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,રોકાણો
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ફાળવણી
 DocType: Quality Inspection Reading,Acceptance Criteria,સ્વીકૃતિ માપદંડ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,ઉપરના કોષ્ટકમાં સામગ્રી અરજીઓ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ઉપરના કોષ્ટકમાં સામગ્રી અરજીઓ દાખલ કરો
 DocType: Item Attribute,Attribute Name,નામ લક્ષણ
 DocType: Item Group,Show In Website,વેબસાઇટ બતાવો
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,ગ્રુપ
@@ -1527,6 +1567,7 @@
 ,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 +25,Gantt chart of all tasks.,બધા કાર્યો ગેન્ટ ચાર્ટ.
+DocType: Pricing Rule,Margin Type,માર્જિન પ્રકાર
 DocType: Appraisal,For Employee Name,કર્મચારીનું નામ માટે
 DocType: Holiday List,Clear Table,સાફ કોષ્ટક
 DocType: Features Setup,Brands,બ્રાન્ડ્સ
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,ગ્રાહક સરનામાં અને સંપર્કો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,રો # {0}: એસેટ એક સ્થિર એસેટ વસ્તુ સામે ફરજિયાત છે
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી માટે શ્રેણી નંબર&gt; ક્રમાંકન સિરીઝ
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,જોડી
+DocType: Asset,Depreciation Schedule,અવમૂલ્યન સૂચિ
 DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
 DocType: Maintenance Schedule Detail,Actual Date,વાસ્તવિક તારીખ
 DocType: Item,Has Batch No,બેચ કોઈ છે
 DocType: Delivery Note,Excise Page Number,એક્સાઇઝ પાનાં ક્રમાંક
+DocType: Asset,Purchase Date,ખરીદ તારીખ
 DocType: Employee,Personal Details,અંગત વિગતો
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},કંપની એસેટ અવમૂલ્યન કિંમત કેન્દ્ર &#39;સુયોજિત કરો {0}
 ,Maintenance Schedules,જાળવણી શેડ્યુલ
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
 ,Pending Amount,બાકી રકમ
 DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,અનુરૂપ પ્રવેશ સમાવેશ થાય છે
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,વાસ્તવિક કુલ
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,એકમ
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ખર્ચ દાવાઓ
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ખર્ચ દાવાઓ
 DocType: Issue,Support,આધાર
 ,BOM Search,બોમ શોધ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},ક્લિયરન્સ તારીખ પંક્તિ ચેક તારીખ પહેલાં ન હોઈ શકે {0}
 DocType: Salary Slip,Deduction,કપાત
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
 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,Gross Margin,એકંદર માર્જીન
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,ગણતરી બેન્ક નિવેદન બેલેન્સ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,અપંગ વપરાશકર્તા
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,અવતરણ
 DocType: Salary Slip,Total Deduction,કુલ કપાત
 DocType: Quotation,Maintenance User,જાળવણી વપરાશકર્તા
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,કિંમત સુધારાશે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,કિંમત સુધારાશે
 DocType: Employee,Date of Birth,જ્ન્મતારીખ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Production Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
@@ -1620,8 +1666,8 @@
 ,SO Qty,તેથી Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
+DocType: Request for Quotation,Manufacturing Manager,ઉત્પાદન વ્યવસ્થાપક
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
 apps/erpnext/erpnext/hooks.py +71,Shipments,આવેલા શિપમેન્ટની
 DocType: Purchase Order Item,To be delivered to customer,ગ્રાહક પર વિતરિત કરવામાં
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,સીરીયલ કોઈ {0} કોઈપણ વેરહાઉસ સંબંધ નથી
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ROW #
 DocType: Purchase Invoice,In Words (Company Currency),શબ્દો માં (કંપની ચલણ)
-DocType: Pricing Rule,Supplier,પુરવઠોકર્તા
+DocType: Asset,Supplier,પુરવઠોકર્તા
 DocType: C-Form,Quarter,ક્વાર્ટર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,લખેલા ન હોય તેવા ખર્ચ
 DocType: Global Defaults,Default Company,મૂળભૂત કંપની
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,વપરાશકર્તા {0} અક્ષમ છે
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
 DocType: Currency Exchange,From Currency,ચલણ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},વસ્તુ માટે જરૂરી વેચાણની ઓર્ડર {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે વસ્તુ આકારણી સાથે કડી થયેલ છે"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,બાળ વસ્તુ એક ઉત્પાદન બંડલ ન હોવી જોઈએ. આઇટમ દૂર `{0} &#39;અને સેવ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,બેન્કિંગ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,ન્યૂ ખર્ચ કેન્દ્રને
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; ની) બાળ ઉમેરો પર ક્લિક કરીને એક નવું એકાઉન્ટ બનાવો અને શું કર દર ઉલ્લેખ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,ન્યૂ ખર્ચ કેન્દ્રને
 DocType: Bin,Ordered Quantity,આદેશ આપ્યો જથ્થો
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
 DocType: Quality Inspection,In Process,પ્રક્રિયામાં
@@ -1670,10 +1716,11 @@
 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,પ્રાપ્ત એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
 DocType: Quotation Item,Stock Balance,સ્ટોક બેલેન્સ
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
 DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,સમય લોગ બનાવવામાં:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,સમય લોગ બનાવવામાં:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
 DocType: Item,Weight UOM,વજન UOM
 DocType: Employee,Blood Group,બ્લડ ગ્રુપ
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
 DocType: Offer Letter Term,Offer Term,ઓફર ગાળાના
 DocType: Quality Inspection,Quality Manager,ગુણવત્તા મેનેજર
 DocType: Job Applicant,Job Opening,જૉબ ઑપનિંગ
 DocType: Payment Reconciliation,Payment Reconciliation,ચુકવણી રિકંસીલેશન
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ટેકનોલોજી
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,પત્ર ઓફર
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,સામગ્રી અરજીઓ (MRP) અને ઉત્પાદન ઓર્ડર્સ બનાવો.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
 DocType: Production Order Operation,Completed Qty,પૂર્ણ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, માત્ર ડેબિટ એકાઉન્ટ્સ બીજા ક્રેડિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,વર્તમાન મૂલ્યાંકન દર
 DocType: Item,Customer Item Codes,ગ્રાહક વસ્તુ કોડ્સ
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,ઓર્ડર્સ અથવા ઇન્વૉઇસેસ સામે ચુકવણી પ્રવેશો બનાવો.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ઓર્ડર્સ અથવા ઇન્વૉઇસેસ સામે ચુકવણી પ્રવેશો બનાવો.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,નવું સરનામું
 DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,વપરાશકર્તાઓ અને પરવાનગીઓ
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,તમારા ગ્રાહકો
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
 DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,હવે લાગુ
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,હવે લાગુ
 DocType: Sales Order,Not Delivered,બચાવી શક્યા
 ,Bank Clearance Summary,બેન્ક ક્લિયરન્સ સારાંશ
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","બનાવો અને દૈનિક, સાપ્તાહિક અને માસિક ઇમેઇલ પચાવી મેનેજ કરો."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,રોજગાર વિગતો
 DocType: Employee,New Workplace,ન્યૂ નોકરીના સ્થળે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,બંધ કરો
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},બારકોડ કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},બારકોડ કોઈ વસ્તુ {0}
 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,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ટ્રાન્સફર સામગ્રી
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},વસ્તુ {0} માં વેચાણ વસ્તુ જ હોવી જોઈએ {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,પગાર કાપલી બનાવો
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ફંડ ઓફ સોર્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,કર્મચારીનું
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,આયાત ઇમેઇલ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,વપરાશકર્તા તરીકે આમંત્રણ આપો
 DocType: Features Setup,After Sale Installations,વેચાણ સ્થાપનો પછી
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},કૃપા કરીને કંપની સુયોજિત {0} {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
 DocType: Workstation Working Hour,End Time,અંત સમય
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,સેલ્સ અથવા ખરીદી માટે નિયમ કરાર શરતો.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},વસ્તુ માટે જરૂરી purchse ઓર્ડર નંબર {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},વસ્તુ માટે જરૂરી purchse ઓર્ડર નંબર {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ફાર્માસ્યુટિકલ
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
 DocType: Warranty Claim,Raised By,દ્વારા ઊભા
 DocType: Payment Gateway Account,Payment Account,ચુકવણી એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 DocType: Newsletter,Test,ટેસ્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,આઇટમ્સ માટે વિનંતી કરે છે.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,અલગ ઉત્પાદન ક્રમમાં દરેક સમાપ્ત સારી વસ્તુ માટે બનાવવામાં આવશે.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,ન્યૂઝલેટર મેઇલિંગ યાદી
 DocType: Delivery Note,Transporter Name,ટ્રાન્સપોર્ટર નામ
 DocType: Authorization Rule,Authorized Value,અધિકૃત ભાવ
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} બંધ છે
 DocType: Email Digest,How frequently?,કેવી રીતે વારંવાર?
 DocType: Purchase Receipt,Get Current Stock,વર્તમાન સ્ટોક મેળવો
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",યોગ્ય ગ્રુપ (સામાન્ય ભંડોળનો ઉપયોગ&gt; વર્તમાન અસ્કયામતો&gt; બેન્ક એકાઉન્ટ્સ પર જાઓ અને (બાળ પ્રકાર ઉમેરો) પર ક્લિક કરીને એક નવું એકાઉન્ટ બનાવો &quot;બેન્ક&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,સામગ્રી બિલ વૃક્ષ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,માર્ક હાજર
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,હેતુ
+DocType: Company,Fixed Asset Depreciation Settings,સ્થિર એસેટ અવમૂલ્યન સેટિંગ્સ
 DocType: Item,Will also apply for variants unless overrridden,Overrridden સિવાય પણ ચલો માટે લાગુ પડશે
 DocType: Purchase Invoice,Advances,એડવાન્સિસ
 DocType: Production Order,Manufacture against Material Request,સામગ્રી વિનંતી સામે ઉત્પાદન
@@ -1884,6 +1933,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,બાળક નોડ છે
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd જથ્થો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
+DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
 DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
 DocType: Tax Rule,Billing City,બિલિંગ સિટી
 DocType: Global Defaults,Hide Currency Symbol,કરન્સી નિશાનીનો છુપાવો
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","દા.ત. બેન્ક, રોકડ, ક્રેડિટ કાર્ડ"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",યોગ્ય ગ્રુપ (સામાન્ય ભંડોળનો ઉપયોગ&gt; વર્તમાન અસ્કયામતો&gt; બેન્ક એકાઉન્ટ્સ પર જાઓ અને (બાળ પ્રકાર ઉમેરો) પર ક્લિક કરીને એક નવું એકાઉન્ટ બનાવો &quot;બેન્ક&quot;
 DocType: Journal Entry,Credit Note,ઉધાર નોધ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},પૂર્ણ Qty કરતાં વધુ ન હોઈ શકે {0} કામગીરી માટે {1}
 DocType: Features Setup,Quality,ગુણવત્તા
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,મારા સરનામાંઓ
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,સંસ્થા શાખા માસ્ટર.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,અથવા
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,ડિફૉલ્ટ ખરીદી ભાવ યાદી
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,ઉપર પસંદ માપદંડ અથવા પગાર સ્લીપ માટે કોઈ કર્મચારી પહેલેથી જ બનાવનાર
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 ,To Produce,પેદા કરવા માટે
 apps/erpnext/erpnext/config/hr.py +93,Payroll,પગારપત્રક
 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} પણ સમાવેશ કરવો જ જોઈએ"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,ખરીદી રસીદ વસ્તુઓ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,જોઈએ એ પ્રમાણે લેખનું ફોર્મ
 DocType: Account,Income Account,આવક એકાઉન્ટ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,કોઈ મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,કી જવાબદારી વિસ્તાર
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,બધા સંબોધે છે.
 DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,ગ્રાહક જૂથ વૃક્ષ મેનેજ કરો.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
 DocType: Leave Control Panel,Leave Control Panel,નિયંત્રણ પેનલ છોડો
 DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
 DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
-apps/erpnext/erpnext/config/support.py +7,Issues,મુદ્દાઓ
+apps/erpnext/erpnext/hooks.py +90,Issues,મુદ્દાઓ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},સ્થિતિ એક હોવો જ જોઈએ {0}
 DocType: Sales Invoice,Debit To,ડેબિટ
 DocType: Delivery Note,Required only for sample item.,માત્ર નમૂના આઇટમ માટે જરૂરી છે.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
 ,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,બહુ્ મોટુ
 ,Profit and Loss Statement,નફો અને નુકસાનનું નિવેદન
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
 DocType: Production Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,બંધ બેલેન્સ શીટ અને પુસ્તક નફો અથવા નુકસાન.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,બંધ બેલેન્સ શીટ અને પુસ્તક નફો અથવા નુકસાન.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,વિનિમય દર અન્ય એક ચલણ કન્વર્ટ કરવા માટે સ્પષ્ટ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,અવતરણ {0} રદ કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,કુલ બાકી રકમ
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, બહુવિધ કામગીરી માં ઓપરેશન તોડી"
 ,Requested,વિનંતી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,કોઈ ટિપ્પણી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,સેલ્સ અને પરચેઝ
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ જ હોવી જોઈએ
 DocType: Supplier Quotation Item,Material Request No,સામગ્રી વિનંતી કોઈ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,જે ગ્રાહક ચલણ પર દર કંપનીના આધાર ચલણ ફેરવાય છે
@@ -2119,7 +2174,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
 DocType: Payment Request,Recipient and Message,મેળવનાર અને સંદેશ
 DocType: Purchase Invoice,Apply Additional Discount On,વધારાના ડિસ્કાઉન્ટ પર લાગુ પડે છે
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,પુરવઠોકર્તા સરનામું પસંદ
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,અવતરણ માટે વિનંતી.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;ના&quot; અને &quot;વેચાણ વસ્તુ છે&quot; &quot;સ્ટોક વસ્તુ છે&quot; છે, જ્યાં &quot;હા&quot; છે વસ્તુ પસંદ કરો અને કોઈ અન્ય ઉત્પાદન બંડલ છે, કૃપા કરીને"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,અસમાન મહિના સમગ્ર લક્ષ્યો વિતરિત કરવા માટે માસિક વિતરણ પસંદ કરો.
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,પ્રોજેક્ટ પ્રારંભ તારીખ
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,દસ્તાવેજ વિરુદ્ધમાં કોઇ
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,સેલ્સ પાર્ટનર્સ મેનેજ કરો.
 DocType: Quality Inspection,Inspection Type,નિરીક્ષણ પ્રકાર
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},પસંદ કરો {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},પસંદ કરો {0}
 DocType: C-Form,C-Form No,સી-ફોર્મ નં
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,જેનું એટેન્ડન્સ
@@ -2183,6 +2239,7 @@
 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,જાહેરખબર
+DocType: Asset Category Account,Depreciation Expense Account,અવમૂલ્યન ખર્ચ એકાઉન્ટ
 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,ખર્ચ તાજનો
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,પુષ્ટિ
 DocType: Payment Gateway,Gateway,ગેટવે
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,એએમટી
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,એએમટી
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,માત્ર પરિસ્થિતિ &#39;માન્ય&#39; સબમિટ કરી શકો છો પૂરૂં છોડો
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"તપાસ સ્ત્રોત અભિયાન છે, તો ઝુંબેશ નામ દાખલ કરો"
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,સ્વીકારાયું વેરહાઉસ
 DocType: Bank Reconciliation Detail,Posting Date,પોસ્ટ તારીખ
 DocType: Item,Valuation Method,મૂલ્યાંકન પદ્ધતિ
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} માટે વિનિમય દર શોધવામાં અસમર્થ {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} માટે વિનિમય દર શોધવામાં અસમર્થ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,માર્ક અડધા દિવસ
 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 +410,[Error],[ભૂલ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,સીરીયલ કોઈ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ગ્રાહક વેરહાઉસ (વૈકલ્પિક)
 DocType: Pricing Rule,Discount Percentage,ડિસ્કાઉન્ટ ટકાવારી
 DocType: Payment Reconciliation Invoice,Invoice Number,બીલ નંબર
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,શરતો અથવા કરારની ઢાંચો.
 DocType: Purchase Invoice,Address and Contact,એડ્રેસ અને સંપર્ક
 DocType: Supplier,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
 DocType: Employee,Feedback,પ્રતિસાદ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","પહેલાં ફાળવવામાં કરી શકાતી નથી મૂકો {0}, રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
+DocType: Asset,Expected Value After Useful Life,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી
 DocType: Item,Reorder level based on Warehouse,વેરહાઉસ પર આધારિત પુનઃક્રમાંકિત કરો સ્તર
 DocType: Activity Cost,Billing Rate,બિલિંગ રેટ
 ,Qty to Deliver,વિતરિત કરવા માટે Qty
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} રદ અથવા બંધ છે
 DocType: Delivery Note,Track this Delivery Note against any Project,કોઈ પણ પ્રોજેક્ટ સામે આ બોલ પર કોઈ નોંધ ટ્રૅક
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,રોકાણ ચોખ્ખી રોકડ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,રુટ ખાતું કાઢી શકાતી નથી
 ,Is Primary Address,પ્રાથમિક સરનામું છે
 DocType: Production Order,Work-in-Progress Warehouse,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,એસેટ {0} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},સંદર્ભ # {0} ના રોજ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,સરનામાંઓ મેનેજ કરો
-DocType: Pricing Rule,Item Code,વસ્તુ કોડ
+DocType: Asset,Item Code,વસ્તુ કોડ
 DocType: Production Planning Tool,Create Production Orders,ઉત્પાદન ઓર્ડર્સ બનાવો
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,સામગ્રી અરજીઓ બનાવો
 DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
 DocType: Payment Request,Reference Details,સંદર્ભ વિગતો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
 DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
 ,Billed Amount,ગણાવી રકમ
+DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,બંધ કરવા માટે રદ ન કરી શકાય છે. રદ કરવા Unclose.
 DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,સુધારાઓ મેળવો
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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; હોવા જ જોઈએ
+DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
 ,Stock Projected Qty,સ્ટોક Qty અંદાજિત
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,સીરીયલ કોઈ અને બેચ
 DocType: Warranty Claim,From Company,કંપનીથી
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ભાવ અથવા Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,મિનિટ
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
 ,Qty to Receive,પ્રાપ્ત Qty
 DocType: Leave Block List,Leave Block List Allowed,બ્લોક યાદી મંજૂર છોડો
 DocType: Sales Partner,Retailer,છૂટક વિક્રેતા
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
 DocType: Global Defaults,Disable In Words,શબ્દો માં અક્ષમ
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,વસ્તુ આપોઆપ નંબર નથી કારણ કે વસ્તુ કોડ ફરજિયાત છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,બેન્ક ઓવરડ્રાફટ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,સુરક્ષીત લોન્સ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},એસેટ વર્ગ {0} અથવા કંપની અવમૂલ્યન સંબંધિત એકાઉન્ટ્સ સુયોજિત કરો {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},સપ્લાયર મોકલવામાં ઇમેઇલ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,અધિકૃત હસ્તાક્ષર
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
@@ -2344,7 +2410,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,સંદેશ મોકલ્યો
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,કુલ માર્જિન
 DocType: Supplier,Supplier Details,પુરવઠોકર્તા વિગતો
 DocType: Expense Claim,Approval Status,મંજૂરી સ્થિતિ
 DocType: Hub Settings,Publish Items to Hub,હબ વસ્તુઓ પ્રકાશિત
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ગ્રાહક જૂથ / ગ્રાહક
 DocType: Payment Gateway Account,Default Payment Request Message,મૂળભૂત ચુકવણી વિનંતી સંદેશ
 DocType: Item Group,Check this if you want to show in website,"તમે વેબસાઇટ બતાવવા માંગો છો, તો આ તપાસો"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,બેંકિંગ અને ચુકવણીઓ
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,બેંકિંગ અને ચુકવણીઓ
 ,Welcome to ERPNext,ERPNext માટે આપનું સ્વાગત છે
 DocType: Payment Reconciliation Payment,Voucher Detail Number,વાઉચર વિગતવાર સંખ્યા
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,અવતરણ માટે લીડ
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,ઓર્ડર {0} અપર્ણ ન કરાય ખરીદી
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ઓર્ડર {0} અપર્ણ ન કરાય ખરીદી
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,પાંદડા અને હોલિડે
 DocType: Sales Order,Not Billed,રજુ કરવામાં આવ્યું ન
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,બંને વેરહાઉસ જ કંપની સંબંધ માટે જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,બિલિંગ માટે બેચ કરેલ
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,જર્નલ પ્રવેશ એકાઉન્ટ
 DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
+DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0} એસેટ ખરીદી તારીખ ખરીદી ભરતિયું તારીખ સાથે મેળ ખાતું નથી
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,વેરહાઉસ {0}: કંપની ફરજિયાત છે
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},માટે ખૂટે કરન્સી વિનિમય દરો {0}
 DocType: Journal Entry,Stock Entry,સ્ટોક એન્ટ્રી
 DocType: Account,Payable,ચૂકવવાપાત્ર
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),ડેટર્સ ({0})
-DocType: Project,Margin,માર્જિન
+DocType: Pricing Rule,Margin,માર્જિન
 DocType: Salary Slip,Arrear Amount,બાકીનો રકમ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,નવા ગ્રાહકો
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,કુલ નફો %
@@ -2435,20 +2504,23 @@
 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,તમે પગાર સ્લીપ સબમિટ જ્યારે દરેક કર્મચારીને મેલ પગાર સ્લીપ મોકલવા માંગો છો તો તપાસો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
 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 +57,Where manufacturing operations are carried.,ઉત્પાદન કામગીરી જ્યાં ધરવામાં આવે છે.
 DocType: Stock Entry Detail,Source Warehouse,સોર્સ વેરહાઉસ
 DocType: Installation Note,Installation Date,સ્થાપન તારીખ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
 DocType: Employee,Confirmation Date,સમર્થન તારીખ
 DocType: C-Form,Total Invoiced Amount,કુલ ભરતિયું રકમ
 DocType: Account,Sales User,સેલ્સ વપરાશકર્તા
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,મીન Qty મેક્સ Qty કરતાં વધારે ન હોઈ શકે
+DocType: Account,Accumulated Depreciation,સંચિત અવમૂલ્યન
 DocType: Stock Entry,Customer or Supplier Details,ગ્રાહક અથવા સપ્લાયર વિગતો
 DocType: Payment Request,Email To,ઇમેલ
 DocType: Lead,Lead Owner,અગ્ર માલિક
 DocType: Bin,Requested Quantity,વિનંતી જથ્થો
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,વેરહાઉસ જરૂરી છે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,વેરહાઉસ જરૂરી છે
 DocType: Employee,Marital Status,વૈવાહિક સ્થિતિ
 DocType: Stock Settings,Auto Material Request,ઓટો સામગ્રી વિનંતી
 DocType: Time Log,Will be updated when billed.,બિલ જ્યારે અપડેટ કરવામાં આવશે.
@@ -2456,11 +2528,12 @@
 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 +115,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 +84,{0}% Delivered,{0}% વિતરિત
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
 DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
 DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,જ સપ્લાયર ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ઓર્ડર વસ્તુ પાડેલ ખરીદી
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,કંપની નામ કંપની ન હોઈ શકે
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,પ્રિન્ટ નમૂનાઓ માટે પત્ર ચેતવણી.
@@ -2470,13 +2543,14 @@
 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: Payment Request,Payment Details,ચુકવણી વિગતો
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM દર
+DocType: Asset,Journal Entry for Scrap,સ્ક્રેપ માટે જર્નલ પ્રવેશ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ડ લવર નોંધ વસ્તુઓ ખેંચી કરો
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,જર્નલ પ્રવેશો {0}-અન જોડાયેલા છે
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","પ્રકાર ઈમેઈલ, ફોન, ચેટ, મુલાકાત, વગેરે બધા સંચાર રેકોર્ડ"
 DocType: Manufacturer,Manufacturers used in Items,વસ્તુઓ વપરાય ઉત્પાદકો
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,કંપની રાઉન્ડ બંધ ખર્ચ કેન્દ્રને ઉલ્લેખ કરો
 DocType: Purchase Invoice,Terms,શરતો
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,ન્યૂ બનાવો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,ન્યૂ બનાવો
 DocType: Buying Settings,Purchase Order Required,ઓર્ડર જરૂરી ખરીદી
 ,Item-wise Sales History,વસ્તુ મુજબના વેચાણનો ઇતિહાસ
 DocType: Expense Claim,Total Sanctioned Amount,કુલ મંજુર રકમ
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,સ્ટોક ખાતાવહી
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},દર: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,પગાર કાપલી કપાત
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,પ્રથમ જૂથ નોડ પસંદ કરો.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,પ્રથમ જૂથ નોડ પસંદ કરો.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,કર્મચારીનું અને હાજરી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},હેતુ એક જ હોવી જોઈએ {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ગ્રાહક, સપ્લાયર, વેચાણ ભાગીદાર અને લીડ સંદર્ભ દૂર કરો, કારણ કે તે તમારી કંપની સરનામું"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: પ્રતિ {1}
 DocType: Task,depends_on,પર આધાર રાખે છે
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા એકાઉન્ટ ના નામ. નોંધ: ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા એકાઉન્ટ ના નામ. નોંધ: ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવી નથી કરો
 DocType: BOM Replace Tool,BOM Replace Tool,BOM સાધન બદલો
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,દેશ મુજબની મૂળભૂત સરનામું નમૂનાઓ
 DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,આગામી તારીખ પોસ્ટ તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,બતાવો કર બ્રેક અપ
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ફોર્મ / વસ્તુ / {0}) સ્ટોક બહાર છે
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,આગામી તારીખ પોસ્ટ તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ભરતિયું પોસ્ટ તારીખ
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;અપેક્ષા બોલ તારીખ&#39; દાખલ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} વસ્તુ માટે માન્ય બેચ નંબર નથી {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","નોંધ: ચુકવણી કોઈપણ સંદર્ભ સામે કરવામાં ન આવે તો, જાતે જર્નલ પ્રવેશ કરો."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,ઉપલબ્ધતા પ્રકાશિત
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
 ,Stock Ageing,સ્ટોક એઇજીંગનો
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,ગ્રાહક સંપર્ક ઇમેઇલ
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
 DocType: Sales Team,Contribution (%),યોગદાન (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,ઢાંચો
 DocType: Sales Person,Sales Person Name,વેચાણ વ્યક્તિ નામ
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,પ્રિન્ટિંગ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},કુલ ડેબિટ કુલ ક્રેડિટ માટે સમાન હોવો જોઈએ. તફાવત છે {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ઓટોમોટિવ
+DocType: Asset Category Account,Fixed Asset Account,સ્થિર એસેટ એકાઉન્ટ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,કેશ અથવા બેન્ક એકાઉન્ટ ચુકવણી પ્રવેશ બનાવવા માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,ઇન્ટર્ન
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,BOM થી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,મૂળભૂત
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} સ્થિર થાય તે પહેલા સ્ટોક વ્યવહારો
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,"તારીખ કરવા માટે, અડધા દિવસ રજા માટે તારીખ તરીકે જ હોવી જોઈએ"
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","દા.ત. કિલો, એકમ, અમે, એમ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,પગાર માળખું
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ઇશ્યૂ સામગ્રી
 DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
 DocType: Employee,Offer Date,ઓફર તારીખ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,સુવાકયો
 DocType: Hub Settings,Access Token,ઍક્સેસ ટોકન
 DocType: Sales Invoice Item,Serial No,સીરીયલ કોઈ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
-DocType: Item,Is Fixed Asset Item,સ્થિર એસેટ વસ્તુ છે
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
 DocType: Purchase Invoice,Print Language,પ્રિંટ ભાષા
 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","તમે લાંબા પ્રિન્ટ બંધારણો હોય, તો આ લક્ષણ દરેક પૃષ્ઠ પર બધા હેડરો અને ફૂટર્સ સાથે અનેક પૃષ્ઠો પર છપાશે પાનું વિભાજિત કરવા માટે વાપરી શકાય છે"
+DocType: Asset,Number of Depreciations,Depreciations સંખ્યા
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,બધા પ્રદેશો
 DocType: Purchase Invoice,Items,વસ્તુઓ
 DocType: Fiscal Year,Year Name,વર્ષ નામ
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
 DocType: Product Bundle Item,Product Bundle Item,ઉત્પાદન બંડલ વસ્તુ
 DocType: Sales Partner,Sales Partner Name,વેચાણ ભાગીદાર નામ
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,સુવાકયો માટે વિનંતી
 DocType: Payment Reconciliation,Maximum Invoice Amount,મહત્તમ ભરતિયું જથ્થા
 DocType: Purchase Invoice Item,Image View,છબી જુઓ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ગ્રાહકો
+DocType: Asset,Partially Depreciated,આંશિક ઘટાડો
 DocType: Issue,Opening Time,ઉદઘાટન સમય
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,પ્રતિ અને જરૂરી તારીખો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,સિક્યોરિટીઝ એન્ડ કોમોડિટી એક્સચેન્જો
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
 DocType: Purchase Taxes and Charges,Valuation and Total,મૂલ્યાંકન અને કુલ
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,જાળવણી વ્યવસ્થાપક
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,કુલ શૂન્ય ન હોઈ શકે
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;છેલ્લું ઓર્ડર સુધીનાં દિવસો&#39; શૂન્ય કરતાં વધારે અથવા સમાન હોવો જોઈએ
-DocType: C-Form,Amended From,સુધારો
+DocType: Asset,Amended From,સુધારો
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,બાળ એકાઉન્ટ આ એકાઉન્ટ માટે અસ્તિત્વમાં છે. તમે આ એકાઉન્ટ કાઢી શકતા નથી.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,આગળ લઈ
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,કંપની એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ &#39;ઉલ્લેખ કૃપા કરીને
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},શ્રેણીબદ્ધ વસ્તુ માટે સીરીયલ અમે જરૂરી {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
 DocType: Journal Entry,Bank Entry,બેન્ક એન્ટ્રી
 DocType: Authorization Rule,Applicable To (Designation),લાગુ કરો (હોદ્દો)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,સૂચી માં સામેલ કરો
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ગ્રુપ દ્વારા
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ અક્ષમ કરો કરન્સી સક્રિય કરો.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ અક્ષમ કરો કરન્સી સક્રિય કરો.
 DocType: Production Planning Tool,Get Material Request,સામગ્રી વિનંતી વિચાર
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ટપાલ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,ટપાલ ખર્ચ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),કુલ (એએમટી)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,મનોરંજન &amp; ફુરસદની પ્રવૃત્તિઓ
 DocType: Quality Inspection,Item Serial No,વસ્તુ સીરીયલ કોઈ
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} અથવા તમે વધારો કરીશું ઓવરફ્લો સહનશીલતા દ્વારા ઘટાડી શકાય જોઈએ
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,કુલ પ્રેઝન્ટ
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,હિસાબી નિવેદનો
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,હિસાબી નિવેદનો
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,કલાક
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",શ્રેણીબદ્ધ વસ્તુ {0} સ્ટોક રિકંસીલેશન ઉપયોગ \ અપડેટ કરી શકાતું નથી
@@ -2687,15 +2766,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),પ્રારંભ પોઇન્ટ ઓફ સેલ (POS)
 apps/erpnext/erpnext/config/support.py +32,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 એકમો આદેશ આપ્યો હોય તો. અને તમારા ભથ્થું પછી તમે 110 એકમો મેળવવા માટે માન્ય છે 10% છે.
 DocType: Pricing Rule,Customer Group,ગ્રાહક જૂથ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: Item,Website Description,વેબસાઇટ વર્ણન
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
 ,Sales Register,સેલ્સ રજિસ્ટર
 DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
@@ -2703,12 +2783,13 @@
 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,ગ્રાહક જૂથ નામ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,વાઉચર પ્રકાર સામે
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},ભૂલ: {0}&gt; {1}
 DocType: Item,Attributes,લક્ષણો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,વસ્તુઓ વિચાર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
 DocType: C-Form,C-Form,સી-ફોર્મ
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,મોબાઈલ નં
 DocType: Payment Tool,Make Journal Entry,જર્નલ પ્રવેશ કરો
 DocType: Leave Allocation,New Leaves Allocated,નવા પાંદડા સોંપાયેલ
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,કોમર્શિયલ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},ભૂલ: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,પિતૃ વસ્તુ {0} સ્ટોક વસ્તુ ન હોવું જોઈએ
 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 +52,All Products or Services.,બધા ઉત્પાદનો અથવા સેવાઓ.
 DocType: Supplier Quotation,Supplier Address,પુરવઠોકર્તા સરનામું
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty આઉટ
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
+apps/erpnext/erpnext/config/accounts.py +259,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,ફાઈનાન્સિયલ સર્વિસીસ
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} એટ્રીબ્યુટ માટે કિંમત શ્રેણી અંદર હોવું જ જોઈએ {1} માટે {2} ના ઇન્ક્રીમેન્ટ {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,લાખોમાં
 DocType: Customer,Default Receivable Accounts,એકાઉન્ટ્સ પ્રાપ્ત મૂળભૂત
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,ટ્રાન્સફર
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,ટ્રાન્સફર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
 DocType: Journal Entry,Pay To / Recd From,ના / Recd પગાર
 DocType: Naming Series,Setup Series,સેટઅપ સિરીઝ
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,રીમાર્કસ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો સામગ્રી વસ્તુ કોડ
 DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
 DocType: Features Setup,POS View,POS જુઓ
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,સીરીયલ નંબર માટે સ્થાપન રેકોર્ડ
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,આગામી તારીખ ડે અને મહિનાનો દિવસ પર પુનરાવર્તન સમાન હોવા જ જોઈએ
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,આગામી તારીખ ડે અને મહિનાનો દિવસ પર પુનરાવર્તન સમાન હોવા જ જોઈએ
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,એક સ્પષ્ટ કરો
 DocType: Offer Letter,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ઉપર
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,સમય લોગ વર્ણવવામાં આવ્યા છે
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 DocType: Salary Slip,Earning & Deduction,અર્નિંગ અને કપાત
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,એકાઉન્ટ {0} ગ્રુપ ન હોઈ શકે
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),કામચલાઉ નફો / નુકશાન (ક્રેડિટ)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},કંપની મૂળભૂત કિંમત {0} સુયોજિત કરો {1}
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,માસિક હાજરી શીટ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,મળ્યું નથી રેકોર્ડ
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી માટે શ્રેણી નંબર&gt; ક્રમાંકન સિરીઝ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+DocType: Asset,Straight Line,સીધી રેખા
+DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,હા અથવા ના હોય તરીકે &#39;subcontracted છે&#39; દાખલ કરો
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,એન્ટ્રી ખુલવાનો મંજૂરી નથી &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {0}
 DocType: Features Setup,Sales Discounts,સેલ્સ ડિસ્કાઉન્ટ
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ઓર્ડર સંખ્યા
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ઉત્પાદન યાદી ટોચ પર બતાવશે કે html / બેનર.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,શીપીંગ જથ્થો ગણતરી કરવા માટે શરતો સ્પષ્ટ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,બાળ ઉમેરો
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,ખુલી ભાવ
 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,સેલ્સ પર કમિશન
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,સેલ્સ પર કમિશન
 DocType: Offer Letter Term,Value / Description,ભાવ / વર્ણન
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 ,Customers Not Buying Since Long Time,ગ્રાહકો લાંબા સમયથી ખરીદી નથી
 DocType: Production Order,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,મનોરંજન ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,મનોરંજન ખર્ચ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,રજા માટે કાર્યક્રમો.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,કાનૂની ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,હાલની વ્યવહાર સાથે એકાઉન્ટ કાઢી શકાતી નથી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,કાનૂની ખર્ચ
 DocType: Sales Invoice,Posting Time,પોસ્ટિંગ સમય
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,ટેલિફોન ખર્ચ
 DocType: Sales Partner,Logo,લોગો
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"તમે બચત પહેલાં શ્રેણી પસંદ કરો વપરાશકર્તા પર દબાણ કરવા માંગો છો, તો આ તપાસો. તમે આ તપાસો જો કોઈ મૂળભૂત હશે."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},સીરીયલ કોઈ સાથે કોઈ વસ્તુ {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ઓપન સૂચનાઓ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,પ્રત્યક્ષ ખર્ચ
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,પ્રત્યક્ષ ખર્ચ
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;સૂચના \ ઇમેઇલ સરનામું&#39; એક અમાન્ય ઇમેઇલ સરનામું
 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,પ્રવાસ ખર્ચ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,પ્રવાસ ખર્ચ
 DocType: Maintenance Visit,Breakdown,વિરામ
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),કુલ બિલિંગ રકમ (સમય લોગ મારફતે)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,અમે આ આઇટમ વેચાણ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,પુરવઠોકર્તા આઈડી
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
 DocType: Journal Entry,Cash Entry,કેશ એન્ટ્રી
 DocType: Sales Partner,Contact Desc,સંપર્ક DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","કેઝ્યુઅલ જેવા પાંદડા પ્રકાર, માંદા વગેરે"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,કુલ સંચાલન ખર્ચ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,નોંધ: વસ્તુ {0} ઘણી વખત દાખલ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,બધા સંપર્કો.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,એસેટ સપ્લાયર {0} ખરીદી ભરતિયું સપ્લાયર સાથે મેળ ખાતું નથી
 DocType: Newsletter,Test Email Id,પરીક્ષણ ઇમેઇલ આઈડી
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,કાચો માલ મુખ્ય વસ્તુ તરીકે જ ન હોઈ શકે
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,પગાર નમૂનો માસ્ટર.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
 ,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,બધા ગ્રાહક જૂથો
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,મનપસંદ બિલિંગ સરનામું
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પાર્ટીના payble એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ટકાવારી ફાળવણી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,સચિવ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","અક્ષમ કરો છો, તો આ ક્ષેત્ર શબ્દો માં &#39;કોઈપણ વ્યવહાર દૃશ્યમાન હશે નહિં"
@@ -2902,13 +2989,13 @@
 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,ક્રેડિટર્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,ક્રેડિટર્સ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,ROW # {0}: સીરીયલ કોઈ ફરજિયાત છે
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
 ,Item-wise Price List Rate,વસ્તુ મુજબના ભાવ યાદી દર
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
 DocType: Lead,Add to calendar on this date,આ તારીખ પર કૅલેન્ડર ઉમેરો
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,આવનારી પ્રવૃત્તિઓ
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,લીડ પ્રતિ
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Hub Settings,Name Token,નામ ટોકન
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ધોરણ વેચાણ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,માપવા એકમ મૂળભૂત દાખલ કરો
-DocType: Project,Project Name,પ્રોજેક્ટ નામ
+DocType: Request for Quotation 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,વસ્તુ બેચ અમે
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,સમાપ્તિ તારીખ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,સ્ટોક વ્યવહારો
 DocType: Employee,Internal Work History,આંતરિક કામ ઇતિહાસ
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,સંચિત અવમૂલ્યન રકમ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,પ્રાઇવેટ ઇક્વિટી
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Account,Expense,ખર્ચ
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","કંપની, ફરજિયાત છે કારણ કે તે તમારી કંપની સરનામું"
 DocType: Item Attribute,From Range,શ્રેણી
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,ત્યારથી તે અવગણવામાં વસ્તુ {0} સ્ટોક વસ્તુ નથી
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,વધુ પ્રક્રિયા માટે આ ઉત્પાદન ઓર્ડર સબમિટ કરો.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,વધુ પ્રક્રિયા માટે આ ઉત્પાદન ઓર્ડર સબમિટ કરો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ચોક્કસ વ્યવહાર માં પ્રાઇસીંગ નિયમ લાગુ નથી, બધા લાગુ કિંમતના નિયમોમાં નિષ્ક્રિય થવી જોઈએ."
 DocType: Company,Domain,ડોમેન
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,નોકરીઓ
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,વધારાના ખર્ચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
 DocType: Quality Inspection,Incoming,ઇનકમિંગ
 DocType: BOM,Materials Required (Exploded),મટિરીયલ્સ (વિસ્ફોટ) જરૂરી
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),પગાર વિના રજા માટે અર્નિંગ ઘટાડો (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,સોંપણી તારીખ
 DocType: Opportunity,Opportunity Date,તક તારીખ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ખરીદી રસીદ સામે પાછા ફરો
+DocType: Request for Quotation Item,Request for Quotation Item,અવતરણ વસ્તુ માટે વિનંતી
 DocType: Purchase Order,To Bill,બિલ
 DocType: Material Request,% Ordered,% આદેશ આપ્યો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,છૂટક કામ
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
 DocType: Accounts Settings,Accounts Settings,સેટિંગ્સ એકાઉન્ટ્સ
 DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},કંપની એસેટ નિકાલ એકાઉન્ટ &#39;સુયોજિત કરો {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,કામચલાઉ ખાતાઓને
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,બ્લેક
 DocType: BOM Explosion Item,BOM Explosion Item,BOM વિસ્ફોટ વસ્તુ
 DocType: Account,Auditor,ઓડિટર
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,અક્ષમ કરો
 DocType: Project Task,Pending Review,બાકી સમીક્ષા
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,પગાર માટે અહીં ક્લિક કરો
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","એસેટ {0}, રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ગ્રાહક આઈડી
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,માર્ક ગેરહાજર
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,સમય સમય કરતાં મોટી હોવી જ જોઈએ કરવા માટે
 DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,વસ્તુઓ ઉમેરો
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""",દા.ત. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,વસ્તુ માટે અસ્તિત્વમાં નથી કરી શકો છો સ્ટોક {0} થી ચલો છે
 ,Sales Person-wise Transaction Summary,વેચાણ વ્યક્તિ મુજબના ટ્રાન્ઝેક્શન સારાંશ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ક્વોલિટી મેનેજમેન્ટ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
 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,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
@@ -3068,7 +3160,7 @@
 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,આગામી સંપર્ક
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,સેટઅપ ગેટવે હિસ્સો ધરાવે છે.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,સેટઅપ ગેટવે હિસ્સો ધરાવે છે.
 DocType: Employee,Employment Type,રોજગાર પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
 ,Cash Flow,રોકડ પ્રવાહ
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},શોધવા કૃપા કરીને જોડાયેલ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,સામાન્ય ખાતાવહી મુજબ બેન્ક નિવેદન બેલેન્સ
 DocType: Job Applicant,Applicant Name,અરજદારનું નામ
 DocType: Authorization Rule,Customer / Item Name,ગ્રાહક / વસ્તુ નામ
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,શ્રેણી / માંથી સ્પષ્ટ કરો
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,વ્યવહારો વેચાણ માટે મૂળભૂત સુયોજનો.
 DocType: BOM Replace Tool,Current BOM,વર્તમાન BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,સીરીયલ કોઈ ઉમેરો
 apps/erpnext/erpnext/config/support.py +43,Warranty,વોરંટી
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,પ્રિન્ટ અને સ્થિર
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ગ્રુપ નોડ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,સુધારા ફિનિશ્ડ ગૂડ્સ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,સુધારા ફિનિશ્ડ ગૂડ્સ
 DocType: Workstation,per hour,કલાક દીઠ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ખરીદી
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,વેરહાઉસ (પર્પેચ્યુઅલ ઈન્વેન્ટરી) માટે એકાઉન્ટ આ એકાઉન્ટ હેઠળ બનાવવામાં આવશે.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
 DocType: Company,Distribution,વિતરણ
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,રકમ ચૂકવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,પ્રોજેક્ટ મેનેજર
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"તારીખ કરવા માટે, નાણાકીય વર્ષ અંદર પ્રયત્ન કરીશું. = તારીખ ધારી રહ્યા છીએ {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","અહીં તમે વગેરે ઊંચાઇ, વજન, એલર્જી, તબીબી બાબતો જાળવી શકે છે"
 DocType: Leave Block List,Applies to Company,કંપની માટે લાગુ પડે છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
 DocType: Purchase Invoice,In Words,શબ્દો માં
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
 DocType: Production Planning Tool,Material Request For Warehouse,વેરહાઉસ માટે સામગ્રી અરજી
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ટ્રાન્ઝેક્શન બંધ કરી દીધું ઉત્પાદન સામે મંજૂરી નથી ક્રમમાં {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",મૂળભૂત તરીકે ચાલુ નાણાકીય વર્ષના સુયોજિત કરવા માટે &#39;મૂળભૂત તરીકે સેટ કરો&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,જોડાઓ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
 DocType: Salary Slip,Salary Slip,પગાર કાપલી
+DocType: Pricing Rule,Margin Rate or Amount,માર્જિન દર અથવા જથ્થો
 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,વેચાણ ઓર્ડર વસ્તુ
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,સેલ્સ ટીમ વિગતો
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},અમાન્ય {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ડિપાર્ટમેન્ટ સ્ટોર્સ
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,પ્રથમ દસ્તાવેજ સાચવો.
 DocType: Account,Chargeable,લેવાપાત્ર
 DocType: Company,Change Abbreviation,બદલો સંક્ષેપનો
 DocType: Expense Claim Detail,Expense Date,ખર્ચ તારીખ
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,સામાન્ય ખાતાવહી
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,જુઓ તરફ દોરી જાય છે
 DocType: Item Attribute Value,Attribute Value,લક્ષણની કિંમત
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ઇમેઇલ ID ને પહેલાથી જ અસ્તિત્વમાં છે, અનન્ય હોવો જોઈએ {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ઇમેઇલ ID ને પહેલાથી જ અસ્તિત્વમાં છે, અનન્ય હોવો જોઈએ {0}"
 ,Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,પ્રથમ {0} પસંદ કરો
 DocType: Features Setup,To get Item Group in details table,વિગતો ટેબલ વસ્તુ જૂથ વિચાર
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {0}
 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>
@@ -3226,23 +3319,23 @@
 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,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(સ્રોત / લક્ષ્ય પર) વાસ્તવિક Qty
 DocType: Item Customer Detail,Ref Code,સંદર્ભ કોડ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,કર્મચારીનું રેકોર્ડ.
 DocType: Payment Gateway,Payment Gateway,પેમેન્ટ ગેટવે
 DocType: HR Settings,Payroll Settings,પગારપત્રક સેટિંગ્સ
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ઓર્ડર કરો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,રુટ પિતૃ ખર્ચ કેન્દ્રને હોઈ શકે નહિં
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,બ્રાન્ડ પસંદ કરો ...
 DocType: Sales Invoice,C-Form Applicable,સી-ફોર્મ લાગુ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,વેરહાઉસ ફરજિયાત છે
 DocType: Supplier,Address and Contacts,એડ્રેસ અને સંપર્કો
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100 પીએક્સ દ્વારા તે (ડબલ્યુ) વેબ મૈત્રી 900px રાખો (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,દ્વારા ઉકેલાઈ
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,ટ્રાન્ઝેક્શન ચલણ પેમેન્ટ ગેટવે ચલણ તરીકે જ હોવી જોઈએ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,પ્રાપ્ત
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,પ્રાપ્ત
 DocType: Maintenance Visit,Fully Completed,સંપૂર્ણપણે પૂર્ણ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% પૂર્ણ
 DocType: Employee,Educational Qualification,શૈક્ષણિક લાયકાત
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,સબમિટ બનાવટ પર
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ખરીદી માસ્ટર વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,મારા ઓર્ડર
@@ -3296,10 +3389,10 @@
 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,મોકલતા પહેલા સંદેશ દાખલ કરો
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,અસુરક્ષીત લોન્સ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,અસુરક્ષીત લોન્સ
 DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
 DocType: Maintenance Schedule Detail,Scheduled Date,અનુસૂચિત તારીખ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,કુલ ભરપાઈ એએમટી
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} વસ્તુ માટે ઓળંગી over- માટે ભથ્થું {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,તમારા સપ્લાયર્સ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; આગળ વધવા માટે ખાતરી કરો.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
 DocType: Purchase Invoice,Contact,સંપર્ક
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,પ્રતિ પ્રાપ્ત
 DocType: Features Setup,Exports,નિકાસ
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,અન્ય ચલણ સાથે એકાઉન્ટ્સ માટે પરવાનગી આપે છે મલ્ટી કરન્સી વિકલ્પ તપાસો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,વસ્તુ: {0} સિસ્ટમ અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,વસ્તુ: {0} સિસ્ટમ અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;હા&#39; હોઈ નોન-સ્ટોક આઇટમ માટે નથી કરી શકો છો &#39;સીરિયલ કોઈ છે&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,એકાઉન્ટ હેડ
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,ગ્રાહક કોડ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,સ્ટોક અસ્કયામતો
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,પગાર સ્લિપ બનાવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","માટે લાગુ તરીકે પસંદ કરેલ છે તે ખરીદી, ચકાસાયેલ જ હોવું જોઈએ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ડિસ્કાઉન્ટ કરતાં ઓછી 100 હોવી જ જોઈએ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,ROW # {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,મહિનાનો દિવસ પર પુનરાવર્તન
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,વર્ષ શરૂ તારીખ અથવા અંતિમ તારીખ {0} સાથે ઓવરલેપિંગ છે. ટાળવા માટે કંપની સુયોજિત કરો
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,નવી ન્યૂઝલેટર
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ઉદાહરણ:. શ્રેણી સુયોજિત છે અને સીરીયલ કોઈ વ્યવહારો માં ઉલ્લેખ નથી તો ABCD #####, તો પછી આપોઆપ સીરીયલ નંબર આ શ્રેણી પર આધારિત બનાવવામાં આવશે. તમે હંમેશા નિશ્ચિતપણે આ આઇટમ માટે સીરીયલ અમે ઉલ્લેખ કરવા માંગો છો. આ ખાલી છોડી દો."
 DocType: Upload Attendance,Upload Attendance,અપલોડ કરો એટેન્ડન્સ
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,કંપની માસ્ટર મૂળભૂત ચલણ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},સાથે કરવેરા નિયમ સંઘર્ષો {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,નવા એકાઉન્ટ નામ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,ગ્રાહક સેવા
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ઓફર ઉમેદવાર જોબ.
 DocType: Notification Control,Prompt for Email on Submission of,સુપરત ઇમેઇલ માટે પ્રોમ્પ્ટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,કુલ ફાળવેલ પાંદડા સમયગાળામાં દિવસો કરતાં વધુ છે
+DocType: Pricing Rule,Percentage,ટકાવારી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,વસ્તુ {0} સ્ટોક વસ્તુ જ હોવી જોઈએ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,પ્રગતિ વેરહાઉસ માં મૂળભૂત કામ
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,હિસાબી વ્યવહારો માટે મૂળભૂત સુયોજનો.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,હિસાબી વ્યવહારો માટે મૂળભૂત સુયોજનો.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,અપેક્ષિત તારીખ સામગ્રી વિનંતી તારીખ પહેલાં ન હોઈ શકે
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,વસ્તુ {0} એક સેલ્સ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,વસ્તુ {0} એક સેલ્સ વસ્તુ જ હોવી જોઈએ
 DocType: Naming Series,Update Series Number,સુધારા સિરીઝ સંખ્યા
 DocType: Account,Equity,ઈક્વિટી
 DocType: Sales Order,Printing Details,પ્રિન્ટિંગ વિગતો
@@ -3431,11 +3527,12 @@
 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,શોધ પેટા એસેમ્બલીઝ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,ખર્ચ એકાઉન્ટ સામે
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; ની) બાળ ઉમેરો પર ક્લિક કરીને એક નવું એકાઉન્ટ બનાવો અને શું કર દર ઉલ્લેખ.
 DocType: Production Order,Production Order,ઉત્પાદન ઓર્ડર
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,સ્થાપન નોંધ {0} પહેલાથી જ સબમિટ કરવામાં આવી છે
 DocType: Quotation Item,Against Docname,Docname સામે
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,રિટેલ અને હોલસેલ
 DocType: Issue,First Responded On,પ્રથમ જવાબ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,બહુવિધ જૂથો માં આઇટમ ક્રોસ લિસ્ટિંગ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ પહેલેથી નાણાકીય વર્ષમાં સુયોજિત છે {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,સફળતાપૂર્વક અનુરૂપ
 DocType: Production Order,Planned End Date,આયોજિત સમાપ્તિ તારીખ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,વસ્તુઓ જ્યાં સંગ્રહાય છે.
 DocType: Tax Rule,Validity,માન્યતા
+DocType: Request for Quotation,Supplier Detail,પુરવઠોકર્તા વિગતવાર
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ભરતિયું રકમ
 DocType: Attendance,Attendance,એટેન્ડન્સ
 apps/erpnext/erpnext/config/projects.py +55,Reports,અહેવાલ
 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 +508,Posting date and posting time is mandatory,તારીખ પોસ્ટ અને સમય પોસ્ટ ફરજિયાત છે
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,વ્યવહારો ખરીદી માટે કરવેરા નમૂનો.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,વ્યવહારો ખરીદી માટે કરવેરા નમૂનો.
 ,Item Prices,વસ્તુ એની
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,તમે ખરીદી માટે સેવ વાર શબ્દો દૃશ્યમાન થશે.
 DocType: Period Closing Voucher,Period Closing Voucher,પીરિયડ બંધ વાઉચર
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,નેટ કુલ પર
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0} પંક્તિ માં લક્ષ્યાંક વેરહાઉસ ઉત્પાદન ઓર્ડર તરીકે જ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,કોઈ પરવાનગી ચુકવણી સાધન વાપરવા માટે
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% S રિકરિંગ માટે સ્પષ્ટ નથી &#39;સૂચના ઇમેઇલ સરનામાંઓ&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% S રિકરિંગ માટે સ્પષ્ટ નથી &#39;સૂચના ઇમેઇલ સરનામાંઓ&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,બદલો
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,કુલ સ્કોર કમાવેલી
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",દા.ત. &quot;મારી કંપની LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,સૂચના સમયગાળા
+DocType: Asset Category,Asset Category Name,એસેટ વર્ગ નામ
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,બધી વસ્તુઓ નોન-સ્ટોક વસ્તુઓ છે કર કેટેગરી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; ન હોઈ શકે
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,બેચ
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,વેચાણ વ્યક્તિ
 DocType: Sales Invoice,Cold Calling,શીત કોલિંગ
 DocType: SMS Parameter,SMS Parameter,એસએમએસ પરિમાણ
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
 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.,મૂલ્યો પર આધારિત વ્યવહારો પ્રતિબંધિત કરવા માટે નિયમો બનાવો.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,ખરીદી સામાન્ય
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 DocType: Sales Invoice,Is POS,POS છે
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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,સ્વીકારાયું જથ્થો
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,પિતૃ એકાઉન્ટ
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,શિક્ષણ
 DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
 DocType: Employee,Current Address Is,વર્તમાન સરનામું
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
 DocType: Address,Office,ઓફિસ
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,બેચ ઈન્વેન્ટરી
 DocType: Employee,Contract End Date,કોન્ટ્રેક્ટ સમાપ્તિ તારીખ
 DocType: Sales Order,Track this Sales Order against any Project,કોઈ પણ પ્રોજેક્ટ સામે આ વેચાણ ઓર્ડર ટ્રેક
+DocType: Sales Invoice Item,Discount and Margin,ડિસ્કાઉન્ટ અને માર્જિન
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,પુલ વેચાણ ઓર્ડર ઉપર માપદંડ પર આધારિત (પહોંચાડવા માટે બાકી)
 DocType: Deduction Type,Deduction Type,કપાત પ્રકાર
 DocType: Attendance,Half Day,અડધા દિવસ
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,માસિક પગાર રજિસ્ટર
 DocType: Warranty Claim,If different than customer address,ગ્રાહક સરનામું કરતાં અલગ તો
 DocType: BOM Operation,BOM Operation,BOM ઓપરેશન
@@ -3617,22 +3717,23 @@
 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 પ્રોફાઇલ
 DocType: Payment Gateway Account,Payment URL Message,ચુકવણી URL સંદેશ
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,રો {0}: ચુકવણી રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,અવેતન કુલ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,સમય લોગ બિલયોગ્ય નથી
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
+DocType: Asset,Asset Category,એસેટ વર્ગ
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,જાતે સામે વાઉચર દાખલ કરો
 DocType: SMS Settings,Static Parameters,સ્થિર પરિમાણો
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,સપ્લાયર સામગ્રી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,એક્સાઇઝ ભરતિયું
 DocType: Expense Claim,Employees Email Id,કર્મચારીઓ ઇમેઇલ આઈડી
 DocType: Employee Attendance Tool,Marked Attendance,માર્કડ એટેન્ડન્સ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,વર્તમાન જવાબદારીઓ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,વર્તમાન જવાબદારીઓ
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,વાસ્તવિક Qty ફરજિયાત છે
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,આંકડાકીય મૂલ્યો
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,લોગો જોડો
 DocType: Customer,Commission Rate,કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,ઍનલિટિક્સ
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,કાર્ટ ખાલી છે
 DocType: Production Order,Actual Operating Cost,વાસ્તવિક ઓપરેટિંગ ખર્ચ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,કોઈ મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,કેપિટલ સ્ટોક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,કેપિટલ સ્ટોક
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
 DocType: Payment Gateway Account,Payment Gateway Account,પેમેન્ટ ગેટવે એકાઉન્ટ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"ચુકવણી પૂર્ણ કર્યા પછી, પસંદ કરેલ પાનું વપરાશકર્તા પુનઃદિશામાન."
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ડીઝાઈનર
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,નિયમો અને શરતો ઢાંચો
 DocType: Serial No,Delivery Details,ડ લવર વિગતો
+DocType: Asset,Current Value (After Depreciation),વર્તમાન કિંમત (અવમૂલ્યન પછી)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
 ,Item-wise Purchase Register,વસ્તુ મુજબના ખરીદી રજીસ્ટર
 DocType: Batch,Expiry Date,અંતિમ તારીખ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","પુનઃક્રમાંકિત કરો સ્તર સુયોજિત કરવા માટે, આઇટમ ખરીદી વસ્તુ અથવા ઉત્પાદન વસ્તુ જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(અડધા દિવસ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,સામગ્રી બિલ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},રો {0}: પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ માટે જરૂરી છે {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,સંદર્ભ તારીખ
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,મંજુર રકમ
 DocType: GL Entry,Is Opening,ખોલ્યા છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,એકાઉન્ટ {0} અસ્તિત્વમાં નથી
 DocType: Account,Cash,કેશ
 DocType: Employee,Short biography for website and other publications.,વેબસાઇટ અને અન્ય પ્રકાશનો માટે લઘુ જીવનચરિત્ર.
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 36eb758..4f7f845 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,סוחר
 DocType: Employee,Rented,הושכר
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
 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.,* יחושב בעסקה.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,אנא עובד התקנת מערכת שמות ב משאבי אנוש&gt; הגדרות HR
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} עץ
 DocType: Job Applicant,Job Applicant,עבודת מבקש
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Leave Type,Leave Type Name,השאר סוג שם
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,הצג פתוח
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,גרסאות הצג
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,כמות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),הלוואות (התחייבויות)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,במלאי
 DocType: Designation,Designation,ייעוד
@@ -64,7 +66,7 @@
 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 +642,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},חדש {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},חדש {0}: # {1}
 ,Sales Partners Commission,ועדת שותפי מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
 DocType: Payment Request,Payment Request,בקשת תשלום
@@ -102,7 +104,7 @@
 DocType: Employee,Married,נשוי
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},חל איסור על {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
 DocType: Quality Inspection Reading,Reading 1,קריאת 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,יומן פעילות:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
+DocType: Item,Is Fixed Asset,האם קבוע נכסים
 DocType: Expense Claim Detail,Claim Amount,סכום תביעה
 DocType: Employee,Mr,מר
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,סוג ספק / ספק
@@ -156,7 +159,8 @@
 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,הוצאות המניה
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} הוא קפוא
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,הוצאות המניה
 DocType: Newsletter,Email Sent?,"דוא""ל שנשלח?"
 DocType: Journal Entry,Contra Entry,קונטרה כניסה
 DocType: Production Order Operation,Show Time Logs,יומני זמן השידור
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,מצב התקנה
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,פריט {0} חייב להיות פריט רכישה
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: BOM Replace Tool,New BOM,BOM החדש
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,נא להזין חברה
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,מזומנים נטו ממימון
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
 DocType: Newsletter List,Total Subscribers,סה&quot;כ מנויים
 ,Contact Name,שם איש קשר
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 DocType: Payment Tool,Reference No,אסמכתא
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,פוסט בנק
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,בקרת הודעה
 DocType: Lead,Suggestions,הצעות
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,תקציבי סט פריט קבוצה חכמה על טריטוריה זו. אתה יכול לכלול גם עונתיות על ידי הגדרת ההפצה.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},נא להזין את קבוצת חשבון הורה למחסן {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},נא להזין את קבוצת חשבון הורה למחסן {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
 DocType: Supplier,Address HTML,כתובת HTML
 DocType: Lead,Mobile No.,מס 'נייד
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,מקסימום 5 תווים
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 apps/erpnext/erpnext/config/desktop.py +83,Learn,לִלמוֹד
+DocType: Asset,Next Depreciation Date,תאריך הפחת הבא
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,עלות פעילות לעובדים
 DocType: Accounts Settings,Settings for Accounts,הגדרות עבור חשבונות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},ספק חשבונית לא קיים חשבונית רכישת {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,ניהול מכירות אדם עץ.
 DocType: Job Applicant,Cover Letter,מכתב כיסוי
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,המחאות ופיקדונות כדי לנקות מצטיינים
 DocType: Item,Synced With Hub,סונכרן עם רכזת
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,סיסמא שגויה
 DocType: Item,Variant Of,גרסה של
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,שגיאת הפניה מעגלית
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} יחידות של [{1}] (טופס # / כתבה / {1}) נמצא [{2}] (טופס # / מחסן / {2})
 DocType: Lead,Industry,תעשייה
 DocType: Employee,Job Profile,פרופיל עבודה
 DocType: 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,סוג חשבונית
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,תעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,אנא בחר חודש והשנה
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,פריט בחר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},מספר סידורי {0} אינו שייך לתעודת משלוח {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,פריט איכות פיקוח פרמטר
 DocType: Leave Application,Leave Approver Name,השאר שם מאשר
-,Schedule Date,תאריך לוח זמנים
+DocType: Depreciation Schedule,Schedule Date,תאריך לוח זמנים
 DocType: Packed Item,Packed Item,פריט ארוז
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,הגדרות ברירת מחדל בעסקות קנייה.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,הגדרות ברירת מחדל בעסקות קנייה.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},עלות פעילות קיימת לעובד {0} מפני סוג פעילות - {1}
 apps/erpnext/erpnext/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,המרת מטבע
@@ -346,6 +353,7 @@
 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","פריטים לבקשו שהם ""אזל"" בהתחשב בכל המחסנים המבוססים על כמות צפויה וכמות הזמנה מינימאלית"
+DocType: Request for Quotation,Request for Quotation,בקשה לציטוט
 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.","אם כללי תמחור מרובים להמשיך לנצח, משתמשים מתבקשים להגדיר עדיפות ידנית לפתור את הסכסוך."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
-DocType: Material Request Item,Required Date,תאריך הנדרש
+DocType: Request for Quotation Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,הודעה על ספק
 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,שלא שולם
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""לא קיים"
 DocType: Pricing Rule,Valid Upto,Upto חוקי
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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 תפוגה אחריות
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,קבלנות משנה ניהול
+DocType: Project,Project will be accessible on the website to these users,הפרויקט יהיה נגיש באתר למשתמשים אלה
 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 +53,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,פריט {0} לא לרכוש פריט
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,פריט {0} לא לרכוש פריט
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,בהמתנה כמות
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
 DocType: Pricing Rule,Valid From,בתוקף מ
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,כספי לשנה / חשבונאות.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ערכים מצטברים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,תאריך שנת כספים התחל לא צריך להיות גדול יותר מתאריך שנת הכספים End
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},נמסר: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,חשבון לתשלום
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,מצורף קורות חיים
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,חזור מכירות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,חזור מכירות
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,רכיבי שכר.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,תואר שני
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,תאריכי עסקת בנק Update
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,תאריכי עסקת בנק Update
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},שגיאה במלאי שלילי ({6}) עבור פריט {0} ב מחסן {1} על {2} {3} {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,מעקב זמן
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,אנא ראשון להיכנס קבלת רכישה
 DocType: Buying Settings,Supplier Naming By,Naming ספק ב
 DocType: Activity Type,Default Costing Rate,דרג תמחיר ברירת מחדל
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,לוח זמנים תחזוקה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,לוח זמנים תחזוקה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","חוקים ואז תמחור מסוננים החוצה על בסיס לקוחות, קבוצת לקוחות, טריטוריה, ספק, סוג של ספק, המבצע, שותף מכירות וכו '"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,מנהל
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,מטרות איש מכירות
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,אנא קבע רשימה נופש או העובד או החברה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
+DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,ימים קבועים
 DocType: Quotation Item,Item Balance,יתרת פריט
 DocType: Sales Invoice,Packing List,רשימת אריזה
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,הזמנות רכש שניתנו לספקים.
+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,נצרך
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,מבצע זמן
 DocType: Pricing Rule,Sales Manager,מנהל מכירות
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,קבוצה לקבוצה
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,הפרויקטים שלי
 DocType: Journal Entry,Write Off Amount,לכתוב את הסכום
 DocType: Journal Entry,Bill No,ביל לא
+DocType: Company,Gain/Loss Account on Asset Disposal,חשבון רווח / הפסד בעת מימוש נכסים
 DocType: Purchase Invoice,Quarterly,הרבעונים
 DocType: Selling Settings,Delivery Note Required,תעודת משלוח חובה
 DocType: Sales Order Item,Basic Rate (Company Currency),שיעור בסיסי (חברת מטבע)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,כניסת תשלום כבר נוצר
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,חיוב סה&quot;כ השנה
 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 +529,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,סוג העץ
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} הוא לא פריט מלאי
 DocType: Mode of Payment Account,Default Account,חשבון ברירת מחדל
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,לקוחות&gt; קבוצת לקוח&gt; טריטוריה
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,הצהרת משכורת חודשית.
 DocType: Item Group,Website Specifications,מפרט אתר
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},יש שגיאת תבנית הכתובת שלך {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,חשבון חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,חשבון חדש
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: החל מ- {0} מסוג {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","חוקי מחיר מרובים קיימים עם אותם הקריטריונים, בבקשה לפתור את סכסוך על ידי הקצאת עדיפות. חוקי מחיר: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","חוקי מחיר מרובים קיימים עם אותם הקריטריונים, בבקשה לפתור את סכסוך על ידי הקצאת עדיפות. חוקי מחיר: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
 DocType: Item Attribute Value,Item Attribute Value,פריט תכונה ערך
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","יומן {0} מקושר נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כמקדמה בחשבונית זו."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,הוצאות משרד תחזוקה
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,אנא ראשון להיכנס פריט
 DocType: Account,Liability,אחריות
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
 DocType: Company,Default Cost of Goods Sold Account,עלות ברירת מחדל של חשבון מכר
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,מחיר המחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Process Payroll,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,חשבוניות שלי
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,חשבוניות שלי
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,אף עובדים מצא
 DocType: Supplier Quotation,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,העלה איזון המניה באמצעות csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,שלח עכשיו
 ,Support Analytics,Analytics תמיכה
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,טעות לוגית: חייב למצוא חופפים
 DocType: Item,Website Warehouse,מחסן אתר
 DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
 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 +267,C-Form records,רשומות C-טופס
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,רשומות C-טופס
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,לקוחות וספקים
 DocType: Email Digest,Email Digest Settings,"הגדרות Digest דוא""ל"
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,שאילתות התמיכה של לקוחות.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,הוצאות
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,האם קבלן
 DocType: Item Attribute,Item Attribute Values,ערכי תכונה פריט
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,צפה מנויים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,קבלת רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
 DocType: Employee,Ms,גב '
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,שער חליפין של מטבע שני.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,שער חליפין של מטבע שני.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,שותפי מכירות טריטוריה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} חייב להיות פעיל
+DocType: Journal Entry,Depreciation Entry,כניסת פחת
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,סל גוטו
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Production Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,המותג
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
 DocType: Employee,Exit Interview Details,פרטי ראיון יציאה
 DocType: Item,Is Purchase Item,האם פריט הרכישה
-DocType: Journal Entry Account,Purchase Invoice,רכישת חשבוניות
+DocType: Asset,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,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;מוצרי Bundle&#39;, מחסן, מספר סידורי ויצוו לא ייחשב מהשולחן &quot;רשימת האריזה&quot;. אם מחסן ויצוו אין הם זהים עבור כל פריטי האריזה עבור כל הפריט &quot;מוצרים Bundle &#39;, ניתן להזין ערכים אלה בטבלת הפריט העיקרית, ערכים יועתקו ל&#39;אריזת רשימה&#39; שולחן."
 DocType: Job Opening,Publish on website,פרסם באתר
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,משלוחים ללקוחות.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,תאריך חשבונית ספק לא יכול להיות גדול מ תאריך פרסום
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,הכנסות עקיפות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,פריט בחר להעברה
 DocType: Purchase Invoice,Additional Discount Percentage,אחוז הנחה נוסף
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,הצגת רשימה של כל סרטי וידאו העזרה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","שורת {0}: חשבונית {1} אינה חוקית, זה עלול להתבטל / לא קיימת. \ זן חשבונית תקפה"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,אל תשלחו לעובדי יום הולדת תזכורות
 ,Employee Holiday Attendance,נוכחות נופש לעובדים
 DocType: Opportunity,Walk In,ללכת ב
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ערכי מניות
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,ערכי מניות
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,הועבר
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,הפוך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,סל הקניות שלי
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,שם רשימת החג
 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 +180,Qty for {0},כמות עבור {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
+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 +80,Leave Allocation Tool,השאר הקצאת כלי
 DocType: Leave Block List,Leave Block List Dates,השאר תאריכי בלוק רשימה
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,דיסקונט
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,סכום מכירה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,יומני זמן
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,יומני זמן
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Issue,Issue,נושא
+DocType: Asset,Scrapped,לגרוטאות
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,חשבון אינו תואם עם חברה
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,גיוס
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,הוצאות מכירה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,הוצאות מכירה
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,ציטוטים המתקבלים מספקים.
+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,גיל ממוצע
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,מטבע ברירת מחדל
 DocType: Contact,Enter designation of this Contact,הזן ייעודו של איש קשר זה
 DocType: Expense Claim,From Employee,מעובדים
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,פינת של ביצועים מרכזיים
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,פרט C-טופס חשבונית
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,תשלום פיוס חשבונית
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,% תרומה
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,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,ברירות מחדל גלובליות
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,הזמנה לשיתוף פעולה בניהול פרויקטים
 DocType: Salary Slip,Deductions,ניכויים
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,אצווה זמן זה התחבר כבר מחויב.
 DocType: Salary Slip,Leave Without Pay,חופשה ללא תשלום
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,שגיאת תכנון קיבולת
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,שגיאת תכנון קיבולת
 ,Trial Balance for Party,מאזן בוחן למפלגה
 DocType: Lead,Consultant,יועץ
 DocType: Salary Slip,Earnings,רווחים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,מאזן חשבונאי פתיחה
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,שום דבר לא לבקש
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,שום דבר לא לבקש
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ניהול
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,סוגים של פעילויות לפחי זמנים
@@ -935,18 +958,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,אנא הגדר מזהה דוא&quot;ל
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,אנא הגדר מזהה דוא&quot;ל
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {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},פרופיל קופה {0} כבר נוצר עבור משתמש: {1} והחברה {2}
 DocType: Purchase Order Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,מסד נתוני ספק.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,מס וניכויי שכר אחרים.
 DocType: Lead,Lead,לידים
 DocType: Email Digest,Payables,זכאי
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,החג
 DocType: Leave Control Panel,Leave blank if considered for all branches,שאר ריק אם תיחשב לכל הסניפים
 ,Daily Time Log Summary,סיכום זמן יומן יומי
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-הטופס אינו ישים עבור חשבונית: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,פרטי תשלום לא מותאמים
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
@@ -973,19 +997,20 @@
 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,ציין מאפיין אחד לפחות בטבלת התכונות
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
 DocType: Contact,User ID,זיהוי משתמש
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,צפה לדג'ר
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,דיבידנדים ששולם
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,דיבידנדים ששולם
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,החשבונאות לדג&#39;ר
 DocType: Stock Reconciliation,Difference Amount,סכום הבדל
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,עודפים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,עודפים
 DocType: BOM Item,Item Description,תיאור פריט
 DocType: Payment Tool,Payment Mode,שיטת תשלום
 DocType: Purchase Invoice,Is Recurring,האם חוזר
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,פתיחה זמנית
 ,Employee Leave Balance,עובד חופשת מאזן
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},דרג הערכה הנדרשים פריט בשורת {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,חשבונות לתשלום סיכום
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 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 +165,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,קטן
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,ראש חשבון {0} נוצר
 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,"סה""כ הושג"
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
@@ -1040,19 +1065,20 @@
 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 +118,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/stock/get_item_details.py +142,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.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
 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},מעמד הזמנת ייצור הוא {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה צפוי הוא פחותה ממועד המתוכנן התחל.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,לספקים
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה צפוי הוא פחותה ממועד המתוכנן התחל.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},לא מצא שום פריט בשם {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,"יוצא סה""כ"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","יכול להיות רק אחד משלוח כלל מצב עם 0 או ערך ריק עבור ""לשווי"""
 DocType: Authorization Rule,Transaction,עסקה
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,קבוצות פריט באתר
 DocType: Purchase Invoice,Total (Company Currency),סה&quot;כ (חברת מטבע)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,מספר סידורי {0} נכנס יותר מפעם אחת
-DocType: Journal Entry,Journal Entry,יומן
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
 DocType: Salary Slip,Bank Account No.,מס 'חשבון הבנק
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,בקשה להצעת מחיר הספק
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,חומרה
 DocType: Sales Order,Recurring Upto,Upto חוזר
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,מטרת הערכת תבנית
 DocType: Salary Slip,Earning,להרוויח
 DocType: Payment Tool,Party Account Currency,מפלגת חשבון מטבע
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},נוכחי ערך לאחר פחת חייב להיות פחות מ שווה ל {0}
 ,BOM Browser,דפדפן BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,להוסיף או לנכות
 DocType: Company,If Yearly Budget Exceeded (for expense account),אם תקציב שנתי חריגה (לחשבון הוצאות)
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},מטבע של חשבון הסגירה חייב להיות {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},הסכום של נקודות לכל המטרות צריך להיות 100. זה {0}
 DocType: Project,Start and End Dates,תאריכי התחלה וסיום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Utilities
 DocType: Purchase Invoice Item,Accounting,חשבונאות
 DocType: Features Setup,Features Setup,הגדרת תכונות
+DocType: Asset,Depreciation Schedules,לוחות זמנים פחת
 DocType: Item,Is Service Item,האם פריט השירות
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
 DocType: Activity Cost,Projects,פרויקטים
 DocType: Payment Request,Transaction Currency,מטבע עסקה
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},מ {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},מ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,תיאור מבצע
 DocType: Item,Will also apply to variants,יחול גם על גרסאות
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,לא ניתן לשנות את תאריך שנת הכספים התחלה ותאריך סיום שנת כספים אחת לשנת הכספים נשמרה.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,קמפיין
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},מקס: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,לחברה
 apps/erpnext/erpnext/config/support.py +17,Communication log.,יומן תקשורת.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,לא יכול להיות גדול מ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,כלל מס לעסקות.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,כלל מס לעסקות.
 DocType: Rename Tool,Type of document to rename.,סוג של מסמך כדי לשנות את השם.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,אנחנו קונים פריט זה
 DocType: Address,Billing,חיוב
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,קריאות
 DocType: Stock Entry,Total Additional Costs,עלויות נוספות סה&quot;כ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,הרכבות תת
+DocType: Asset,Asset Name,שם נכס
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Supplier,Stock Manager,ניהול מלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Slip אריזה
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,השכרת משרד
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Slip אריזה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,בקשה להצעת המחיר יכולה להיות גישה על ידי לחיצה על הקישור הבא
+DocType: Asset,Number of Months in a Period,מספר חודשים בתוך תקופה
 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 עבודה שעה
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ממשלה
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),"סה""כ ({0})"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),"סה""כ ({0})"
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 DocType: Sales Invoice,Source,מקור
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,הצג סגור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,תאריך כספי לשנה שהתחל
 DocType: Employee External Work History,Total Experience,"ניסיון סה""כ"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,תזרים מזומנים מהשקעות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 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 +86,Transfer Materials for Manufacture,העברת חומרים לייצור
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,העברת חומרים לייצור
 DocType: Pricing Rule,For Price List,למחירון
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,חיפוש הנהלה
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
@@ -1212,7 +1245,7 @@
 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.,צור חשבון חדש מתרשים של חשבונות.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,תחזוקה בקר
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,תחזוקה בקר
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,אצווה זמין כמות במחסן
 DocType: Time Log Batch Detail,Time Log Batch Detail,פרט אצווה הזמן התחבר
 DocType: Landed Cost Voucher,Landed Cost Help,עזרה עלות נחתה
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,אדון מותג.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ספק&gt; סוג ספק
 DocType: Sales Invoice Item,Brand Name,שם מותג
 DocType: Purchase Receipt,Transporter Details,פרטי Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,תיבה
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,קריאת 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,תביעות לחשבון חברה.
 DocType: Company,Default Holiday List,ברירת מחדל רשימת Holiday
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,התחייבויות מניות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,התחייבויות מניות
 DocType: Purchase Receipt,Supplier Warehouse,מחסן ספק
 DocType: Opportunity,Contact Mobile No,לתקשר נייד לא
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,שלח שוב דוא&quot;ל תשלום
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} צפה
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,שינוי נטו במזומנים
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,קודם שנת הכספים אינה סגורה
 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 +40,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 +38,Supplier Type master.,סוג ספק אמן.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
 DocType: Purchase Invoice,Reference Document,מסמך ההפניה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% שחויבו
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,שינוי נטו בחשבונות זכאים
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,אנא ודא id הדוא&quot;ל שלך
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',לקוחות הנדרשים עבור 'דיסקונט Customerwise'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
 DocType: Quotation,Term Details,פרטי טווח
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} חייב להיות גדול מ 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,הפעיל אחריות
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,כתובת קבועה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",מקדמה ששולם כנגד {0} {1} לא יכול להיות גדול \ מ גרנד סה&quot;כ {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,אנא בחר קוד פריט
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,אנא בחר קוד פריט
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),להפחית ניכוי לחופשה ללא תשלום (LWP)
 DocType: Territory,Territory Manager,מנהל שטח
 DocType: Packed Item,To Warehouse (Optional),למחסן (אופציונאלי)
@@ -1343,15 +1377,15 @@
 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,הוצאות שיווק
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,יחידה אחת של פריט.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',זמן יומן אצווה {0} חייב להיות 'הוגש'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,פריט חכם מכירות הרשמה
+DocType: Asset,Gross Purchase Amount,סכום רכישה גרוס
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","""הבנק הלאומי XYZ"" למשל"
+DocType: Asset,Depreciation Method,שיטת הפחת
 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 +29,Shopping Cart is enabled,סל קניות מופעל
 DocType: Job Applicant,Applicant for a Job,מועמד לעבודה
 DocType: Production Plan Material Request,Production Plan Material Request,בקשת חומר תכנית ייצור
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,אין הזמנות ייצור שנוצרו
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,אין הזמנות ייצור שנוצרו
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,ראשי
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,עבודה ב-התקדמות המחסן נדרש לפני הגשה
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,מועמד לעבודה.
 DocType: Purchase Order Item,Warehouse and Reference,מחסן והפניה
 DocType: Supplier,Statutory info and other general information about your Supplier,מידע סטטוטורי ומידע כללי אחר על הספק שלך
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,כתובות
+apps/erpnext/erpnext/hooks.py +91,Addresses,כתובות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,ערכות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,תנאי עבור כלל משלוח
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,פריט אינו מותר לי הזמנת ייצור.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,פריט אינו מותר לי הזמנת ייצור.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,אנא להגדיר מסנן מבוסס על פריט או מחסן
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),משקל נטו של חבילה זו. (מחושב באופן אוטומטי כסכום של משקל נטו של פריטים)
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,יומני זמן לייצור.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,זמן יומן למשימות.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,מותג
 DocType: Item,Will also apply for variants,תחול גם לגרסות
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Quotation Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
+DocType: Request for Quotation Supplier,Send Email to Supplier,שלח הספק
 DocType: SMS Center,Create Receiver List,צור מקלט רשימה
 DocType: Packing Slip,To Package No.,חבילת מס '
 DocType: Production Planning Tool,Material Requests,בקשות חומר
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,מחסן אספקה
 DocType: Stock Settings,Allowance Percent,אחוז הקצבה
 DocType: SMS Settings,Message Parameter,פרמטר הודעה
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,עץ מרכזי עלות הכספיים.
 DocType: Serial No,Delivery Document No,משלוח מסמך לא
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,לקבל פריטים מתקבולי הרכישה
 DocType: Serial No,Creation Date,תאריך יצירה
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,הסכום לאספקת
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,מוצר או שירות
 DocType: Naming Series,Current Value,ערך נוכחי
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} נוצר
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
 ,Serial No Status,סטטוס מספר סידורי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,שולחן פריט לא יכול להיות ריק
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","שורת {0}: כדי להגדיר {1} מחזורי, הבדל בין מ ו תאריך \ חייב להיות גדול או שווה ל {2}"
 DocType: Pricing Rule,Selling,מכירה
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,חובות ומסים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,נא להזין את תאריך הפניה
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Gateway תשלום החשבון אינו מוגדר
 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: Production Order,Material Request Item,פריט בקשת חומר
+DocType: Request for Quotation Item,Material Request Item,פריט בקשת חומר
 apps/erpnext/erpnext/config/stock.py +85,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,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
+DocType: Asset,Sold,נמכר
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,השקעות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,הקצבות
 DocType: Quality Inspection Reading,Acceptance Criteria,קריטריונים לקבלה
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,נא להזין את בקשות חומר בטבלה לעיל
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,נא להזין את בקשות חומר בטבלה לעיל
 DocType: Item Attribute,Attribute Name,שם תכונה
 DocType: Item Group,Show In Website,הצג באתר
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,קבוצה
@@ -1527,6 +1567,7 @@
 ,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, להזמין מכירות, מספר סידורי"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,תרשים גנט של כל המשימות.
+DocType: Pricing Rule,Margin Type,סוג שוליים
 DocType: Appraisal,For Employee Name,לשם עובדים
 DocType: Holiday List,Clear Table,לוח ברור
 DocType: Features Setup,Brands,מותגים
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,כתובות של לקוחות ואנשי קשר
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,# השורה {0}: לנכסי לקוחות עשה כנגד פריט רכוש קבוע
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,בבקשה הגדירו מספור סדרה להגנת נוכחות באמצעות התקנה&gt; סדרה מספורה
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) חייב להיות 'מאשר מהוצאות' תפקיד
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,זוג
+DocType: Asset,Depreciation Schedule,בתוספת פחת
 DocType: Bank Reconciliation Detail,Against Account,נגד חשבון
 DocType: Maintenance Schedule Detail,Actual Date,תאריך בפועל
 DocType: Item,Has Batch No,יש אצווה לא
 DocType: Delivery Note,Excise Page Number,בלו מספר העמוד
+DocType: Asset,Purchase Date,תאריך רכישה
 DocType: Employee,Personal Details,פרטים אישיים
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},אנא הגדר &#39;מרכז עלות נכסי פחת&#39; ב חברת {0}
 ,Maintenance Schedules,לוחות זמנים תחזוקה
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש"
 DocType: HR Settings,HR Settings,הגדרות HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"סה""כ בפועל"
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,יחידה
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,נא לציין את החברה
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,תביעות חשבון
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
 ,BOM Search,חיפוש BOM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},תאריך חיסול לא יכול להיות לפני בדיקת תאריך בשורת {0}
 DocType: Salary Slip,Deduction,ניכוי
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 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 +137,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,מאזן חשבון בנק מחושב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,משתמשים נכים
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,הצעת מחיר
 DocType: Salary Slip,Total Deduction,סך ניכוי
 DocType: Quotation,Maintenance User,משתמש תחזוקה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,עלות עדכון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,עלות עדכון
 DocType: Employee,Date of Birth,תאריך לידה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,אנא עובד התקנת מערכת שמות ב משאבי אנוש&gt; הגדרות HR
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO כמות
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
+DocType: Request for Quotation,Manufacturing Manager,ייצור מנהל
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
 apps/erpnext/erpnext/hooks.py +71,Shipments,משלוחים
 DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,# שורה
 DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע)
-DocType: Pricing Rule,Supplier,ספק
+DocType: Asset,Supplier,ספק
 DocType: C-Form,Quarter,רבעון
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,הוצאות שונות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,הוצאות שונות
 DocType: Global Defaults,Default Company,חברת ברירת מחדל
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,משתמש {0} אינו זמין
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","# השורה {0}: כמות חייבת להיות 1, כפריט קשור לנכס"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,פריט ילד לא צריך להיות Bundle מוצר. אנא הסר פריט `{0}` ולשמור
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,בנקאות
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,מרכז עלות חדש
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",עבור אל הקבוצה המתאימה (בדרך כלל מקור הכספים&gt; התחייבויות שוטפות&gt; מסים וליצור חשבון חדש (על ידי לחיצה על הוסף Child) מסוג &quot;מס&quot; ולעשות להזכיר את שיעור המס.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,מרכז עלות חדש
 DocType: Bin,Ordered Quantity,כמות מוזמנת
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
 DocType: Quality Inspection,In Process,בתהליך
@@ -1670,10 +1716,11 @@
 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,חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
 DocType: Quotation Item,Stock Balance,יתרת מלאי
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,להזמין מכירות לתשלום
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,זמן יומנים שנוצרו:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,זמן יומנים שנוצרו:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Employee,Blood Group,קבוצת דם
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,חיוב נדרש
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
 DocType: Offer Letter Term,Offer Term,טווח הצעה
 DocType: Quality Inspection,Quality Manager,מנהל איכות
 DocType: Job Applicant,Job Opening,פתיחת עבודה
 DocType: Payment Reconciliation,Payment Reconciliation,פיוס תשלום
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,טכנולוגיה
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,להציע מכתב
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,צור בקשות חומר (MRP) והזמנות ייצור.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
 DocType: Production Order Operation,Completed Qty,כמות שהושלמה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,דרג הערכה נוכחי
 DocType: Item,Customer Item Codes,קודי פריט לקוחות
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,צור ערכי תשלום כנגד הזמנות או חשבוניות.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,צור ערכי תשלום כנגד הזמנות או חשבוניות.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,כתובת חדשה
 DocType: Quality Inspection,Sample Size,גודל מדגם
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,משתמשים והרשאות
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,מספר סידורי {0} לא נמצאו
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,מספר סידורי {0} לא נמצאו
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,הלקוחות שלך
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
 DocType: Leave Block List Date,Block Date,תאריך בלוק
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,החל עכשיו
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,החל עכשיו
 DocType: Sales Order,Not Delivered,לא נמסר
 ,Bank Clearance Summary,סיכום עמילות בנק
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,פרטי תעסוקה
 DocType: Employee,New Workplace,חדש במקום העבודה
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,קבע כסגור
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},אין פריט ברקוד {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},אין פריט ברקוד {0}
 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,הצג מצגת בחלק העליון של הדף
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,העברת חומר
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},פריט {0} חייב להיות פריט מכירות {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,צור שכר Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),מקור הכספים (התחייבויות)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,עובד
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,דוא&quot;ל יבוא מ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,הזמן כמשתמש
 DocType: Features Setup,After Sale Installations,לאחר התקנות מכירה
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},אנא להגדיר {0} ב החברה {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
 DocType: Workstation Working Hour,End Time,שעת סיום
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,תנאי חוזה סטנדרטי למכירות או רכש.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,תרופות
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Gateway Account,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,Accepted,קיבלתי
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} לא יוגש
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,רשימת תפוצה עלון
 DocType: Delivery Note,Transporter Name,שם Transporter
 DocType: Authorization Rule,Authorized Value,ערך מורשה
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} סגור
 DocType: Email Digest,How frequently?,באיזו תדירות?
 DocType: Purchase Receipt,Get Current Stock,קבל מלאי נוכחי
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",עבור אל הקבוצה המתאימה (בדרך כלל יישום של קרנות&gt; נכסים שוטפים&gt; חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף Child) מסוג &quot;בנק&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,עץ של הצעת החוק של חומרים
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,מארק הווה
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,מטרה
+DocType: Company,Fixed Asset Depreciation Settings,הגדרות פחת רכוש קבוע
 DocType: Item,Will also apply for variants unless overrridden,תחול גם לגרסות אלא אם overrridden
 DocType: Purchase Invoice,Advances,התקדמות
 DocType: Production Order,Manufacture against Material Request,ייצור נגד בקשת חומר
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,יש ילד צומת
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,כמות Recd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
+DocType: Asset Category Account,Asset Category Account,חשבון קטגורית נכסים
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","למשל בנק, מזומן, כרטיס אשראי"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",עבור אל הקבוצה המתאימה (בדרך כלל יישום של קרנות&gt; נכסים שוטפים&gt; חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף Child) מסוג &quot;בנק&quot;
 DocType: Journal Entry,Credit Note,כְּתַב זְכוּיוֹת
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},כמות שהושלמה לא יכולה להיות יותר מ {0} לפעולת {1}
 DocType: Features Setup,Quality,איכות
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,הכתובות שלי
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,אדון סניף ארגון.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,מחיר מחירון קניית ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,אף עובדים לקריטריונים לעיל נבחרים או תלוש משכורת כבר נוצר
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 apps/erpnext/erpnext/config/hr.py +93,Payroll,גִלְיוֹן שָׂכָר
 apps/erpnext/erpnext/accounts/doctype/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} חייבים להיות כלולות גם"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,פריטים קבלת רכישה
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,טפסי התאמה אישית
 DocType: Account,Income Account,חשבון הכנסות
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,אין תבנית כתובת ברירת מחדל נמצאת. אנא צור חשבון חדש מההגדרה&gt; הדפסה ומיתוג&gt; תבנית כתובת.
 DocType: Payment Request,Amount in customer's currency,הסכום במטבע של הלקוח
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,פינת אחריות מפתח
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,שם מרכז העלות חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,שם מרכז העלות חדש
 DocType: Leave Control Panel,Leave Control Panel,השאר לוח הבקרה
 DocType: Appraisal,HR User,משתמש HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,מסים והיטלים שנוכה
-apps/erpnext/erpnext/config/support.py +7,Issues,נושאים
+apps/erpnext/erpnext/hooks.py +90,Issues,נושאים
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},מצב חייב להיות אחד {0}
 DocType: Sales Invoice,Debit To,חיוב ל
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} מושבתת
 DocType: Supplier,Billing Currency,מטבע חיוב
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,גדול במיוחד
 ,Profit and Loss Statement,דוח רווח והפסד
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
 DocType: Production Order Operation,Planned Start Time,מתוכנן זמן התחלה
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ציין שער חליפין להמיר מטבע אחד לעוד
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,ציטוט {0} יבוטל
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,סכום חוב סך הכל
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","מבצע {0} יותר מכל שעות עבודה זמינות בתחנת העבודה {1}, לשבור את הפעולה לפעולות מרובות"
 ,Requested,ביקשתי
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,אין הערות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,מכירות ורכש
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי
 DocType: Supplier Quotation Item,Material Request No,בקשת חומר לא
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,קצב שבו לקוחות של מטבע מומר למטבע הבסיס של החברה
@@ -2119,7 +2174,7 @@
 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 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 DocType: Payment Request,Recipient and Message,נמען ומסר
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 DocType: Payment Request,Mute Email,דוא&quot;ל השתקה
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,בקשה לציטוט.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,מטבע מחירון לא נבחר
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,תאריך התחלת פרויקט
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,נגד מסמך לא
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,ניהול שותפי מכירות.
 DocType: Quality Inspection,Inspection Type,סוג הפיקוח
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},אנא בחר {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},אנא בחר {0}
 DocType: C-Form,C-Form No,C-טופס לא
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,נוכחות לא מסומנת
@@ -2183,6 +2239,7 @@
 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,פרסומת
+DocType: Asset Category Account,Depreciation Expense Account,חשבון הוצאות פחת
 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,מאשר חשבון
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,אישר
 DocType: Payment Gateway,Gateway,כְּנִיסָה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,נא להזין את הקלת מועד.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,מחסן מקובל
 DocType: Bank Reconciliation Detail,Posting Date,תאריך פרסום
 DocType: Item,Valuation Method,שיטת הערכת שווי
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},לא ניתן למצוא שער חליפין עבור {0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},לא ניתן למצוא שער חליפין עבור {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,יום חצי מארק
 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 +410,[Error],[שגיאה]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),עלים חדשים המוקצים (בימים)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,מספר סידורי {0} אינו קיימות
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ספק&gt; סוג ספק
 DocType: Sales Invoice Item,Customer Warehouse (Optional),גלריית לקוחות (אופציונלי)
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,בקשות חומר {0} נוצרו
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,בקשות חומר {0} נוצרו
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,תבנית של מונחים או חוזה.
 DocType: Purchase Invoice,Address and Contact,כתובת ולתקשר
 DocType: Supplier,Last Day of the Next Month,היום האחרון של החודש הבא
 DocType: Employee,Feedback,משוב
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+DocType: Asset Category Account,Accumulated Depreciation Account,חשבון פחת נצבר
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
+DocType: Asset,Expected Value After Useful Life,ערך צפוי אחרי חיים שימושיים
 DocType: Item,Reorder level based on Warehouse,רמת הזמנה חוזרת המבוסס על מחסן
 DocType: Activity Cost,Billing Rate,דרג חיוב
 ,Qty to Deliver,כמות לאספקה
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} יבוטל או סגור
 DocType: Delivery Note,Track this Delivery Note against any Project,עקוב אחר תעודת משלוח זה נגד כל פרויקט
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,מזומנים נטו מהשקעות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,חשבון שורש לא ניתן למחוק
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,נכסים {0} יש להגיש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,ניהול כתובות
-DocType: Pricing Rule,Item Code,קוד פריט
+DocType: Asset,Item Code,קוד פריט
 DocType: Production Planning Tool,Create Production Orders,צור הזמנות ייצור
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,צור בקשות חומר
 DocType: Employee Education,School/University,בית ספר / אוניברסיטה
 DocType: Payment Request,Reference Details,התייחסות פרטים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
 DocType: Sales Invoice Item,Available Qty at Warehouse,כמות זמינה במחסן
 ,Billed Amount,סכום חיוב
+DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,כדי סגור לא ניתן לבטל. חוסר קרבה לבטל.
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,קבל עדכונים
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
+DocType: Asset,Fully Depreciated,לגמרי מופחת
 ,Stock Projected Qty,המניה צפויה כמות
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML נוכחות ניכרת
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,אין ו אצווה סידורי
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ערך או כמות
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,דקות
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
 ,Qty to Receive,כמות לקבלת
 DocType: Leave Block List,Leave Block List Allowed,השאר בלוק רשימת מחמד
 DocType: Sales Partner,Retailer,הקמעונאית
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
 DocType: Global Defaults,Disable In Words,שבת במילות
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,בנק משייך יתר חשבון
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,קוד פריט&gt; קבוצת פריט&gt; מותג
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,הלוואות מובטחות
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},אנא להגדיר חשבונות הקשורים פחת קטגוריה Asset {0} או החברה {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,הון עצמי יתרה פתיחה
 DocType: Appraisal,Appraisal,הערכה
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},דוא&quot;ל נשלח אל ספק {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,התאריך חוזר על עצמו
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,מורשה חתימה
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},השאר מאשר חייב להיות האחד {0}
@@ -2344,7 +2410,7 @@
 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 +199,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,לבטל את המנוי לדוא&quot;ל זה תקציר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,הודעה נשלחה
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margin סה&quot;כ
 DocType: Supplier,Supplier Details,פרטי ספק
 DocType: Expense Claim,Approval Status,סטטוס אישור
 DocType: Hub Settings,Publish Items to Hub,לפרסם פריטים לHub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Payment Gateway Account,Default Payment Request Message,הודעת בקשת תשלום ברירת מחדל
 DocType: Item Group,Check this if you want to show in website,לבדוק את זה אם אתה רוצה להראות באתר
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,בנקאות תשלומים
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,בנקאות תשלומים
 ,Welcome to ERPNext,ברוכים הבאים לERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,מספר פרטי שובר
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,להוביל להצעת המחיר
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,עלים וחג
 DocType: Sales Order,Not Billed,לא חויב
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,לכלך לחיוב
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
+DocType: Company,Asset Depreciation Cost Center,מרכז עלות פחת נכסים
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
 DocType: Sales Invoice Item,Delivered Qty,כמות נמסרה
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,מחסן {0}: החברה היא חובה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,תאריך רכישת הנכס {0} אינו תואם עם תאריך חשבונית הרכישה
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,מחסן {0}: החברה היא חובה
 ,Payment Period Based On Invoice Date,תקופת תשלום מבוסס בתאריך החשבונית
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},שערי חליפין מטבע חסר עבור {0}
 DocType: Journal Entry,Stock Entry,פריט מלאי
 DocType: Account,Payable,משתלם
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),חייבים ({0})
-DocType: Project,Margin,Margin
+DocType: Pricing Rule,Margin,Margin
 DocType: Salary Slip,Arrear Amount,סכום חוֹב
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,לקוחות חדשים
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,% רווח גולמי
@@ -2435,20 +2504,23 @@
 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,בדוק אם ברצונך לשלוח תלוש משכורת בדואר לכל עובד בעת הגשת תלוש משכורת
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
 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 +57,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
 DocType: Stock Entry Detail,Source Warehouse,מחסן מקור
 DocType: Installation Note,Installation Date,התקנת תאריך
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
 DocType: Employee,Confirmation Date,תאריך אישור
 DocType: C-Form,Total Invoiced Amount,"סכום חשבונית סה""כ"
 DocType: Account,Sales User,משתמש מכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,דקות כמות לא יכולה להיות גדולה יותר מכמות מקס
+DocType: Account,Accumulated Depreciation,ירידת ערך מצטברת
 DocType: Stock Entry,Customer or Supplier Details,פרטי לקוח או ספק
 DocType: Payment Request,Email To,דוא&quot;ל ל
 DocType: Lead,Lead Owner,בעלי ליד
 DocType: Bin,Requested Quantity,כמות מבוקשת
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,המחסן נדרש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,המחסן נדרש
 DocType: Employee,Marital Status,מצב משפחתי
 DocType: Stock Settings,Auto Material Request,בקשת Auto חומר
 DocType: Time Log,Will be updated when billed.,יעודכן כאשר חיוב.
@@ -2456,11 +2528,12 @@
 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 +115,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 +84,{0}% Delivered,{0}% נמסר
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,אחוז בחתך חודשי
 DocType: Territory,Territory Targets,מטרות שטח
 DocType: Delivery Note,Transporter Info,Transporter מידע
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,ספק זהה הוזן מספר פעמים
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,לרכוש פריט להזמין מסופק
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,שם חברה לא יכול להיות חברה
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ראשי מכתב לתבניות הדפסה.
@@ -2470,13 +2543,14 @@
 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.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 DocType: Payment Request,Payment Details,פרטי תשלום
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
+DocType: Asset,Journal Entry for Scrap,תנועת יומן עבור גרוטאות
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","שיא של כל התקשורת של דואר אלקטרוני מסוג, טלפון, צ&#39;אט, ביקור, וכו &#39;"
 DocType: Manufacturer,Manufacturers used in Items,יצרנים השתמשו בפריטים
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,נא לציין מרכז העלות לעגל בחברה
 DocType: Purchase Invoice,Terms,תנאים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,צור חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,צור חדש
 DocType: Buying Settings,Purchase Order Required,הזמנת רכש דרוש
 ,Item-wise Sales History,היסטוריה מכירות פריט-חכמה
 DocType: Expense Claim,Total Sanctioned Amount,"הסכום אושר סה""כ"
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,יומן מלאי
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},שיעור: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ניכוי תלוש משכורת
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,בחר צומת קבוצה ראשונה.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,בחר צומת קבוצה ראשונה.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,עובד ונוכחות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},למטרה צריך להיות אחד {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","סר הפניה של לקוח, ספק, מכירות שותף ועופרת, כפי שהוא כתובת החברה שלך"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: החל מ- {1}
 DocType: Task,depends_on,תלוי ב
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,שם חשבון חדש. הערה: נא לא ליצור חשבונות ללקוחות וספקים
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,שם חשבון חדש. הערה: נא לא ליצור חשבונות ללקוחות וספקים
 DocType: BOM Replace Tool,BOM Replace Tool,BOM החלף כלי
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,תבניות כתובת ברירת מחדל חכם ארץ
 DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,התאריך הבא חייב להיות גדול מ תאריך פרסום
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,התפרקות מס הצג
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (טופס # / כתבה / {0}) אזל מהמלאי
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,התאריך הבא חייב להיות גדול מ תאריך פרסום
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/accounts/party.py +289,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',אם כרוך בפעילות ייצור. מאפשר פריט 'מיוצר'
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,תאריך פרסום חשבונית
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה צפויה של
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","הערה: אם תשלום לא נעשה נגד כל התייחסות, להפוך את תנועת היומן ידני."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,פרסם זמינים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,התיישנות מלאי
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
 DocType: Warranty Claim,Item and Warranty Details,פרטי פריט ואחריות
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,רכב
+DocType: Asset Category Account,Fixed Asset Account,חשבון רכוש קבוע
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Intern
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,מBOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,בסיסי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,לתאריך צריך להיות זהה מתאריך לחופשה חצי יום
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,שכר מבנה
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ציטוטים
 DocType: Hub Settings,Access Token,גישת אסימון
 DocType: Sales Invoice Item,Serial No,מספר סידורי
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
-DocType: Item,Is Fixed Asset Item,האם פריט רכוש קבוע
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
 DocType: Purchase Invoice,Print Language,שפת דפס
 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","אם יש לך פורמטי הדפסה ארוכים, תכונה זו יכולה לשמש כדי לפצל את הדף שיודפס על דפים רבים עם כל הכותרות העליונות והתחתונות בכל עמוד"
+DocType: Asset,Number of Depreciations,מספר הפחת
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 DocType: Fiscal Year,Year Name,שם שנה
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,בקשת ציטטות
 DocType: Payment Reconciliation,Maximum Invoice Amount,סכום חשבונית מרבי
 DocType: Purchase Invoice Item,Image View,צפה בתמונה
 apps/erpnext/erpnext/config/selling.py +23,Customers,לקוחות
+DocType: Asset,Partially Depreciated,חלקי מופחת
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,מנהל אחזקה
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,"סה""כ לא יכול להיות אפס"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,מספר הימים מההזמנה האחרונה 'חייב להיות גדול או שווה לאפס
-DocType: C-Form,Amended From,תוקן מ
+DocType: Asset,Amended From,תוקן מ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,לְהַעֲבִיר הָלְאָה
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,נא לציין &#39;החשבון רווח / הפסד בעת מימוש הנכסים בחברה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
 DocType: Journal Entry,Bank Entry,בנק כניסה
 DocType: Authorization Rule,Applicable To (Designation),כדי ישים (ייעוד)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,הוסף לסל
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,קבוצה על ידי
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 DocType: Production Planning Tool,Get Material Request,קבל בקשת חומר
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,הוצאות דואר
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,הוצאות דואר
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),"סה""כ (AMT)"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,"הווה סה""כ"
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,דוחות חשבונאות
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,דוחות חשבונאות
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,שעה
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
@@ -2687,15 +2766,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),התחל Point-of-מכירה (POS)
 apps/erpnext/erpnext/config/support.py +32,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,קבוצת לקוחות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: Item,Website Description,תיאור אתר
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,שינוי נטו בהון עצמי
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
@@ -2703,12 +2783,13 @@
 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,שם קבוצת הלקוחות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,נגד סוג השובר
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},שגיאה: {0}&gt; {1}
 DocType: Item,Attributes,תכונות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,קבל פריטים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,נא להזין לכתוב את החשבון
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,קבל פריטים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,נא להזין לכתוב את החשבון
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,התאריך אחרון סדר
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
 DocType: C-Form,C-Form,C-טופס
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Payment Tool,Make Journal Entry,הפוך יומן
 DocType: Leave Allocation,New Leaves Allocated,עלים חדשים שהוקצו
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,מסחרי
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},שגיאה: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,פריט הורה {0} לא חייב להיות פריט במלאי
 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 +52,All Products or Services.,כל המוצרים או שירותים.
 DocType: Supplier Quotation,Supplier Address,כתובת ספק
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
+apps/erpnext/erpnext/config/accounts.py +259,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,שירותים פיננסיים
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} במרווחים של {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
 DocType: Tax Rule,Billing State,מדינת חיוב
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,העברה
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,תאריך היעד הוא חובה
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,הערות
 DocType: Purchase Order Item Supplied,Raw Material Item Code,קוד פריט חומר הגלם
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
 DocType: Features Setup,POS View,POS צפה
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,שיא התקנה למס 'סידורי
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,אנא ציין
 DocType: Offer Letter,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,מעל
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,הזמן התחבר כבר מחויב
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,אנא להגדיר שמות סדרה עבור {0} באמצעות התקנה&gt; הגדרות&gt; סדרת Naming
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},אנא להגדיר את ערך ברירת מחדל {0} בחברת {1}
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,גיליון נוכחות חודשי
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,לא נמצא רשומה
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,בבקשה הגדירו מספור סדרה להגנת נוכחות באמצעות התקנה&gt; סדרה מספורה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+DocType: Asset,Straight Line,קו ישר
+DocType: Project User,Project User,משתמש פרויקט
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
 DocType: Sales Team,Contact No.,מס 'לתקשר
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
 DocType: Features Setup,Sales Discounts,מבצעים מכירות
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,מספר להזמין
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / אנר זה ייראה על החלק העליון של רשימת מוצרים.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ציין תנאים לחישוב סכום משלוח
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,הוסף לילדים
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,ערך פתיחה
 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,עמלה על מכירות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,עמלה על מכירות
 DocType: Offer Letter Term,Value / Description,ערך / תיאור
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 DocType: Tax Rule,Billing Country,ארץ חיוב
 ,Customers Not Buying Since Long Time,לקוחות לא קונים מאז הרבה זמן
 DocType: Production Order,Expected Delivery Date,תאריך אספקה צפוי
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,הוצאות בידור
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,הוצאות בידור
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,בקשות לחופשה.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,הוצאות משפטיות
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,הוצאות משפטיות
 DocType: Sales Invoice,Posting Time,זמן פרסום
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,הוצאות טלפון
 DocType: Sales Partner,Logo,לוגו
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,לבדוק את זה אם אתה רוצה להכריח את המשתמש לבחור סדרה לפני השמירה. לא יהיה ברירת מחדל אם תבדקו את זה.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},אין פריט עם מספר סידורי {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,הודעות פתוחות
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,הוצאות ישירות
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,הוצאות ישירות
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} היא כתובת דואר אלקטרוני לא חוקית &#39;כתובת דוא&quot;ל להודעות \&#39;
 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,הוצאות נסיעה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),סכום חיוב כולל (דרך זמן יומנים)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,אנחנו מוכרים פריט זה
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ספק זיהוי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
 DocType: Journal Entry,Cash Entry,כניסה במזומן
 DocType: Sales Partner,Contact Desc,לתקשר יורד
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","סוג של עלים כמו מזדמן, חולה וכו '"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,"עלות הפעלה סה""כ"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,כל אנשי הקשר.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,ספק של נכס {0} אינו תואם עם ספק חשבונית הרכישה
 DocType: Newsletter,Test Email Id,"דוא""ל מבחן זיהוי"
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,חומר גלם לא יכול להיות זהה לפריט עיקרי
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,אדון תבנית שכר.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,כתובת חיוב מועדפת
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,מטבע חיוב חייב להיות שווה המטבע של או comapany המחדל או מטבע חשבון payble של המפלגה
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,מזכיר
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","אם להשבית, &#39;במילים&#39; שדה לא יהיה גלוי בכל עסקה"
@@ -2902,13 +2989,13 @@
 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,צבירת השכר Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,נושים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,נושים
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,# השורה {0}: מספר סידורי הוא חובה
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,פריט Detail המס וייז
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,מליד
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Hub Settings,Name Token,שם אסימון
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,מכירה סטנדרטית
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
-DocType: Project,Project Name,שם פרויקט
+DocType: Request for Quotation 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,אצווה פריט מס '
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,תאריך סיום
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,והתאמות מלאות
 DocType: Employee,Internal Work History,היסטוריה עבודה פנימית
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,סכום פחת שנצבר
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,הון פרטי
 DocType: Maintenance Visit,Customer Feedback,לקוחות משוב
 DocType: Account,Expense,חשבון
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","החברה היא חובה, כפי שהוא כתובת החברה שלך"
 DocType: Item Attribute,From Range,מטווח
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,פריט {0} התעלם כן הוא לא פריט מניות
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,שלח הזמנת ייצור זה לעיבוד נוסף.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,שלח הזמנת ייצור זה לעיבוד נוסף.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
 DocType: Company,Domain,תחום
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,מקומות תעסוקה
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),להפחית צבירה לחופשה ללא תשלום (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,תאריך לידה
 DocType: Opportunity,Opportunity Date,תאריך הזדמנות
 DocType: Purchase Receipt,Return Against Purchase Receipt,חזור כנגד קבלת רכישה
+DocType: Request for Quotation Item,Request for Quotation Item,בקשה להצעת מחיר הפריט
 DocType: Purchase Order,To Bill,להצעת החוק
 DocType: Material Request,% Ordered,% מסודר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,פריט {0} הוא לא התקנה למס סידורי. טור חייב להיות ריק
 DocType: Accounts Settings,Accounts Settings,חשבונות הגדרות
 DocType: Customer,Sales Partner and Commission,פרטנר מכירות והוועדה
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},אנא הגדר &#39;חשבון סילוק נכסים&#39; ב חברת {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,חשבונות זמניים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,שחור
 DocType: BOM Explosion Item,BOM Explosion Item,פריט פיצוץ BOM
 DocType: Account,Auditor,מבקר
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,בטל
 DocType: Project Task,Pending Review,בהמתנה לבדיקה
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,לחץ כאן כדי לשלם
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","נכסים {0} לא יכול להיות לגרוטאות, כפי שהוא כבר {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),תביעה סה&quot;כ הוצאות (באמצעות תביעת הוצאות)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,זהות לקוח
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,מארק בהעדר
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,לזמן חייב להיות גדול מ מהזמן
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,הוספת פריטים מ
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,הוספת פריטים מ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,משימת זיהוי
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","לדוגמא: ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,המניה לא יכול להתקיים לפריט {0} שכן יש גרסאות
 ,Sales Person-wise Transaction Summary,סיכום עסקת איש מכירות-חכם
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,מחסן {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,הפריט שנבחר לא יכול להיות אצווה
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,ניהול איכות
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,פריט {0} הושבה
 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,העובד חיצוני היסטוריה עבודה
@@ -3068,7 +3160,7 @@
 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,לתקשר הבא
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,חשבונות Gateway התקנה.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,חשבונות Gateway התקנה.
 DocType: Employee,Employment Type,סוג התעסוקה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,רכוש קבוע
 ,Cash Flow,תזרים מזומנים
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,מאזן חשבון בנק בהתאם לכללי לדג&#39;ר
 DocType: Job Applicant,Applicant Name,שם מבקש
 DocType: Authorization Rule,Customer / Item Name,לקוחות / שם פריט
@@ -3098,19 +3190,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,לקוחות&gt; קבוצת לקוח&gt; טריטוריה
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,הגדרות ברירת מחדל עבור עסקות מכירה.
 DocType: BOM Replace Tool,Current BOM,BOM הנוכחי
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,להוסיף מספר סידורי
 apps/erpnext/erpnext/config/support.py +43,Warranty,אַחֲרָיוּת
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,הדפסה ונייחת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,צומת קבוצה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,מוצרים מוגמרים עדכון
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,מוצרים מוגמרים עדכון
 DocType: Workstation,per hour,לשעה
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,רכש
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,חשבון למחסן (מלאי תמידי) ייווצר תחת חשבון זה.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,הסכום ששולם
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
 DocType: Leave Block List,Applies to Company,חל על חברה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
 DocType: Purchase Invoice,In Words,במילים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
 DocType: Production Planning Tool,Material Request For Warehouse,בקשת חומר למחסן
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
+DocType: Pricing Rule,Margin Rate or Amount,שיעור או סכום שולי
 apps/erpnext/erpnext/stock/report/batch_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,פריט להזמין מכירות
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} כבר קיבל
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},לא חוקי {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,אנא להגדיר שמות סדרה עבור {0} באמצעות התקנה&gt; הגדרות&gt; סדרת Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,שמור את המסמך ראשון.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
 DocType: Company,Change Abbreviation,קיצור שינוי
 DocType: Expense Claim Detail,Expense Date,תאריך הוצאה
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,בכלל לדג'ר
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,צפייה בלידים
 DocType: Item Attribute Value,Attribute Value,תכונה ערך
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","id דוא""ל חייב להיות ייחודי, כבר קיים עבור {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","id דוא""ל חייב להיות ייחודי, כבר קיים עבור {0}"
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,אנא בחר {0} ראשון
 DocType: Features Setup,To get Item Group in details table,כדי לקבל קבוצת פריט בטבלת פרטים
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {0}
 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>
@@ -3226,23 +3319,23 @@
 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,מעקב מלאי חכם פרויקט
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},לוח זמנים תחזוקה {0} קיים נגד {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},לוח זמנים תחזוקה {0} קיים נגד {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),כמות בפועל (במקור / יעד)
 DocType: Item Customer Detail,Ref Code,"נ""צ קוד"
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,רשומות עובדים.
 DocType: Payment Gateway,Payment Gateway,תשלום Gateway
 DocType: HR Settings,Payroll Settings,הגדרות שכר
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,להזמין מקום
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,שורש לא יכול להיות מרכז עלות הורה
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,מותג בחר ...
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,המחסן הוא חובה
 DocType: Supplier,Address and Contacts,כתובת ומגעים
 DocType: UOM Conversion Detail,UOM Conversion Detail,פרט של אוני 'מישגן ההמרה
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,נפתר על ידי
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,עסקת מטבע חייב להיות זהה לתשלום במטבע Gateway
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,קבל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% הושלם
 DocType: Employee,Educational Qualification,הכשרה חינוכית
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,שלח על יצירה
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 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 +137,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,ההזמנות שלי
@@ -3296,10 +3389,10 @@
 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 +250,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
+apps/erpnext/erpnext/config/accounts.py +258,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} כבר מחויב
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,"הלוואות בחו""ל"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,"הלוואות בחו""ל"
 DocType: Cost Center,Cost Center Name,שם מרכז עלות
 DocType: Maintenance Schedule Detail,Scheduled Date,תאריך מתוכנן
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,"Amt שילם סה""כ"
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. בבקשה לעשות את מעמדה 'לא פעיל' כדי להמשיך.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,אין ספק חלק
 DocType: Purchase Invoice,Contact,צור קשר עם
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,התקבל מ
 DocType: Features Setup,Exports,יצוא
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,מועד ההנפקה
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Payment Reconciliation,From Invoice Date,מתאריך החשבונית
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,חשבון ראש
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז להזמין אחרון
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,נכסים במלאי
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,צור תלושי שכר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","קנייה יש לבדוק, אם לישים שנבחרה הוא {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,חזור על פעולה ביום בחודש
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,תאריך התחלת שנה או תאריך סיום חופף עם {0}. כדי למנוע נא לקבוע חברה
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ניו עלון
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","לדוגמא:. ABCD ##### אם הסדרה מוגדרת ומספר סידורי אינו מוזכר בעסקות, מספר סידורי ולאחר מכן אוטומטי ייווצר מבוסס על סדרה זו. אם אתה תמיד רוצה להזכיר במפורש מס 'סידורי לפריט זה. להשאיר ריק זה."
 DocType: Upload Attendance,Upload Attendance,נוכחות העלאה
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Analytics מכירות
 DocType: Manufacturing Settings,Manufacturing Settings,הגדרות ייצור
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,הגדרת דוא&quot;ל
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,נא להזין את ברירת מחדל של המטבע בחברה Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,נא להזין את ברירת מחדל של המטבע בחברה 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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ניגודים כלל מס עם {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,שם חשבון חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,שירות לקוחות
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,מועמד הצעת עבודה.
 DocType: Notification Control,Prompt for Email on Submission of,"הנחיה לדוא""ל על הגשת"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,עלים שהוקצו סה&quot;כ יותר מ ימים בתקופה
+DocType: Pricing Rule,Percentage,אֲחוּזִים
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,פריט {0} חייב להיות פריט מניות
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,עבודה המוגדרת כברירת מחדל במחסן ההתקדמות
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,הגדרות ברירת מחדל עבור עסקות חשבונאיות.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,הגדרות ברירת מחדל עבור עסקות חשבונאיות.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,פריט {0} חייב להיות פריט מכירות
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,פריט {0} חייב להיות פריט מכירות
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
 DocType: Account,Equity,הון עצמי
 DocType: Sales Order,Printing Details,הדפסת פרטים
@@ -3431,11 +3527,12 @@
 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,הרכבות תת חיפוש
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,נגד חשבון הוצאות
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",עבור אל הקבוצה המתאימה (בדרך כלל מקור הכספים&gt; התחייבויות שוטפות&gt; מסים וליצור חשבון חדש (על ידי לחיצה על הוסף Child) מסוג &quot;מס&quot; ולעשות להזכיר את שיעור המס.
 DocType: Production Order,Production Order,הזמנת ייצור
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
 DocType: Quotation Item,Against Docname,נגד Docname
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
 DocType: Issue,First Responded On,הגיב בראשון
 DocType: Website Item Group,Cross Listing of Item in multiple groups,רישום צלב של פריט בקבוצות מרובות
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},שנת כספי תאריך ההתחלה ותאריך סיום שנת כספים כבר נקבעו בשנת הכספים {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,מפוייס בהצלחה
 DocType: Production Order,Planned End Date,תאריך סיום מתוכנן
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,איפה פריטים מאוחסנים.
 DocType: Tax Rule,Validity,תוקף
+DocType: Request for Quotation,Supplier Detail,פרטי ספק
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,סכום חשבונית
 DocType: Attendance,Attendance,נוכחות
 apps/erpnext/erpnext/config/projects.py +55,Reports,דיווחים
 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 +508,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,תבנית מס בעסקות קנייה.
 ,Item Prices,מחירי פריט
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
 DocType: Period Closing Voucher,Period Closing Voucher,שובר סגירת תקופה
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,בסך הכל נטו
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,שינוי
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
+DocType: Asset Category,Asset Category Name,שם קטגוריה נכסים
 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,משקלים של אוני 'מישגן
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"קטגוריה מס לא יכולה להיות ""הערכה"" או ""הערכה וסה""כ 'ככל הפריטים הם פריטים שאינם במלאי"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,אצווה
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,איש מכירות
 DocType: Sales Invoice,Cold Calling,קורא קר
 DocType: SMS Parameter,SMS Parameter,פרמטר SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,תקציב מרכז עלות
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,תקציב מרכז עלות
 DocType: Maintenance Schedule Item,Half Yearly,חצי שנתי
 DocType: Lead,Blog Subscriber,Subscriber בלוג
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,רכישה משותפת
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,הצעת מחיר הספק {0} נוצר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,קוד פריט&gt; קבוצת פריט&gt; מותג
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,חשבון הורה
@@ -3574,7 +3673,7 @@
 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 +219,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 DocType: Address,Office,משרד
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,מלאי אצווה
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Sales Order,Track this Sales Order against any Project,עקוב אחר הזמנת מכירות זה נגד כל פרויקט
+DocType: Sales Invoice Item,Discount and Margin,דיסקונט שולי
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,הזמנות משיכה (תלויות ועומדות כדי לספק) המבוסס על הקריטריונים לעיל
 DocType: Deduction Type,Deduction Type,סוג הניכוי
 DocType: Attendance,Half Day,חצי יום
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,חודשי שכר הרשמה
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
@@ -3617,22 +3717,23 @@
 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,פרופיל קופה
 DocType: Payment Gateway Account,Payment URL Message,מסר URL תשלום
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,השורה {0}: סכום תשלום לא יכול להיות גדולה מסכום חוב
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,סה&quot;כ שלא שולם
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,זמן יומן הוא לא לחיוב
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
+DocType: Asset,Asset Category,קטגורית נכסים
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,נא להזין את השוברים נגד ידני
 DocType: SMS Settings,Static Parameters,פרמטרים סטטיים
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,חומר לספקים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,בלו חשבונית
 DocType: Expense Claim,Employees Email Id,"דוא""ל עובדי זיהוי"
 DocType: Employee Attendance Tool,Marked Attendance,נוכחות בולטת
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,התחייבויות שוטפות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,התחייבויות שוטפות
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,הכמות בפועל היא חובה
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,ערכים מספריים
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,אין תבנית כתובת ברירת מחדל נמצאת. אנא צור חשבון חדש מההגדרה&gt; הדפסה ומיתוג&gt; תבנית כתובת.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,מלאי הון
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,מלאי הון
 DocType: Packing Slip,Package Weight Details,חבילת משקל פרטים
 DocType: Payment Gateway Account,Payment Gateway Account,חשבון תשלום Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,לאחר השלמת התשלום להפנות המשתמש לדף הנבחר.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
+DocType: Asset,Current Value (After Depreciation),ערך נוכחי (לאחר פחת)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,הצעת חוק של חומרים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,תאריך אסמכתא
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,חשבון {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: Account,Cash,מזומנים
 DocType: Employee,Short biography for website and other publications.,ביוגרפיה קצרות באתר האינטרנט של ופרסומים אחרים.
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 3afd1ed..151d7ee 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,व्यापारी
 DocType: Employee,Rented,किराये पर
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,आप वास्तव में इस संपत्ति स्क्रैप करना चाहते हैं?
 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.,* लेनदेन में गणना की जाएगी.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ट्री
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,खुले शो
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,नई छुट्टी के लिए अर्जी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,दिखाएँ वेरिएंट
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,मात्रा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ऋण (देनदारियों)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक में
 DocType: Designation,Designation,पदनाम
@@ -64,7 +66,7 @@
 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 +642,Invoice,बीजक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},नई {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},नई {0}: # {1}
 ,Sales Partners Commission,बिक्री पार्टनर्स आयोग
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,संक्षिप्त 5 से अधिक वर्ण की नहीं हो सकती
 DocType: Payment Request,Payment Request,भुगतान अनुरोध
@@ -102,7 +104,7 @@
 DocType: Employee,Married,विवाहित
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,से आइटम प्राप्त
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,योजनापूर्ण
 DocType: BOM,Total Cost,कुल लागत
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,गतिविधि प्रवेश करें :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
+DocType: Item,Is Fixed Asset,निश्चित परिसंपत्ति है
 DocType: Expense Claim Detail,Claim Amount,दावे की राशि
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
@@ -156,7 +159,8 @@
 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,शेयर व्यय
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} जमे हुए है
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,शेयर व्यय
 DocType: Newsletter,Email Sent?,ईमेल भेजा है?
 DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
 DocType: Production Order Operation,Show Time Logs,शो टाइम लॉग्स
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,आइटम {0} एक क्रय मद होना चाहिए
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: BOM Replace Tool,New BOM,नई बीओएम
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,कंपनी दाखिल करें
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,फाइनेंसिंग से नेट नकद
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
 DocType: Newsletter List,Total Subscribers,कुल ग्राहकों
 ,Contact Name,संपर्क का नाम
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 DocType: Payment Tool,Reference No,संदर्भ संक्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,बैंक प्रविष्टियां
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,अधिसूचना नियंत्रण
 DocType: Lead,Suggestions,सुझाव
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,इस क्षेत्र पर आइटम ग्रुप - वाईस बजट निर्धारित करें. तुम भी वितरण की स्थापना द्वारा मौसमी शामिल कर सकते हैं.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},गोदाम के लिए माता पिता के खाते समूह दर्ज करें {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},गोदाम के लिए माता पिता के खाते समूह दर्ज करें {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
 DocType: Supplier,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,अधिकतम 5 अक्षर
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 apps/erpnext/erpnext/config/desktop.py +83,Learn,सीखना
+DocType: Asset,Next Depreciation Date,अगली तिथि मूल्यह्रास
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},आपूर्तिकर्ता चालान नहीं खरीद चालान में मौजूद है {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,बिक्री व्यक्ति पेड़ की व्यवस्था करें.
 DocType: Job Applicant,Cover Letter,कवर लेटर
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,बकाया चेक्स और स्पष्ट करने जमाओं
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] की इकाइयों (# प्रपत्र / मद / {1}) [{2}] में पाया (# प्रपत्र / गोदाम / {2})
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,नौकरी प्रोफाइल
 DocType: 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,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,बिलटी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,बिलटी
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,माह और वर्ष का चयन करें
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,माना कुल ऑर्डर
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},धारावाहिक नहीं {0} डिलिवरी नोट से संबंधित नहीं है {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आइटम गुणवत्ता निरीक्षण पैरामीटर
 DocType: Leave Application,Leave Approver Name,अनुमोदनकर्ता छोड़ दो नाम
-,Schedule Date,नियत तिथि
+DocType: Depreciation Schedule,Schedule Date,नियत तिथि
 DocType: Packed Item,Packed Item,डिलिवरी नोट पैकिंग आइटम
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,लेनदेन खरीदने के लिए डिफ़ॉल्ट सेटिंग्स .
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,लेनदेन खरीदने के लिए डिफ़ॉल्ट सेटिंग्स .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},गतिविधि लागत गतिविधि प्रकार के खिलाफ कर्मचारी {0} के लिए मौजूद है - {1}
 apps/erpnext/erpnext/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,मुद्रा विनिमय
@@ -348,6 +355,7 @@
 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;
+DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
 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.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
-DocType: Material Request Item,Required Date,आवश्यक तिथि
+DocType: Request for Quotation Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,प्रदायक के लिए संदेश
 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,अवैतनिक
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 ,Serial No Warranty Expiry,धारावाहिक नहीं वारंटी समाप्ति
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,प्रबंध उप
+DocType: Project,Project will be accessible on the website to these users,परियोजना इन उपयोगकर्ताओं के लिए वेबसाइट पर सुलभ हो जाएगा
 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 +53,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,आइटम {0} आइटम खरीद नहीं है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,आइटम {0} आइटम खरीद नहीं है
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,विचाराधीन मात्रा
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
 DocType: Pricing Rule,Valid From,चुन
 DocType: Sales Invoice,Total Commission,कुल आयोग
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
@@ -471,13 +481,13 @@
 , इस वितरण का उपयोग कर एक बजट वितरित ** लागत केंद्र में ** इस ** मासिक वितरण सेट करने के लिए **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,वित्तीय / लेखा वर्ष .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,संचित मान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,वित्तीय वर्ष प्रारंभ तिथि वित्तीय वर्ष के अंत तिथि से बड़ा नहीं होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,वित्तीय वर्ष प्रारंभ तिथि वित्तीय वर्ष के अंत तिथि से बड़ा नहीं होना चाहिए
 DocType: Warranty Claim,Resolution,संकल्प
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},वितरित: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,देय खाता
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,जीवनवृत्त संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,बिक्री लौटें
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,वेतन घटकों.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभावित ग्राहकों के लिए धन्यवाद.
@@ -494,7 +504,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,स्नातकोत्तर
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,अद्यतन बैंक लेनदेन की तिथियां
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,अद्यतन बैंक लेनदेन की तिथियां
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक स्टॉक त्रुटि ( {6} ) मद के लिए {0} गोदाम में {1} को {2} {3} में {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,समय ट्रैकिंग
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
@@ -522,27 +532,27 @@
 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,डिफ़ॉल्ट लागत दर
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,रखरखाव अनुसूची
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,रखरखाव अनुसूची
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","तो मूल्य निर्धारण नियमों ग्राहकों के आधार पर बाहर छान रहे हैं, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक प्रकार, अभियान, बिक्री साथी आदि"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,सूची में शुद्ध परिवर्तन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,बिक्री व्यक्ति लक्ष्य
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,या तो कर्मचारी या कंपनी के लिए एक छुट्टी सूची सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
+DocType: Depreciation Schedule,Depreciation Amount,मूल्यह्रास राशि
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,निश्चित दिन
 DocType: Quotation Item,Item Balance,मद शेष
 DocType: Sales Invoice,Packing List,सूची पैकिंग
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,खरीद आपूर्तिकर्ताओं के लिए दिए गए आदेश.
+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,प्रयुक्त
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,संचालन समय
 DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,समूह के लिए समूह
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,मेरा परियोजनाओं
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
 DocType: Journal Entry,Bill No,विधेयक नहीं
+DocType: Company,Gain/Loss Account on Asset Disposal,एसेट निपटान पर लाभ / हानि खाता
 DocType: Purchase Invoice,Quarterly,त्रैमासिक
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
 DocType: Sales Order Item,Basic Rate (Company Currency),बेसिक रेट (कंपनी मुद्रा)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} मद से जुड़ा हुआ नहीं है {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,इस साल कुल बिलिंग
 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 +529,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,पेड़ के प्रकार
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
 DocType: Mode of Payment Account,Default Account,डिफ़ॉल्ट खाता
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
 ,Sales Person Target Variance Item Group-Wise,बिक्री व्यक्ति लक्ष्य विचरण मद समूहवार
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक वेतन बयान.
 DocType: Item Group,Website Specifications,वेबसाइट निर्दिष्टीकरण
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},अपनी पता टेम्पलेट में कोई त्रुटि है {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,नया खाता
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,नया खाता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा संघर्ष का समाधान करें। मूल्य नियम: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा संघर्ष का समाधान करें। मूल्य नियम: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
 DocType: Opportunity,Maintenance,रखरखाव
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रविष्टि {0} यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए अगर {1}, जाँच के आदेश के खिलाफ जुड़ा हुआ है।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,कार्यालय रखरखाव का खर्च
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
 DocType: Company,Default Cost of Goods Sold Account,माल बेच खाते की डिफ़ॉल्ट लागत
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,मूल्य सूची चयनित नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Process Payroll,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,मेरा चालान
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,मेरा चालान
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नहीं मिला कर्मचारी
 DocType: Supplier Quotation,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Csv के माध्यम से शेयर संतुलन अपलोड करें.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,अब भेजें
 ,Support Analytics,समर्थन विश्लेषिकी
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,तार्किक त्रुटि: ओवरलैपिंग लगाना होगा
 DocType: Item,Website Warehouse,वेबसाइट वेअरहाउस
 DocType: Payment Reconciliation,Minimum Invoice Amount,न्यूनतम चालान राशि
 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 +267,C-Form records,सी फार्म रिकॉर्ड
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,सी फार्म रिकॉर्ड
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ग्राहक और आपूर्तिकर्ता
 DocType: Email Digest,Email Digest Settings,ईमेल डाइजेस्ट सेटिंग
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ग्राहकों से प्रश्नों का समर्थन करें.
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,व्यय
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,क्या subcontracted
 DocType: Item Attribute,Item Attribute Values,आइटम विशेषता मान
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,देखें सदस्य
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,रसीद खरीद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
 DocType: Employee,Ms,सुश्री
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+DocType: Journal Entry,Depreciation Entry,मूल्यह्रास एंट्री
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,गाड़ी पर जाना
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,स्थायी पता है
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन कितने तैयार माल के लिए पूरा?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ब्रांड
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
 DocType: Employee,Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें
 DocType: Item,Is Purchase Item,खरीद आइटम है
-DocType: Journal Entry Account,Purchase Invoice,चालान खरीद
+DocType: Asset,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,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
@@ -808,21 +825,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; आइटम के लिए सभी मदों की पैकिंग के लिए ही कर रहे हैं, तो उन मूल्यों को मुख्य मद तालिका में दर्ज किया जा सकता है, मूल्यों की मेज &#39;पैकिंग सूची&#39; में कॉपी किया जाएगा।"
 DocType: Job Opening,Publish on website,वेबसाइट पर प्रकाशित करें
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ग्राहकों के लिए लदान.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,आपूर्तिकर्ता चालान दिनांक पोस्ट दिनांक से बड़ा नहीं हो सकता है
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष आय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त छूट प्रतिशत
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","पंक्ति {0}: चालान {1} अमान्य है, इसे रद्द कर दिया जा सकता है / मौजूद नहीं है। \ एक वैध चालान दर्ज करें"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
 ,Employee Holiday Attendance,कर्मचारी छुट्टी उपस्थिति
 DocType: Opportunity,Walk In,में चलो
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,स्टॉक प्रविष्टियां
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,स्टॉक प्रविष्टियां
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,तबादला
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,मेक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,मेरी गाड़ी
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
 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 +180,Qty for {0},के लिए मात्रा {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
+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 +80,Leave Allocation Tool,आबंटन उपकरण छोड़ दो
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक सूची तिथियां छोड़ो
@@ -861,7 +882,7 @@
 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 +547,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,छूट
@@ -876,20 +897,21 @@
 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 +69,Selling Amount,बेच राशि
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,टाइम लॉग्स
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,टाइम लॉग्स
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
 DocType: Issue,Issue,मुद्दा
+DocType: Asset,Scrapped,खत्म कर दिया
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,खाते कंपनी के साथ मेल नहीं खाता
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,भरती
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,बिक्री व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,बिक्री व्यय
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
@@ -906,7 +928,7 @@
 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.,कंपनी 1 नाम का चयन करें.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,डा
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
+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,औसत आयु
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,डिफ़ॉल्ट मुद्रा
 DocType: Contact,Enter designation of this Contact,इस संपर्क के पद पर नियुक्ति दर्ज करें
 DocType: Expense Claim,From Employee,कर्मचारी से
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,परफ़ॉर्मेंस क्षेत्र
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,अंशदान%
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,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,वैश्विक मूलभूत
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
 DocType: Salary Slip,Deductions,कटौती
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,इस बार प्रवेश बैच बिल भेजा गया है.
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,क्षमता योजना में त्रुटि
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,क्षमता योजना में त्रुटि
 ,Trial Balance for Party,पार्टी के लिए परीक्षण शेष
 DocType: Lead,Consultant,सलाहकार
 DocType: Salary Slip,Earnings,कमाई
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,खुलने का लेखा बैलेंस
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,प्रबंधन
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,गतिविधियों के समय पत्रक के लिए प्रकार
@@ -958,18 +981,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,ईमेल आईडी सेट करें
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ईमेल आईडी सेट करें
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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},पीओएस प्रोफ़ाइल {0} पहले से ही उपयोगकर्ता के लिए बनाया: {1} और कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,प्रदायक डेटाबेस.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,प्रदायक डेटाबेस.
 DocType: Account,Balance Sheet,बैलेंस शीट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,टैक्स और अन्य वेतन कटौती.
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,छुट्टी
 DocType: Leave Control Panel,Leave blank if considered for all branches,रिक्त छोड़ अगर सभी शाखाओं के लिए माना जाता है
 ,Daily Time Log Summary,दैनिक समय प्रवेश सारांश
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},सी-फार्म के चालान के लिए लागू नहीं है: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled भुगतान विवरण
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
@@ -996,19 +1020,20 @@
 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,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
 DocType: Contact,User ID,प्रयोक्ता आईडी
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,देखें खाता बही
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,देखें खाता बही
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,सूद अदा किया
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,प्रतिधारित कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,प्रतिधारित कमाई
 DocType: BOM Item,Item Description,आइटम विवरण
 DocType: Payment Tool,Payment Mode,भुगतान का प्रकार
 DocType: Purchase Invoice,Is Recurring,आवर्ती है
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,अस्थाई उद्घाटन
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},मूल्यांकन दर पंक्ति में आइटम के लिए आवश्यक {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,लेखा देय सारांश
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 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 +165,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,छोटा
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,लेखाशीर्ष {0} बनाया
 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,कुल प्राप्त
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 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,वेयरहाउस संपर्क जानकारी
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
 DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
 apps/erpnext/erpnext/controllers/selling_controller.py +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},उत्पादन का आदेश स्थिति है {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},किसी भी आइटम बुलाया नहीं मिला {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,कुल निवर्तमान
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","केवल "" मूल्य "" के लिए 0 या रिक्त मान के साथ एक शिपिंग शासन की स्थिति नहीं हो सकता"
 DocType: Authorization Rule,Transaction,लेन - देन
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,वेबसाइट आइटम समूह
 DocType: Purchase Invoice,Total (Company Currency),कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,सीरियल नंबर {0} एक बार से अधिक दर्ज किया
-DocType: Journal Entry,Journal Entry,जर्नल प्रविष्टि
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
 DocType: Naming Series,This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
@@ -1095,6 +1121,7 @@
 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,वर्कस्टेशन
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,कोटेशन प्रदायक के लिए अनुरोध
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेयर
 DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन टेम्पलेट लक्ष्य
 DocType: Salary Slip,Earning,कमाई
 DocType: Payment Tool,Party Account Currency,पार्टी खाता मुद्रा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},वर्तमान मूल्य अवमूल्यन के बाद के बराबर की तुलना में कम होना चाहिए {0}
 ,BOM Browser,बीओएम ब्राउज़र
 DocType: Purchase Taxes and Charges,Add or Deduct,जोड़ें या घटा
 DocType: Company,If Yearly Budget Exceeded (for expense account),"वार्षिक बजट (व्यय खाते के लिए) से अधिक है, तो"
@@ -1119,21 +1147,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
 DocType: Project,Start and End Dates,आरंभ और अंत तारीखें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,सुविधाएँ सेटअप
+DocType: Asset,Depreciation Schedules,मूल्यह्रास कार्यक्रम
 DocType: Item,Is Service Item,सेवा आइटम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
 DocType: Payment Request,Transaction Currency,कारोबारी मुद्रा
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},से {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},से {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ऑपरेशन विवरण
 DocType: Item,Will also apply to variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष सहेजा जाता है एक बार वित्तीय वर्ष के अंत तिथि नहीं बदल सकते.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,अभियान
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},मैक्स: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,कंपनी के लिए
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संचार लॉग इन करें.
@@ -1156,8 +1185,8 @@
 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 +472,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
 DocType: Rename Tool,Type of document to rename.,नाम बदलने के लिए दस्तावेज का प्रकार.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,हम इस मद से खरीदें
 DocType: Address,Billing,बिलिंग
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,रीडिंग
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,उप असेंबलियों
+DocType: Asset,Asset Name,एसेट का नाम
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Supplier,Stock Manager,शेयर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,पर्ची पैकिंग
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय का किराया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,उद्धरण के लिए अनुरोध के बाद लिंक पर क्लिक करके उपयोग किया जा सकता
+DocType: Asset,Number of Months in a Period,महीनों की संख्या अवधि में
 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,कार्य केंद्र घंटे काम
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),कुल ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),कुल ({0})
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
 DocType: Sales Invoice,Source,स्रोत
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,दिखाएँ बंद
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
 DocType: Employee External Work History,Total Experience,कुल अनुभव
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,निवेश से कैश फ्लो
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 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 +86,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} नहीं मिला, लेखा प्रविष्टि (व्यय) बुक करने के लिए आवश्यक है। एक खरीद मूल्य सूची के खिलाफ मद कीमत का उल्लेख करें।"
@@ -1236,7 +1269,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 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.,खातों का चार्ट से नया खाता बनाने के लिए धन्यवाद.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,रखरखाव भेंट
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,रखरखाव भेंट
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,गोदाम में उपलब्ध बैच मात्रा
 DocType: Time Log Batch Detail,Time Log Batch Detail,समय प्रवेश बैच विस्तार
 DocType: Landed Cost Voucher,Landed Cost Help,उतरा लागत सहायता
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,ब्रांड गुरु.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,डिब्बा
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +131,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,शेयर देयताएं
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,शेयर देयताएं
 DocType: Purchase Receipt,Supplier Warehouse,प्रदायक वेअरहाउस
 DocType: Opportunity,Contact Mobile No,मोबाइल संपर्क नहीं
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भुगतान ईमेल पुन: भेजें
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,अन्य रिपोर्टें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,बंद करो जन्मदिन अनुस्मारक
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} देखें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,पिछले वित्त वर्ष बंद नहीं है
 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 +40,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 +38,Supplier Type master.,प्रदायक प्रकार मास्टर .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
 DocType: Purchase Invoice,Reference Document,संदर्भ दस्तावेज़
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,देय खातों में शुद्ध परिवर्तन
 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',' Customerwise डिस्काउंट ' के लिए आवश्यक ग्राहक
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
 DocType: Quotation,Term Details,अवधि विवरण
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 से अधिक होना चाहिए
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिन) के लिए क्षमता योजना
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,वारंटी का दावा
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,स्थायी पता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",महायोग से \ {0} {1} अधिक से अधिक नहीं हो सकता है के खिलाफ अग्रिम भुगतान कर दिया {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,आइटम कोड का चयन करें
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,आइटम कोड का चयन करें
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),बिना वेतन छुट्टी के लिए कटौती में कमी (LWP)
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
 DocType: Packed Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
@@ -1367,15 +1401,15 @@
 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,विपणन व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,एक आइटम के एकल इकाई.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',समय लॉग बैच {0} ' प्रस्तुत ' होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,आइटम के लिहाज से बिक्री रजिस्टर
+DocType: Asset,Gross Purchase Amount,सकल खरीद राशि
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","उदाहरण के लिए ""एक्सवायजेड नेशनल बैंक """
+DocType: Asset,Depreciation Method,मूल्यह्रास विधि
 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 +29,Shopping Cart is enabled,खरीदारी की टोकरी में सक्षम हो जाता है
 DocType: Job Applicant,Applicant for a Job,एक नौकरी के लिए आवेदक
 DocType: Production Plan Material Request,Production Plan Material Request,उत्पादन योजना सामग्री का अनुरोध
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,बनाया नहीं उत्पादन के आदेश
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,बनाया नहीं उत्पादन के आदेश
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
@@ -1426,31 +1462,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,एक नौकरी के लिए आवेदक.
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,पतों
+apps/erpnext/erpnext/hooks.py +91,Addresses,पतों
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,मूल्यांकन
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,आइटम उत्पादन का आदेश दिया है करने के लिए अनुमति नहीं है।
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,आइटम उत्पादन का आदेश दिया है करने के लिए अनुमति नहीं है।
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,कृपया मद या गोदाम के आधार पर फ़िल्टर सेट
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),इस पैकेज के शुद्ध वजन. (वस्तुओं का शुद्ध वजन की राशि के रूप में स्वतः गणना)
 DocType: Sales Order,To Deliver and Bill,उद्धार और बिल के लिए
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,विनिर्माण के लिए टाइम लॉग करता है।
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,कार्यों के लिए समय प्रवेश.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,भुगतान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ब्रांड
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
 DocType: Quotation Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
+DocType: Request for Quotation Supplier,Send Email to Supplier,प्रदायक ईमेल भेजें
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 DocType: Packing Slip,To Package No.,सं पैकेज
 DocType: Production Planning Tool,Material Requests,सामग्री अनुरोध
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,वितरण गोदाम
 DocType: Stock Settings,Allowance Percent,भत्ता प्रतिशत
 DocType: SMS Settings,Message Parameter,संदेश पैरामीटर
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,वित्तीय लागत केन्द्रों के पेड़।
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,वित्तीय लागत केन्द्रों के पेड़।
 DocType: Serial No,Delivery Document No,डिलिवरी दस्तावेज़
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,खरीद प्राप्तियों से आइटम प्राप्त
 DocType: Serial No,Creation Date,निर्माण तिथि
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,राशि वितरित करने के लिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,उत्पाद या सेवा
 DocType: Naming Series,Current Value,वर्तमान मान
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} बनाया
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} बनाया
 DocType: Delivery Note Item,Against Sales Order,बिक्री के आदेश के खिलाफ
 ,Serial No Status,धारावाहिक नहीं स्थिति
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,आइटम तालिका खाली नहीं हो सकता
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","पंक्ति {0}: सेट करने के लिए {1} अवधि, से और तारीख \
  करने के बीच अंतर करने के लिए अधिक से अधिक या बराबर होना चाहिए {2}"
 DocType: Pricing Rule,Selling,विक्रय
 DocType: Employee,Salary Information,वेतन की जानकारी
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,शुल्कों और करों
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,संदर्भ तिथि दर्ज करें
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,पेमेंट गेटवे खाते कॉन्फ़िगर नहीं है
 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: Production Order,Material Request Item,सामग्री अनुरोध आइटम
+DocType: Request for Quotation Item,Material Request Item,सामग्री अनुरोध आइटम
 apps/erpnext/erpnext/config/stock.py +85,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,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
+DocType: Asset,Sold,बिक गया
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
 DocType: Sales Invoice,Accounting Details,लेखा विवरण
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,इस कंपनी के लिए सभी लेन-देन को हटाएं
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,निवेश
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,आवंटन
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृति मापदंड
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,उपरोक्त तालिका में सामग्री अनुरोध दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,उपरोक्त तालिका में सामग्री अनुरोध दर्ज करें
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 DocType: Item Group,Show In Website,वेबसाइट में दिखाएँ
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,समूह
@@ -1552,6 +1592,7 @@
 ,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","निम्नलिखित दस्तावेजों डिलिवरी नोट, अवसर, सामग्री अनुरोध, मद, खरीद आदेश, खरीद वाउचर, क्रेता रसीद, कोटेशन, बिक्री चालान, उत्पाद बंडल, बिक्री आदेश, सीरियल नहीं में ब्रांड नाम को ट्रैक करने के लिए"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,सभी कार्यों के गैंट चार्ट.
+DocType: Pricing Rule,Margin Type,मार्जिन प्रकार
 DocType: Appraisal,For Employee Name,कर्मचारी का नाम
 DocType: Holiday List,Clear Table,स्पष्ट मेज
 DocType: Features Setup,Brands,ब्रांड
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,ग्राहक के पते और संपर्क
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,पंक्ति # {0}: संपत्ति एक निश्चित परिसंपत्ति मद के खिलाफ अनिवार्य है
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप सेटअप के माध्यम से उपस्थिति के लिए श्रृंखला नंबर&gt; नंबरिंग सीरीज
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,जोड़ा
+DocType: Asset,Depreciation Schedule,मूल्यह्रास अनुसूची
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बैच है नहीं
 DocType: Delivery Note,Excise Page Number,आबकारी पृष्ठ संख्या
+DocType: Asset,Purchase Date,खरीद की तारीख
 DocType: Employee,Personal Details,व्यक्तिगत विवरण
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी में &#39;संपत्ति मूल्यह्रास लागत केंद्र&#39; सेट करें {0}
 ,Maintenance Schedules,रखरखाव अनुसूचियों
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,मेल मिलाप प्रविष्टियां शामिल करें
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक कुल
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,इकाई
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,कंपनी निर्दिष्ट करें
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,खर्चों के दावे
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
 ,BOM Search,बीओएम खोज
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),समापन (+ योग खोलने)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},क्लीयरेंस तारीख पंक्ति में चेक की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Salary Slip,Deduction,कटौती
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 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 +137,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,परिकलित बैंक बैलेंस
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,विकलांग उपयोगकर्ता
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,उद्धरण
 DocType: Salary Slip,Total Deduction,कुल कटौती
 DocType: Quotation,Maintenance User,रखरखाव उपयोगकर्ता
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,मूल्य अपडेट
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,मूल्य अपडेट
 DocType: Employee,Date of Birth,जन्म तिथि
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
@@ -1645,8 +1691,8 @@
 ,SO Qty,अतः मात्रा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
+DocType: Request for Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
 apps/erpnext/erpnext/hooks.py +71,Shipments,लदान
 DocType: Purchase Order Item,To be delivered to customer,ग्राहक के लिए दिया जाना
@@ -1654,12 +1700,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,पंक्ति #
 DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा)
-DocType: Pricing Rule,Supplier,प्रदायक
+DocType: Asset,Supplier,प्रदायक
 DocType: C-Form,Quarter,तिमाही
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,विविध व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,विविध व्यय
 DocType: Global Defaults,Default Company,Default कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,प्रयोक्ता {0} अक्षम है
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Currency Exchange,From Currency,मुद्रा से
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक परिसंपत्ति से जुड़ा हुआ है"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,बाल मद एक उत्पाद बंडल नहीं होना चाहिए। आइटम को हटा दें `` {0} और बचाने के लिए कृपया
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बैंकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,नई लागत केंद्र
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; की) बाल जोड़े पर क्लिक करके एक नया खाता बनाने और कर टैक्स दर का उल्लेख है।
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,नई लागत केंद्र
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Quality Inspection,In Process,इस प्रक्रिया में
@@ -1695,10 +1741,11 @@
 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,प्राप्य खाता
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
 DocType: Quotation Item,Stock Balance,बाकी स्टाक
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,टाइम लॉग्स बनाया:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,टाइम लॉग्स बनाया:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Employee,Blood Group,रक्त वर्ग
@@ -1716,13 +1763,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,डेबिट करने के लिए आवश्यक है
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
 DocType: Offer Letter Term,Offer Term,ऑफर टर्म
 DocType: Quality Inspection,Quality Manager,गुणवत्ता प्रबंधक
 DocType: Job Applicant,Job Opening,नौकरी खोलने
 DocType: Payment Reconciliation,Payment Reconciliation,भुगतान सुलह
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,प्रस्ताव पत्र
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,सामग्री (एमआरपी) के अनुरोध और उत्पादन के आदेश उत्पन्न.
@@ -1730,22 +1777,22 @@
 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 +103,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}।
 DocType: Stock Reconciliation Item,Current Valuation Rate,वर्तमान मूल्यांकन दर
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
 DocType: Opportunity,Lost Reason,खोया कारण
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,आदेश या चालान के खिलाफ भुगतान प्रविष्टियों को बनाने।
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,आदेश या चालान के खिलाफ भुगतान प्रविष्टियों को बनाने।
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,उपयोगकर्ता और अनुमतियाँ
@@ -1754,10 +1801,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,अपने ग्राहकों
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,अभी अप्लाई करें
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,अभी अप्लाई करें
 DocType: Sales Order,Not Delivered,नहीं वितरित
 ,Bank Clearance Summary,बैंक क्लीयरेंस सारांश
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,रोजगार के विवरण
 DocType: Employee,New Workplace,नए कार्यस्थल
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,बंद के रूप में सेट करें
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},बारकोड के साथ कोई आइटम {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},बारकोड के साथ कोई आइटम {0}
 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,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,हस्तांतरण सामग्री
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},मद {0} में एक बिक्री मद में होना चाहिए {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),धन के स्रोत (देनदारियों)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,कर्मचारी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,से आयात ईमेल
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,उपयोगकर्ता के रूप में आमंत्रित
 DocType: Features Setup,After Sale Installations,बिक्री के प्रतिष्ठान के बाद
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},कृपया कंपनी में सेट {0} {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
 DocType: Workstation Working Hour,End Time,अंतिम समय
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,बिक्री या खरीद के लिए मानक अनुबंध शर्तों .
@@ -1830,9 +1879,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,औषधि
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Gateway Account,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 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 +206,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,न्यूज़लेटर मेलिंग सूची
 DocType: Delivery Note,Transporter Name,ट्रांसपोर्टर नाम
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} बंद कर दिया गया है
 DocType: Email Digest,How frequently?,कितनी बार?
 DocType: Purchase Receipt,Get Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",उचित समूह (आम तौर पर फंड के आवेदन&gt; वर्तमान आस्तियों&gt; बैंक खातों पर जाएं और (बाल प्रकार के जोड़े) पर क्लिक करके एक नया खाता बनाने के &quot;बैंक&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,सामग्री के बिल का पेड़
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,मार्क का तोहफा
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},रखरखाव शुरू करने की तारीख धारावाहिक नहीं के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,उद्देश्य
+DocType: Company,Fixed Asset Depreciation Settings,निश्चित संपत्ति मूल्यह्रास सेटिंग
 DocType: Item,Will also apply for variants unless overrridden,Overrridden जब तक भी वेरिएंट के लिए लागू होगी
 DocType: Purchase Invoice,Advances,अग्रिम
 DocType: Production Order,Manufacture against Material Request,सामग्री अनुरोध के खिलाफ निर्माण
@@ -1909,6 +1958,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,बाल नोड है
@@ -1959,12 +2009,14 @@
  9। के लिए टैक्स या शुल्क पर विचार करें: टैक्स / प्रभारी मूल्यांकन के लिए ही है (कुल का नहीं एक हिस्सा) या केवल (आइटम के लिए मूल्य जोड़ नहीं है) कुल के लिए या दोनों के लिए अगर इस अनुभाग में आप निर्दिष्ट कर सकते हैं।
  10। जोड़ें या घटा देते हैं: आप जोड़ सकते हैं या कर कटौती करना चाहते हैं।"
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
+DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","जैसे बैंक, नकद, क्रेडिट कार्ड"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",उचित समूह (आम तौर पर फंड के आवेदन&gt; वर्तमान आस्तियों&gt; बैंक खातों पर जाएं और (बाल प्रकार के जोड़े) पर क्लिक करके एक नया खाता बनाने के &quot;बैंक&quot;
 DocType: Journal Entry,Credit Note,जमापत्र
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},पूरे किए मात्रा से अधिक नहीं हो सकता है {0} ऑपरेशन के लिए {1}
 DocType: Features Setup,Quality,गुणवत्ता
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,मेरे पते
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,संगठन शाखा मास्टर .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,डिफ़ॉल्ट खरीद मूल्य सूची
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,ऊपर चयनित मानदंड या वेतन पर्ची के लिए कोई कर्मचारी पहले से ही बनाया
@@ -2017,7 +2069,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/config/hr.py +93,Payroll,पेरोल
 apps/erpnext/erpnext/accounts/doctype/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} भी शामिल किया जाना चाहिए"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,रसीद वस्तुओं की खरीद
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,अनुकूलित प्रपत्र
 DocType: Account,Income Account,आय खाता
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,कोई डिफ़ॉल्ट पता खाका पाया। सेटअप&gt; मुद्रण और ब्रांडिंग&gt; पता खाका से एक नया एक का सृजन करें।
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,कुंजी जिम्मेदारी क्षेत्र
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,नए लागत केन्द्र का नाम
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर और शुल्क कटौती
-apps/erpnext/erpnext/config/support.py +7,Issues,मुद्दे
+apps/erpnext/erpnext/hooks.py +90,Issues,मुद्दे
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},स्थिति का एक होना चाहिए {0}
 DocType: Sales Invoice,Debit To,करने के लिए डेबिट
 DocType: Delivery Note,Required only for sample item.,केवल नमूना आइटम के लिए आवश्यक है.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} अक्षम है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,एक्स्ट्रा लार्ज
 ,Profit and Loss Statement,लाभ एवं हानि के विवरण
@@ -2078,10 +2132,10 @@
 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 +139,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर दूसरे में एक मुद्रा में परिवर्तित करने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,कुल बकाया राशि
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
 ,Requested,निवेदित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,कोई टिप्पणी
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,बिक्री और खरीद
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए
 DocType: Supplier Quotation Item,Material Request No,सामग्री अनुरोध नहीं
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,जिस पर दर ग्राहक की मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
@@ -2176,7 +2231,7 @@
 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 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 DocType: Payment Request,Recipient and Message,प्राप्तकर्ता और संदेश
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,प्रदायक पते का चयन
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,उद्धरण के लिए अनुरोध।
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;नहीं&quot; और &quot;बिक्री मद है&quot; &quot;स्टॉक मद है&quot; कहाँ है &quot;हाँ&quot; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,परियोजना प्रारंभ दिनांक
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,दस्तावेज़ के खिलाफ कोई
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,बिक्री भागीदारों की व्यवस्था करें.
 DocType: Quality Inspection,Inspection Type,निरीक्षण के प्रकार
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},कृपया चुनें {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,अगोचर उपस्थिति
@@ -2240,6 +2296,7 @@
 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,विज्ञापन
+DocType: Asset Category Account,Depreciation Expense Account,मूल्यह्रास व्यय खाते में
 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,व्यय अनुमोदनकर्ता
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टि
 DocType: Payment Gateway,Gateway,द्वार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,तारीख से राहत दर्ज करें.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,राशि
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,राशि
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
@@ -2267,18 +2324,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,स्वीकार किए जाते हैं गोदाम
 DocType: Bank Reconciliation Detail,Posting Date,तिथि पोस्टिंग
 DocType: Item,Valuation Method,मूल्यन विधि
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} के लिए विनिमय दर मिल करने में असमर्थ {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} के लिए विनिमय दर मिल करने में असमर्थ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,मार्क आधे दिन
 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 +410,[Error],[त्रुटि]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ग्राहक गोदाम (वैकल्पिक)
 DocType: Pricing Rule,Discount Percentage,डिस्काउंट प्रतिशत
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
@@ -2304,14 +2362,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,शब्दों या अनुबंध के टेम्पलेट.
 DocType: Purchase Invoice,Address and Contact,पता और संपर्क
 DocType: Supplier,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Employee,Feedback,प्रतिपुष्टि
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","पहले आवंटित नहीं किया जा सकता छोड़ दो {0}, छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है के रूप में {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
+DocType: Asset,Expected Value After Useful Life,उम्मीद मूल्य उपयोगी जीवन के बाद
 DocType: Item,Reorder level based on Warehouse,गोदाम के आधार पर पुन: व्यवस्थित स्तर
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,उद्धार करने के लिए मात्रा
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} को रद्द कर दिया है या बंद है
 DocType: Delivery Note,Track this Delivery Note against any Project,किसी भी परियोजना के खिलाफ इस डिलिवरी नोट हुए
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,निवेश से नेट नकद
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,एसेट {0} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,पतों का प्रबंधन
-DocType: Pricing Rule,Item Code,आइटम कोड
+DocType: Asset,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,सामग्री अनुरोध बनाएँ
 DocType: Employee Education,School/University,स्कूल / विश्वविद्यालय
 DocType: Payment Request,Reference Details,संदर्भ विवरण
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
 DocType: Sales Invoice Item,Available Qty at Warehouse,गोदाम में उपलब्ध मात्रा
 ,Billed Amount,बिल की राशि
+DocType: Asset,Double Declining Balance,डबल गिरावट का संतुलन
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,बंद आदेश को रद्द नहीं किया जा सकता। रद्द करने के लिए खुल जाना।
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अपडेट प्राप्त करे
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
+DocType: Asset,Fully Depreciated,पूरी तरह से घिस
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,सीरियल नहीं और बैच
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य या मात्रा
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,मिनट
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 ,Qty to Receive,प्राप्त करने के लिए मात्रा
 DocType: Leave Block List,Leave Block List Allowed,छोड़ दो ब्लॉक सूची रख सकते है
 DocType: Sales Partner,Retailer,खुदरा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
 DocType: Global Defaults,Disable In Words,शब्दों में अक्षम
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,सुरक्षित कर्जे
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},में परिसंपत्ति वर्ग {0} या कंपनी मूल्यह्रास संबंधित खाते सेट करें {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
 DocType: Appraisal,Appraisal,मूल्यांकन
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},आपूर्तिकर्ता के लिए भेजा ईमेल {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
@@ -2401,7 +2467,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,भेजे गए संदेश
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,कुल मार्जिन
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
 DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 DocType: Hub Settings,Publish Items to Hub,हब के लिए आइटम प्रकाशित करें
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक समूह / ग्राहक
 DocType: Payment Gateway Account,Default Payment Request Message,डिफ़ॉल्ट भुगतान अनुरोध संदेश
 DocType: Item Group,Check this if you want to show in website,यह जाँच लें कि आप वेबसाइट में दिखाना चाहते हैं
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,बैंकिंग और भुगतान
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,बैंकिंग और भुगतान
 ,Welcome to ERPNext,ERPNext में आपका स्वागत है
 DocType: Payment Reconciliation Payment,Voucher Detail Number,वाउचर विस्तार संख्या
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,कोटेशन के लिए लीड
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,पत्तियां और छुट्टी
 DocType: Sales Order,Not Billed,नहीं बिल
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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
@@ -2476,15 +2543,17 @@
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
+DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
 DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0} संपत्ति की खरीद की तारीख चालान की खरीद की तारीख के साथ मेल नहीं खाता
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),देनदार ({0})
-DocType: Project,Margin,हाशिया
+DocType: Pricing Rule,Margin,हाशिया
 DocType: Salary Slip,Arrear Amount,बकाया राशि
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नए ग्राहकों
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,सकल लाभ%
@@ -2492,20 +2561,23 @@
 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,अगर आप मेल में प्रत्येक कर्मचारी को वेतन पर्ची भेजना चाहते हैं की जाँच करते समय वेतन पर्ची प्रस्तुत
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
 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 +57,Where manufacturing operations are carried.,निर्माण कार्यों कहां किया जाता है।
 DocType: Stock Entry Detail,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
 DocType: Employee,Confirmation Date,पुष्टिकरण तिथि
 DocType: C-Form,Total Invoiced Amount,कुल चालान राशि
 DocType: Account,Sales User,बिक्री प्रयोक्ता
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,न्यूनतम मात्रा अधिकतम मात्रा से ज्यादा नहीं हो सकता
+DocType: Account,Accumulated Depreciation,संग्रहित अवमूल्यन
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
 DocType: Payment Request,Email To,इसे ईमेल किया गया
 DocType: Lead,Lead Owner,मालिक लीड
 DocType: Bin,Requested Quantity,अनुरोध मात्रा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,गोदाम की आवश्यकता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,गोदाम की आवश्यकता है
 DocType: Employee,Marital Status,वैवाहिक स्थिति
 DocType: Stock Settings,Auto Material Request,ऑटो सामग्री अनुरोध
 DocType: Time Log,Will be updated when billed.,बिल भेजा जब अद्यतन किया जाएगा.
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% वितरित
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,एक ही सप्लायर कई बार दर्ज किया गया है
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरीद आदेश आइटम की आपूर्ति
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,कंपनी का नाम कंपनी नहीं किया जा सकता
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
@@ -2527,13 +2600,14 @@
 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: Payment Request,Payment Details,भुगतान विवरण
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
+DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ईमेल, फोन, चैट, यात्रा, आदि के सभी संचार के रिकार्ड"
 DocType: Manufacturer,Manufacturers used in Items,वस्तुओं में इस्तेमाल किया निर्माता
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,कंपनी में गोल लागत से केंद्र का उल्लेख करें
 DocType: Purchase Invoice,Terms,शर्तें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,नई बनाएँ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,नई बनाएँ
 DocType: Buying Settings,Purchase Order Required,खरीदने के लिए आवश्यक आदेश
 ,Item-wise Sales History,आइटम के लिहाज से बिक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,कुल स्वीकृत राशि
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,स्टॉक लेजर
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,वेतनपर्ची कटौती
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,पहले एक समूह नोड का चयन करें।
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,पहले एक समूह नोड का चयन करें।
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी और उपस्थिति
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ग्राहक, आपूर्तिकर्ता, बिक्री साथी और नेतृत्व के संदर्भ निकालें, क्योंकि यह आपकी कंपनी का पता है"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} से: {1}
 DocType: Task,depends_on,निर्भर करता है
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,अगली तारीख पोस्ट दिनांक से अधिक होना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,शो कर तोड़-अप
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# प्रपत्र / मद / {0}) स्टॉक से बाहर है
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,अगली तारीख पोस्ट दिनांक से अधिक होना चाहिए
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/accounts/party.py +289,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',आप विनिर्माण गतिविधि में शामिल हैं .
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,चालान पोस्ट दिनांक
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","नोट: भुगतान किसी भी संदर्भ के खिलाफ नहीं बनाया गया है, तो मैन्युअल रूप जर्नल प्रविष्टि बनाते हैं।"
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
 ,Stock Ageing,स्टॉक बूढ़े
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
+DocType: Asset Category Account,Fixed Asset Account,फिक्स्ड परिसंपत्ति खाते
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,प्रशिक्षु
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,बीओएम से
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,तिथि करने के लिए आधे दिन की छुट्टी के लिए तिथि से ही होना चाहिए
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,वेतन संरचना
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,कोटेशन
 DocType: Hub Settings,Access Token,एक्सेस टोकन
 DocType: Sales Invoice Item,Serial No,नहीं सीरियल
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
-DocType: Item,Is Fixed Asset Item,तय परिसंपत्ति मद है
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
 DocType: Purchase Invoice,Print Language,प्रिंट भाषा
 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","यदि आप लंबे समय स्वरूपों मुद्रित किया है, इस सुविधा के लिए प्रत्येक पृष्ठ पर सभी हेडर और पाद लेख के साथ एकाधिक पृष्ठों पर मुद्रित विभाजित करने के लिए इस्तेमाल किया जा सकता है"
+DocType: Asset,Number of Depreciations,Depreciations की संख्या
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 DocType: Fiscal Year,Year Name,वर्ष नाम
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
 DocType: Product Bundle Item,Product Bundle Item,उत्पाद बंडल आइटम
 DocType: Sales Partner,Sales Partner Name,बिक्री भागीदार नाम
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,कोटेशन के लिए अनुरोध
 DocType: Payment Reconciliation,Maximum Invoice Amount,अधिकतम चालान राशि
 DocType: Purchase Invoice Item,Image View,छवि देखें
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहकों
+DocType: Asset,Partially Depreciated,आंशिक रूप से घिस
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,दिनांक से और
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,रखरखाव प्रबंधक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,कुल शून्य नहीं हो सकते
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'आखिरी बिक्री आदेश को कितने दिन हुए' शून्य या उससे अधिक होना चाहिए
-DocType: C-Form,Amended From,से संशोधित
+DocType: Asset,Amended From,से संशोधित
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,आगे ले जाना
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,कंपनी में &#39;एसेट निपटान पर लाभ / हानि खाता&#39; का उल्लेख करें
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,चालान के साथ मैच भुगतान
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,चालान के साथ मैच भुगतान
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,कार्ट में जोड़ें
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,समूह द्वारा
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
 DocType: Production Planning Tool,Get Material Request,सामग्री अनुरोध प्राप्त
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,पोस्टल व्यय
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राशि)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,कुल वर्तमान
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,लेखांकन बयान
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,लेखांकन बयान
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,घंटा
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
@@ -2746,15 +2825,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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,ग्राहक समूह
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: Item,Website Description,वेबसाइट विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
 ,Sales Register,बिक्री रजिस्टर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
@@ -2762,12 +2842,13 @@
 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,ग्राहक समूह का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,वाउचर प्रकार के खिलाफ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},त्रुटि: {0}&gt; {1}
 DocType: Item,Attributes,गुण
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,आइटम पाने के लिए
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,आइटम पाने के लिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,पिछले आदेश की तिथि
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
 DocType: C-Form,C-Form,सी - फार्म
@@ -2779,18 +2860,18 @@
 DocType: Purchase Invoice,Mobile No,नहीं मोबाइल
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रविष्टि बनाने
 DocType: Leave Allocation,New Leaves Allocated,नई आवंटित पत्तियां
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,वाणिज्यिक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},त्रुटि: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 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 +52,All Products or Services.,सभी उत्पादों या सेवाओं.
 DocType: Supplier Quotation,Supplier Address,प्रदायक पता
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
+apps/erpnext/erpnext/config/accounts.py +259,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,वित्तीय सेवाएँ
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} को {2} की वेतन वृद्धि में {3}
@@ -2801,10 +2882,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,सीआर
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,हस्तांतरण
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,हस्तांतरण
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,नियत तिथि अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
 DocType: Journal Entry,Pay To / Recd From,/ रिसी डी से भुगतान
 DocType: Naming Series,Setup Series,सेटअप सीरीज
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,टिप्पणियाँ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चे माल के मद कोड
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,प्रदायक ईमेल भेजें
 DocType: Features Setup,POS View,स्थिति देखें
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,अगली तारीख के दिन और महीने के दिवस पर दोहराएँ बराबर होना चाहिए
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,अगली तारीख के दिन और महीने के दिवस पर दोहराएँ बराबर होना चाहिए
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,कृपया बताएं एक
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ऊपर
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,समय लॉग बिल भेजा गया है
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),अनंतिम लाभ / हानि (क्रेडिट)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},कंपनी में डिफ़ॉल्ट मान {0} सेट करें {1}
@@ -2847,12 +2930,13 @@
 ,Monthly Attendance Sheet,मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,कोई रिकॉर्ड पाया
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: लागत केंद्र मद के लिए अनिवार्य है {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप सेटअप के माध्यम से उपस्थिति के लिए श्रृंखला नंबर&gt; नंबरिंग सीरीज
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+DocType: Asset,Straight Line,सीधी रेखा
+DocType: Project User,Project User,परियोजना उपयोगकर्ता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
 DocType: Sales Team,Contact No.,सं संपर्क
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
 DocType: Features Setup,Sales Discounts,बिक्री छूट
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,आदेश की संख्या
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML बैनर / कि उत्पाद सूची के शीर्ष पर दिखाई देगा.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,शिपिंग राशि की गणना करने के लिए शर्तों को निर्दिष्ट
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,बाल जोड़ें
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,उद्घाटन मूल्य
 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,बिक्री पर कमीशन
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,बिक्री पर कमीशन
 DocType: Offer Letter Term,Value / Description,मूल्य / विवरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 ,Customers Not Buying Since Long Time,ग्राहकों को लंबे समय से खरीद नहीं
 DocType: Production Order,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,मनोरंजन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,मनोरंजन खर्च
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,छुट्टी के लिए आवेदन.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,विधि व्यय
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,विधि व्यय
 DocType: Sales Invoice,Posting Time,बार पोस्टिंग
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,टेलीफोन व्यय
 DocType: Sales Partner,Logo,लोगो
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,यह जाँच लें कि आप उपयोगकर्ता बचत से पहले एक श्रृंखला का चयन करने के लिए मजबूर करना चाहते हैं. कोई डिफ़ॉल्ट हो सकता है अगर आप इस जाँच करेगा.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},धारावाहिक नहीं के साथ कोई आइटम {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचनाएं
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,प्रत्यक्ष खर्च
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,प्रत्यक्ष खर्च
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;अधिसूचना \ ईमेल एड्रेस&#39; में कोई अमान्य ईमेल पता है
 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,यात्रा व्यय
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,हम इस आइटम बेचने
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,आपूर्तिकर्ता आईडी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
 DocType: Journal Entry,Cash Entry,कैश एंट्री
 DocType: Sales Partner,Contact Desc,संपर्क जानकारी
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","आकस्मिक, बीमार आदि की तरह पत्तियों के प्रकार"
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सभी संपर्क.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,संपत्ति के प्रदायक {0} चालान की खरीद में आपूर्तिकर्ता के साथ मेल नहीं खाता
 DocType: Newsletter,Test Email Id,टेस्ट ईमेल आईडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,कच्चे माल के मुख्य मद के रूप में ही नहीं हो सकता
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,वेतन टेम्पलेट मास्टर .
@@ -2946,12 +3032,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,पसंदीदा बिलिंग पता
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी की payble खाता मुद्रा के बराबर होना चाहिए
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","अक्षम करते हैं, क्षेत्र &#39;शब्दों में&#39; किसी भी सौदे में दिखाई नहीं होगा"
@@ -2961,13 +3048,13 @@
 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,लेनदारों
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,लेनदारों
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,पंक्ति # {0}: सीरियल नहीं अनिवार्य है
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर विस्तार से
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Hub Settings,Name Token,नाम टोकन
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
-DocType: Project,Project Name,इस परियोजना का नाम
+DocType: Request for Quotation 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
@@ -3026,6 +3112,7 @@
 DocType: Sales Invoice,End Date,समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेयर लेनदेन
 DocType: Employee,Internal Work History,आंतरिक कार्य इतिहास
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,संचित मूल्यह्रास राशि
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","कंपनी, अनिवार्य है, क्योंकि यह आपकी कंपनी पता है"
 DocType: Item Attribute,From Range,सीमा से
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,यह एक शेयर आइटम नहीं है क्योंकि मद {0} को नजरअंदाज कर दिया
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,आगे की प्रक्रिया के लिए इस उत्पादन का आदेश सबमिट करें .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,आगे की प्रक्रिया के लिए इस उत्पादन का आदेश सबमिट करें .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एक विशेष लेन - देन में मूल्य निर्धारण नियम लागू नहीं करने के लिए, सभी लागू नहीं डालती निष्क्रिय किया जाना चाहिए."
 DocType: Company,Domain,डोमेन
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,नौकरियां
@@ -3045,6 +3132,7 @@
 DocType: Time Log,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),वेतन (LWP) के बिना छुट्टी लिए कमाई कम करें
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,प्रसव की तारीख
 DocType: Opportunity,Opportunity Date,अवसर तिथि
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरीद रसीद के खिलाफ लौटें
+DocType: Request for Quotation Item,Request for Quotation Item,कोटेशन मद के लिए अनुरोध
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% का आदेश दिया
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ठेका
@@ -3075,11 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,आइटम {0} सीरियल नग स्तंभ के लिए सेटअप रिक्त होना चाहिए नहीं है
 DocType: Accounts Settings,Accounts Settings,लेखा सेटिंग्स
 DocType: Customer,Sales Partner and Commission,बिक्री साथी और आयोग
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},कंपनी में &#39;आस्ति निपटान खाता&#39; सेट करें {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,अस्थाई लेखा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Account,Auditor,आडिटर
@@ -3088,21 +3178,22 @@
 DocType: Pricing Rule,Disable,असमर्थ
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,भुगतान करने के लिए यहां क्लिक करें
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","एसेट {0}, खत्म कर दिया नहीं जा सकता क्योंकि यह पहले से ही है {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आईडी
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,मार्क अनुपस्थित
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,समय समय से की तुलना में अधिक से अधिक होना चाहिए
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,से आइटम जोड़ें
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,से आइटम जोड़ें
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,टास्क आईडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",उदाहरणार्थ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,आइटम के लिए मौजूद नहीं कर सकते स्टॉक {0} के बाद से वेरिएंट है
 ,Sales Person-wise Transaction Summary,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,चयनित आइटम बैच नहीं हो सकता
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,गुणवत्ता प्रबंधन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,मद {0} अक्षम किया गया है
 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,कर्मचारी बाहरी काम इतिहास
@@ -3128,7 +3220,7 @@
 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,अगले संपर्क
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,सेटअप गेटवे खातों।
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,सेटअप गेटवे खातों।
 DocType: Employee,Employment Type,रोजगार के प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थायी संपत्तियाँ
 ,Cash Flow,नकदी प्रवाह
@@ -3142,7 +3234,7 @@
 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 +132,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,जनरल लेजर के अनुसार बैंक बैलेंस
 DocType: Job Applicant,Applicant Name,आवेदक के नाम
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / मद का नाम
@@ -3158,19 +3250,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,सीमा होती है / से निर्दिष्ट करें
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,लेनदेन को बेचने के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: BOM Replace Tool,Current BOM,वर्तमान बीओएम
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,धारावाहिक नहीं जोड़ें
 apps/erpnext/erpnext/config/support.py +43,Warranty,गारंटी
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,प्रिंट और स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,समूह नोड
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,अद्यतन तैयार माल
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,अद्यतन तैयार माल
 DocType: Workstation,per hour,प्रति घंटा
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,क्रय
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,राशि का भुगतान
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
 DocType: Leave Block List,Applies to Company,कंपनी के लिए लागू होता है
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
 DocType: Purchase Invoice,In Words,शब्दों में
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
 DocType: Production Planning Tool,Material Request For Warehouse,वेयरहाउस के लिए सामग्री का अनुरोध
@@ -3213,9 +3304,11 @@
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
+DocType: Pricing Rule,Margin Rate or Amount,मार्जिन दर या राशि
 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,बिक्री आदेश आइटम
@@ -3225,7 +3318,7 @@
 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 +782,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} पहले से ही प्राप्त हो गया है
@@ -3233,14 +3326,13 @@
 DocType: Customer,Sales Team Details,बिक्री टीम विवरण
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},अमान्य {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग के स्टोर
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहले दस्तावेज़ को सहेजें।
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,पहले दस्तावेज़ को सहेजें।
 DocType: Account,Chargeable,प्रभार्य
 DocType: Company,Change Abbreviation,बदले संक्षिप्त
 DocType: Expense Claim Detail,Expense Date,व्यय तिथि
@@ -3258,14 +3350,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,सामान्य खाता
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,देखें बिक्रीसूत्र
 DocType: Item Attribute Value,Attribute Value,मान बताइए
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ईमेल आईडी अद्वितीय होना चाहिए , पहले से ही मौजूद है {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ईमेल आईडी अद्वितीय होना चाहिए , पहले से ही मौजूद है {0}"
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,पहला {0} का चयन करें
 DocType: Features Setup,To get Item Group in details table,विवरण तालिका में आइटम समूह
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} या कंपनी {0}
 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>
@@ -3297,23 +3390,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},रखरखाव अनुसूची {0} के खिलाफ मौजूद {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},रखरखाव अनुसूची {0} के खिलाफ मौजूद {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),वास्तविक मात्रा (स्रोत / लक्ष्य पर)
 DocType: Item Customer Detail,Ref Code,रेफरी कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रिकॉर्ड.
 DocType: Payment Gateway,Payment Gateway,भुगतान के लिए रास्ता
 DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,गैर जुड़े चालान और भुगतान का मिलान.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,गैर जुड़े चालान और भुगतान का मिलान.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,आदेश देना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक माता पिता लागत केंद्र नहीं कर सकते
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,चुनें ब्रांड ...
 DocType: Sales Invoice,C-Form Applicable,लागू सी फार्म
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,गोदाम अनिवार्य है
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,द्वारा हल किया
@@ -3331,7 +3424,7 @@
 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 / / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,लेन-देन मुद्रा पेमेंट गेटवे मुद्रा के रूप में ही किया जाना चाहिए
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूरी तरह से पूरा
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,जमा करें निर्माण पर
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,मेरे आदेश
@@ -3367,10 +3460,10 @@
 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,भेजने से पहले संदेश प्रविष्ट करें
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,असुरक्षित ऋण
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,असुरक्षित ऋण
 DocType: Cost Center,Cost Center Name,लागत केन्द्र का नाम
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तिथि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,कुल भुगतान राशि
@@ -3382,11 +3475,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}। अपनी स्थिति को 'निष्क्रिय' आगे बढ़ने के लिए करें।
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,प्रदायक भाग नहीं
 DocType: Purchase Invoice,Contact,संपर्क
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,से प्राप्त
 DocType: Features Setup,Exports,निर्यात
@@ -3395,12 +3489,12 @@
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} के लिए {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
@@ -3409,7 +3503,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,लेखाशीर्ष
@@ -3422,7 +3516,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,शेयर एसेट्स
@@ -3436,15 +3530,15 @@
 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 +576,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,परियोजना / कार्य कार्य.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो खरीदना, जाँच की जानी चाहिए {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,महीने का दिन पर दोहराएँ
@@ -3464,8 +3558,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,साल शुरू की तारीख या अंत की तारीख {0} के साथ अतिव्यापी है। से बचने के लिए कंपनी सेट करें
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नई न्यूज़लेटर
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","उदाहरण:। श्रृंखला के लिए निर्धारित है और सीरियल कोई लेन-देन में उल्लेख नहीं किया गया है, तो एबीसीडी ##### 
 , तो स्वत: सीरियल नंबर इस श्रृंखला के आधार पर बनाया जाएगा। आप हमेशा स्पष्ट रूप से इस मद के लिए सीरियल नंबर का उल्लेख करना चाहते हैं। इस खाली छोड़ दें।"
@@ -3477,11 +3572,11 @@
 ,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 +91,Please enter default currency in Company Master,कंपनी मास्टर में डिफ़ॉल्ट मुद्रा दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},साथ टैक्स नियम संघर्ष {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,नया खाता नाम
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,ग्राहक सेवा
@@ -3491,11 +3586,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ऑफर उम्मीदवार एक नौकरी।
 DocType: Notification Control,Prompt for Email on Submission of,प्रस्तुत करने पर ईमेल के लिए संकेत
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,कुल आवंटित पत्ते अवधि में दिनों की तुलना में अधिक कर रहे हैं
+DocType: Pricing Rule,Percentage,का प्रतिशत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,आइटम {0} एक बिक्री आइटम होना चाहिए
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,आइटम {0} एक बिक्री आइटम होना चाहिए
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
 DocType: Account,Equity,इक्विटी
 DocType: Sales Order,Printing Details,मुद्रण विवरण
@@ -3503,11 +3599,12 @@
 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,खोज उप असेंबलियों
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,व्यय खाते के खिलाफ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; की) बाल जोड़े पर क्लिक करके एक नया खाता बनाने और कर टैक्स दर का उल्लेख है।
 DocType: Production Order,Production Order,उत्पादन का आदेश
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
 DocType: Quotation Item,Against Docname,Docname खिलाफ
@@ -3526,18 +3623,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,सफलतापूर्वक राज़ी
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
 DocType: Tax Rule,Validity,वैधता
+DocType: Request for Quotation,Supplier Detail,प्रदायक विस्तार
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,चालान राशि
 DocType: Attendance,Attendance,उपस्थिति
 apps/erpnext/erpnext/config/projects.py +55,Reports,रिपोर्ट
 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 +508,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,लेनदेन खरीदने के लिए टैक्स टेम्पलेट .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,लेनदेन खरीदने के लिए टैक्स टेम्पलेट .
 ,Item Prices,आइटम के मूल्य
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,शब्दों में दिखाई हो सकता है एक बार आप खरीद आदेश को बचाने के लिए होगा.
 DocType: Period Closing Voucher,Period Closing Voucher,अवधि समापन वाउचर
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,परिवर्तन
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",उदाहरणार्थ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
+DocType: Asset Category,Asset Category Name,एसेट श्रेणी नाम
 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
@@ -3569,13 +3668,13 @@
 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 +559,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,बैच
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,बिक्री व्यक्ति
 DocType: Sales Invoice,Cold Calling,सर्द पहुँच
 DocType: SMS Parameter,SMS Parameter,एसएमएस पैरामीटर
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,बजट और लागत केंद्र
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,बजट और लागत केंद्र
 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.,मूल्यों पर आधारित लेनदेन को प्रतिबंधित करने के नियम बनाएँ .
@@ -3620,9 +3719,9 @@
 DocType: Purchase Common,Purchase Common,आम खरीद
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
@@ -3630,7 +3729,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,खाते के जनक
@@ -3646,7 +3745,7 @@
 DocType: Employee,Education,शिक्षा
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
 DocType: Address,Office,कार्यालय
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
@@ -3661,6 +3760,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,बैच इन्वेंटरी
 DocType: Employee,Contract End Date,अनुबंध समाप्ति तिथि
 DocType: Sales Order,Track this Sales Order against any Project,किसी भी परियोजना के खिलाफ हुए इस बिक्री आदेश
+DocType: Sales Invoice Item,Discount and Margin,डिस्काउंट और मार्जिन
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,उपरोक्त मानदंडों के आधार पर बिक्री के आदेश (वितरित करने के लिए लंबित) खींचो
 DocType: Deduction Type,Deduction Type,कटौती के प्रकार
 DocType: Attendance,Half Day,आधे दिन
@@ -3681,7 +3781,7 @@
 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}।
+apps/erpnext/erpnext/accounts/party.py +234,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,मासिक वेतन रेजिस्टर
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
@@ -3689,22 +3789,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,कम से कम एक पंक्ति में भुगतान राशि दर्ज करें
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 DocType: Payment Gateway Account,Payment URL Message,भुगतान यूआरएल संदेश
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,पंक्ति {0}: भुगतान की गई राशि बकाया राशि से अधिक नहीं हो सकता है
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,अवैतनिक कुल
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,समय लॉग बिल नहीं है
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
+DocType: Asset,Asset Category,परिसंपत्ति वर्ग है
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,मैन्युअल रूप खिलाफ वाउचर दर्ज करें
 DocType: SMS Settings,Static Parameters,स्टेटिक पैरामीटर
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,प्रदायक के लिए सामग्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,आबकारी चालान
 DocType: Expense Claim,Employees Email Id,ईमेल आईडी कर्मचारी
 DocType: Employee Attendance Tool,Marked Attendance,उल्लेखनीय उपस्थिति
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,वर्तमान देयताएं
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,वर्तमान देयताएं
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
@@ -3725,17 +3826,16 @@
 DocType: Item Attribute,Numeric Values,संख्यात्मक मान
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,लोगो अटैच
 DocType: Customer,Commission Rate,आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,एनालिटिक्स
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट खाली है
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,कोई डिफ़ॉल्ट पता खाका पाया। सेटअप&gt; मुद्रण और ब्रांडिंग&gt; पता खाका से एक नया एक का सृजन करें।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,शेयर पूंजी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,शेयर पूंजी
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,भुगतान पूरा होने के बाद चयनित पृष्ठ के लिए उपयोगकर्ता अनुप्रेषित।
@@ -3744,20 +3844,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
+DocType: Asset,Current Value (After Depreciation),वर्तमान मूल्य (मूल्यह्रास के बाद)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,सामग्री के बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,रेफरी की तिथि
@@ -3765,6 +3866,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,खाते {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,खाते {0} मौजूद नहीं है
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 793d495..9e772d2 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljeno
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
 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 cjenik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo postavljanje zaposlenika sustav imenovanja u ljudskim resursima&gt; HR Postavke
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Prikaži otvorena
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija je uspješno ažurirana
 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
+,Purchase Order Items To Be Received,Stavke narudžbenice za zaprimanje
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Pokaži varijante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Računi stol ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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 zalihi
 DocType: Designation,Designation,Oznaka
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Novi {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Novi {0}: #{1}
 ,Sales Partners Commission,Provizija prodajnih partnera
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
 DocType: Payment Request,Payment Request,Zahtjev za plaćanje
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Oženjen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dopušteno {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Nabavite stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutske
+DocType: Item,Is Fixed Asset,Je nepokretne imovine
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Svi kontakti
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} je zamrznuta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
 DocType: Journal Entry,Contra Entry,Contra Stupanje
 DocType: Production Order Operation,Show Time Logs,Pokaži Trupci vrijeme
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Status instalacije
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Stavka {0} mora biti stavka nabave
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 DocType: BOM Replace Tool,New BOM,Novi BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Unesite tvrtke
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Neto novčani tijek iz financijskih
 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 +217,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 +227,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
 ,Contact Name,Kontakt ime
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 DocType: Payment Tool,Reference No,Referentni broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bankovni tekstova
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
@@ -249,10 +253,10 @@
 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 +592,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
-DocType: Item,Purchase Details,Kupnja Detalji
+DocType: Item,Purchase Details,Detalji nabave
 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}
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Obavijest kontrole
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite proračun za grupu proizvoda na ovom području. Također možete uključiti sezonalnost postavljanjem distribucije.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Unesite nadređenu skupinu računa za skladište {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Unesite nadređenu skupinu računa za skladište {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Naučiti
+DocType: Asset,Next Depreciation Date,Sljedeći datum Amortizacija
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivnost Cijena po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun br postoji u fakturi {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Uredi raspodjelu prodavača.
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti za brisanje
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Pogrešna Lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jedinica [{1}] (# Form / Artikl / {1}) naći u [{2}] (# Form / Skladište / {2})
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Profil posla
 DocType: Newsletter,Newsletter,Bilten
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
 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 +381,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Molimo odaberite mjesec i godinu
@@ -309,19 +316,19 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Naručite Smatra
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Odaberite stavku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,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
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Primka mora biti zaprimljena
 apps/erpnext/erpnext/config/stock.py +118,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
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete proizvoda
 DocType: Leave Application,Leave Approver Name,Ime osobe ovlaštene za odobrenje odsustva
-,Schedule Date,Raspored Datum
+DocType: Depreciation Schedule,Schedule Date,Raspored Datum
 DocType: Packed Item,Packed Item,Pakirani proizvod
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivnost Trošak postoji zaposlenom {0} protiv tip aktivnosti - {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.,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
@@ -348,10 +355,11 @@
 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
+DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Workstation,Working Hours,Radnih sati
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
-,Purchase Register,Kupnja Registracija
+,Purchase Register,Popis nabave
 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 +192,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
@@ -366,7 +374,7 @@
 DocType: Purchase Invoice,Yearly,Godišnji
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,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 +67,Avg. Selling Rate,AVG. Prodajnom tečaju
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Prosječna prodajna cijena
 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
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
-DocType: Material Request Item,Required Date,Potrebna Datum
+DocType: Request for Quotation Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Neplaćen
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 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 +315,Managing Subcontracting,Upravljanje podugovaranje
+DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupan na web-stranici ovih korisnika
 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 +53,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Prirast ne može biti 0
 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 +86,Item {0} is not Purchase Item,Proizvod {0} nije nabavni proizvod
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Proizvod {0} nije nabavni proizvod
 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
@@ -459,23 +469,23 @@
 DocType: Production Plan Item,Pending Qty,U tijeku Kom
 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 +126,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 +127,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
-DocType: Buying Settings,Purchase Receipt Required,Kupnja Potvrda Obvezno
+DocType: Buying Settings,Purchase Receipt Required,Primka je obvezna
 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 +126,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 +230,Financial / accounting year.,Financijska / obračunska godina.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Isporučuje se: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Obveze prema dobavljačima
@@ -483,7 +493,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Povrat robe
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Komponente plaće
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
@@ -492,7 +502,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -502,7 +512,7 @@
 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/config/accounts.py +70,Masters,Masteri
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Transakcijski Termini Update banke
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Transakcijski Termini Update banke
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,praćenje vremena
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
@@ -520,27 +530,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Unesite prvo primku
 DocType: Buying Settings,Supplier Naming By,Dobavljač nazivanje
 DocType: Activity Type,Default Costing Rate,Zadana Obračun troškova stopa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Raspored održavanja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto promjena u inventar
 DocType: Employee,Passport Number,Broj putovnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Isti predmet je ušao više puta.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Postavite odmor popis za bilo zaposlenik ili Društvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Iznos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Isporučeno Iznos
 DocType: Supplier,Fixed Days,Fiksni dana
 DocType: Quotation Item,Item Balance,Stanje predmeta
 DocType: Sales Invoice,Packing List,Popis pakiranja
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Narudžbenice poslane dobavljačima
 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
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,Operacija vrijeme
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Skupine do skupine
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Moji projekti
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Bill Ne
+DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / Gubitak računa na sredstva Odlaganje
 DocType: Purchase Invoice,Quarterly,Tromjesečni
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
 DocType: Sales Order Item,Basic Rate (Company Currency),Osnovna stopa (valuta tvrtke)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Ulazak Plaćanje je već stvorio
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Ukupno naplatu ove godine
 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 +529,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -597,6 +610,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička Group&gt; Regija
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Pregled prometa po prodavaču i grupi proizvoda
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Došlo je do pogreške u vašem adresnoj predložak {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Novi račun
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Od {0} od tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {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.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -666,17 +680,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Popis Cijena ne bira
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Moji Računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moji Računi
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nisu pronađeni zaposlenici
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošalji odmah
 ,Support Analytics,Analitike podrške
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logička pogreška: Mora naći preklapanje
 DocType: Item,Website Warehouse,Skladište web stranice
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manja od ili jednaka 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-obrazac zapisi
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-obrazac zapisi
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kupaca i dobavljača
 DocType: Email Digest,Email Digest Settings,E-pošta postavke
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Upiti podršci.
@@ -716,11 +732,11 @@
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 DocType: Shopping Cart Settings,Enable Checkout,Omogući Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Narudžbenica za plaćanje
+apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Narudžbenice za plaćanje
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -757,14 +773,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
 DocType: Item Attribute,Item Attribute Values,Stavka vrijednosti atributa
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Primka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Primka
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 DocType: Employee,Ms,Gospođa
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Majstor valute .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Majstor valute .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Prodaja Partneri i Županija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} mora biti aktivna
+DocType: Journal Entry,Depreciation Entry,Amortizacija Ulaz
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Idi košarica
 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
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam
 DocType: Address,Shop,Dućan
@@ -793,10 +810,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Ulazni račun
+DocType: Asset,Purchase Invoice,Ulazni račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
 DocType: Stock Entry,Total Outgoing Value,Ukupna odlazna vrijednost
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine
@@ -804,23 +821,26 @@
 DocType: Payment Request,Paid,Plaćen
 DocType: Salary Slip,Total in words,Ukupno je u riječima
 DocType: Material Request Item,Lead Time Date,Potencijalni kupac - datum
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možda Mjenjačnica zapis nije stvoren za
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obavezno. Možta nije upisan tečaj za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Za &#39;proizvod Bundle&#39; predmeta, skladište, rednim i hrpa Ne smatrat će se iz &quot;Popis pakiranja &#39;stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo &#39;proizvod Bundle&#39; točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u &#39;pakiranje popis&#39; stol."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Za &#39;proizvod Bundle&#39; predmeta, skladište, rednim i hrpa Ne smatrat će se iz &quot;Popis pakiranja &#39;stol. Ako Skladište i serije ne su isti za sve pakiranje predmeta za bilo &#39;proizvod Bundle&#39; točke, te vrijednosti može se unijeti u glavnoj točki stol, vrijednosti će se kopirati u &#39;pakiranje popis&#39; stol."
 DocType: Job Opening,Publish on website,Objavi na web stranici
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Isporuke kupcima.
-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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
+DocType: Purchase Invoice Item,Purchase Order Item,Stavka narudžbenice
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Postavi Iznos Plaćanje = Izvanredna Iznos
 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 +672,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Odaberite stavke za prijenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni Postotak Popust
 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,Dopusti korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Red {0}: Račun {1} je nevažeća, to bi moglo biti poništena / ne postoji. \ Unesite valjanu fakture"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
@@ -829,14 +849,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 ,Employee Holiday Attendance,Zaposlenik odmor posjećenost
 DocType: Opportunity,Walk In,Šetnja u
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock tekstova
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock tekstova
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Napravi
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
 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 +5,My Cart,Moja košarica
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
 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 +180,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Da li stvarno želite vratiti ovaj otpisan imovine?
+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 +80,Leave Allocation Tool,Alat za raspodjelu odsustva
 DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
@@ -859,11 +880,11 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 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 +547,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Popust
-DocType: Features Setup,Purchase Discounts,Kupnja Popusti
+DocType: Features Setup,Purchase Discounts,Popusti pri nabavi
 DocType: Workstation,Wages,Plaće
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Će se ažurirati samo ako vrijeme Log &#39;naplativo&#39;
 DocType: Project,Internal,Interni
@@ -871,23 +892,24 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Navedite valjanu Row ID za redom {0} u tablici {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Idi na radnu površinu i početi koristiti ERPNext
 DocType: Item,Manufacturer,Proizvođač
-DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
+DocType: Landed Cost Item,Purchase Receipt Item,Stavka primke
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Vrijeme Trupci
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Vrijeme Trupci
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,otpisan
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,regrutacija
 DocType: BOM Operation,Operation,Operacija
 DocType: Lead,Organization Name,Naziv organizacije
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Prodajni troškovi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
@@ -904,7 +926,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Doktor
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 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
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -921,7 +943,7 @@
 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 +130,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 +131,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 +42,Contribution %,Doprinos%
@@ -930,22 +952,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt Suradnja Poziv
 DocType: Salary Slip,Deductions,Odbici
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ovo Batch Vrijeme Log je naplaćeno.
 DocType: Salary Slip,Leave Without Pay,Neplaćeno odsustvo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapacitet Greška planiranje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapacitet Greška planiranje
 ,Trial Balance for Party,Suđenje Stanje na stranku
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Zarada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Stanje
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ništa za zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Uprava
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
@@ -956,24 +979,24 @@
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Država cjenika
 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"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Molimo postavite e-ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Molimo postavite e-ID
 DocType: Item,UOMs,J. MJ.
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod proizvoda ne može se mijenjati za serijski broj.
 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/config/buying.py +33,Supplier database.,Dobavljač baza podataka.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavljač baza podataka.
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Troška za stavku s šifra '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,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 +83,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
+,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Proizvod ulaznog računa
 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.
@@ -981,6 +1004,7 @@
 DocType: Holiday,Holiday,Odmor
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-oblika nije primjenjiv za fakture: {0}
 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
@@ -994,19 +1018,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
 DocType: Contact,User ID,Korisnički ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Pogledaj Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Plaćeni Dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Plaćeni Dividende
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo knjiga
 DocType: Stock Reconciliation,Difference Amount,Razlika Količina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Zadržana dobit
 DocType: BOM Item,Item Description,Opis proizvoda
 DocType: Payment Tool,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajući
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Privremeni Otvaranje
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
@@ -1029,8 +1054,8 @@
 ,Accounts Payable Summary,Obveze Sažetak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
@@ -1038,7 +1063,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Zaglavlje računa {0} stvoreno
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareno
@@ -1046,12 +1071,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 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
@@ -1061,19 +1086,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Web Prodavač
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status proizvodnog naloga je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status proizvodnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,za Supplier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Niste pronašli bilo koju stavku pod nazivom {0}
 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
@@ -1081,10 +1107,10 @@
 DocType: Item,Website Item Groups,Grupe proizvoda web stranice
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
-DocType: Journal Entry,Journal Entry,Temeljnica
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 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
@@ -1093,6 +1119,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ponavljajući Upto
 DocType: Attendance,HR Manager,HR menadžer
@@ -1103,6 +1130,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Trenutna vrijednost nakon amortizacije mora biti manja od jednaka {0}
 ,BOM Browser,BOM preglednik
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ako Godišnji proračun Prebačen (za reprezentaciju)
@@ -1117,21 +1145,22 @@
 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}
 DocType: Project,Start and End Dates,Datumi početka i završetka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Prosječni popust
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Knjigovodstvo
 DocType: Features Setup,Features Setup,Značajke postavki
+DocType: Asset,Depreciation Schedules,amortizacija Raspored
 DocType: Item,Is Service Item,Je usluga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,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
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,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.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1145,8 +1174,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 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 +513,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 +181,Max: {0},Maksimalno: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevnik mailova
@@ -1154,13 +1183,13 @@
 DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontni plan
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ne može biti veće od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
-,Purchase Invoice Trends,Trendovi kupnje proizvoda
+,Purchase Invoice Trends,Trendovi nabavnih računa
 DocType: Employee,Better Prospects,Bolji izgledi
 DocType: Appraisal,Goals,Golovi
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
@@ -1177,11 +1206,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Porezni Pravilo za transakcije.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Porezni Pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Kupili smo ovaj proizvod
 DocType: Address,Billing,Naplata
@@ -1191,12 +1220,15 @@
 DocType: Quality Inspection,Readings,Očitanja
 DocType: Stock Entry,Total Additional Costs,Ukupno Dodatni troškovi
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,pod skupštine
+DocType: Asset,Asset Name,Naziv imovinom
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Odreskom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Najam ureda
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Odreskom
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Postavke SMS pristupnika
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahtjev za ponudu može biti pristup klikom linku
+DocType: Asset,Number of Months in a Period,Broj mjeseci u razdoblju
 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
@@ -1213,28 +1245,29 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
 DocType: Sales Invoice,Source,Izvor
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Prikaži zatvorene
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Financijska godina - početni datum
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Novčani tijek iz investicijskih
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
 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 +86,Transfer Materials for Manufacture,Prijenos Materijali za izradu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Prijenos Materijali za izradu
 DocType: Pricing Rule,For Price List,Za cjenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
+apps/erpnext/erpnext/stock/stock_ledger.py +406,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nabavna cijena za stavke: {0} nije pronađena, a potrebna je za knjiženje (trošak). Molimo unesite cijenu stavke prema popisu nabavnnih 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Kreirajte novi račun iz kontnog plana.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Održavanje Posjetite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Održavanje Posjetite
 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: Landed Cost Voucher,Landed Cost Help,Zavisni troškovi - Pomoć
@@ -1248,7 +1281,6 @@
 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 +196,Brand master.,Glavni brend.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,kutija
@@ -1276,7 +1308,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Potraživanja za tvrtke trošak.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
@@ -1285,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno slanje plaćanja Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Ostala izvješća
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1295,26 +1327,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Pogledaj
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Količina ne smije biti veća od {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Prethodne financijske godine nije zatvoren
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Dobavljač Vrsta majstor .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 DocType: Purchase Invoice,Reference Document,Referentni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Primka {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,Primka {0} nije potvrđena
 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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Naplaćeno
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
@@ -1336,8 +1369,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto promjena u obveze prema dobavljačima
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Molimo provjerite svoj e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 DocType: Quotation,Term Details,Oročeni Detalji
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planiranje kapaciteta za (dani)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Jamstvo Zatraži
@@ -1355,7 +1389,7 @@
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Unaprijed plaćeni od {0} {1} ne može biti veća \ nego SVEUKUPNO {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Odaberite Šifra
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Odaberite Šifra
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Smanjite odbitak za ostaviti bez plaća (lwp)
 DocType: Territory,Territory Manager,Upravitelj teritorija
 DocType: Packed Item,To Warehouse (Optional),Za Warehouse (po izboru)
@@ -1365,15 +1399,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Jedna jedinica stavku.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1390,33 +1424,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","npr ""XYZ narodna banka """
+DocType: Asset,Depreciation Method,Metoda amortizacije
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 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 +29,Shopping Cart is enabled,Košarica omogućeno
 DocType: Job Applicant,Applicant for a Job,Podnositelj zahtjeva za posao
 DocType: Production Plan Material Request,Production Plan Material Request,Izrada plana materijala Zahtjev
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nema napravljenih proizvodnih naloga
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nema napravljenih proizvodnih naloga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1424,31 +1460,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Naziv teritorija
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adrese
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,procjene
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za pravilu dostava
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Stavka ne smije imati proizvodni nalog.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Stavka ne smije imati proizvodni nalog.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
 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: 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 +27,Time Logs for manufacturing.,Vrijeme Trupci za proizvodnju.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Uplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1459,6 +1496,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
+DocType: Request for Quotation Supplier,Send Email to Supplier,Pošaljite e-poštu Dobavljaču
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Production Planning Tool,Material Requests,Materijal Zahtjevi
@@ -1476,7 +1514,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 DocType: Stock Settings,Allowance Percent,Dodatak posto
 DocType: SMS Settings,Message Parameter,Parametri poruke
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Drvo centara financijski trošak.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Drvo centara financijski trošak.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Se predmeti od kupnje primitke
 DocType: Serial No,Creation Date,Datum stvaranja
@@ -1508,41 +1546,43 @@
 ,Amount to Deliver,Iznos za isporuku
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} stvorio
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
 ,Serial No Status,Status serijskog broja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tablica ne može biti prazna
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: Za postavljanje {1} periodičnost, razlika između od a do danas \
  mora biti veći ili jednak {2}"
 DocType: Pricing Rule,Selling,Prodaja
 DocType: Employee,Salary Information,Informacije o plaći
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway račun nije konfiguriran
 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: Production Order,Material Request Item,Zahtjev za robom - proizvod
+DocType: Request for Quotation Item,Material Request Item,Zahtjev za robom - proizvod
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,prodan
+,Item-wise Purchase History,Povjest nabave po stavkama
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crvena
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Izbrišite sve transakcije za ovu Društvo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: Item Group,Show In Website,Pokaži na web stranici
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupa
@@ -1550,6 +1590,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantogram svih zadataka.
+DocType: Pricing Rule,Margin Type,Margina Vrsta
 DocType: Appraisal,For Employee Name,Za ime zaposlenika
 DocType: Holiday List,Clear Table,Jasno Tablica
 DocType: Features Setup,Brands,Brendovi
@@ -1557,20 +1598,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Red # {0}: Imovina je obavezno protiv dugotrajne imovine točki
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo postavljanje broje serija za sudjelovanje putem Podešavanje&gt; numeriranja Serija
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 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: Asset,Purchase Date,Datum kupnje
 DocType: Employee,Personal Details,Osobni podaci
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo postavite &quot;imovinom Centar Amortizacija troškova &#39;u Društvu {0}
 ,Maintenance Schedules,Održavanja rasporeda
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
@@ -1584,23 +1630,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa ne-Group
 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/public/js/setup_wizard.js +272,Unit,jedinica
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Navedite tvrtke
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM Pretraživanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
@@ -1609,29 +1654,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,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/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
 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
 DocType: Territory,Classification of Customers by region,Klasifikacija korisnika po regiji
 DocType: Project,% Tasks Completed,% Odrađeni zadaci
 DocType: Project,Gross Margin,Bruto marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Izračunato banka Izjava stanje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogućen korisnika
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Ponuda
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Korisnik održavanja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Trošak Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Trošak Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo postavljanje zaposlenika sustav imenovanja u ljudskim resursima&gt; HR Postavke
 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
@@ -1643,8 +1689,8 @@
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+DocType: Request for Quotation,Manufacturing Manager,Upravitelj proizvodnje
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
@@ -1652,12 +1698,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Korisnik {0} je onemogućen
@@ -1666,7 +1712,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
@@ -1676,11 +1722,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Red # {0}: Količina mora biti jedan, jer je predmet vezan za imovinu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Uklonite stavku &#39;{0}&#39; i spremanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Novi trošak
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idi u odgovarajuću grupu (obično izvor sredstava&gt; kratkoročne obveze&gt; poreza i pristojbi te stvoriti novi korisnički račun (klikom na Dodaj Child) tipa &quot;porez&quot; i ne spominju stope poreza.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Quality Inspection,In Process,U procesu
@@ -1693,10 +1739,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
 DocType: Quotation Item,Stock Balance,Skladišna bilanca
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Vrijeme Evidencije stvorio:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Vrijeme Evidencije stvorio:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
@@ -1714,13 +1761,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Navedite zemlju za ovaj Dostava pravilom ili provjeriti Dostava u svijetu
 DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Zaduženja je potrebno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
 DocType: Offer Letter Term,Offer Term,Ponuda Pojam
 DocType: Quality Inspection,Quality Manager,Upravitelj kvalitete
 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 +141,Please select Incharge Person's name,Odaberite incharge ime osobe
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
@@ -1728,22 +1775,22 @@
 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 +103,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Cjenik {0} je ugašen
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cjenik {0} je ugašen
 DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutno Vrednovanje Ocijenite
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
 DocType: Opportunity,Lost Reason,Razlog gubitka
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Stvaranje unosa plaćanja protiv narudžbe ili fakture.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Stvaranje unosa plaćanja protiv narudžbe ili fakture.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1752,10 +1799,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ne plaća slip naći za mjesec dana:
 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 +175,Serial No {0} not found,Serijski broj {0} nije pronađen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serijski broj {0} nije pronađen
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vaši klijenti
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Datum bloka
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Primijeni sada
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Primijeni sada
 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."
@@ -1779,7 +1827,7 @@
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novo radno mjesto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Postavi kao zatvoreno
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nema proizvoda sa barkodom {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nema proizvoda sa barkodom {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Ako imate prodajnog tima i prodaja partnerima (partneri) mogu biti označene i održavati svoj doprinos u prodajne aktivnosti
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
@@ -1797,10 +1845,10 @@
 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 +608,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Prijenos materijala
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Stavka {0} mora biti Prodaja predmeta u {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -1814,12 +1862,13 @@
 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: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz e od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Pozovi kao korisnik
 DocType: Features Setup,After Sale Installations,Nakon prodaje postrojenja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Molimo postavite {0} u Društvu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 DocType: Workstation Working Hour,End Time,Kraj vremena
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
@@ -1828,9 +1877,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Grupno slanje mailova
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
@@ -1842,30 +1891,30 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalji rasporeda održavanja
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je Frozen
-DocType: Buying Settings,Buying Settings,Kupnja postavke
+DocType: Buying Settings,Buying Settings,Ppostavke nabave
 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
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Račun za plaćanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto promjena u potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Brzo Temeljnica
 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 +206,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nije podnesen
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1874,7 +1923,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Bilten Mailing lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
@@ -1892,13 +1941,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} je zatvorena
 DocType: Email Digest,How frequently?,Kako često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi u odgovarajuću grupu (obično Application fondova&gt; kratkotrajne imovine&gt; bankovnih računa i stvorili novi račun (klikom na Dodaj Child) tipa &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill materijala
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Sadašnje
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: Authorization Rule,Applicable To (Role),Odnosi se na (uloga)
 DocType: Stock Entry,Purpose,Svrha
+DocType: Company,Fixed Asset Depreciation Settings,Postavke Amortizacija osnovnog sredstva
 DocType: Item,Will also apply for variants unless overrridden,Također će zatražiti varijante osim overrridden
 DocType: Purchase Invoice,Advances,Predujmovi
 DocType: Production Order,Manufacture against Material Request,Proizvodnja od materijala dogovoru
@@ -1907,6 +1956,7 @@
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1957,12 +2007,14 @@
  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: Purchase Receipt Item,Recd Quantity,RecD Količina
-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}
+DocType: Asset Category Account,Asset Category Account,Imovina Kategorija račun
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","npr. banka, gotovina, kreditne kartice"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi u odgovarajuću grupu (obično Application fondova&gt; kratkotrajne imovine&gt; bankovnih računa i stvorili novi račun (klikom na Dodaj Child) tipa &quot;Banka&quot;
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1986,9 +2038,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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 kupovni cjenik
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Niti jedan zaposlenik za prethodno izabrane kriterije ili plaća klizanja već stvorili
@@ -2015,7 +2067,7 @@
 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 +200,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'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Platni spisak
 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"
@@ -2025,8 +2077,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagodba Obrasci
 DocType: Account,Income Account,Račun prihoda
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ne zadana adresa predloška pronađen. Molimo stvoriti novi iz Setup&gt; Tisak i Branding&gt; Address predložak.
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2048,21 +2101,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Novi naziv troškovnog centra
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
 DocType: Appraisal,HR User,HR Korisnik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/config/support.py +7,Issues,Pitanja
+apps/erpnext/erpnext/hooks.py +90,Issues,Pitanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Račun dobiti i gubitka
@@ -2076,10 +2130,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
 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 +139,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
 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 +142,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupni iznos
@@ -2147,13 +2201,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Tražena
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nema primjedbi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fiksni Asset Stavka mora biti ne-stock točka a
 DocType: Supplier Quotation Item,Material Request No,Zahtjev za robom br.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2174,7 +2229,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Payment Request,Recipient and Message,Primatelj i poruka
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2188,7 +2243,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Odaberite Dobavljač adresa
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute e
@@ -2210,12 +2265,13 @@
 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/config/buying.py +18,Request for quotation.,Zahtjev za ponudu.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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ći od sveukupnog ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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ći od sveukupnog ({2})
 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 +294,Price List Currency not selected,Valuta cjenika nije odabrana
-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/stock/get_item_details.py +293,Price List Currency not selected,Valuta cjenika nije odabrana
+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,Red stavke {0}:Primka {1} ne postoji u gornjem popisu primki
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,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
@@ -2223,7 +2279,7 @@
 DocType: Installation Note Item,Against Document No,Protiv dokumentu nema
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Uredi prodajne partnere.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Odaberite {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačeno posjećenost
@@ -2238,11 +2294,12 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Amortizacija reprezentaciju
 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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Zaprimljena stavka iz primke
 apps/erpnext/erpnext/public/js/pos/pos.js +356,Pay,Platiti
 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
@@ -2251,7 +2308,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 DocType: Payment Gateway,Gateway,Prolaz
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Unesite olakšavanja datum .
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2265,18 +2322,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaj za {0} do {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaj za {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Poludnevni
 DocType: Sales Invoice,Sales Team,Prodajni tim
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dupli unos
 DocType: Serial No,Under Warranty,Pod jamstvom
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Kupac skladišta (po izboru)
 DocType: Pricing Rule,Discount Percentage,Postotak popusta
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
@@ -2287,7 +2345,7 @@
 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
-DocType: Pricing Rule,Purchase Manager,Kupnja Manager
+DocType: Pricing Rule,Purchase Manager,Upravitelj nabave
 DocType: Payment Tool,Payment Tool,Alat za plaćanje
 DocType: Target Detail,Target Detail,Ciljana Detalj
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Svi poslovi
@@ -2302,14 +2360,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite tip transakcije
 DocType: GL Entry,Voucher No,Bon Ne
 DocType: Leave Allocation,Leave Allocation,Raspodjela odsustva
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Zahtjevi za robom {0} kreirani
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Zahtjevi za robom {0} kreirani
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Predložak izraza ili ugovora.
 DocType: Purchase Invoice,Address and Contact,Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Akumulirana amortizacija računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
+DocType: Asset,Expected Value After Useful Life,Očekivana vrijednost nakon korisnog vijeka trajanja
 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
@@ -2322,12 +2382,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto novac od investicijskih
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Korijen račun ne može biti izbrisan
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Imovina {0} mora biti predana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Upravljanje adrese
-DocType: Pricing Rule,Item Code,Šifra proizvoda
+DocType: Asset,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 DocType: Journal Entry,User Remark,Upute Zabilješka
@@ -2346,8 +2406,10 @@
 DocType: Production Planning Tool,Create Material Requests,Zahtjevnica za nabavu
 DocType: Employee Education,School/University,Škola / Sveučilište
 DocType: Payment Request,Reference Details,Referentni Detalji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 ,Billed Amount,Naplaćeni iznos
+DocType: Asset,Double Declining Balance,Dvaput padu Stanje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena redoslijed ne može se otkazati. Otvarati otkazati.
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nabavite ažuriranja
@@ -2366,6 +2428,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,potpuno amortizirana
 ,Stock Projected Qty,Stanje skladišta
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Gledatelja HTML
@@ -2373,25 +2436,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serijski broj i serije
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minuta
-DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
+DocType: Purchase Invoice,Purchase Taxes and Charges,Nabavni porezi i terećenja
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Odobreni popis neodobrenih odsustava
 DocType: Sales Partner,Retailer,Prodavač na malo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Onemogućavanje riječima
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank Prekoračenje računa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Stavka Šifra&gt; Stavka Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo postavite Amortizacija se odnose računi u imovini Kategorija {0} ili Društvo {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Početno stanje kapital
 DocType: Appraisal,Appraisal,Procjena
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-pošta dostavljati opskrbljivaču {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 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 +187,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
@@ -2399,7 +2465,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Workstation Working Hour,Start Time,Vrijeme početka
 DocType: Item Price,Bulk Import Help,Bulk uvoz Pomoć
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Odaberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Odaberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odjaviti s ovog Pošalji Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poslana poruka
@@ -2427,6 +2493,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Ukupna marža
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavi artikle u Hub
@@ -2440,7 +2507,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa kupaca / Kupac
 DocType: Payment Gateway Account,Default Payment Request Message,Zadana Zahtjev Plaćanje poruku
 DocType: Item Group,Check this if you want to show in website,Označi ovo ako želiš prikazati na webu
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bankarstvo i plaćanje
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankarstvo i plaćanje
 ,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
@@ -2448,17 +2515,17 @@
 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 +199,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 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/config/hr.py +55,Leaves and Holiday,Lišće i odmor
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Iznos naloga zavisnog troška
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
@@ -2474,15 +2541,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Imovina Centar Amortizacija troškova
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Kupnja Datum imovine {0} ne podudara s datumom kupnje proizvoda
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 ,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}
 DocType: Journal Entry,Stock Entry,Međuskladišnica
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dužnici ({0})
-DocType: Project,Margin,Marža
+DocType: Pricing Rule,Margin,Marža
 DocType: Salary Slip,Arrear Amount,Iznos unatrag
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobit%
@@ -2490,20 +2559,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
 DocType: Newsletter,Newsletter List,Popis Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Provjerite ako želite poslati plaće slip u pošti svakom zaposleniku, dok podnošenje plaće slip"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
 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 +57,Where manufacturing operations are carried.,Gdje se odvija proizvodni postupci.
 DocType: Stock Entry Detail,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
 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: Account,Accumulated Depreciation,akumulirana amortizacija
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
 DocType: Payment Request,Email To,E-mail Da
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
 DocType: Bin,Requested Quantity,Tražena količina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Skladište je potrebno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2511,12 +2583,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Isporučeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Isporučeno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Isti dobavljač je unesen više puta
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Stavka narudžbenice broj
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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."
@@ -2525,17 +2598,18 @@
 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.
 DocType: Payment Request,Payment Details,Pojedinosti o plaćanju
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
+DocType: Asset,Journal Entry for Scrap,Temeljnica za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 DocType: Manufacturer,Manufacturers used in Items,Proizvođači se koriste u stavkama
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Kreiraj novi dokument
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
+,Purchase Analytics,Analitika nabave
 DocType: Sales Invoice Item,Delivery Note Item,Otpremnica proizvoda
 DocType: Expense Claim,Task,Zadatak
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
@@ -2544,7 +2618,7 @@
 ,Stock Ledger,Glavna knjiga
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Ocijenite: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Odaberite grupu čvor na prvom mjestu.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Odaberite grupu čvor na prvom mjestu.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenika i posjećenost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Svrha mora biti jedna od {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Uklonite referencu kupac, dobavljač, prodaje partnera i olova, kao što je vaša adresa tvrtke"
@@ -2566,13 +2640,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: od {1}
 DocType: Task,depends_on,ovisi o
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Pokaži porez raspada
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Obrazac / Artikl / {0}) je out of stock
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od datum knjiženja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun knjiženja Datum
@@ -2587,7 +2662,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2601,7 +2676,7 @@
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2611,7 +2686,7 @@
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
 DocType: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
@@ -2622,7 +2697,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
@@ -2631,11 +2706,12 @@
 DocType: Journal Entry,Printing Settings,Ispis Postavke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Fiksni račun imovinom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Tečaj cjenika
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
@@ -2643,7 +2719,7 @@
 DocType: Stock Entry,From BOM,Od sastavnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
@@ -2651,17 +2727,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Izdavanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
 DocType: Hub Settings,Access Token,Pristup token
 DocType: Sales Invoice Item,Serial No,Serijski br
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
-DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 DocType: Purchase Invoice,Print Language,Ispis Language
 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"
+DocType: Asset,Number of Depreciations,Broj deprecijaciju
 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
@@ -2669,19 +2745,21 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Zahtjev za dostavljanje ponuda
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalna Iznos dostavnice
 DocType: Purchase Invoice Item,Image View,Prikaz slike
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
+DocType: Asset,Partially Depreciated,djelomično amortiziraju
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 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 +59,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: Account,Purchase User,Korisnik nabave
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
@@ -2691,13 +2769,13 @@
 DocType: Quotation,Maintenance Manager,Upravitelj održavanja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Izmijenjena Od
+DocType: Asset,Amended From,Izmijenjena Od
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2710,21 +2788,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Molimo spomenuti &#39;dobici / gubici računa na sredstva Odlaganje&#39; u društvu
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Plaćanja s faktura
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Plaćanja s faktura
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj u košaricu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupa Do
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Omogućiti / onemogućiti valute .
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 DocType: Production Planning Tool,Get Material Request,Dobiti materijala zahtjev
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Ukupno Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Računovodstveni izvještaji
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Računovodstveni izvještaji
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2744,15 +2823,16 @@
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Titula
 DocType: Features Setup,Item Groups in Details,Grupe proizvoda detaljno
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Početak Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Pogledajte izvješće razgovora vezanih uz održavanje.
 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 +169,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 +171,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Opis web stranice
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto promjena u kapitalu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
@@ -2760,12 +2840,13 @@
 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
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Pogreška: {0}&gt; {1}
 DocType: Item,Attributes,Značajke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnje narudžbe Datum
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
 DocType: C-Form,C-Form,C-obrazac
@@ -2777,18 +2858,18 @@
 DocType: Purchase Invoice,Mobile No,Mobitel br
 DocType: Payment Tool,Make Journal Entry,Provjerite Temeljnica
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,trgovački
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Pogreška: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Svi proizvodi i usluge.
 DocType: Supplier Quotation,Supplier Address,Dobavljač Adresa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2799,17 +2880,17 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default receivable račune
 DocType: Tax Rule,Billing State,Državna naplate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Prijenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Datum dospijeća je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Za Račun Datum
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Neaktivni korisnici
-DocType: Landed Cost Voucher,Purchase Receipts,Kupnja Primici
+DocType: Landed Cost Voucher,Purchase Receipts,Primke
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Quality Inspection,Delivery Note No,Otpremnica br
 DocType: Company,Retail,Maloprodaja
@@ -2817,25 +2898,27 @@
 DocType: Attendance,Absent,Odsutan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupnja poreze i pristojbe predloška
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Predložak nabavnih poreza i terećenja
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Pošalji Supplier e-pošte
 DocType: Features Setup,POS View,Prodajno mjesto prikaz
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Vrijeme Prijavite se Naplaćeno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Imenovanje serija za {0} preko Postavljanje&gt; Postavke&gt; imenujući serije
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Račun {0} ne može biti grupa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Molimo postavite zadanu vrijednost {0} u Društvu {1}
@@ -2845,12 +2928,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo postavljanje broje serija za sudjelovanje putem Podešavanje&gt; numeriranja Serija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+DocType: Asset,Straight Line,Ravna crta
+DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Prodajni popusti
@@ -2864,39 +2948,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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: 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 +117,Add Child,Dodaj dijete
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Otvaranje vrijednost
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Naplata Država
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Troškovi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Prijave za odmor.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Pravni troškovi
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Sales Order,% Amount Billed,% Naplaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonski troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonski troškovi
 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.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nema proizvoda sa serijskim brojem {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvoreno Obavijesti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Izravni troškovi
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Izravni troškovi
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} nije ispravan e-mail adresu u &quot;Obavijest \ e-mail adresa &#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
@@ -2913,7 +2998,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Prodajemo ovaj proizvod
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Dobavljač
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Količina bi trebala biti veća od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Količina bi trebala biti veća od 0
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
@@ -2924,11 +3009,12 @@
 DocType: Production Order,Total Operating Cost,Ukupni trošak
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dobavljač imovine {0} ne podudara s dobavljačem na fakturi
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plaća predložak majstor .
@@ -2944,28 +3030,29 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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),Stopa cjenika (valuta tvrtke)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Valuta naplate mora biti jednaka Zadano comapany valute ili payble valutu stranke
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,tajnica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite &quot;, riječima &#39;polja neće biti vidljiva u bilo koju transakciju"
 DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku
-DocType: Pricing Rule,Buying,Kupnja
+DocType: Pricing Rule,Buying,Nabava
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ovo Batch Vrijeme Log je otkazan.
 ,Reqd By Date,Reqd Po datumu
 DocType: Salary Slip Earning,Salary Slip Earning,Plaća proklizavanja Zarada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Vjerovnici
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Vjerovnici
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Red # {0}: Serijski br obvezno
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 ,Item-wise Price List Rate,Item-wise cjenik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2986,15 +3073,14 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
-DocType: Project,Project Name,Naziv projekta
+DocType: Request for Quotation Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije proizvoda
@@ -3024,6 +3110,7 @@
 DocType: Sales Invoice,End Date,Datum završetka
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock transakcije
 DocType: Employee,Internal Work History,Unutarnja Povijest Posao
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumulirana amortizacija iznos
 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
@@ -3031,7 +3118,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Društvo je obvezno, kao što je vaša adresa tvrtke"
 DocType: Item Attribute,From Range,Iz raspona
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Proizvod {0} se ignorira budući da nije skladišni artikal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
 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.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Company,Domain,Domena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Posao
@@ -3043,6 +3130,7 @@
 DocType: Time Log,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3059,10 +3147,11 @@
 DocType: Sales Order,Delivery Date,Datum isporuke
 DocType: Opportunity,Opportunity Date,Datum prilike
 DocType: Purchase Receipt,Return Against Purchase Receipt,Povratak na primku
+DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za ponudu točke
 DocType: Purchase Order,To Bill,Za Billa
 DocType: Material Request,% Ordered,% Naručeno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,AVG. Kupnja stopa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Prosječna nabavna cijena
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Newsletteri
@@ -3073,11 +3162,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Postavke računa
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Molimo postavite &quot;Asset račun Odlaganje &#39;u Društvu {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Postrojenja i strojevi
 DocType: Sales Partner,Partner's Website,Web stranica partnera
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Privremeni računi
 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
@@ -3085,22 +3175,23 @@
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Kliknite ovdje za plačanje
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Kliknite ovdje za plaćanje
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Imovina {0} ne može biti otpisan, kao što je već {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsutni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Dodavanje stavki iz
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Dodavanje stavki iz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladište {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3115,10 +3206,11 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Stavka {0} je onemogućen
 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
+DocType: Tax Rule,Purchase,Nabava
 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}
@@ -3126,7 +3218,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Postava Gateway račune.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Postava Gateway račune.
 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
 ,Cash Flow,Protok novca
@@ -3140,7 +3232,7 @@
 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 +132,Please find attached {0} #{1},U prilogu {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},U prilogu {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
@@ -3156,19 +3248,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Navedite od / do rasponu
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička Group&gt; Regija
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Zadane postavke za prodajne transakcije.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/support.py +43,Warranty,garancija
 DocType: Production Order,Warehouses,Skladišta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Ispis i stacionarnih
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Ispis i stacionarnih
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Update gotovih proizvoda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Plaćeni iznos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
@@ -3198,7 +3289,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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."
 DocType: Leave Block List,Applies to Company,Odnosi se na Društvo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
 DocType: Purchase Invoice,In Words,Riječima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Danas je {0} 'rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Zahtjev za robom za skladište
@@ -3206,14 +3297,16 @@
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Pregled zadataka
 apps/erpnext/erpnext/public/js/setup_wizard.js +40,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
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite primke
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Pridružiti
 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 +564,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
+DocType: Pricing Rule,Margin Rate or Amount,Margina brzine ili količine
 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
@@ -3223,7 +3316,7 @@
 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 +782,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3231,14 +3324,13 @@
 DocType: Customer,Sales Team Details,Detalji prodnog tima
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Pogrešna {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Imenovanje serija za {0} preko Postavljanje&gt; Postavke&gt; imenujući serije
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni naziv
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
@@ -3256,14 +3348,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Glavna knjiga
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj vodi
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {0}
 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>
@@ -3293,25 +3386,25 @@
 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 .
-DocType: Tax Rule,Purchase Tax Template,Porez na predložak
+DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
 ,Project wise Stock Tracking,Projekt mudar Stock Praćenje
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarni Kol (na izvoru / ciljne)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidencija zaposlenih.
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,Postavke plaće
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Naručiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Odaberite brand ...
 DocType: Sales Invoice,C-Form Applicable,Primjenjivi C-obrazac
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3329,7 +3422,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Primite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Primite
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Napravljeno
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
@@ -3337,14 +3430,14 @@
 DocType: Purchase Invoice,Submit on creation,Pošalji na stvaranje
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Upravitelj predloška nabave
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Moje narudžbe
@@ -3365,10 +3458,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-prodaju Profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Maintenance Schedule Detail,Scheduled Date,Planirano Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Cjelokupni iznos Amt
@@ -3380,11 +3473,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Dobavljač Dio Ne
 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
@@ -3393,12 +3487,12 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Od {0} od {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Payment Reconciliation,From Invoice Date,Iz dostavnice Datum
@@ -3407,7 +3501,7 @@
 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 +351,'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 +356,'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
@@ -3420,7 +3514,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
@@ -3434,15 +3528,15 @@
 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 +576,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projekt aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
-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/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nabava mora 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: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3462,8 +3556,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Godina datum početka ili završetka je preklapanje s {0}. Da bi se izbjegla postavite tvrtku
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novi bilten
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 DocType: 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.","Primjer:. ABCD ##### 
  Ako Serija je postavljena i serijski broj ne spominje u prometu, a zatim automatsko serijski broj će biti izrađen na temelju ove serije. Ako ste uvijek žele eksplicitno spomenuti serijski brojevi za tu stavku. ostavite praznim."
@@ -3475,11 +3570,11 @@
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Postavke proizvodnje
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavljanje e-poštu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Unesite zadanu valutu u tvrtki Master
 DocType: Stock Entry Detail,Stock Entry Detail,Detalji međuskladišnice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dnevne Podsjetnici
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Naziv novog računa
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
@@ -3489,11 +3584,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Postotak
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3501,11 +3597,12 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 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 +385,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Tip partnera
 DocType: Purchase Taxes and Charges,Actual,Stvaran
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idi u odgovarajuću grupu (obično izvor sredstava&gt; kratkoročne obveze&gt; poreza i pristojbi te stvoriti novi korisnički račun (klikom na Dodaj Child) tipa &quot;porez&quot; i ne spominju stope poreza.
 DocType: Production Order,Production Order,Proizvodni nalog
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
@@ -3524,18 +3621,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani datum završetka
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Valjanost
+DocType: Request for Quotation,Supplier Detail,Dobavljač Detalj
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Dostavljeni iznos
 DocType: Attendance,Attendance,Pohađanje
 apps/erpnext/erpnext/config/projects.py +55,Reports,Izvješća
 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 +508,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,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
@@ -3545,10 +3643,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,VPC
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativni troškovi
 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 +455,Change,Promjena
@@ -3556,6 +3654,7 @@
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Imovina Kategorija Naziv
 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
@@ -3567,13 +3666,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Serija
@@ -3587,7 +3686,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodajna osoba
 DocType: Sales Invoice,Cold Calling,Hladno pozivanje
 DocType: SMS Parameter,SMS Parameter,SMS parametra
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Proračun i Centar Cijena
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Proračun i Centar Cijena
 DocType: Maintenance Schedule Item,Half Yearly,Pola godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Napravi pravila za ograničavanje prometa na temelju vrijednosti.
@@ -3615,12 +3714,12 @@
 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 +95,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
+DocType: Purchase Common,Purchase Common,Zajednička nabava
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Stavka Šifra&gt; Stavka Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3628,7 +3727,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Nadređeni račun
@@ -3644,7 +3743,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
 DocType: Address,Office,Ured
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
@@ -3655,10 +3754,11 @@
 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: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
+DocType: Serial No,Purchase / Manufacture Details,Detalji nabave/proizvodnje
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Popusti i margina
 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: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
@@ -3679,7 +3779,7 @@
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
@@ -3687,22 +3787,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Plaćanje URL poruka
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Ukupno Neplaćeni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Vrijeme Log nije naplatnih
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Kupac
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
+DocType: Asset,Asset Category,imovina Kategorija
+apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Dobavljač
 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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materijal za dobavljača
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Trošarine Račun
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Označena posjećenost
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kratkoročne obveze
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kratkoročne obveze
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Stvarni Količina je obavezno
@@ -3723,17 +3824,16 @@
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Pričvrstite Logo
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analitika
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ne zadana adresa predloška pronađen. Molimo stvoriti novi iz Setup&gt; Tisak i Branding&gt; Address predložak.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapital
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka plaćanja preusmjeriti korisnika na odabranu stranicu.
@@ -3742,20 +3842,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
+DocType: Asset,Current Value (After Depreciation),Trenutna vrijednost (nakon amortizacije)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
-,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
+,Item-wise Purchase Register,Popis nabave po stavkama
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Za postavljanje razine automatske narudžbe, stavka mora biti odobrena za nabavu ili proizvodnju"
 ,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 +13,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 +409, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
@@ -3763,6 +3864,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Račun {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 2a00085..3404172 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Terjesztő
 DocType: Employee,Rented,Bérelt
 DocType: POS Profile,Applicable for User,Alkalmazható Felhasználó
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,"Tényleg azt szeretnénk, hogy leépítik ezt az eszközt?"
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük beállítási Alkalmazott névadási rendszerben Emberi Erőforrás&gt; HR beállítások
 DocType: Purchase Order,Customer Contact,Ügyfélkapcsolati
 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ó
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
 DocType: Manufacturing Settings,Default 10 mins,Default 10 perc
 DocType: Leave Type,Leave Type Name,Hagyja típus neve
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,műsormegnyitó
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sorozat sikeresen frissítve
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Új Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mutasd változatok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Fiókok tábla nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Titulus
@@ -64,7 +66,7 @@
 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 +642,Invoice,Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Védelem
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Új {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Új {0}: # {1}
 ,Sales Partners Commission,Értékesítő partner jutaléka
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
 DocType: Payment Request,Payment Request,Kifizetési kérelem
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Házas
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nem engedélyezett {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Hogy elemeket
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
 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 +197,Item {0} does not exist in the system or has expired,"Elem {0} nem létezik a rendszerben, vagy lejárt"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,Van állóeszköz
 DocType: Expense Claim Detail,Claim Amount,Követelés összege
 DocType: Employee,Mr,Úr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Szállító Type / szállító
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Minden Kapcsolattartó
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} fagyasztott
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock költségek
 DocType: Newsletter,Email Sent?,Emailt elküldeni?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Időnaplók mutatása
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Telepítés állapota
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Elem {0} kell a vásárlást tétel
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Beállításait HR modul
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: BOM Replace Tool,New BOM,Új anyagjegyzék
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Advance összege nem lehet nagyobb, mint {0} {1}"
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Advance összege nem lehet nagyobb, mint {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Kérjük, adja Társaság"
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettó származó pénzeszközök
 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 +217,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 +227,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ő
 ,Contact Name,Kapcsolattartó neve
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a {1} céghez
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
 DocType: Payment Tool,Reference No,Hivatkozási szám
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank bejegyzések
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,{0} elem törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Notification vezérlés
 DocType: Lead,Suggestions,Javaslatok
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set tétel Group-bölcs költségvetés azon a területen. Akkor is a szezonalitás beállításával Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Kérjük, adja szülő fiókcsoportot raktári {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Kérjük, adja szülő fiókcsoportot raktári {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetési ellen {0} {1} nem lehet nagyobb, mint kint levő összeg {2}"
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobiltelefon
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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ó
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Tanul
+DocType: Asset,Next Depreciation Date,Következő Értékcsökkenés dátuma
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activity Egy alkalmazottra jutó
 DocType: Accounts Settings,Settings for Accounts,Beállításait Accounts
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Szállító számla nem létezik beszerzési számla {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Kezelje Sales Person fa.
 DocType: Job Applicant,Cover Letter,Kísérő levél
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Kiemelkedő csekkeket és a betétek egyértelmű
 DocType: Item,Synced With Hub,Szinkronizálta Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Hibás Jelszó
 DocType: Item,Variant Of,Változata
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
 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: 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."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} egység [{1}] (# Form / pont / {1}) található a [{2}] (# Form / Warehouse / {2})
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Hírlevél
 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
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Szállítólevél
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Szállítólevél
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Beállítása Adók
 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 +381,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Kérjük, válasszon hónapot és évet"
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,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/inactive_customers/inactive_customers.py +69,Total Order Considered,Teljes Megrendelés Tekinthető
 apps/erpnext/erpnext/config/hr.py +190,"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 +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített Employee {1} időszakra {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Elem kiválasztása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nem tartozik szállítólevél {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Anyag minőségi vizsgálatának részletei
 DocType: Leave Application,Leave Approver Name,Hagyja Jóváhagyó név
-,Schedule Date,Menetrend dátuma
+DocType: Depreciation Schedule,Schedule Date,Menetrend dátuma
 DocType: Packed Item,Packed Item,Csomagolt Elem
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Alapértelmezett beállítások a vásárlás tranzakciókat.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Alapértelmezett beállítások a vásárlás tranzakciókat.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Tevékenység Költség létezik Employee {0} elleni tevékenység típusa - {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.,"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
@@ -346,6 +353,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
 DocType: Workstation,Working Hours,Munkaidő
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszám egy meglévő sorozatban.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ha több árképzési szabályok továbbra is fennállnak, a felhasználók arra kérik, hogy a prioritás beállítása kézzel tudja oldani a konfliktusokat."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,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 +550,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 +555,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 +70,Holiday master.,Nyaralás mester.
-DocType: Material Request Item,Required Date,Szükséges dátuma
+DocType: Request for Quotation 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 +770,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Üzenet a Szállító
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
 DocType: Employee,Health Concerns,Egészségügyi aggodalmak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Fizetetlen
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 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 +315,Managing Subcontracting,Ügyvezető alvállalkozói munkák
+DocType: Project,Project will be accessible on the website to these users,"Project lesz elérhető a honlapon, hogy ezek a felhasználó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 +53,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Lépésköz nem lehet 0
 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 +86,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Folyamatban db
 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 +126,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 +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Pénzügyi / számviteli év.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Halmozott értékek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
 DocType: Project Task,Project Task,Projekt feladat
 ,Lead Id,Célpont ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Szállított: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Fizetendő számla
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Folytatás Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
 DocType: Leave Control Panel,Allocate,Osztja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Eladás visszaküldése
 DocType: Item,Delivered by Supplier (Drop Ship),Megérkezés a Szállító (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,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.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,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/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Fő adatok
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Frissítés Bank Tranzakció időpontja
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Frissítés Bank Tranzakció időpontja
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Kérjük, adja vásárlási nyugta első"
 DocType: Buying Settings,Supplier Naming By,Elnevezése a szállítóval
 DocType: Activity Type,Default Costing Rate,Alapértelmezett Költség Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Karbantartási ütemterv
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettó készletváltozás
 DocType: Employee,Passport Number,Útlevél száma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menedzser
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Kérjük, állítsa be Nyaralás lista sem az alkalmazottak vagy a Társaság"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,értékcsökkenés összege
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Átalakítás Group
 DocType: Activity Cost,Activity Type,Tevékenység típusa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Szállított érték
 DocType: Supplier,Fixed Days,Fix Napok
 DocType: Quotation Item,Item Balance,Elem Balance
 DocType: Sales Invoice,Packing List,Csomagolási lista
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Megrendelések beszállítóknak.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Megrendelések beszállítóknak.
 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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Működési idő
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Csoportról csoportra
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Saját projektek
 DocType: Journal Entry,Write Off Amount,Leírt összeg
 DocType: Journal Entry,Bill No,Bill No
+DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla on Asset ártalmatlanítása
 DocType: Purchase Invoice,Quarterly,Negyedévenként
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Társaság Currency)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Fizetési Nevezési már létrehozott
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Asset nem kapcsolódik pont {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Összesen számlázási idén
 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 +529,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"Lead kell állítani, ha Opportunity készült Lead"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,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
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
 DocType: Item Group,Website Specifications,Honlapok
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Van egy hiba a Címsablon {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,New Account
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: A {0} típusú {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumok, kérjük megoldani konfliktus elsőbbséget. Ár Szabályok: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumok, kérjük megoldani konfliktus elsőbbséget. Ár Szabályok: {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.,Könyvelési tételek nem lehet neki felróni az ágakat. Bejegyzés elleni csoportjai nem engedélyezettek.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Irodai karbantartási költségek
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}."
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Árlista nincs kiválasztva
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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ő"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Saját számlák
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Saját számlák
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Asset kell benyújtani
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Egyetlen dolgozó sem találtam
 DocType: Supplier Quotation,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Töltsd fel készletének egyenlege keresztül csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Küldés most
 ,Support Analytics,Támogatási analitika
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logikai hiba: Meg kell találni az átfedések
 DocType: Item,Website Warehouse,Weboldal Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,"Pontszám kell lennie, kisebb vagy egyenlő, mint 5"
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form bejegyzések
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form bejegyzések
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Vevői és szállítói
 DocType: Email Digest,Email Digest Settings,Email összefoglaló beállításai
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Támogatás lekérdezések az ügyfelek.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Alvállalkozó által feldolgozandó?
 DocType: Item Attribute,Item Attribute Values,Elem attribútum-értékekben
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Kilátás előfizetők
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Vásárlási nyugta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Vásárlási nyugta
 ,Received Items To Be Billed,Kapott elemek is fizetnie kell
 DocType: Employee,Ms,Hölgy
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Devizaárfolyam mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Devizaárfolyam mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Értékesítési partnerek és Terület
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} aktívnak kell lennie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} aktívnak kell lennie
+DocType: Journal Entry,Depreciation Entry,ÉCS bejegyzés
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát első"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Kosár
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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?
-DocType: Journal Entry Account,Purchase Invoice,Vásárlási számla
+DocType: Asset,Purchase Invoice,Vásárlási számla
 DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részlet No
 DocType: Stock Entry,Total Outgoing Value,Összes kimenő Érték
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Megnyitása és határidőt kell belül ugyanazon üzleti év
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Átfutási idő dátuma
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán Pénzváltó rekord nem teremtett
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Mert &quot;Termék Bundle&quot; tételek, raktár, Serial No és Batch Nem fogják tekinteni a &quot;Csomagolási lista&quot; táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely &quot;Product Bundle&quot; elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva &quot;Csomagolási lista&quot; táblázatban."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Mert &quot;Termék Bundle&quot; tételek, raktár, Serial No és Batch Nem fogják tekinteni a &quot;Csomagolási lista&quot; táblázatban. Ha Warehouse és a Batch Nem vagyunk azonosak az összes csomagoljon bármely &quot;Product Bundle&quot; elemet, ezek az értékek bekerülnek a fő tétel asztal, értékek lesznek másolva &quot;Csomagolási lista&quot; táblázatban."
 DocType: Job Opening,Publish on website,Közzéteszi honlapján
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Kiszállítás a vevő felé.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,"Szállító Számla dátuma nem lehet nagyobb, mint Beküldés dátuma"
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Közvetett jövedelem
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Állítsa fizetés összege = fennálló összeg
 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 +672,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Válassza ki a tétel a Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalékos
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Sor {0}: {1} számla érvénytelen, akkor lehet törölni / nem létezik. \ Adjon meg egy érvényes számla"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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/setup_wizard/industry_type.py +16,Chemical,Vegyi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,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."
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön dolgozói születésnapi emlékeztetőt
 ,Employee Holiday Attendance,Alkalmazott Nyaralás Nézőszám
 DocType: Opportunity,Walk In,Utcáról
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock bejegyzések
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock bejegyzések
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,TRANSFERED
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Csinál
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Csinál
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 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 +5,My Cart,Kosár
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
 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 +180,Qty for {0},Mennyiség: {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Tényleg azt szeretné visszaállítani ezt a kiselejtezett eszköz?
+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 +80,Leave Allocation Tool,Szabadság Lefoglaló Eszköz
 DocType: Leave Block List,Leave Block List Dates,Hagyja Block List dátuma
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 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 +547,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Kedvezmény
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Vásárlási nyugta Elem
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Fenntartva Warehouse Sales Order / készáru raktárba
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Értékesítési összeg
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Idő naplók
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Idő naplók
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,selejtezve
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Toborzás
 DocType: BOM Operation,Operation,Működés
 DocType: Lead,Organization Name,Szervezet neve
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Az értékesítési költségek
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Normál vásárlás
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint a Start Date"
 DocType: Sales Person,Select company name first.,Válassza ki a cég nevét először.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Idézetek a szállítóktól kapott.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Idézetek a szállítóktól kapott.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 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
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Alapértelmezett pénznem
 DocType: Contact,Enter designation of this Contact,Adja kijelölése ennek Kapcsolat
 DocType: Expense Claim,From Employee,Dolgozótól
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Hozzájárulás%
@@ -909,22 +931,23 @@
 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 +208,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/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
 ,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.
 DocType: Global Defaults,Global Defaults,Általános beállítások
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Project Együttműködés Meghívó
 DocType: Salary Slip,Deductions,Levonások
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ez az Időnapló gyűjtő ki lett számlázva.
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli szabadságon
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapacitás tervezés Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapacitás tervezés Error
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Szaktanácsadó
 DocType: Salary Slip,Earnings,Keresetek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Kész elem {0} kell beírni gyártása típusú bejegyzést
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Nyitva Könyvelési egyenleg
 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 +473,Nothing to request,Nincs kérni
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Vezetés
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Az Időtáblában szereplő tevékenységek típusai
@@ -935,18 +958,18 @@
 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"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Kérjük, állítsa E-mail ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Kérjük, állítsa E-mail ID"
 DocType: Item,UOMs,Mértékegységek
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámot, nos jogcím {1}"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Tételkód nem lehet megváltoztatni a 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} 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/config/buying.py +33,Supplier database.,Beszállítói adatbázis.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Beszállítói adatbázis.
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,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
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Szabadnap
 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ő
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nem alkalmazható számla: {0}
 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
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,"Elem {0} kell lennie, nem Raktárkészleten"
 DocType: Contact,User ID,Felhasználó ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Kilátás Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Kilátás Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,"Az osztalék,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,"Az osztalék,"
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Számviteli Ledger
 DocType: Stock Reconciliation,Difference Amount,Eltérés összege
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Eredménytartalék
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Eredménytartalék
 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ő
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Ideiglenes megnyitását
 ,Employee Leave Balance,Munkavállalói Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Értékelés Rate szükséges tétel sorában {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,A szállítói kötelezettségek összefoglalása
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlára {0}
 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 +165,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Vevői {0} nem érvényes
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","A teljes téma / Transfer mennyiség {0} Anyaga kérése {1} \ nem lehet nagyobb, mint kért mennyiséget {2} jogcím {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kis
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Account fejét {0} létre
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Összesen Elért
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,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/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 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ó
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,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 +143,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,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 +142,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."
 DocType: Hub Settings,Seller Website,Eladó Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,A teljes lefoglalt százalékos értékesítési csapatot kell 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Gyártási rendelés állapot {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Gyártási rendelés állapot {0}
 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 +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,A Szállító
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Nem találtunk semmilyen elem az úgynevezett {0}
 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ó
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Weboldal Elem Csoportok
 DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Sorozatszámot {0} belépett többször
-DocType: Journal Entry,Journal Entry,Könyvelési tétel
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
 DocType: Sales Partner,Target Distribution,Cél Distribution
 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"
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Árajánlatkérés Szállító
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ismétlődő Upto
 DocType: Attendance,HR Manager,HR menedzser
@@ -1082,6 +1109,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},"Jelenlegi eszközök értékcsökkenés utáni kisebbnek kell lennie, mint egyenlő {0}"
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Add vagy le lehet vonni
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ha az éves költségvetés túllépése (a költség számla)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Kezdetének és befejezésének időpontjai
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Műveletek nem maradt üresen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Átlagos kedvezmény
 DocType: Address,Utilities,Segédletek
 DocType: Purchase Invoice Item,Accounting,Könyvelés
 DocType: Features Setup,Features Setup,Funkciók beállítása
+DocType: Asset,Depreciation Schedules,Értékcsökkenési ütemezések
 DocType: Item,Is Service Item,A szolgáltatás Elem
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,tranzakció pénzneme
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Re {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Re {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operation Leírás
 DocType: Item,Will also apply to variants,Is alkalmazni kell változatok
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nem lehet megváltoztatni pénzügyi év kezdő dátuma és a pénzügyi év vége dátum, amikor a pénzügyi év menti."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nem lehet megváltoztatni pénzügyi év kezdő dátuma és a pénzügyi év vége dátum, amikor a pénzügyi év menti."
 DocType: Quotation,Shopping Cart,Kosár
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Átlag napi kimenő
 DocType: Pricing Rule,Campaign,Kampány
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettó változás állóeszköz-
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikációs napló.
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím Név
 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 +472,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,"nem lehet nagyobb, mint 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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"
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Adó szabály tranzakciók.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Adó szabály tranzakciók.
 DocType: Rename Tool,Type of document to rename.,Dokumentum típusa átnevezni.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Vásárolunk ezt a tárgyat
 DocType: Address,Billing,Számlázás
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Olvasmányok
 DocType: Stock Entry,Total Additional Costs,Összesen További költségek
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Részegységek
+DocType: Asset,Asset Name,Eszköz neve
 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 +142,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Csomagjegy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Beállítás SMS gateway beállítások
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Ajánlatkérés lehet hozzáférést kattintva következő link
+DocType: Asset,Number of Months in a Period,A hónapok száma egy periódus
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kormány
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Összesen ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Összesen ({0})
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
 DocType: Sales Invoice,Source,Forrás
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,mutatása zárva
 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 +129,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 +39,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: Employee External Work History,Total Experience,Összesen Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow Befektetési
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding és díjak
 DocType: Item Group,Item Group Name,Anyagcsoport neve
 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 +86,Transfer Materials for Manufacture,Transfer anyagok gyártása
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer anyagok gyártása
 DocType: Pricing Rule,For Price List,Ezen árlistán
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1212,7 +1245,7 @@
 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/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."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Karbantartási látogatás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Karbantartási látogatás
 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: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Márka mester.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Transporter Részletek
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Doboz
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Követelések cég költségén.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Források
 DocType: Purchase Receipt,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 ,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"
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra Fizetési E-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,más jelentések
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} megtekintése
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettó Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,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/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Kifizetési kérelmet már létezik: {0}
 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 +184,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Előző pénzügyi év nem zárt
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Szállító Type mester.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Szállító Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Szállító rész száma
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
 DocType: Purchase Invoice,Reference Document,referenciadokumentum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,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 +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% számlázott
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettó Szállítói kötelezettségek változása
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Kérjük, ellenőrizze az e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Vásárlói szükséges ""Customerwise Discount"""
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Frissítse bank fizetési időpontokat folyóiratokkal.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Frissítse bank fizetési időpontokat folyóiratokkal.
 DocType: Quotation,Term Details,ÁSZF részletek
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0} nagyobbnak kell lennie, mint 0"
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés Az (nap)
 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."
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Jótállási igény
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","A kifizetett előleg ellen {0} {1} nem lehet nagyobb, \ mint Mindösszesen {2}"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Kérjük, jelölje ki az elemet kódot"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Kérjük, jelölje ki az elemet kódot"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Csökkentse levonás fizetés nélküli szabadságon (LWP)
 DocType: Territory,Territory Manager,Területi igazgató
 DocType: Packed Item,To Warehouse (Optional),A Warehouse (opcionális)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Elem Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Egy darab anyag.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse szükség Row {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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ó
+DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
+DocType: Asset,Depreciation Method,Értékcsökkenési módszer
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez adó az árban Basic Rate?
 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 +29,Shopping Cart is enabled,Kosár engedélyezve
 DocType: Job Applicant,Applicant for a Job,Kérelmező számára a Job
 DocType: Production Plan Material Request,Production Plan Material Request,Termelési terv Anyag kérése
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nem gyártási megrendelések létre
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nem gyártási megrendelések létre
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variáns
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,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/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Beszerzési rendelés készítése
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Vevő cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
 DocType: Territory,Territory Name,Terület neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work in progress Warehouse van szükség, mielőtt beküldése"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,"Work in progress Warehouse van szükség, mielőtt beküldése"
 apps/erpnext/erpnext/config/hr.py +40,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ó
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Címek
+apps/erpnext/erpnext/hooks.py +91,Addresses,Címek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,értékeléséből
 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 +337,Item is not allowed to have Production Order.,"Elem nem engedjük, hogy a gyártási rendelés."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,"Elem nem engedjük, hogy a gyártási rendelés."
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Kérjük, adja meg a szűrési alapján pont vagy a Warehouse"
 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: 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 +27,Time Logs for manufacturing.,Time Naplók gyártás.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} kell benyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} kell benyújtani
 DocType: Authorization Control,Authorization Control,Felhatalmazásvezérlés
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasítva Warehouse kötelező elleni elutasított elem {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,A feladatok időnaplói.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Fizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Márka
 DocType: Item,Will also apply for variants,Kell alkalmazni a változatok
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Eszközt nem lehet törölni, mivel ez már {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle tételek idején eladó.
 DocType: Quotation Item,Actual Qty,Aktuális db.
 DocType: Sales Invoice Item,References,Referenciák
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Társult
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Elem {0} nem folytatásos tétel
+DocType: Request for Quotation Supplier,Send Email to Supplier,E-mail küldése a Szállító
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 DocType: Packing Slip,To Package No.,A csomag No.
 DocType: Production Planning Tool,Material Requests,Anyaga kérések
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Szállítási Warehouse
 DocType: Stock Settings,Allowance Percent,Juttatás Percent
 DocType: SMS Settings,Message Parameter,Üzenet paraméter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Fája pénzügyi költség központok.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Fája pénzügyi költség központok.
 DocType: Serial No,Delivery Document No,Szállítási Document No
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hogy elemeket vásárlása bevételek
 DocType: Serial No,Creation Date,Létrehozás dátuma
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Összeget Deliver
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} létrehozva
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a cég pénzügyi évben"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői
 ,Serial No Status,Sorozatszám állapota
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Az Anyagok rész nem lehet üres
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: beállítása {1} periodicitás, különbség a, és a mai napig \ nagyobbnak kell lennie, vagy egyenlő, mint {2}"
 DocType: Pricing Rule,Selling,Értékesítés
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Neve és dolgozói azonosító
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Vámok és adók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Fizetési Gateway fiók nincs beállítva
 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: Production Order,Material Request Item,Anyagigénylés tétel
+DocType: Request for Quotation Item,Material Request Item,Anyagigénylés tétel
 apps/erpnext/erpnext/config/stock.py +85,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ú"
+DocType: Asset,Sold,Eladott
 ,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Piros
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Telepítési idő
 DocType: Sales Invoice,Accounting Details,Számviteli Részletek
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Törölje az összes tranzakciók erre Társaság
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,A kiosztandó
 DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Kérjük, adja anyag kérelmeket a fenti táblázatban"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Kérjük, adja anyag kérelmeket a fenti táblázatban"
 DocType: Item Attribute,Attribute Name,Jellemző neve
 DocType: Item Group,Show In Website,Weboldalon megjelenjen
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Csoport
@@ -1527,6 +1567,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
+DocType: Pricing Rule,Margin Type,Margó típus
 DocType: Appraisal,For Employee Name,Az alkalmazott neve
 DocType: Holiday List,Clear Table,Tábla törlése
 DocType: Features Setup,Brands,Márkák
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Sor # {0}: Asset kötelező szemben befektetett eszközök tételeire
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük beállítás számozási sorozat Jelenléti a Setup&gt; számozás sorozat
 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/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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) kell szerepet költségére Jóváhagyó """
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pár
+DocType: Asset,Depreciation Schedule,Az értékcsökkenési leírás ütemezése
 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: Asset,Purchase Date,Vásárlás időpontja
 DocType: Employee,Personal Details,Személyes adatai
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa &quot;értékcsökkenés Költségközpont&quot; a Társaság {0}"
 ,Maintenance Schedules,Karbantartási ütemezések
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Közé Egyeztetett bejegyzések
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Csoport Csoporton kívüli
 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/public/js/setup_wizard.js +272,Unit,Egység
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Kérem adja meg a Cég nevét
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Költségtérítési igényeket
 DocType: Issue,Support,Támogatás
 ,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)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Elem Ár hozzáadott {0} árjegyzéke {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Elem Ár hozzáadott {0} árjegyzéke {1}
 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ő"
 DocType: Territory,Classification of Customers by region,Fogyasztói csoportosítás régiónként
 DocType: Project,% Tasks Completed,% feladat elvégezve
 DocType: Project,Gross Margin,Bruttó árrés
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Kérjük, adja Production pont első"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Kérjük, adja Production pont első"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Számított Bankkivonat egyensúly
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Költség Frissítve
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,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 +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük beállítási Alkalmazott névadási rendszerben Emberi Erőforrás&gt; HR beállítások
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Mennyiség
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
+DocType: Request for Quotation,Manufacturing Manager,Gyártási menedzser
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Szállítások
 DocType: Purchase Order Item,To be delivered to customer,Be kell nyújtani az ügyfél
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Egyéb ráfordítások
 DocType: Global Defaults,Default Company,Alapértelmezett cég
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,A(z) {0} felhasználó tiltva
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} kötelező tétel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} kötelező tétel {1}
 DocType: Currency Exchange,From Currency,Deviza-
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Vevői szükséges Elem {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",Sor # {0}: Mennyiség legyen 1 a pont kapcsolódik az eszköz
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Gyermek pont nem lehet egy termék Bundle. Kérjük, távolítsa el tétel `{0} &#39;és mentse"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Új költségközpont
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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ó mértékét."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Új költségközpont
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Quality Inspection,In Process,In Process
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Sor # {0}: Asset {1} {2} már
 DocType: Quotation Item,Stock Balance,Készlet egyenleg
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Time Naplók létre:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Naplók létre:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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
@@ -1691,13 +1738,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Kérem adjon meg egy országot a házhozszállítás szabály vagy ellenőrizze Világszerte Szállítási
 DocType: Stock Entry,Total Incoming Value,A bejövő Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Megterhelése szükséges
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Megterhelése szükséges
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Vételár listája
 DocType: Offer Letter Term,Offer Term,Ajánlat Term
 DocType: Quality Inspection,Quality Manager,Minőségbiztosítási vezető
 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 +141,Please select Incharge Person's name,"Kérjük, válasszon incharge személy nevét"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Kérjük, válasszon incharge személy nevét"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ajánlat Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Létrehoz Material kérelmeket (MRP) és a gyártási megrendeléseket.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Árlista {0} van tiltva
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Árlista {0} van tiltva
 DocType: Manufacturing Settings,Allow Overtime,Hagyjuk Túlóra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges jogcím {1}. Megadta {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Értékelés Rate
 DocType: Item,Customer Item Codes,Vásárlói pont kódok
 DocType: Opportunity,Lost Reason,Elveszett Reason
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Új cím
 DocType: Quality Inspection,Sample Size,A minta mérete
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nem fizetése csúszik talált hónapban:
 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 +175,Serial No {0} not found,Serial No {0} nem található
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} nem található
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Az ügyfelek
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},"Ön meghívást kapott, hogy működjenek együtt a projekt: {0}"
 DocType: Leave Block List Date,Block Date,Blokk dátuma
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Jelentkezz most
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Jelentkezz most
 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."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Beállítás Zárt
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Egyetlen tétel Vonalkód {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Egyetlen tétel Vonalkód {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nem. Nem lehet 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,"Ha értékesítési csapat és eladó Partners (Channel Partners) akkor kell jelölni, és megtartják hozzájárulást az értékesítési tevékenység"
 DocType: Item,Show a slideshow at the top of the page,Mutass egy slideshow a lap tetején
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Transfer anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer anyag
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Elem {0} kell egy értékesítési pont a {1}
 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."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Kérjük, állítsa be az ismétlődő mentés után"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Kérjük, állítsa be az ismétlődő mentés után"
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Bérlap létrehozása
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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ó
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import-mail-tól
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Meghívás Felhasználó
 DocType: Features Setup,After Sale Installations,Miután Eladó létesítmények
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Kérjük, állítsa be {0} {1} Társaság"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} teljesen számlázott
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Az általános szerződési feltételek az értékesítési vagy megvásárolható.
@@ -1805,9 +1854,9 @@
 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: Rename Tool,File to Rename,Fájl átnevezése
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Kérjük, válassza ki BOM jogcím sorában {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Kérjük, válassza ki BOM jogcím sorában {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Gateway Account,Payment Account,Fizetési számla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettó változás Vevők
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,Accepted,Elfogadva
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Gyors Naplókönyvelés
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nem nyújtják be
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,A következő gyártási megrendelések jött létre:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,A következő gyártási megrendelések jött létre:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Hírlevél levelezőlista
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
 DocType: Authorization Rule,Authorized Value,Megengedett érték
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} zárva
 DocType: Email Digest,How frequently?,Milyen gyakran?
 DocType: Purchase Receipt,Get Current Stock,Aktuális raktárkészlet átmásolása
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tovább a megfelelő csoportba (általában alkalmazása alapok&gt; Forgóeszközök&gt; Bankszámlák és hozzon létre egy új fiók (kattintva Add Child) típusú &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi szállítási határidő a Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi szállítási határidő a Serial No {0}
 DocType: Production Order,Actual End Date,Tényleges befejezési dátum
 DocType: Authorization Rule,Applicable To (Role),Alkalmazandó (Role)
 DocType: Stock Entry,Purpose,Cél
+DocType: Company,Fixed Asset Depreciation Settings,Fix értékcsökkenés beállítások
 DocType: Item,Will also apply for variants unless overrridden,"Kell alkalmazni a változatok, hacsak overrridden"
 DocType: Purchase Invoice,Advances,Előlegek
 DocType: Production Order,Manufacture against Material Request,Előállítás ellen Anyag kérése
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Nem kért SMS
 DocType: Campaign,Campaign-.####,Kampány -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Kérjük adja meg a terméket a lehető legjobb áron
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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?
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
-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}"
+DocType: Asset Category Account,Asset Category Account,Eszköz kategória fiók
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","pl. bank, készpénz, hitelkártya"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tovább a megfelelő csoportba (általában alkalmazása alapok&gt; Forgóeszközök&gt; Bankszámlák és hozzon létre egy új fiók (kattintva Add Child) típusú &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Jóváírási értesítő
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Saját címek
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Szervezet ága mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nem alkalmazottja a fent kiválasztott kritériumoknak vagy fizetés csúszik már létrehozott
@@ -1972,7 +2024,7 @@
 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 +200,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"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,bérszámfejtés
 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"
@@ -1982,8 +2034,9 @@
 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
 DocType: Account,Income Account,Jövedelem számla
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nincs alapértelmezett Címsablon talált. Kérjük, hozzon létre egy újat a Beállítás&gt; Nyomtatás és Branding&gt; Címsablon."
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,A pálya vezet az ipar típusa.
 DocType: Item Supplier,Item Supplier,Anyagbeszállító
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Kérjük, adja tételkód hogy batch nincs"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Minden címek.
 DocType: Company,Stock Settings,Készlet beállítások
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,A vevői csoport fa.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Új költségközpont neve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Új költségközpont neve
 DocType: Leave Control Panel,Leave Control Panel,Hagyja Vezérlőpult
 DocType: Appraisal,HR User,HR Felhasználó
 DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
-apps/erpnext/erpnext/config/support.py +7,Issues,Problémák
+apps/erpnext/erpnext/hooks.py +90,Issues,Problémák
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Állapot közül kell {0}
 DocType: Sales Invoice,Debit To,Megterhelése
 DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség Miután a tranzakciós
 ,Pending SO Items For Purchase Request,Függőben lévő SO elemek vásárolható kérése
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Nagy
 ,Profit and Loss Statement,Az eredmény-kimutatás
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
 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 +139,Please mention no of visits required,Kérjük beszélve nincs ellenőrzés szükséges
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Kérjük beszélve nincs ellenőrzés szükséges
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
 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 +142,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
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Kért
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nincs megjegyzés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,"Befektetett eszközök tételeire kell lennie, nem készlet tétel"
 DocType: Supplier Quotation Item,Material Request No,Anyagigénylés száma
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2119,7 +2174,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
 DocType: Payment Request,Recipient and Message,A címzett és a Message
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Select Gyártó címe
 DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute-mail
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Ajánlatkérés.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előre ({0}) ellen rendelés {1} nem lehet nagyobb, mint a végösszeg ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előre ({0}) ellen rendelés {1} nem lehet nagyobb, mint a végösszeg ({2})"
 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 +294,Price List Currency not selected,Árlista Ki nem választott
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Ellen Document No
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Kezelje a forgalmazókkal.
 DocType: Quality Inspection,Inspection Type,Vizsgálat típusa
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Kérjük, válassza ki a {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Jelöletlen Nézőszám
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Értékcsökkenési ráfordítás számla
 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ó
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Megerősített
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nem található árfolyam {0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nem található árfolyam {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Félnapos
 DocType: Sales Invoice,Sales Team,Értékesítő csapat
 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 +410,[Error],[Hiba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,A {0} sorozatszám nem létezik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Ügyfél Warehouse (opcionális)
 DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
@@ -2247,14 +2305,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,Szabadság lefoglalása
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,{0} anyagigénylés létrejött
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,{0} anyagigénylés létrejött
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Sablon kifejezések vagy szerződés.
 DocType: Purchase Invoice,Address and Contact,Cím és kapcsolattartási
 DocType: Supplier,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 +280,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/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Halmozott értékcsökkenés számla
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
+DocType: Asset,Expected Value After Useful Life,Várható érték után hasznos élettartam
 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!
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} törlik vagy zárva
 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/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Származó nettó cash Befektetés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root fiók nem törölhető
 ,Is Primary Address,Van Elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Work in progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} kell benyújtani
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Kezelje címek
-DocType: Pricing Rule,Item Code,Tételkód
+DocType: Asset,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
 DocType: Employee Education,School/University,Iskola / Egyetem
 DocType: Payment Request,Reference Details,Referencia Részletek
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték után hasznos élettartam alatt kell lennie, mint a bruttó Vásárlás összege"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Elérhető mennyiség a raktárban
 ,Billed Amount,Számlázott összeg
+DocType: Asset,Double Declining Balance,Dupla degresszív
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,"Zárt hogy nem lehet törölni. Felnyit, hogy megszünteti."
 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
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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"
+DocType: Asset,Fully Depreciated,teljesen amortizálódott
 ,Stock Projected Qty,Stock kivetített Mennyiség
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Sorszám és Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions rendelések nem lehet emelni a:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions rendelések nem lehet emelni a:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Kiskereskedő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Disable szavakban
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Folyószámlahitel Account
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Elem Csoport&gt; Márka
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Zálogkölcsön
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Kérjük, állítsa be Értékcsökkenési kapcsolódó számlák Asset Kategória {0} vagy {1} Társaság"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Nyitó egyenleg Equity
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mailt küldött a szállítóval {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dátum megismétlődik
 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 +187,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
@@ -2344,7 +2410,7 @@
 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
 DocType: Item Price,Bulk Import Help,Tömeges Import Súgó
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Select Mennyiség
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Select Mennyiség
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Jóváhagyó szerepet nem lehet ugyanaz, mint szerepe a szabály alkalmazandó"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Iratkozni a e-mail kivonat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Üzenet elküldve
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Összesen Margó
 DocType: Supplier,Supplier Details,Beszállító részletei
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzé tételek Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vásárlói csoport / Ügyfélszolgálat
 DocType: Payment Gateway Account,Default Payment Request Message,Alapértelmezett kifizetési kérelem Üzenet
 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/config/accounts.py +118,Banking and Payments,Banki és kifizetések
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Banki és kifizetések
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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"
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"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"
 DocType: Notification Control,Quotation Message,Idézet Message
 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/config/hr.py +55,Leaves and Holiday,A levelek és a Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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.
 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
@@ -2419,15 +2486,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Értékcsökkenés Költségközpont
 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,{0} raktár: Cég megadása kötelező
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Vásárlás időpontja eszköz {0} nem egyezik vásárlást igazoló számla dátumától
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,{0} raktár: Cég megadása kötelező
 ,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}
 DocType: Journal Entry,Stock Entry,Készlet mozgás
 DocType: Account,Payable,Kifizetendő
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Követelések ({0})
-DocType: Project,Margin,Margó
+DocType: Pricing Rule,Margin,Margó
 DocType: Salary Slip,Arrear Amount,Hátralék összege
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új vásárló
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruttó nyereség %
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Távolság dátuma
 DocType: Newsletter,Newsletter List,Hírlevél listája
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Ellenőrizze, hogy a küldeni kívánt fizetése csúszik mail fel az alkalmazottaknak, míg benyújtásával fizetés slip"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
 DocType: Lead,Address Desc,Cím leírása
 apps/erpnext/erpnext/accounts/doctype/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 +57,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végzik.
 DocType: Stock Entry Detail,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Sor # {0}: {1} Asset nem tartozik a cég {2}
 DocType: Employee,Confirmation Date,Visszaigazolás
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
 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: Account,Accumulated Depreciation,Halmozott értékcsökkenés
 DocType: Stock Entry,Customer or Supplier Details,Ügyfél vagy beszállító Részletek
 DocType: Payment Request,Email To,E-mailben
 DocType: Lead,Lead Owner,Célpont tulajdonosa
 DocType: Bin,Requested Quantity,kért mennyiség
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Warehouse van szükség
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Jelenlegi BOM és a New BOM nem lehet ugyanazon
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,"A nyugdíjazás nagyobbnak kell lennie, mint Csatlakozás dátuma"
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% szállítva
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% szállítva
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Elem {0}: Rendezett Mennyiség {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (pontban meghatározott)."
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi elosztási százalék
 DocType: Territory,Territory Targets,Területi célpontok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Ugyanaz a szállító már többször jelenik meg
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Megrendelés mellékelt tételek
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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."
 DocType: Payment Request,Payment Details,Fizetési részletek
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Naplóbejegyzést Fémhulladék
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
 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 +73,"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"
 DocType: Manufacturer,Manufacturers used in Items,Gyártók használt elemek
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Új létrehozása
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Készlet könyvelés
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Fizetés Slip levonása
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Válasszon egy csoportot csomópont először.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Válasszon egy csoportot csomópont először.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Alkalmazott és nyilvántartó
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Ezen célok közül kell választani: {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Távolítsuk referencia vevő, szállító, értékesítési partner és az ólom, mivel ez a cég címe"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}
 DocType: Task,depends_on,attól függ
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,"Következő Dátum nagyobbnak kell lennie, mint a Beküldés dátuma"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mutass adókedvezmény-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / pont / {0}) elfogyott
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,"Következő Dátum nagyobbnak kell lennie, mint a Beküldés dátuma"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mutass adókedvezmény-up
+apps/erpnext/erpnext/accounts/party.py +289,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"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Számla Könyvelési dátum
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,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 +101,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 +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Közzé Elérhetőség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Vásárlói Email
 DocType: Warranty Claim,Item and Warranty Details,Elem és garancia Részletek
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Állóeszköz-fiók
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Arány
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,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 +204,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Bérrendszer
 DocType: Account,Bank,Bank
 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 +612,Issue Material,Kérdés Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Idézetek
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Sorozatszám
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Kérjük, adja fenntartás Részletek először"
-DocType: Item,Is Fixed Asset Item,A befektetett eszközök tételeire
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Kérjük, adja fenntartás Részletek először"
 DocType: Purchase Invoice,Print Language,Print Language
 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"
+DocType: Asset,Number of Depreciations,Száma amortizáció
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Árajánlatkérés
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximális Számla összege
 DocType: Purchase Invoice Item,Image View,Kép megtekintése
 apps/erpnext/erpnext/config/selling.py +23,Customers,Az ügyfelek
+DocType: Asset,Partially Depreciated,részben leértékelődött
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Karbantartási vezető
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Összesen nem lehet nulla
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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"
-DocType: C-Form,Amended From,Módosított től
+DocType: Asset,Amended From,Módosított től
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Kérjük beszélve &quot;nyereség / veszteség számla az eszközök elidegenítését&quot; a Társaság
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match kifizetések a számlák
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match kifizetések a számlák
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,A kosárban
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
 DocType: Production Planning Tool,Get Material Request,Get Anyag kérése
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Postai költségek
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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 +145,{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 +56,Total Present,Összesen Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,számviteli kimutatások
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,számviteli kimutatások
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Számlák
 DocType: Job Opening,Job Title,Állás megnevezése
 DocType: Features Setup,Item Groups in Details,Az anyagcsoport részletei
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
 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 +32,Visit report for maintenance call.,Látogassa jelentést karbantartási hívást.
 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 +169,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 +171,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
 DocType: Item,Website Description,Weboldal leírása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettó változása Részvény
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,"Kérjük, törölje vásárlási számla {0} első"
 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
@@ -2703,12 +2783,13 @@
 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"
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Hiba: {0}&gt; {1}
 DocType: Item,Attributes,Attribútumok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Tételek áthozása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Kérjük, adja leírni Account"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Tételek áthozása
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Kérjük, adja leírni Account"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Utolsó rendelési dátum
 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: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobiltelefon
 DocType: Payment Tool,Make Journal Entry,Tedd Naplókönyvelés
 DocType: Leave Allocation,New Leaves Allocated,Új szabadság lefoglalás
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Kereskedelmi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Hiba: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Minden termék és szolgáltatás.
 DocType: Supplier Quotation,Supplier Address,Beszállító címe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fiók típusúnak kell lennie &quot;állóeszköz&quot;
 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 +251,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/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 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
 DocType: Tax Rule,Billing State,Számlázási állam
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Átutalás
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Átutalás
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date kötelező
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
 DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás beállítása
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Megjegyzések
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
 DocType: Journal Entry,Write Off Based On,Írja Off alapuló
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Küldj Szállító e-mailek
 DocType: Features Setup,POS View,POS megtekintése
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Telepítés rekordot a Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Következő Dátum napon és az Ismétlés A hónap napja egyenlőnek kell lennie
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Következő Dátum napon és az Ismétlés A hónap napja egyenlőnek kell lennie
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Idő Napló már kiszámlázott
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be elnevezési Series {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
 DocType: Salary Slip,Earning & Deduction,Kereset és levonás
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Account {0} nem lehet Group
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Kérjük alapértelmezett értéke {0} Company {1}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center kötelező tétel {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük beállítás számozási sorozat Jelenléti a Setup&gt; számozás sorozat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+DocType: Asset,Straight Line,Egyenes
+DocType: Project User,Project User,projekt felhasználó
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'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: Features Setup,Sales Discounts,Értékesítési Kedvezmények
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Add Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,nyitó érték
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Eladási jutalékok
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Sor # {0}: {1} Asset nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási ország
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Reprezentációs költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Reprezentációs költségek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,A pályázatokat a szabadság.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Jogi költségek
 DocType: Sales Invoice,Posting Time,Rögzítés ideje
 DocType: Sales Order,% Amount Billed,% mennyiség számlázva
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefon költségek
 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.,"Jelölje be, ha azt szeretné, hogy a felhasználó kiválaszthatja a sorozatban mentés előtt. Nem lesz alapértelmezett, ha ellenőrizni."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Egyetlen tétel Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Egyetlen tétel Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Nyílt értesítések
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Közvetlen költségek
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Közvetlen költségek
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} érvénytelen e-mail címet a &quot;Bejelentés \ e-mail cím&quot;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázási összeg (via Idő Napló)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
 DocType: Journal Entry,Cash Entry,Készpénz Entry
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Típusú levelek, mint alkalmi, beteg stb"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Teljes működési költség
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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ó.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Szolgáltatót eszköz {0} nem egyezik a szolgáltató a vásárlási számla
 DocType: Newsletter,Test Email Id,Teszt email azonosítója
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,"Alapanyag nem lehet ugyanaz, mint a fő elem"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Fizetés sablon mester.
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Számlázási pénznem egyenlőnek kell lennie vagy az alapértelmezett comapany pénznemét vagy fél payble számla pénznemében
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Titkár
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ha kikapcsolja, az &quot;In szavak&quot; mezőben nem lesz látható bármilyen tranzakció"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ez az Időnapló gyűjtő törölve lett.
 ,Reqd By Date,Reqd Dátum szerint
 DocType: Salary Slip Earning,Salary Slip Earning,Fizetés Slip Earning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,A hitelezők
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,A hitelezők
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Sor # {0}: Sorszám kötelező
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Elem Wise Tax részlete
 ,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Célponttól
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Normál Ajánló
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
-DocType: Project,Project Name,Projekt neve
+DocType: Request for Quotation 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: 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
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Határidő
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock tranzakciók
 DocType: Employee,Internal Work History,Belső munka története
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Halmozott értékcsökkené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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Company kötelező, hiszen a cég címe"
 DocType: Item Attribute,From Range,Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Elem {0} figyelmen kívül hagyni, mivel ez nem egy állomány elem"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Benyújtja ezt Production Order további feldolgozásra.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Benyújtja ezt Production Order további feldolgozásra.
 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.",Hogy nem vonatkozik árképzési szabály egy adott ügylet minden esetben árképzési szabályokat kell tiltani.
 DocType: Company,Domain,Terület
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Állás
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Szállítási dátum
 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: Request for Quotation Item,Request for Quotation Item,Árajánlatkérés pont
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Rendezett%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Darabszámra fizetett munka
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Elem {0} nem beállítás Serial Nos. Oszlop üresen kell
 DocType: Accounts Settings,Accounts Settings,Könyvelés beállításai
 DocType: Customer,Sales Partner and Commission,Értékesítési Partner és a Bizottság
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},"Kérjük, állítsa &quot;Asset lebonyolítási számlára&quot; a Társaság {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Berendezések és gépek
 DocType: Sales Partner,Partner's Website,Partner weboldala
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Ideiglenes számlák
 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ó
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Tiltva
 DocType: Project Task,Pending Review,Ellenőrzésre vár
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Kattintson ide, hogy fordítson"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nem selejtezték, ahogy ez már {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Hiányzik
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Add tárgyak
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},{0} raktár: a szülő számla {1} nem kapcsolódik a {2} céghez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Add tárgyak
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},{0} raktár: a szülő számla {1} nem kapcsolódik a {2} céghez
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","pl. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,{0} raktár nem létezik
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,Warehouse {0} does not exist,{0} raktár nem létezik
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi 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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Elem {0} van tiltva
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Beállítás Gateway számlákat.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Beállítás Gateway számlákat.
 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
 ,Cash Flow,Pénzforgalom
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Mellékeljük {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Mellékeljük {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,"Bankkivonat egyensúlyt, mint egy főkönyvi"
 DocType: Job Applicant,Applicant Name,Kérelmező neve
 DocType: Authorization Rule,Customer / Item Name,Vevő / cikknév
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Kérem adjon meg / a tartomány
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Alapértelmezett beállítások eladási tranzakciókat.
 DocType: BOM Replace Tool,Current BOM,Aktuális anyagjegyzék (mit)
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Add Serial No
 apps/erpnext/erpnext/config/support.py +43,Warranty,szavatosság
 DocType: Production Order,Warehouses,Raktárak
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Nyomtatás és álló
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Nyomtatás és álló
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Csoport Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Késztermék frissítése
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Késztermék frissítése
 DocType: Workstation,per hour,óránként
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,beszerzés
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Kifizetett Összeg
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Vonatkozik Társaság
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet mondani, mert be Stock Entry {0} létezik"
 DocType: Purchase Invoice,In Words,Szavakkal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Ma van {0} 's születésnapját!
 DocType: Production Planning Tool,Material Request For Warehouse,Anyagigénylés raktárba
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett ellen leállította a termelést Megrendelni {0}
 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/projects/doctype/project/project.py +133,Join,Csatlakozik
 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 +564,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
 DocType: Salary Slip,Salary Slip,Bérlap
+DocType: Pricing Rule,Margin Rate or Amount,Margó ütemére vagy mértékére
 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
@@ -3165,7 +3258,7 @@
 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 +782,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 +793,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
@@ -3173,14 +3266,13 @@
 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 +17,Potential opportunities for selling.,A potenciális értékesítési lehetőségeinek.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Érvénytelen {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be elnevezési Series {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Áruházak
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
 DocType: Company,Change Abbreviation,Change rövidítése
 DocType: Expense Claim Detail,Expense Date,Igénylés dátuma
@@ -3198,14 +3290,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Főkönyvi számla
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Kilátás vezet
 DocType: Item Attribute Value,Attribute Value,Jellemző értéke
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id-nek egyedinek kell lennie, ez már létezik: {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email id-nek egyedinek kell lennie, ez már létezik: {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Ajánlott Reorder Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} pont {1} lejárt.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Kérjük, állítsa be az alapértelmezett Nyaralás List Employee {0} vagy vállalat {0}"
 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>
@@ -3226,23 +3319,23 @@
 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."
 DocType: Tax Rule,Purchase Tax Template,Forgalmi adót Template
 ,Project wise Stock Tracking,Projekt raktárkészlet követése
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik elleni {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik elleni {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tényleges Mennyiség (forrásnál / target)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Munkavállalók adatait.
 DocType: Payment Gateway,Payment Gateway,Fizetési Gateway
 DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Egyezik összeköttetésben nem álló számlákat és a kifizetéseket.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Place Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nem lehet egy szülő költséghely
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Válasszon márkát ...
 DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse kötelező
 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/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Termelési hogy nem lehet ellen emelt elemsablont
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,A művelet pénzneme meg kell egyeznie a Payment Gateway pénznemben
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Kaphat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Küldje el a teremtés
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Add / Edit árak
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Saját rendelések
@@ -3296,10 +3389,10 @@
 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"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Fedezetlen hitelek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költségközpont neve
 DocType: Maintenance Schedule Detail,Scheduled Date,Ütemezett dátum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Teljes befizetett Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Szállító szám
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: A {0} az {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} nem található
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezt a tárgyat több csoportban a honlapon.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,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: Payment Reconciliation,From Invoice Date,Honnan Számla dátuma
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Napok óta utolsó rendelés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projekt feladatok és tevékenységek.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Bérlap generálása
 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: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,"Év kezdő vagy befejezési időpont átfedésben van {0}. Annak elkerülése érdekében, kérjük, állítsa cég"
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,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}"
 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.","Példa: ABCD. ##### Ha sorozatban van állítva, és Serial No nem szerepel az ügylet, akkor az automatikus sorozatszáma alapján készíthető ez a sorozat. Ha azt szeretné, hogy kifejezetten említsék Serial Nos ezt az elemet. hagyja üresen."
 DocType: Upload Attendance,Upload Attendance,Feltöltés Nézőszám
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Értékesítési analítika
 DocType: Manufacturing Settings,Manufacturing Settings,Gyártás Beállítások
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-mail beállítása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Kérjük, adja alapértelmezett pénznem Company mester"
 DocType: Stock Entry Detail,Stock Entry Detail,Készlet mozgás részletei
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Napi emlékeztetők
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Adó szabály ütközik {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Account Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Ügyfélszolgálat
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Százalék
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Alapértelmezett beállításokat számviteli tranzakciók.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Alapértelmezett beállításokat számviteli tranzakciók.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Elem {0} kell lennie Sales tétel
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
 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 +385,Item Code required at Row No {0},Tételkód szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Tételkód szükség Row {0}
 DocType: Sales Partner,Partner Type,Partner típusa
 DocType: Purchase Taxes and Charges,Actual,Tényleges
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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ó mértékét."
 DocType: Production Order,Production Order,Gyártásrendelés
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Quotation Item,Against Docname,Ellen Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Production Order,Planned End Date,Tervezett befejezési dátuma
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Tax Rule,Validity,Érvényességi
+DocType: Request for Quotation,Supplier Detail,szállító részlet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Számlázott összeg
 DocType: Attendance,Attendance,Jelenléti
 apps/erpnext/erpnext/config/projects.py +55,Reports,jelentések
 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 +508,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Adó sablont vásárol tranzakciókat.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Adó sablont vásárol tranzakciókat.
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Igazgatási költségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Igazgatási költségek
 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 +455,Change,Változás
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Eszköz Kategória neve
 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
@@ -3497,13 +3596,13 @@
 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 +559,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 +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Köteg
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Értékesítő
 DocType: Sales Invoice,Cold Calling,Hideg hívás (telemarketing)
 DocType: SMS Parameter,SMS Parameter,SMS paraméter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Költségvetés és költséghatékonyság Center
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Költségvetés és költséghatékonyság Center
 DocType: Maintenance Schedule Item,Half Yearly,Félévente
 DocType: Lead,Blog Subscriber,Blog Előfizető
 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.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Vásárlási Közös
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Szállító Idézet {0} létrehozott
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Elem Csoport&gt; Márka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Bills emelte az ügyfelek számára.
 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 +492,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á
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Szülő Account
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Kedvezmény és Margó
 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: Deduction Type,Deduction Type,Levonás típusa
 DocType: Attendance,Half Day,Félnapos
@@ -3609,7 +3709,7 @@
 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}."
+apps/erpnext/erpnext/accounts/party.py +234,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ó
 DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Fizetési URL Üzenet
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezésekor, célok stb"
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Összesen Kifizetetlen
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Időnapló nem számlázható
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Elem {0} egy olyan sablon, kérjük, válasszon variánsai"
+DocType: Asset,Asset Category,Eszköz kategória
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Anyaga a Szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Anyaga a Szállító
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Jövedéki számla
 DocType: Expense Claim,Employees Email Id,Dolgozó emailcíme
 DocType: Employee Attendance Tool,Marked Attendance,jelzett Nézőszám
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,A rövid lejáratú kötelezettségek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,A rövid lejáratú kötelezettségek
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Tényleges Mennyiség kötelező
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Numerikus értékek
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Logo csatolása
 DocType: Customer,Commission Rate,Jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Győződjön Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analitika
 apps/erpnext/erpnext/templates/pages/cart.html +51,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/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nincs alapértelmezett Címsablon talált. Kérjük, hozzon létre egy újat a Beállítás&gt; Nyomtatás és Branding&gt; Címsablon."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 DocType: Payment Gateway Account,Payment Gateway Account,Fizetési Gateway fiók
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,A fizetés után befejezése átirányítani a felhasználó a kiválasztott oldalon.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
+DocType: Asset,Current Value (After Depreciation),Aktuális érték (értékcsökkenés utáni)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,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 +408,"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 +413,"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 +13,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 +409, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Kérjük, adja vevői rendelések, a fenti táblázatban"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Kérjük, adja vevői rendelések, a fenti táblázatban"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Darabjegyzékben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref dátuma
@@ -3693,6 +3794,6 @@
 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 +169,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 +212,Account {0} does not exist,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 3a55188..d3e07d9 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer (Pelaku)
 DocType: Employee,Rented,Sewaan
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan penyiapan Karyawan Penamaan Sistem di Sumber Daya Manusia&gt; Settings HR
 DocType: Purchase Order,Customer Contact,Kontak Konsumen
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Pemohon Kerja
@@ -35,26 +35,28 @@
 DocType: Purchase Order,% Billed,Ditagih %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kurs harus sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Konsumen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +100,Bank account cannot be named as {0},Rekening bank tidak dapat disebut sebagai {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +100,Bank account cannot be named as {0},Rekening bank tidak dapat namakan sebagai {0}
 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 data yang diekspor seperti mata uang, nilai tukar, total, grand total dll terdapat di Nota Pengiriman, POS, Penawaran, Faktur Penjualan, Sales Order dll."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kelompok) terhadap yang Entri Akuntansi dibuat dan saldo dipertahankan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standar 10 menit
 DocType: Leave Type,Leave Type Name,Nama Tipe Cuti
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Tampilkan terbuka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series Berhasil Diupdate
 DocType: Pricing Rule,Apply On,Terapkan Pada
 DocType: Item Price,Multiple Item prices.,Multiple Item harga.
 ,Purchase Order Items To Be Received,Order Pembelian Stok Barang Akan Diterima
 DocType: SMS Center,All Supplier Contact,Kontak semua Supplier
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Aplikasi Cuti Baru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Akun Pembayaran Rekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Tampilkan Varian
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Kuantitas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredit (Kewajiban)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Tabel account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Berjalan
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Dalam Persediaan
 DocType: Designation,Designation,Penunjukan
@@ -64,7 +66,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,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 +642,Invoice,Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
@@ -81,7 +83,7 @@
 DocType: Cost Center,Stock User,Pengguna Stok
 DocType: Company,Phone No,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 +131,New {0}: #{1},Baru {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Baru {0}: # {1}
 ,Sales Partners Commission,Komisi Mitra Penjualan
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Singkatan (Abbr) tidak boleh melebihi 5 karakter
 DocType: Payment Request,Payment Request,Permintaan pembayaran
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Menikah
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak diizinkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Mendapatkan Stok Barang-Stok Barang dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 DocType: Payment Reconciliation,Reconcile,Rekonsiliasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko Kelontongan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktivitas:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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,Laporan Rekening
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
+DocType: Item,Is Fixed Asset,Apakah Aset Tetap
 DocType: Expense Claim Detail,Claim Amount,Nilai Klaim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Supplier Type / Supplier
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Semua Kontak
 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 Stok
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} beku
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Beban Stok
 DocType: Newsletter,Email Sent?,Email Terkirim?
 DocType: Journal Entry,Contra Entry,Contra Entri
 DocType: Production Order Operation,Show Time Logs,Show Time Log
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Status Instalasi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Item {0} harus Pembelian Stok Barang
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Item {0} harus Pembelian Stok Barang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan melampirkan gambar yang sudah dimodifikasi.
  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 +507,"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 Stok Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,"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 Stok Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,BOM Baru
@@ -203,17 +207,17 @@
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Alokasi cuti untuk tahun berjalan.
 DocType: Earning Type,Earning Type,Tipe Pendapatan
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Nonaktifkan Perencanaan Kapasitas dan Waktu Pelacakan
-DocType: Bank Reconciliation,Bank Account,Bank Account/Rekening Bank
+DocType: Bank Reconciliation,Bank Account,Rekening Bank
 DocType: Leave Type,Allow Negative Balance,Izinkan Saldo Negatif
 DocType: Selling Settings,Default Territory,Wilayah standar
 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 +79,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Sales Invoice,Is Opening Entry,Entri Pembuka?
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika akun non-standar piutang yang berlaku
-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/manufacturing/doctype/production_order/production_order.py +156,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,Diterima pada
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Pilih Perusahaan
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Kas Bersih dari Pendanaan
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan 'cuti tak terpakai' dari alokasi sebelumnya
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
 DocType: Newsletter List,Total Subscribers,Jumlah Konsumen
 ,Contact Name,Nama Kontak
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 DocType: Payment Tool,Reference No,Nomor Referensi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Cuti Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Stok Barang
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Item,Publish in Hub,Publikasikan di Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Pemberitahuan Kontrol
 DocType: Lead,Suggestions,Saran
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Menetapkan anggaran Group-bijaksana Stok Barang di Wilayah ini. Anda juga bisa memasukkan musiman dengan menetapkan Distribusi.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Cukup masukkan rekening kelompok orang tua untuk gudang {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Cukup masukkan rekening kelompok orang tua untuk gudang {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Nomor Ponsel
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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 terlebih dahulu dalam daftar akan ditetapkan sebagai default Cuti Approver
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Belajar
+DocType: Asset,Next Depreciation Date,Berikutnya Penyusutan Tanggal
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Biaya Aktivitas Per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Pemasok Faktur ada ada di Purchase Invoice {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Pengelolaan Tingkat Salesman
 DocType: Job Applicant,Cover Letter,Sampul surat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Penghapusan Cek dan Deposito yang Jatuh Tempo
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Kata Sandi Salah
 DocType: Item,Variant Of,Varian Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
 DocType: Period Closing Voucher,Closing Account Head,Penutupan Akun Kepala
 DocType: Employee,External Work History,Pengalaman Kerja Diluar
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referensi Kesalahan melingkar
 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unit [{1}] (# Form / Item / {1}) ditemukan di [{2}] (# Form / Gudang / {2})
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil Pekerjaan
 DocType: Newsletter,Newsletter,Laporan berkala
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui Email pada penciptaan Permintaan Bahan otomatis
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipe Faktur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Nota Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Nota Pengiriman
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Persiapan Pajak
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Entri pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok 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,Biaya Sewa
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Silakan pilih bulan dan tahun
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order Diperhitungkan
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,Entrikan 'Ulangi pada Hari Bulan' nilai bidang
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Entrikan 'Ulangi pada Hari Bulan' nilai bidang
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Konsumen Mata Uang dikonversi ke mata uang dasar Konsumen
 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, Order Produksi, Purchase Order, Nota Penerimaan, Faktur Penjualan, Sales Order, Stock Entri, Timesheet"
 DocType: Item Tax,Tax Rate,Tarif Pajak
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} ke {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Pilih Stok Barang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,Select Item,Pilih Stok 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 Entri"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Stok Barang Kualitas Parameter Inspeksi
 DocType: Leave Application,Leave Approver Name,Nama Approver Cuti
-,Schedule Date,Jadwal Tanggal
+DocType: Depreciation Schedule,Schedule Date,Jadwal Tanggal
 DocType: Packed Item,Packed Item,Stok Barang Kemasan
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Pengaturan default untuk transaksi Pembelian.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Pengaturan default untuk transaksi Pembelian.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Terdapat Biaya Kegiatan untuk Karyawan {0} untuk 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.,Mohon TIDAK membuat Account untuk Konsumen dan Supplier. Mereka dibuat langsung dari Konsumen / Supplier master.
 DocType: Currency Exchange,Currency Exchange,Kurs Mata Uang
@@ -348,6 +355,7 @@
 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 Order minimum qty"
+DocType: Request for Quotation,Request for Quotation,Permintaan Quotation
 DocType: Workstation,Working Hours,Jam Kerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master Holiday.
-DocType: Material Request Item,Required Date,Diperlukan Tanggal
+DocType: Request for Quotation Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Entrikan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,Please enter Item Code.,Entrikan 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"
+DocType: Request for Quotation,Message for Supplier,Pesan Supplier
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
 DocType: Employee,Health Concerns,Kekhawatiran Kesehatan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Tunggakan
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Tidak ada"
 DocType: Pricing Rule,Valid Upto,Valid Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,List a few of your customers. They could be organizations or individuals.,Daftar beberapa Konsumen 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,Pendapatan Langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
 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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Biaya Operasi Tambahan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telepon Darurat
 ,Serial No Warranty Expiry,Nomor Serial Garansi telah kadaluarsa
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Pengaturan Subkontrak
+DocType: Project,Project will be accessible on the website to these users,Proyek akan dapat diakses di website pengguna ini
 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 +53,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Kenaikan tidak bisa 0
 DocType: Production Planning Tool,Material Requirement,Permintaan Material / Bahan
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Item {0} tidak Pembelian Stok Barang
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Item {0} tidak Pembelian Stok Barang
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Purchase Invoice,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Qty Tertunda
 DocType: Company,Ignore,Diabaikan
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Gudang wajib untuk Pembelian Penerimaan sub-kontrak
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Gudang wajib untuk Pembelian Penerimaan sub-kontrak
 DocType: Pricing Rule,Valid From,Valid Dari
 DocType: Sales Invoice,Total Commission,Jumlah Nilai Komisi
 DocType: Pricing Rule,Sales Partner,Mitra Penjualan
@@ -471,13 +481,13 @@
  Untuk mendistribusikan anggaran menggunakan distribusi ini, mengatur Distribusi Bulanan ** ini ** di ** Biaya Pusat **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 terlebih dahulu
-apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Nilai akumulasi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
 DocType: Project Task,Project Task,Tugas Proyek
 ,Lead Id,Id Kesempatan
 DocType: C-Form Invoice Detail,Grand Total,Nilai Jumlah Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Terkirim: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Akun Hutang
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Lanjutkan Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumen Langganan
 DocType: Leave Control Panel,Allocate,Alokasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Retur Penjualan
 DocType: Item,Delivered by Supplier (Drop Ship),Dikirim oleh Supplier (Drop Shipment)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Komponen gaji.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Konsumen potensial.
@@ -494,9 +504,9 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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 Nilai Tagihan
+DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri stok yang dibuat.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
 DocType: Sales Invoice,Customer's Vendor,Vendor Konsumen
@@ -504,7 +514,7 @@
 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,Sales Person lain {0} ada dengan id Karyawan yang sama
 apps/erpnext/erpnext/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Tanggal Transaksi pembaruan Bank
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Tanggal Transaksi pembaruan Bank
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Pelacakan waktu
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Fiskal Perusahaan
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Cukup masukkan Nota Penerimaan terlebih dahulu
 DocType: Buying Settings,Supplier Naming By,Penamaan Supplier Berdasarkan
 DocType: Activity Type,Default Costing Rate,Standar Tingkat Biaya
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Jadwal Pemeliharaan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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 Konsumen, Kelompok Konsumen, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Perubahan Nilai bersih dalam Persediaan
 DocType: Employee,Passport Number,Nomor Paspor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manajer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Parameter Penerima
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
 DocType: Sales Person,Sales Person Targets,Target Sales Person
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Tanggal Resolusi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Silahkan mengatur Holiday Daftar baik untuk Karyawan atau Perusahaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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 Konsumen Dengan
+DocType: Depreciation Schedule,Depreciation Amount,penyusutan Jumlah
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Konversikan ke Grup
 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 Telah Terikirim
 DocType: Supplier,Fixed Days,Hari Tetap
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Packing List
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Order Pembelian yang diberikan kepada Supplier.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Order Pembelian yang diberikan kepada Supplier.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
 DocType: Activity Cost,Projects User,Pengguna Proyek
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Waktu Operasi
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Kelompok untuk Kelopok
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Proyek saya
 DocType: Journal Entry,Write Off Amount,Jumlah Nilai Write Off
 DocType: Journal Entry,Bill No,Nomor Tagihan
+DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Account pada Asset Disposal
 DocType: Purchase Invoice,Quarterly,Triwulan
 DocType: Selling Settings,Delivery Note Required,Nota Pengiriman Diperlukan
 DocType: Sales Order Item,Basic Rate (Company Currency),Harga Dasar (Dalam Mata Uang Lokal)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Entri pembayaran sudah dibuat
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Total tagihan tahun ini
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
 DocType: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Kota Penjual
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Term Surat Penawaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai Stok
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Jenis Tingkat Tree
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} bukan merupakan Stok Barang persediaan
 DocType: Mode of Payment Account,Default Account,Akun Standar
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Production Order Operation,Planned End Time,Rencana Waktu Berakhir
 ,Sales Person Target Variance Item Group-Wise,Sales Person Sasaran Variance Stok Barang Group-Wise
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Laporan gaji bulanan.
 DocType: Item Group,Website Specifications,Website Spesifikasi
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Ada kesalahan dalam Template Alamat Anda {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Akun baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Akun baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {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.,Entri akunting hanya dapat dilakukan terhadap akun anggota. Entri terhadap Grup tidak diperbolehkan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Nomor Nota Penerimaan diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},Nomor Nota Penerimaan diperlukan untuk Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Nilai Item Atribut
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 DocType: Address,Personal,Pribadi
 DocType: Expense Claim Detail,Expense Claim Type,Tipe Beban Klaim
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Pengaturan default untuk Belanja
-apps/erpnext/erpnext/controllers/accounts_controller.py +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Beban Pemeliharaan Kantor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Entrikan Stok Barang terlebih dahulu
 DocType: Account,Liability,Kewajiban
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standar Harga Pokok Penjualan
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Daftar Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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 terlebih dahulu"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Faktur saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Faktur saya
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Supplier Quotation,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Upload keseimbangan Stok melalui csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Kirim sekarang
 ,Support Analytics,Dukungan Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logical error: Harus menemukan tumpang tindih
 DocType: Item,Website Warehouse,Situs Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Nilai Minimum Faktur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor harus kurang dari atau sama dengan 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form catatan
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form catatan
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Konsumen dan Supplier
 DocType: Email Digest,Email Digest Settings,Pengaturan Email Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Permintaan Support dari Konsumen
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,Proyeksi Qty
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,Pesan Nota Pengiriman
 DocType: Expense Claim,Expenses,Biaya / Beban
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak?
 DocType: Item Attribute,Item Attribute Values,Item Nilai Atribut
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Lihat Pendaftar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Nota Penerimaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Nota Penerimaan
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Master Nilai Mata Uang
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Master Nilai Mata Uang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Mitra Penjualan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} harus aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} harus aktif
+DocType: Journal Entry,Depreciation Entry,penyusutan Masuk
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Silakan pilih jenis dokumen terlebih dahulu
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Cart
 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
@@ -785,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
 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 +524,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Uang Muka Faktur Pembelian
 DocType: Address,Shop,Toko
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,Alamat Permanen Adalah:
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak Stok Barang jadi?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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,Stok Dibeli dari Supplier
-DocType: Journal Entry Account,Purchase Invoice,Faktur Pembelian
+DocType: Asset,Purchase Invoice,Faktur Pembelian
 DocType: Stock Ledger Entry,Voucher Detail No,Nomor Detail Voucher
 DocType: Stock Entry,Total Outgoing Value,Nilai Total Keluaran
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tanggal dan Closing Date membuka harus berada dalam Tahun Anggaran yang sama
@@ -808,21 +825,24 @@
 DocType: Material Request Item,Lead Time Date,Waktu Tenggang Pesanan
 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 +110,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 +539,"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 Stok Barang utama, nilai akan disalin ke &#39;Packing List&#39; meja."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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 Stok Barang utama, nilai akan disalin ke &#39;Packing List&#39; meja."
 DocType: Job Opening,Publish on website,Mempublikasikan di website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Pengiriman ke Konsumen.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
 DocType: Purchase Invoice Item,Purchase Order Item,Stok Barang Order Pembelian
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Pendapatan Tidak Langsung
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Pendapatan Tidak Langsung
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Mengatur Jumlah Pembayaran = Outstanding Jumlah
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
 ,Company Name,Nama Perusahaan
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Pilih item untuk transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Persentase Diskon Tambahan
 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,Qty Maksimum
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Faktur {1} tidak valid, mungkin dibatalkan / tidak ada. \ Masukkan Faktur valid"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Pengingat Ulang Tahun
 ,Employee Holiday Attendance,Absensi Libur Karyawan
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entri Stok
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Entri Stok
 DocType: Item,Inspection Criteria,Kriteria Inspeksi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Ditransfer
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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 Kesempatan (Open)
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Membuat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Membuat
 DocType: Journal Entry,Total Amount in Words,Jumlah Total dalam Kata
 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 +5,My Cart,Cart saya
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,List Hari Libur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opsi Persediaan
 DocType: Journal Entry Account,Expense Claim,Biaya Klaim
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},Jumlah untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Apakah Anda benar-benar ingin mengembalikan aset dibuang ini?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Jumlah untuk {0}
 DocType: Leave Application,Leave Application,Aplikasi Cuti
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat Alokasi Cuti
 DocType: Leave Block List,Leave Block List Dates,Tanggal Blok List Cuti
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
 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 +547,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak dapat negatif
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Diskon
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Nota Penerimaan Stok Barang
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Stok Barang Jadi Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Nilai Penjualan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Log Waktu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Log Waktu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver untuk record ini. Silakan Update 'Status' dan Simpan
 DocType: Serial No,Creation Document No,Nomor Dokumen
 DocType: Issue,Issue,Masalah / Isu
+DocType: Asset,Scrapped,membatalkan
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akun tidak sesuai dengan Perusahaan
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Pengerahan
 DocType: BOM Operation,Operation,Operasi
 DocType: Lead,Organization Name,Nama Organisasi
 DocType: Tax Rule,Shipping State,Negara Pengirim
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Beban Penjualan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standar Pembelian
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Standar Pusat Biaya Jual
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tanggal Berakhir tidak boleh lebih awal dari Tanggal Mulai
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan terlebih dahulu.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Untuk {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,Diperbaharui melalui log waktu
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Standar Mata Uang
 DocType: Contact,Enter designation of this Contact,Entrikan penunjukan Kontak ini
 DocType: Expense Claim,From Employee,Dari Karyawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,Buat Entri Perbedaan
 DocType: Upload Attendance,Attendance From Date,Absensi Kehadiran dari Tanggal
 DocType: Appraisal Template Goal,Key Performance Area,Area Kinerja Kunci
@@ -923,7 +945,7 @@
 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 +130,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 +131,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 Faktur Pembayaran
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Kontribusi%
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Aturan Pengiriman Belanja Shoping Cart
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Order produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
 ,Ordered Items To Be Billed,Item Pesanan Tertagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Standar Global
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Proyek Kolaborasi Undangan
 DocType: Salary Slip,Deductions,Pengurangan
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Batch Waktu Log ini telah ditagih.
 DocType: Salary Slip,Leave Without Pay,Cuti Tanpa Bayar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
 ,Trial Balance for Party,Trial Balance untuk Partai
 DocType: Lead,Consultant,Konsultan
 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,Selesai Stok Barang {0} harus dimasukkan untuk jenis Produksi entri
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo Akuntansi Pembuka
 DocType: Sales Invoice Advance,Sales Invoice Advance,Uang Muka Faktur Penjualan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Tidak ada Permintaan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Tidak ada Permintaan
 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/setup_wizard/install_fixtures.py +75,Management,Manajemen
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Jenis kegiatan untuk Sheet Waktu
@@ -958,18 +981,18 @@
 DocType: Purchase Invoice,Is Return,Retur Barang
 DocType: Price List Country,Price List Country,Negara Daftar Harga
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Silahkan mengatur ID Email
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Silahkan mengatur ID Email
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} nomor serial valid untuk Item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
 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,Faktor Konversi UOM
 DocType: Stock Settings,Default Item Group,Standar Item Grup
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Database Supplier.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database Supplier.
 DocType: Account,Balance Sheet,Neraca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi Konsumen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Pajak dan pemotongan gaji lainnya.
 DocType: Lead,Lead,Kesempatan
 DocType: Email Digest,Payables,Hutang
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Hari Libur
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-bentuk tidak berlaku untuk Faktur: {0}
 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 Pembulatan Jumlah
@@ -996,19 +1020,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} harus item non-saham
 DocType: Contact,User ID,ID Pengguna
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Lihat Buku Besar
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Lihat Buku Besar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Paling Awal
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
 DocType: Production Order,Manufacture against Sales Order,Produksi Berdasarkan Order Penjualan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +412,Rest Of The World,Rest of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Nilai Gross Bayar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividen Dibagi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividen Dibagi
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Buku Besar Akuntansi
 DocType: Stock Reconciliation,Difference Amount,Jumlah Perbedaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Laba Ditahan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Laba Ditahan
 DocType: BOM Item,Item Description,Deskripsi Barang
 DocType: Payment Tool,Payment Mode,Mode Pembayaran
 DocType: Purchase Invoice,Is Recurring,Dokumen Berulang/Langganan
@@ -1016,7 +1041,7 @@
 DocType: Production Order,Qty To Manufacture,Qty Untuk Produksi
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mempertahankan tingkat yang sama sepanjang siklus pembelian
 DocType: Opportunity Item,Opportunity Item,Peluang Stok Barang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Akun Pembukaan Sementara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Akun Pembukaan Sementara
 ,Employee Leave Balance,Nilai Cuti Karyawan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Ringkasan Buku Besar Hutang
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Faktur Berjalan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Kepala akun {0} telah dibuat
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Dicapai
@@ -1048,12 +1073,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambahkan Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Pertanian
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,Nomor Detail Serial
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Stok Barang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"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 +482,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Perlengkapan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
 DocType: Hub Settings,Seller Website,Situs Penjual
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status Order produksi adalah {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status Order produksi adalah {0}
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Untuk Supplier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Untuk Supplier
 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),Jumlah Nilai Total (Mata Uang Perusahaan)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Tidak menemukan item yang disebut {0}
 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
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Situs Grup Stok Barang
 DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
-DocType: Journal Entry,Journal Entry,Jurnal Entri
+DocType: Depreciation Schedule,Journal Entry,Jurnal Entri
 DocType: Workstation,Workstation Name,Nama Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
 DocType: Salary Slip,Bank Account No.,No Rekening Bank
 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
@@ -1095,6 +1121,7 @@
 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 Dihitung
 DocType: BOM Operation,Workstation,Workstation
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Permintaan Quotation Pemasok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perangkat keras
 DocType: Sales Order,Recurring Upto,berulang Upto
 DocType: Attendance,HR Manager,HR Manager
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Template Target Penilaian Pencapaian
 DocType: Salary Slip,Earning,Pendapatan
 DocType: Payment Tool,Party Account Currency,Akun Mata Uang per Party
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Nilai saat ini Setelah Penyusutan harus kurang dari sama dengan {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Penambahan atau Pengurangan
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jika Anggaran Tahunan Melebihi (untuk akun beban)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Mulai dan Akhir Tanggal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
 ,Delivered Items To Be Billed,Produk Terkirim untuk 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: Authorization Rule,Average Discount,Rata-rata Diskon
 DocType: Address,Utilities,Utilitas
 DocType: Purchase Invoice Item,Accounting,Akuntansi
 DocType: Features Setup,Features Setup,Fitur Pengaturan
+DocType: Asset,Depreciation Schedules,Jadwal penyusutan
 DocType: Item,Is Service Item,Apakah Layanan Barang
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 DocType: Payment Request,Transaction Currency,Mata uang transaksi
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Dari {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Deskripsi Operasi
 DocType: Item,Will also apply to variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat mengubah Tahun Anggaran Tanggal Mulai dan Tanggal Akhir Tahun Anggaran setelah Tahun Anggaran disimpan.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat mengubah Tahun Anggaran Tanggal Mulai dan Tanggal Akhir Tahun Anggaran setelah Tahun Anggaran disimpan.
 DocType: Quotation,Shopping Cart,Daftar Belanja
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Rata-rata Harian Outgoing
 DocType: Pricing Rule,Campaign,Promosi
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stok Entries sudah dibuat untuk Order Produksi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Alamat Pengiriman
 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 +472,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri akunting untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri akunting untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,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 Akun Rekening
-apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,Aturan pajak untuk transaksi.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Aturan pajak untuk transaksi.
 DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk mengubah nama.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Kami membeli item ini
 DocType: Address,Billing,Penagihan
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assemblies
+DocType: Asset,Asset Name,aset Nama
 DocType: Shipping Rule Condition,To Value,Untuk Dinilai
 DocType: Supplier,Stock Manager,Manajer Stok Barang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Slip Packing
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Sewa Kantor
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Slip Packing
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Sewa Kantor
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Permintaan kutipan dapat diakses dengan mengklik link berikut
+DocType: Asset,Number of Months in a Period,Jumlah Bulan di Masa a
 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.,Belum ditambahkan alamat
 DocType: Workstation Working Hour,Workstation Working Hour,Jam Kerja Workstation
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,pemerintahan
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Item Varian
 DocType: Company,Services,Layanan
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Jumlah ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
 DocType: Sales Invoice,Source,Sumber
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Tampilkan ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Cuti Tanpa Bayar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Arus Kas dari Investasi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Item Group,Item Group Name,Nama Item Grup
 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 +86,Transfer Materials for Manufacture,Transfer Material untuk Produksi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer Material untuk Produksi
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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 Stok Barang terhadap daftar harga beli."
@@ -1236,7 +1269,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskon Tambahan (dalam Mata Uang Perusahaan)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Kunjungan Pemeliharaan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Kunjungan Pemeliharaan
 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: Landed Cost Voucher,Landed Cost Help,Bantuan Biaya Landed
@@ -1250,7 +1283,6 @@
 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 Stok 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 +196,Brand master.,Master merek.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
 DocType: Sales Invoice Item,Brand Name,Merek Nama
 DocType: Purchase Receipt,Transporter Details,Detail transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kotak
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Klaim untuk biaya perusahaan.
 DocType: Company,Default Holiday List,Standar Daftar Hari Libur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Hutang Stok
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Hutang Stok
 DocType: Purchase Receipt,Supplier Warehouse,Gudang Supplier
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Supplier Quotation tidak diciptakan
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Kirim ulang Pembayaran Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Laporan lainnya
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} View
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Pengurang Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Sebelumnya Keuangan Tahun tidak tertutup
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Quotation Stok Barang
 DocType: Account,Account Name,Nama Akun
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Supplier Type induk.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Supplier Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Supplier Part Number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
 DocType: Purchase Invoice,Reference Document,Dokumen referensi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kredit Kontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dikirim Tanggal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,Nota Penerimaan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,Nota Penerimaan {0} tidak Terkirim
 DocType: Company,Default Payable Account,Standar Akun Hutang
-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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Ditagih
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Perubahan bersih Hutang
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Harap verifikasi id email Anda
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Konsumen yang dibutuhkan untuk 'Customerwise Diskon'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
 DocType: Quotation,Term Details,Rincian Term
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} harus lebih besar dari 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perencanaan Kapasitas Untuk (Hari)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garansi Klaim
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Uang muka yang dibayar terhadap {0} {1} tidak dapat lebih besar \ dari Grand Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Silahkan pilih kode Stok Barang
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Silahkan pilih kode Stok Barang
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Pengurangan untuk Cuti Tanpa Bayar (LWP)
 DocType: Territory,Territory Manager,Manager Wilayah
 DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat Entri Bursa ini
 apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,Unit tunggal Item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 cuti Dialokasikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,Entrikan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
 DocType: Employee,Date Of Retirement,Tanggal Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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,Kontak Berikutnya Melalui
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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,Tipe Order
 DocType: Purchase Invoice,Notification Email Address,Alamat Email Notifikasi
 DocType: Payment Tool,Find Invoices to Match,Cari Faktur yang Sesuai
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
+DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Gross
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","misalnya ""XYZ Bank Nasional """
+DocType: Asset,Depreciation Method,Metode penyusutan
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Total Jumlah Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Daftar Belanja diaktifkan
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk Lowongan Kerja
 DocType: Production Plan Material Request,Production Plan Material Request,Produksi Permintaan Rencana Material
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Tidak ada Order Produksi dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Tidak ada Order Produksi dibuat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 Order terhadap Purchase Order Konsumen
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Cuti dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari Bidang Usaha Wajib Diisi
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kode Barang/Item Konsumen
 DocType: Stock Reconciliation,Stock Reconciliation,Rekonsiliasi Stok
 DocType: Territory,Territory Name,Nama Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon untuk Lowongan 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 Supplier Anda
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Daftar Alamat
+apps/erpnext/erpnext/hooks.py +91,Addresses,Daftar Alamat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Entri Jurnal {0} sama sekali tidak memiliki ketidakcocokan {1} entri
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,penilaian
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Item tidak diperbolehkan untuk memiliki Orde Produksi.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item tidak diperbolehkan untuk memiliki Orde Produksi.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
 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: Sales Order,To Deliver and Bill,Untuk Dikirim dan Ditagih
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Log Waktu untuk manufaktur.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} harus diserahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Stok Barang {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Waktu Log untuk Tugas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Payment,Pembayaran
 DocType: Production Order Operation,Actual Time and Cost,Waktu dan Biaya Aktual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimal {0} dapat dibuat untuk Item {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Panggilan
 DocType: Pricing Rule,Brand,Merek
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundel item pada saat penjualan.
 DocType: Quotation Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 Stok Barang Atribut Nilai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Rekan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} bukan merupakan Stok Barang serial
+DocType: Request for Quotation Supplier,Send Email to Supplier,Kirim Email ke Pemasok
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 DocType: Packing Slip,To Package No.,Untuk Paket No
 DocType: Production Planning Tool,Material Requests,Permintaan bahan
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Gudang Pengiriman
 DocType: Stock Settings,Allowance Percent,Persentasi Allowance
 DocType: SMS Settings,Message Parameter,Parameter pesan
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Pohon Pusat Biaya keuangan.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Pohon Pusat Biaya keuangan.
 DocType: Serial No,Delivery Document No,Nomor Dokumen Pengiriman
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dapatkan Produk Dari Pembelian Penerimaan
 DocType: Serial No,Creation Date,Tanggal Pembuatan
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,Jumlah untuk Dikirim
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} dibuat
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} dibuat
 DocType: Delivery Note Item,Against Sales Order,Berdasarkan Order Penjualan
 ,Serial No Status,Status Nomor Serial
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tabel Stok Barang tidak boleh kosong
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Baris {0}: Untuk mengatur {1} periodisitas, perbedaan antara dari dan sampai saat ini \
  harus lebih besar dari atau sama dengan {2}"
 DocType: Pricing Rule,Selling,Penjualan
 DocType: Employee,Salary Information,Informasi Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tarif dan Pajak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Tarif dan Pajak
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Harap masukkan tanggal Referensi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway Rekening tidak dikonfigurasi
 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,Qty Disupply
-DocType: Production Order,Material Request Item,Item Permintaan Material
+DocType: Request for Quotation Item,Material Request Item,Item Permintaan Material
 apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,Tree 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
+DocType: Asset,Sold,Terjual
 ,Item-wise Purchase History,Laporan Riwayat Pembelian berdasarkan Stok Barang/Item
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Merah
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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,Order Produksi Aktif
 DocType: Installation Note,Installation Time,Waktu Installasi
 DocType: Sales Invoice,Accounting Details,Akunting Detail
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Hapus semua Transaksi untuk Perusahaan ini
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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 Stok 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokasi
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
 DocType: Item Attribute,Attribute Name,Nama Atribut
 DocType: Item Group,Show In Website,Tampilkan Di Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grup
@@ -1552,6 +1592,7 @@
 ,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, Stok Barang, Purchase Order, Voucher Pembelian, Pembeli Penerimaan, Quotation, Faktur Penjualan, Produk Bundle, Sales Order, Serial No"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt chart dari semua tugas.
+DocType: Pricing Rule,Margin Type,Margin Jenis
 DocType: Appraisal,For Employee Name,Untuk Nama Karyawan
 DocType: Holiday List,Clear Table,Bersihkan Table
 DocType: Features Setup,Brands,Merek
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Tingkat Biaya
 ,Customer Addresses And Contacts,Alamat dan kontak Konsumen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Aset adalah wajib terhadap Aset Barang Tetap
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan penyiapan penomoran seri untuk Kehadiran melalui Pengaturan&gt; Penomoran Series
 DocType: Employee,Resignation Letter Date,Tanggal Surat Pengunduran Diri
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pendapatan konsumen langganan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pasangan
+DocType: Asset,Depreciation Schedule,Jadwal penyusutan
 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 Halaman Excise
+DocType: Asset,Purchase Date,Tanggal Pembelian
 DocType: Employee,Personal Details,Data Pribadi
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Silahkan mengatur &#39;Biaya Penyusutan Asset Center di Perusahaan {0}
 ,Maintenance Schedules,Jadwal pemeliharaan
 ,Quotation Trends,Trend Quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
 DocType: Shipping Rule Condition,Shipping Amount,Jumlah Pengiriman
 ,Pending Amount,Jumlah Pending
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Entri Rekonsiliasi
 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,Distribusi Biaya Berdasarkan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Stok Barang {1} adalah merupakan sebuah Aset Tetap
 DocType: HR Settings,HR Settings,Pengaturan Sumber Daya Manusia
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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,Jumlah Diskon Tambahan
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr tidak boleh kosong atau spasi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Kelompok Non-kelompok
 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/public/js/setup_wizard.js +272,Unit,Satuan
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Silakan tentukan Perusahaan
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi Konsumen 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/public/js/setup_wizard.js +42,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,Beban Klaim
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Beban Klaim
 DocType: Issue,Support,Support
 ,BOM Search,BOM Cari
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutupan (Membuka Total +)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Stok 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/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 +249,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata Uang harus {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata Uang 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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
 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 Sales Person ini
 DocType: Territory,Classification of Customers by region,Klasifikasi Konsumen menurut wilayah
 DocType: Project,% Tasks Completed,% Tugas Selesai
 DocType: Project,Gross Margin,Margin kotor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Dihitung keseimbangan Laporan Bank
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Pengguna Non-aktif
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Quotation
 DocType: Salary Slip,Total Deduction,Jumlah Deduksi
 DocType: Quotation,Maintenance User,Pengguna Pemeliharaan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Perbarui Biaya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Perbarui Biaya
 DocType: Employee,Date of Birth,Tanggal Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Konsumen / Alamat Kesempatan
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan penyiapan Karyawan Penamaan Sistem di Sumber Daya Manusia&gt; Settings HR
 DocType: Production Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Pengurangan
@@ -1645,8 +1691,8 @@
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri Stok 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,Manajer Manufaktur
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
+DocType: Request for Quotation,Manufacturing Manager,Manajer Manufaktur
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Pengiriman
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dikirimkan ke Konsumen
@@ -1654,12 +1700,12 @@
 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/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,Supplier
+DocType: Asset,Supplier,Supplier
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 Stok
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Pengguna {0} dinonaktifkan
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Currency Exchange,From Currency,Dari mata uang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
@@ -1678,11 +1724,11 @@
 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 terlebih dahulu
+apps/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Qty harus 1, sebagai pos terkait dengan aset"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Anak Barang seharusnya tidak menjadi Bundle Produk. Silakan hapus item yang `{0}` dan menyimpan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Biaya Pusat baru
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pergi ke grup yang sesuai (biasanya Sumber Dana&gt; Kewajiban Lancar&gt; Pajak dan Tugas dan membuat Akun baru (dengan mengklik Tambahkan Anak) jenis &quot;Pajak&quot; dan melakukan menyebutkan tingkat pajak.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Biaya Pusat baru
 DocType: Bin,Ordered Quantity,Qty Terpesan/Terorder
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Quality Inspection,In Process,Dalam Proses
@@ -1695,10 +1741,11 @@
 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,Akun Piutang
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Balance Nilai Stok
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Nota Penjualan untuk Pembayaran
 DocType: Expense Claim Detail,Expense Claim Detail,Detail Klaim Biaya
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Waktu Log dibuat:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Waktu Log dibuat:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Silakan pilih akun yang benar
 DocType: Item,Weight UOM,Berat UOM
 DocType: Employee,Blood Group,Golongan darah
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Silakan tentukan negara untuk Aturan Pengiriman ini atau periksa Seluruh Dunia Pengiriman
 DocType: Stock Entry,Total Incoming Value,Total nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debit Untuk diperlukan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
 DocType: Offer Letter Term,Offer Term,Penawaran Term
 DocType: Quality Inspection,Quality Manager,Manajer Mutu
 DocType: Job Applicant,Job Opening,Lowongan Pekerjaan
 DocType: Payment Reconciliation,Payment Reconciliation,Rekonsiliasi Pembayaran
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Silahkan Pilih Pihak penanggung jawab
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Silahkan Pilih Pihak penanggung jawab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Surat Penawaran
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menghasilkan Permintaan Material (MRP) dan Order Produksi.
@@ -1730,22 +1777,22 @@
 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 Tree dan klik pada node di mana Anda ingin menambahkan lebih banyak node."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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,Qty Selesai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
 DocType: Manufacturing Settings,Allow Overtime,Perbolehkan Lembur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Number diperlukan untuk Item {1}. Anda telah disediakan {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nilai Tingkat Penilaian Saat ini
 DocType: Item,Customer Item Codes,Kode Stok Barang Konsumen
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Buat Entri Pembayaran terhadap Order atau Faktur.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Buat Entri Pembayaran terhadap Order atau Faktur.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,All items have already been invoiced,Semua Stok Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,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 +303,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
@@ -1754,10 +1801,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ada slip gaji yang ditemukan selama satu bulan:
 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 +175,Serial No {0} not found,Serial No {0} tidak ditemukan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} tidak ditemukan
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Konsumen Anda
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
 DocType: Leave Block List Date,Block Date,Blokir Tanggal
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Terapkan Sekarang
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Terapkan Sekarang
 DocType: Sales Order,Not Delivered,Tidak Terkirim
 ,Bank Clearance Summary,Laporan Ringkasan Kliring Bank
 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."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Rincian Pekerjaan
 DocType: Employee,New Workplace,Tempat Kerja Baru
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Tetapkan untuk ditutup
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ada Stok Barang dengan Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ada Stok Barang dengan Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kasus No tidak bisa 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 memiliki Tim Penjualan dan Penjualan Mitra (Mitra Channel) mereka dapat ditandai dan mempertahankan kontribusi mereka dalam aktivitas penjualan
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
@@ -1799,10 +1847,10 @@
 DocType: Rename Tool,Rename Tool,Alat Perubahan Nama
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Perbarui Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Material/Stok Barang
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} harus menjadi Stok Barang Penjualan di {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkkan Stok Negatif
@@ -1816,12 +1864,13 @@
 DocType: Quality Inspection,Purchase Receipt No,No Nota Penerimaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Impor Email Dari
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Undang sebagai Pengguna
 DocType: Features Setup,After Sale Installations,Pemasangan setelah Penjualan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Silakan set {0} di Perusahaan {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 DocType: Workstation Working Hour,End Time,Waktu Akhir
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Ketentuan kontrak standar untuk Penjualan atau Pembelian.
@@ -1830,9 +1879,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan pada
 DocType: Sales Invoice,Mass Mailing,Pengiriman Email secara Banyak
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nomor Order purchse diperlukan untuk Item {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Nomor Order purchse diperlukan untuk Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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,Klaim Biaya Disetujui
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 DocType: Warranty Claim,Raised By,Diangkat Oleh
 DocType: Payment Gateway Account,Payment Account,Akun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Perubahan bersih Piutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,Accepted,Diterima
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
 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 Order Produksi {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 Order Produksi {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 Stok 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 +449,Quick Journal Entry,Jurnal Entry Cepat
 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 Stok 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 +206,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} tidak di-posting
 apps/erpnext/erpnext/config/stock.py +27,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 Stok Barang jadi.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nama
 DocType: Authorization Rule,Authorized Value,Nilai disetujui
@@ -1894,21 +1943,22 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} adalah ditutup
 DocType: Email Digest,How frequently?,Seberapa sering?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Stok saat ini
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke grup yang sesuai (biasanya Penerapan Dana&gt; Aset Lancar&gt; Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) jenis &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Bill of Material
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Hadir
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
 DocType: Production Order,Actual End Date,Tanggal Akhir Aktual
 DocType: Authorization Rule,Applicable To (Role),Berlaku Untuk (Peran)
 DocType: Stock Entry,Purpose,Tujuan
+DocType: Company,Fixed Asset Depreciation Settings,Pengaturan Penyusutan Aset Tetap
 DocType: Item,Will also apply for variants unless overrridden,Juga akan berlaku untuk varian kecuali overrridden
 DocType: Purchase Invoice,Advances,Advances
 DocType: Production Order,Manufacture against Material Request,Memproduksi terhadap Permintaan Bahan
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Menyetujui Pengguna tidak bisa sama dengan pengguna aturan yang Berlaku Untuk
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tingkat dasar (seperti per Stok UOM)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Nilai dasar (seperti per Stok UOM)
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
 DocType: Campaign,Campaign-.####,Promosi-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1959,12 +2009,14 @@
  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 Stok Barang) atau keduanya.
  10. Menambah atau Dikurangi: Apakah Anda ingin menambah atau mengurangi pajak."
 DocType: Purchase Receipt Item,Recd Quantity,Qty Diterima
-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 Stok Barang {0} daripada kuantitas Sales Order {1}
+DocType: Asset Category Account,Asset Category Account,Aset Kategori Akun
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Entri Bursa {0} tidak Terkirim
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Kota Penagihan
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","misalnya Bank, Kas, Kartu Kredit"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke grup yang sesuai (biasanya Penerapan Dana&gt; Aset Lancar&gt; Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) jenis &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Nota Kredit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Cabang master organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Tidak ada karyawan untuk kriteria di atas yang dipilih ATAU Slip gaji sudah dibuat
@@ -2017,7 +2069,7 @@
 DocType: Product Bundle,Parent Item,Induk Stok 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,Cuti Jenis {0} tidak dapat membawa-diteruskan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +200,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'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Daftar gaji
 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"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nota Penerimaan Produk
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Menyesuaikan Bentuk
 DocType: Account,Income Account,Akun Penghasilan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Tidak Template bawaan Alamat ditemukan. Harap membuat yang baru dari Pengaturan&gt; Percetakan dan Branding&gt; Template Alamat.
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,22 +2103,23 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Melacak Memimpin menurut Produksi Type.
 DocType: Item Supplier,Item Supplier,Item Supplier
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan Stok
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Manage Group Konsumen Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Baru Nama Biaya Pusat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Cuti Control Panel
 DocType: Appraisal,HR User,HR Pengguna
 DocType: Purchase Invoice,Taxes and Charges Deducted,Pajak dan Biaya Dikurangi
-apps/erpnext/erpnext/config/support.py +7,Issues,Isu
+apps/erpnext/erpnext/hooks.py +90,Issues,Isu
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status harus menjadi salah satu {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,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/accounts/party.py +322,{0} {1} is disabled,{0} {1} dinonaktifkan
+DocType: Supplier,Billing Currency,Mata Uang Penagihan
 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
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
 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 +139,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Stock Settings,Default Valuation Method,Metode standar Penilaian
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
 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 +142,Quotation {0} is cancelled,Quotation {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Total Outstanding
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Diminta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Tidak ada Keterangan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset Item harus item non-saham
 DocType: Supplier Quotation Item,Material Request No,Permintaan Material yang
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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 Konsumen dikonversi ke mata uang dasar perusahaan
@@ -2176,7 +2231,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entri Akunting untuk Stok
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat Konsumen
 DocType: Payment Request,Recipient and Message,Penerima dan Pesan
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
 DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Bisu Email
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Meminta kutipan.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
 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 +294,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +293,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}: Nota Penerimaan {1} tidak ada dalam tabel di atas 'Pembelian Penerimaan'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,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,Tanggal Project Mulai
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Terhadap No. Dokumen
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Kelola Partner Penjualan
 DocType: Quality Inspection,Inspection Type,Tipe Inspeksi
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Silahkan pilih {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Pembesaran Item
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran non-absen
@@ -2240,6 +2296,7 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan Konsumen, 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
+DocType: Asset Category Account,Depreciation Expense Account,Akun Beban Penyusutan
 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 cuti yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Approver Klaim Biaya
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Dikonfirmasi
 DocType: Payment Gateway,Gateway,Gerbang
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Silahkan masukkan menghilangkan date.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Hanya Cuti Aplikasi status 'Disetujui' dapat diajukan
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Wajib masukan Judul Alamat.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrikan nama kampanye jika sumber penyelidikan adalah kampanye
@@ -2267,18 +2324,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Barang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Tanggal Posting
 DocType: Item,Valuation Method,Metode Penilaian
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Tidak dapat menemukan tukar untuk {0} ke {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Tidak dapat menemukan tukar untuk {0} ke {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Tim Penjualan
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entri Ganda/Duplikat
 DocType: Serial No,Under Warranty,Masih Garansi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[Kesalahan]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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),cuti baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial ada {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Gudang Customer (pilihan)
 DocType: Pricing Rule,Discount Percentage,Persentase Diskon
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
@@ -2304,16 +2362,18 @@
 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
 DocType: Leave Allocation,Leave Allocation,Alokasi Cuti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Permintaan Material {0} dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Permintaan Material {0} dibuat
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Template istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Kontak
 DocType: Supplier,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}","Cuti tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
+DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
+DocType: Asset,Expected Value After Useful Life,Nilai diharapkan Setelah Hidup Berguna
 DocType: Item,Reorder level based on Warehouse,Tingkat Re-Order berdasarkan Gudang
-DocType: Activity Cost,Billing Rate,Tingkat penagihan
+DocType: Activity Cost,Billing Rate,Tarip penagihan
 ,Qty to Deliver,Qty untuk Dikirim
 DocType: Monthly Distribution Percentage,Month,Bulan
 ,Stock Analytics,Stock Analytics
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} dibatalkan atau ditutup
 DocType: Delivery Note,Track this Delivery Note against any Project,Lacak Pengiriman ini Catatan terhadap Proyek manapun
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Kas Bersih dari Investasi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Account root tidak bisa dihapus
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Gudang Work In Progress
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Aset {0} harus diserahkan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Pengelolaan Alamat
-DocType: Pricing Rule,Item Code,Kode Item
+DocType: Asset,Item Code,Kode Item
 DocType: Production Planning Tool,Create Production Orders,Buat Order Produksi
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
 DocType: Journal Entry,User Remark,Keterangan Pengguna
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Order Permintaan Material
 DocType: Employee Education,School/University,Sekolah / Universitas
 DocType: Payment Request,Reference Details,Detail referensi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
 ,Billed Amount,Jumlah Tagihan
+DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Agar tertutup tidak dapat dibatalkan. Unclose untuk membatalkan.
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Update
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Entri Pembukaan"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +131,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'
+DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
 ,Stock Projected Qty,Stock Proyeksi Jumlah
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serial dan Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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,Cuti Block List Diizinkan
 DocType: Sales Partner,Retailer,Pengecer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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 Supplier
 DocType: Global Defaults,Disable In Words,Nonaktifkan Dalam Kata-kata
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Stok 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,Bank Akun Overdraft
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank Akun Overdraft
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Grup&gt; Merek
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Pinjaman Aman
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Silahkan mengatur Penyusutan Akun terkait Aset Kategori {0} atau Perusahaan {1}
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Yang Mengagumkan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo pembukaan Ekuitas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Saldo pembukaan Ekuitas
 DocType: Appraisal,Appraisal,Penilaian
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Email dikirim ke pemasok {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tanggal diulang
 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 +187,Leave approver must be one of {0},Cuti approver harus menjadi salah satu {0}
@@ -2401,7 +2467,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Workstation Working Hour,Start Time,Waktu Mulai
 DocType: Item Price,Bulk Import Help,Bantuan Impor Masal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Pilih Kuantitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Pilih Kuantitas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Menyetujui Peran tidak bisa sama dengan peran aturan yang Berlaku Untuk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Berhenti berlangganan dari Email ini Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Pesan Terkirim
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,My Shipments,Pengiriman saya
 DocType: Journal Entry,Bill Date,Tanggal Penagihan
 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: Sales Invoice Item,Total Margin,total Margin
 DocType: Supplier,Supplier Details,Rincian Supplier
 DocType: Expense Claim,Approval Status,Approval Status
 DocType: Hub Settings,Publish Items to Hub,Publikasikan Produk untuk Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Konsumen / Konsumen
 DocType: Payment Gateway Account,Default Payment Request Message,Standar Pesan Permintaan Pembayaran
 DocType: Item Group,Check this if you want to show in website,Periksa ini jika Anda ingin menunjukkan di website
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Perbankan dan Pembayaran
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Perbankan dan Pembayaran
 ,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,Kesempatan menjadi Peluang
@@ -2450,21 +2517,21 @@
 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 +199,Purchase Order {0} is not submitted,Order Pembelian {0} tidak terkirim
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Order Pembelian {0} tidak terkirim
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
 DocType: Notification Control,Quotation Message,Quotation Pesan
 DocType: Issue,Opening Date,Tanggal pembukaan
 DocType: Journal Entry,Remark,Komentar
 DocType: Purchase Receipt Item,Rate and Amount,Rate dan Jumlah
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Daun dan Liburan
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Jumlah Nilai Voucher Landing Cost
 DocType: Time Log,Batched for Billing,Batched untuk Billing
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tagian diajukan oleh Supplier.
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tagihan diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Akun Write Off
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
@@ -2476,15 +2543,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Akun Jurnal Entri
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
+DocType: Company,Asset Depreciation Cost Center,Asset Pusat Penyusutan Biaya
 DocType: Sales Order Item,Sales Order Date,Tanggal Nota Penjualan
 DocType: Sales Invoice Item,Delivered Qty,Qty Terkirim
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Tanggal pembelian aset {0} tidak sesuai dengan tanggal pembelian Faktur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Entri
 DocType: Account,Payable,Hutang
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debitur ({0})
-DocType: Project,Margin,Margin
+DocType: Pricing Rule,Margin,Margin
 DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Konsumen baru
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Laba Kotor%
@@ -2492,20 +2561,23 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
 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 +57,Where manufacturing operations are carried.,Dimana operasi manufaktur dilakukan.
 DocType: Stock Entry Detail,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
 DocType: C-Form,Total Invoiced Amount,Jumlah Total Tagihan
 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: Account,Accumulated Depreciation,Akumulasi penyusutan
 DocType: Stock Entry,Customer or Supplier Details,Konsumen atau Supplier Detail
 DocType: Payment Request,Email To,Email Untuk
 DocType: Lead,Lead Owner,Timbal Owner
 DocType: Bin,Requested Quantity,diminta Kuantitas
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Gudang diperlukan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Terkirim
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Terkirim
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,pemasok yang sama telah dimasukkan beberapa kali
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Stok Barang Disediakan
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2527,13 +2600,14 @@
 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.
 DocType: Payment Request,Payment Details,Rincian Pembayaran
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
+DocType: Asset,Journal Entry for Scrap,Jurnal masuk untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Catatan dari semua komunikasi email jenis, telepon, chatting, kunjungan, dll"
 DocType: Manufacturer,Manufacturers used in Items,Produsen yang digunakan dalam Produk
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Buat New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Buat New
 DocType: Buying Settings,Purchase Order Required,Order Pembelian Diperlukan
 ,Item-wise Sales History,Item-wise Penjualan Sejarah
 DocType: Expense Claim,Total Sanctioned Amount,Jumlah Total Disahkan
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Bursa Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Tingkat: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Slip Gaji Pengurangan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Pilih simpul kelompok terlebih dahulu.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Pilih simpul kelompok terlebih dahulu.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Karyawan dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Hapus referensi dari pelanggan, pemasok, mitra penjualan dan memimpin, karena alamat perusahaan Anda"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
 DocType: Task,depends_on,tergantung pada
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Diskon Fields akan tersedia dalam Purchase Order, Nota Penerimaan, Purchase Invoice"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat account untuk Konsumen dan Supplier
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat account untuk Konsumen dan Supplier
 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,Supplier memberikan kepada Konsumen
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Posting Tanggal
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Tampilkan pajak break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) adalah keluar dari saham
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Posting Tanggal
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 Stok Barang 'Apakah Diproduksi'
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktur Posting Tanggal
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Perusahaan (tidak Konsumen atau Supplier) Master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Entrikan 'Diharapkan Pengiriman Tanggal'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk Stok Barang {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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 Entri manual."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,Email Kontak Konsumen
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Akun Aset Tetap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Dari Delivery Note
 DocType: Time Log,From Time,Dari Waktu
 DocType: Notification Control,Custom Message,Custom Pesan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Menilai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Menginternir
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,Dari BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Transaksi Stok sebelum {0} dibekukan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Struktur Gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Isu Material
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotation
 DocType: Hub Settings,Access Token,Akses Token
 DocType: Sales Invoice Item,Serial No,Serial ada
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail terlebih dahulu
-DocType: Item,Is Fixed Asset Item,Apakah Fixed Asset Stok Barang
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail terlebih dahulu
 DocType: Purchase Invoice,Print Language,cetak Bahasa
 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"
+DocType: Asset,Number of Depreciations,Jumlah Penyusutan
 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
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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 Stok Barang
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Permintaan Kutipan
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Faktur Jumlah
 DocType: Purchase Invoice Item,Image View,Citra Tampilan
 apps/erpnext/erpnext/config/selling.py +23,Customers,pelanggan
+DocType: Asset,Partially Depreciated,sebagian disusutkan
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,Manajer Pemeliharaan
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh nol
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Diubah Dari
+DocType: Asset,Amended From,Diubah Dari
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Harap menyebutkan &#39;Gain / Loss Account pada Asset Disposal&#39; di Perusahaan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Stok Barang {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
 DocType: Journal Entry,Bank Entry,Bank Entri
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Tambahkan ke Keranjang Belanja
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Kelompok Dengan
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
 DocType: Production Planning Tool,Get Material Request,Dapatkan Material Permintaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Beban pos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Beban pos
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Quality Inspection,Item Serial No,Item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Total Hadir
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Laporan akuntansi
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Laporan akuntansi
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Jam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Stok Barang {0} tidak dapat diperbarui \
@@ -2746,15 +2825,16 @@
 DocType: C-Form,Invoices,Faktur
 DocType: Job Opening,Job Title,Jabatan
 DocType: Features Setup,Item Groups in Details,Item Grup dalam Rincian
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Mulai Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Kunjungi laporan untuk panggilan pemeliharaan.
 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 Konsumen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: Item,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Perubahan Bersih Ekuitas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
 DocType: Serial No,AMC Expiry Date,AMC Tanggal Berakhir
 ,Sales Register,Daftar Penjualan
 DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
@@ -2762,12 +2842,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nama Kelompok Konsumen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Kesalahan: {0}&gt; {1}
 DocType: Item,Attributes,Atribut
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Dapatkan Produk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Cukup masukkan Write Off Akun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Dapatkan Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Order terakhir Tanggal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
 DocType: C-Form,C-Form,C-Form
@@ -2779,32 +2860,32 @@
 DocType: Purchase Invoice,Mobile No,Ponsel Tidak ada
 DocType: Payment Tool,Make Journal Entry,Membuat Jurnal Entri
 DocType: Leave Allocation,New Leaves Allocated,cuti baru Dialokasikan
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Komersial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Kesalahan: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Induk Stok Barang {0} tidak harus menjadi Stok Item
 DocType: Cost Center,Distribution Id,Id Distribusi
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Semua Produk atau Jasa.
 DocType: Supplier Quotation,Supplier Address,Supplier Alamat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Qty
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 apps/erpnext/erpnext/controllers/item_variant.py +62,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
+DocType: Stock Entry Detail,Basic Amount,Jumlah Dasar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
 DocType: Tax Rule,Billing State,Negara penagihan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,Keterangan
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Kirim Pemasok Email
 DocType: Features Setup,POS View,Lihat POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Catatan instalasi untuk No Serial
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Waktu Log telah Ditagih
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silahkan mengatur Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Silakan set nilai default {0} di Perusahaan {1}
@@ -2847,12 +2930,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan penyiapan penomoran seri untuk Kehadiran melalui Pengaturan&gt; Penomoran Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Dapatkan Produk dari Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Dapatkan Produk dari Bundle Produk
+DocType: Asset,Straight Line,Garis lurus
+DocType: Project User,Project User,proyek Pengguna
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Entrikan 'Apakah subkontrak' sebagai Ya atau Tidak
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,Entrikan 'Apakah subkontrak' sebagai Ya atau Tidak
 DocType: Sales Team,Contact No.,Hubungi Nomor
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'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
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Jumlah Order
 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 +117,Add Child,Tambah Anak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Nilai pembukaan
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisi Penjualan
 DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
-DocType: Tax Rule,Billing Country,Penagihan Negara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
+DocType: Tax Rule,Billing Country,Negara Penagihan
 ,Customers Not Buying Since Long Time,Konsumen Tidak Membeli Sejak Long Time
 DocType: Production Order,Expected Delivery Date,Diharapkan Pengiriman Tanggal
 apps/erpnext/erpnext/accounts/general_ledger.py +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Beban Hiburan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Beban Hiburan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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
+DocType: Time Log,Billing Amount,Jumlah Penagihan
 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 +60,Applications for leave.,Aplikasi untuk cuti.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Beban Legal
 DocType: Sales Invoice,Posting Time,Posting Waktu
 DocType: Sales Order,% Amount Billed,% Jumlah Ditagih
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Beban Telepon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Beban Telepon
 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.,Periksa ini jika Anda ingin untuk memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Tidak ada Stok Barang dengan Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Tidak ada Stok Barang dengan Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Terbuka Pemberitahuan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Beban Langsung
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Beban Langsung
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} adalah alamat email yang tidak valid di &#39;Pemberitahuan \ Alamat Email&#39;
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Pendapatan Konsumen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Biaya Perjalanan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,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 +60,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Kami menjual item ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Supplier Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
 DocType: Journal Entry,Cash Entry,Entri Kas
 DocType: Sales Partner,Contact Desc,Contact Info
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis cuti seperti kasual, dll sakit"
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Catatan: Stok Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kontak.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Pemasok aset {0} tidak cocok dengan pemasok di Purchase Invoice
 DocType: Newsletter,Test Email Id,Uji Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 Stok Barang QA Diperlukan dan QA ada di Nota Penerimaan
 DocType: GL Entry,Party Type,Type Partai
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,Bahan baku tidak bisa sama dengan Butir utama
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Master Gaji Template.
@@ -2946,12 +3032,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit Stok beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Stok Barang Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Konsumen
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,mata uang penagihan harus sama dengan mata uang baik bawaan comapany atau mata uang akun payble partai
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretaris
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika menonaktifkan, &#39;Dalam Kata-kata&#39; bidang tidak akan terlihat di setiap transaksi"
@@ -2961,13 +3048,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Batch Waktu Log ini telah dibatalkan.
 ,Reqd By Date,Reqd By Date
 DocType: Salary Slip Earning,Salary Slip Earning,Slip Gaji Produktif
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditor
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Serial ada adalah wajib
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stok Barang Wise Detil Pajak
 ,Item-wise Price List Rate,Stok Barang-bijaksana Daftar Harga Tingkat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Supplier 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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order 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 +456,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Entrikan Satuan default Ukur
-DocType: Project,Project Name,Nama Proyek
+DocType: Request for Quotation Item,Project Name,Nama Proyek
 DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Features Setup,Item Batch Nos,Item Batch Nos
@@ -3026,6 +3112,7 @@
 DocType: Sales Invoice,End Date,Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksi saham
 DocType: Employee,Internal Work History,Sejarah Kerja internal
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumulasi Penyusutan Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Konsumen Umpan
 DocType: Account,Expense,Biaya
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Perusahaan adalah wajib, karena alamat perusahaan Anda"
 DocType: Item Attribute,From Range,Dari Rentang
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Item {0} diabaikan karena bukan Stok Barang stok
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Kirim Produksi ini Order untuk diproses lebih lanjut.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Kirim Produksi ini Order untuk diproses lebih lanjut.
 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.","Untuk tidak berlaku Rule Harga dalam transaksi tertentu, semua Aturan Harga yang berlaku harus dinonaktifkan."
 DocType: Company,Domain,Domain
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -3045,6 +3132,7 @@
 DocType: Time Log,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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 Cuti Tanpa Bayar (LWP)
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,Tanggal Pengiriman
 DocType: Opportunity,Opportunity Date,Peluang Tanggal
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Pembelian Penerimaan
+DocType: Request for Quotation Item,Request for Quotation Item,Permintaan Quotation Barang
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Memerintahkan%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
@@ -3075,11 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak setup untuk Serial Nos Kolom harus kosong
 DocType: Accounts Settings,Accounts Settings,Pengaturan Akun
 DocType: Customer,Sales Partner and Commission,Penjualan Mitra dan Komisi
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Silahkan mengatur &#39;Asset Disposal Akun&#39; di Perusahaan {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Tanaman dan Mesin
 DocType: Sales Partner,Partner's Website,Partner Website
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Akun sementara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Ledakan Stok Barang
 DocType: Account,Auditor,Akuntan
@@ -3088,21 +3178,22 @@
 DocType: Pricing Rule,Disable,Nonaktifkan
 DocType: Project Task,Pending Review,Pending Ulasan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klik di sini untuk membayar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Aset {0} tidak dapat dihapus, karena sudah {1}"
 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,Konsumen Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absen
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Menambahkan item dari
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Menambahkan item dari
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Tugas ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","misalnya ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,Stok tidak bisa eksis untuk Item {0} karena memiliki varian
 ,Sales Person-wise Transaction Summary,Sales Person-bijaksana Rangkuman Transaksi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Gudang {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} telah dinonaktifkan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap No. Voucher
 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
@@ -3128,7 +3220,7 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tingkat di mana mata uang Supplier 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Rekening Gateway setup.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Rekening Gateway setup.
 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
 ,Cash Flow,Arus kas
@@ -3142,7 +3234,7 @@
 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 +132,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Bank saldo Laporan per General Ledger
 DocType: Job Applicant,Applicant Name,Nama Pemohon
 DocType: Authorization Rule,Customer / Item Name,Konsumen / Item Nama
@@ -3158,19 +3250,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Silakan tentukan 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,Tingkat penilaian Item dihitung ulang mengingat mendarat biaya jumlah voucher
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Pengaturan default untuk menjual transaksi.
 DocType: BOM Replace Tool,Current BOM,BOM saat ini
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tambahkan Nomor Serial
 apps/erpnext/erpnext/config/support.py +43,Warranty,Jaminan
 DocType: Production Order,Warehouses,Gudang
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Alat Cetak dan Alat Tulis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Alat Cetak dan Alat Tulis
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node Grup
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Stok Barang pembaruan Selesai
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Stok Barang pembaruan Selesai
 DocType: Workstation,per hour,per jam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,pembelian
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Jumlah Dibayar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Berlaku untuk Perusahaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
 DocType: Purchase Invoice,In Words,Dalam Kata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
 DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Material Untuk Gudang
@@ -3213,9 +3304,11 @@
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {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 mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Ikut
 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 +564,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
+DocType: Pricing Rule,Margin Rate or Amount,Tingkat margin atau Jumlah
 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,Stok barang Order Penjualan
@@ -3225,7 +3318,7 @@
 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 +782,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Salary Slip,Net Pay,Nilai Bersih Terbayar
 DocType: Account,Account,Akun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial ada {0} telah diterima
@@ -3233,14 +3326,13 @@
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensi peluang untuk menjadi penjualan.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Valid {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silahkan mengatur Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departmen Store
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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 terlebih dahulu.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Simpan dokumen terlebih dahulu.
 DocType: Account,Chargeable,Dapat Dibebankan
 DocType: Company,Change Abbreviation,Ubah Singkatan
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
@@ -3258,14 +3350,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,General Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Kesempatan
 DocType: Item Attribute Value,Attribute Value,Nilai Atribut
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id harus unik, sudah ada untuk {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email id harus unik, sudah ada untuk {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Silahkan pilih {0} terlebih dahulu
 DocType: Features Setup,To get Item Group in details table,Untuk mendapatkan Stok Barang Group di tabel rincian
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {0}
 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>
@@ -3297,23 +3390,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
 ,Project wise Stock Tracking,Project Tracking Stock bijaksana
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Jadwal pemeliharaan {0} ada terhadap {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Jadwal pemeliharaan {0} ada terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Jumlah Aktual (di sumber/target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Catatan karyawan.
 DocType: Payment Gateway,Payment Gateway,Gerbang pembayaran
 DocType: HR Settings,Payroll Settings,Pengaturan Payroll
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Order
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root tidak dapat memiliki pusat biaya orang tua
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Merek ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Berlaku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Gudang adalah wajib
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Simpan sebagai web-friendly 900px  (w) X 100px (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok 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 VoucherOutstanding
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
@@ -3331,7 +3424,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,Kirim pada penciptaan
 DocType: Employee Leave Approver,Employee Leave Approver,Approver Cuti Karyawan
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Master Manajer Pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Order produksi {0} harus diserahkan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Order saya
@@ -3367,10 +3460,10 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entrikan 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,Entrikan pesan sebelum mengirimnya
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Profil Point of Sale
+apps/erpnext/erpnext/config/accounts.py +258,Point-of-Sale Profile,Profil Point of Sale
 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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pinjaman tanpa Jaminan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Pinjaman tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
 DocType: Maintenance Schedule Detail,Scheduled Date,Dijadwalkan Tanggal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total nilai Bayar
@@ -3382,11 +3475,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Supplier Anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Pemasok Bagian Tidak
 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
@@ -3395,12 +3489,12 @@
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Tipe Konten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Stok Barang ini dalam beberapa kelompok di website.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,Dari Faktur Tanggal
@@ -3409,7 +3503,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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
@@ -3422,7 +3516,7 @@
 DocType: Item,Customer Code,Kode Konsumen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Birthday Reminder untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah hari semenjak order terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Series Penamaan
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stok Asset
@@ -3436,15 +3530,15 @@
 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,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Kegiatan proyek / tugas.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Buat Slip Gaji
 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: Purchase Invoice,Write Off Amount (Company Currency),Jumlah Nilai Write Off (mata uang perusahaan)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Landing Cost
 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
@@ -3464,8 +3558,9 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nama Kampanye Promosi diwajibkan
 DocType: Maintenance Visit,Maintenance Date,Tanggal Pemeliharaan
 DocType: Purchase Receipt Item,Rejected Serial No,Serial No Barang Ditolak
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tanggal mulai atau tanggal akhir ini tumpang tindih dengan {0}. Untuk menghindari silakan mengatur perusahaan
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Newsletter Baru
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### 
  Jika seri diatur dan Serial ada tidak disebutkan dalam transaksi, nomor seri maka otomatis akan dibuat berdasarkan seri ini. Jika Anda selalu ingin secara eksplisit menyebutkan Serial Nos untuk item ini. biarkan kosong."
@@ -3477,11 +3572,11 @@
 ,Sales Analytics,Analitika Penjualan
 DocType: Manufacturing Settings,Manufacturing Settings,Pengaturan manufaktur
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Persiapan Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Entrikan mata uang default di Perusahaan Guru
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Entrikan mata uang default di Perusahaan Guru
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entri Detil
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Pengingat harian
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Account Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Layanan Konsumen
@@ -3491,11 +3586,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tawarkan Lowongan Kerja kepada Calon
 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 cuti dialokasikan lebih dari hari pada periode
+DocType: Pricing Rule,Percentage,Persentase
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Item {0} harus stok Stok Barang
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Gudang Work In Progress
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Item {0} harus Item Penjualan
+apps/erpnext/erpnext/stock/get_item_details.py +131,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,Detai Print dan Cetak
@@ -3503,11 +3599,12 @@
 DocType: Sales Order Item,Produced Quantity,Jumlah Diproduksi
 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 Barang Sub Assembly
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
 DocType: Sales Partner,Partner Type,Tipe Mitra/Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Diskon Berdasar Konsumen
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pergi ke grup yang sesuai (biasanya Sumber Dana&gt; Kewajiban Lancar&gt; Pajak dan Tugas dan membuat Akun baru (dengan mengklik Tambahkan Anak) jenis &quot;Pajak&quot; dan melakukan menyebutkan tingkat pajak.
 DocType: Production Order,Production Order,Order Produksi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah Terkirim
 DocType: Quotation Item,Against Docname,Terhadap Docname
@@ -3526,18 +3623,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Ditangani Pertama kali pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Berhasil Direkonsiliasi
 DocType: Production Order,Planned End Date,Tanggal Akhir Planning
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Dimana Item Disimpan
 DocType: Tax Rule,Validity,Keabsahan
+DocType: Request for Quotation,Supplier Detail,pemasok Detil
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Nilai Tertagih Faktur
 DocType: Attendance,Attendance,Absensi
 apps/erpnext/erpnext/config/projects.py +55,Reports,laporan
 DocType: BOM,Materials,Material/Barang
 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 +508,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
 ,Item Prices,Harga Barang/Item
 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 Tutup Periode
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Pada Jumlah Net Bersih
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Notifikasi Alamat Email' tidak ditentukan untuk nota langganan %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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,Akun Pembulatan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Beban Administrasi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Beban Administrasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Grup Konsumen
 apps/erpnext/erpnext/public/js/pos/pos.js +455,Change,Perubahan
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,Skor Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Masa Pemberitahuan
+DocType: Asset Category,Asset Category Name,Aset Kategori Nama
 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,UOM Berat Kotor
@@ -3569,13 +3668,13 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah Stok 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 Stok Barang di Order Penjualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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),Tanggal Akhir Aktual (via Log Waktu)
 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,Entrikan pusat biaya orang tua
 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,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-Stok
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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-Stok
 DocType: Issue,Support Team,Tim Support /Layanan
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
 DocType: Batch,Batch,Batch
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Calling Dingin
 DocType: SMS Parameter,SMS Parameter,Parameter SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Anggaran dan Pusat Biaya
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Anggaran dan Pusat Biaya
 DocType: Maintenance Schedule Item,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Buat aturan untuk membatasi transaksi berdasarkan nilai-nilai.
@@ -3607,7 +3706,7 @@
 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: Time Log,Billing Rate based on Activity Type (per hour),Tarip penagihan berdasarkan Jenis Kegiatan (per jam)
 DocType: Company,Company Info,Info Perusahaan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +216,"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)
@@ -3620,17 +3719,17 @@
 DocType: Purchase Common,Purchase Common,Pembelian Umum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
 DocType: Sales Invoice,Is POS,Apakah POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Grup&gt; Merek
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Qty Diproduksi
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
-apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan diajukan ke Konsumen.
+apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan diajukan ke Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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} Konsumen telah ditambahkan
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0} Konsumen 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;"
 DocType: Account,Parent Account,Rekening Induk
@@ -3646,7 +3745,7 @@
 DocType: Employee,Education,Pendidikan
 DocType: Selling Settings,Campaign Naming By,Penamaan Kampanye Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
 DocType: Address,Office,Kantor
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
@@ -3661,6 +3760,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Batch Persediaan
 DocType: Employee,Contract End Date,Tanggal Kontrak End
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Order Penjualan ini terhadap Proyek apapun
+DocType: Sales Invoice Item,Discount and Margin,Diskon dan Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tarik Order penjualan (pending untuk memberikan) berdasarkan kriteria di atas
 DocType: Deduction Type,Deduction Type,Tipe Pengurangan
 DocType: Attendance,Half Day,Half Day
@@ -3681,7 +3781,7 @@
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Daftar Gaji Bulanan
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat Konsumen
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3689,22 +3789,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pembayaran URL Pesan
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total Jumlah Tunggakan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Waktu Log tidak dapat ditagih
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
+DocType: Asset,Asset Category,aset Kategori
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Silahkan masukkan Terhadap Voucher manual
 DocType: SMS Settings,Static Parameters,Parameter Statis
 DocType: Purchase Order,Advance Paid,Pembayaran Dimuka (Advance)
 DocType: Item,Item Tax,Pajak Stok Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Bahan untuk Supplier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Cukai Faktur
 DocType: Expense Claim,Employees Email Id,Karyawan Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Absensi Terdaftar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Piutang Lancar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Piutang Lancar
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Qty Aktual wajib diisi
@@ -3725,17 +3826,16 @@
 DocType: Item Attribute,Numeric Values,Nilai numerik
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Pasang Logo
 DocType: Customer,Commission Rate,Tingkat Komisi
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Buat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Buat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Cart adalah Kosong
 DocType: Production Order,Actual Operating Cost,Biaya Operasi Aktual
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Tidak Template bawaan Alamat ditemukan. Harap membuat yang baru dari Pengaturan&gt; Percetakan dan Branding&gt; Template Alamat.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Konsumen Purchase Order Tanggal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Modal / Saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Modal / Saham
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
 DocType: Payment Gateway Account,Payment Gateway Account,Pembayaran Rekening Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -3744,20 +3844,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
+DocType: Asset,Current Value (After Depreciation),Nilai saat ini (Setelah Penyusutan)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Stok Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, Stok Barang harus Item Pembelian atau Manufacturing Stok Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, Stok Barang harus Item Pembelian atau Manufacturing Stok Barang"
 ,Supplier Addresses and Contacts,Supplier Alamat dan Kontak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori terlebih dahulu
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master 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 +409, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Material
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Tanggal
@@ -3765,6 +3866,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Akun {0} tidak ada
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index d2111a4..c63ef87 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Rivenditore
 DocType: Employee,Rented,Affittato
 DocType: POS Profile,Applicable for User,Applicabile per utente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
 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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di messa a punto dei dipendenti Naming System in risorse umane&gt; Impostazioni HR
 DocType: Purchase Order,Customer Contact,Customer Contact
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Albero
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Mostra aperta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie Aggiornato con successo
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Nuovo Lascia Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostra Varianti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Quantità
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prestiti (passività )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Tabella degli account non può essere vuoto.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Designazione
@@ -64,7 +66,7 @@
 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 +642,Invoice,Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nuova {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuova {0}: # {1}
 ,Sales Partners Commission,Vendite Partners Commissione
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
 DocType: Payment Request,Payment Request,Richiesta di pagamento
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Sposato
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non consentito per {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Ottenere elementi dal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro attività:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,È cespite
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Tutti i contatti
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} è congelato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Spese Giacenza
 DocType: Newsletter,Email Sent?,E-mail Inviata?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Mostra Logs Tempo
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Stato di installazione
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Quantità accettata + rifiutata deve essere uguale alla quantità ricevuta per {0}
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
-apps/erpnext/erpnext/stock/get_item_details.py +140,Item {0} must be a Purchase Item,L'articolo {0} deve essere un'Articolo da Acquistare
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: BOM Replace Tool,New BOM,Nuova Distinta Base
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Inserisci Società
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Di cassa netto da finanziamento
 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 +217,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
 DocType: Newsletter List,Total Subscribers,Totale Iscritti
 ,Contact Name,Nome Contatto
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene a società {1}
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 DocType: Payment Tool,Reference No,Di riferimento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Le voci bancari
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Controllo di notifica
 DocType: Lead,Suggestions,Suggerimenti
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Impostare la voce del budget di Gruppo-saggi su questo territorio. È inoltre possibile includere la stagionalità impostando la distribuzione.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Inserisci il gruppo account padre per il magazzino {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Inserisci il gruppo account padre per il magazzino {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Max 5 caratteri
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Imparare
+DocType: Asset,Next Depreciation Date,Successivo ammortamento Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Fornitore fattura n esiste in Acquisto Fattura {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Gestire venditori ad albero
 DocType: Job Applicant,Cover Letter,Lettera di presentazione
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
 DocType: Item,Synced With Hub,Sincronizzati con Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Password Errata
 DocType: Item,Variant Of,Variante di
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unità di [{1}] (# Form / Voce / {1}) in [{2}] (# Form / magazzino / {2})
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Profilo di lavoro
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Nota Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Nota Consegna
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Impostazione Tasse
 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 +381,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Si prega di selezionare mese e anno
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale ordine Considerato
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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 d'acquisto, ordine di produzione, ordine d'acquisto, ricevuta d'acquisto, fattura di vendita, ordini di vendita, giacenza, foglio presenze"
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} già allocato il dipendente {1} per il periodo {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Seleziona elemento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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","Articolo: {0} gestito a partita-lotto non può essere riconciliato in magazzino, utilizzare invece l'entrata giacenza."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
@@ -336,9 +343,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Voce di controllo di qualità dei parametri
 DocType: Leave Application,Leave Approver Name,Nome responsabile ferie
-,Schedule Date,Programma Data
+DocType: Depreciation Schedule,Schedule Date,Programma Data
 DocType: Packed Item,Packed Item,Nota Consegna Imballaggio articolo
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Impostazioni predefinite per operazioni di acquisto .
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Impostazioni predefinite per operazioni di acquisto .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Costo attività trovato per dipendente {0} con tipo attività - {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.,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
@@ -347,6 +354,7 @@
 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
+DocType: Request for Quotation,Request for Quotation,Richiesta di offerta
 DocType: Workstation,Working Hours,Orario di lavoro
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
@@ -387,15 +395,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
-DocType: Material Request Item,Required Date,Data richiesta
+DocType: Request for Quotation Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Messaggio per fornitore
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
 DocType: Employee,Health Concerns,Preoccupazioni per la salute
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Non pagata
@@ -417,17 +426,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Non esiste"
 DocType: Pricing Rule,Valid Upto,Valido Fino
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -436,6 +445,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gestione subfornitura / terzista
+DocType: Project,Project will be accessible on the website to these users,Progetto sarà accessibile sul sito web per questi utenti
 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 +53,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
@@ -447,7 +457,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento non può essere 0
 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 +86,Item {0} is not Purchase Item,L'articolo {0} non è un'Articolo da Acquistare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,L'articolo {0} non è un'Articolo da Acquistare
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
@@ -458,7 +468,7 @@
 DocType: Production Plan Item,Pending Qty,In attesa Quantità
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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 vendite
@@ -468,13 +478,13 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",La **distribuzione mensile** aiuta a distribuire il budget nei mesi utile se si ha una stagionalità nel proprio business. Per utilizzare questa modalità di distribuzione del budget assegnare la **Distribuzione mensile** nel **Centro di costo**
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Esercizio finanziario / contabile .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,valori accumulati
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id Contatto
 DocType: C-Form Invoice Detail,Grand Total,Somma totale
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Consegna: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conto da pagare
@@ -482,7 +492,7 @@
 DocType: Job Applicant,Resume Attachment,Riprendi Allegato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Ritorno di vendite
 DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Componenti stipendio
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
@@ -491,7 +501,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,Magazzino logico utilizzato per l'entrata giacenza.
@@ -501,7 +511,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Aggiornamento banca data delle relative operazioni
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Aggiornamento banca data delle relative operazioni
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitoraggio tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
@@ -519,27 +529,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Inserisci RICEVUTA primo
 DocType: Buying Settings,Supplier Naming By,Fornitore di denominazione
 DocType: Activity Type,Default Costing Rate,Tasso Costing Predefinito
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Programma di manutenzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Programma di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Variazione netta Inventario
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Si prega di impostare un elenco per le vacanze sia per il dipendente o l&#39;azienda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,quota di ammortamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Tipo attività
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Importo Consegnato
 DocType: Supplier,Fixed Days,Giorni fissi
 DocType: Quotation Item,Item Balance,Saldo
 DocType: Sales Invoice,Packing List,Lista di imballaggio
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,editoria
 DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
@@ -554,8 +564,10 @@
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Gruppo a gruppo
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,I miei progetti
 DocType: Journal Entry,Write Off Amount,Scrivi Off Importo
 DocType: Journal Entry,Bill No,Fattura N.
+DocType: Company,Gain/Loss Account on Asset Disposal,Conto guadagno / perdita su Asset smaltimento
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Nota Consegna Richiesta
 DocType: Sales Order Item,Basic Rate (Company Currency),Tasso Base (Valuta Azienda)
@@ -567,13 +579,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Pagamento L&#39;ingresso è già stato creato
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Fatturazione totale quest&#39;anno
 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 +529,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -596,6 +609,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person target Varianza articolo Group- Wise
@@ -610,14 +624,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Busta Paga Mensile.
 DocType: Item Group,Website Specifications,Website Specifiche
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},C&#39;è un errore nel vostro indirizzo template {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nuovo Account
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nuovo Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {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.,Le voci di contabilità può essere fatta contro nodi foglia. Non sono ammesse le voci contro gruppi.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -665,17 +679,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Spese Manutenzione Ufficio
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Inserisci articolo prima
 DocType: Account,Liability,responsabilità
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
 DocType: Company,Default Cost of Goods Sold Account,Costo predefinito di Account merci vendute
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Listino Prezzi non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -683,7 +697,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Le mie fatture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Le mie fatture
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nessun dipendente trovato
 DocType: Supplier Quotation,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
@@ -692,10 +707,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Carica Saldi Giacenze tramite csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Invia Ora
 ,Support Analytics,Analytics Support
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,errore logico: Deve trovare sovrapposizione
 DocType: Item,Website Warehouse,Magazzino sito web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punteggio deve essere minore o uguale a 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Record C -Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Record C -Form
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Cliente e Fornitore
 DocType: Email Digest,Email Digest Settings,Impostazioni Email di Sintesi
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Supportare le query da parte dei clienti.
@@ -719,7 +735,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -756,14 +772,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Di subappalto
 DocType: Item Attribute,Item Attribute Values,Valori Attributi Articolo
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Visualizza abbonati
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,RICEVUTA
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
 DocType: Employee,Ms,Sig.ra
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,I partner di vendita e Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} deve essere attivo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} deve essere attivo
+DocType: Journal Entry,Depreciation Entry,Ammortamenti Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Vai a carrello
 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
@@ -782,7 +799,7 @@
 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 +524,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -792,10 +809,10 @@
 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/public/js/setup_wizard.js +139,The Brand,Il marchio / brand
-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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Fattura di Acquisto
+DocType: Asset,Purchase Invoice,Fattura di Acquisto
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Totale Valore uscita
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Data e Data di chiusura di apertura dovrebbe essere entro lo stesso anno fiscale
@@ -805,21 +822,24 @@
 DocType: Material Request Item,Lead Time Date,Data Tempo di Esecuzione
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,Obbligatorio. Forse non è stato definito il vambio di valuta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Per &#39;prodotto Bundle&#39;, Warehouse, numero di serie e Batch No sarà considerata dal &#39;Packing List&#39; tavolo. Se Magazzino e Batch No sono gli stessi per tutti gli elementi di imballaggio per un elemento qualsiasi &#39;Product Bundle&#39;, questi valori possono essere inseriti nella tabella principale elemento, i valori verranno copiati a &#39;Packing List&#39; tavolo."
 DocType: Job Opening,Publish on website,Pubblicare sul sito web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Le spedizioni verso i clienti.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Proventi indiretti
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set di Pagamento = debito residuo
 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 +672,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Selezionare la voce per il trasferimento
 DocType: Purchase Invoice,Additional Discount Percentage,Additional Percentuale di sconto
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Riga {0}: Fattura {1} non è valido, potrebbe essere cancellato / non esiste. \ Si prega di inserire una fattura valida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
@@ -828,14 +848,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipendente Birthday Reminders
 ,Employee Holiday Attendance,Impiegato vacanze presenze
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Le entrate nelle scorte
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Le entrate nelle scorte
 DocType: Item,Inspection Criteria,Criteri di ispezione
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Trasferiti
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Fare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Fare
 DocType: Journal Entry,Total Amount in Words,Importo totale in parole
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
@@ -845,7 +865,8 @@
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
 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 +180,Qty for {0},Quantità per {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantità per {0}
 DocType: Leave Application,Leave Application,Lascia Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lascia strumento Allocazione
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
@@ -858,7 +879,7 @@
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
 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 +547,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Sconto
@@ -873,20 +894,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,RICEVUTA articolo
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Importo di vendita
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Logs tempo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Logs tempo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione spese per questo record. Aggiorna lo Stato e salva
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Issue,Issue,Questione
+DocType: Asset,Scrapped,Demolita
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Il conto non corrisponde alla Società
 apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per voce Varianti. P. es. 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 +181,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Reclutamento
 DocType: BOM Operation,Operation,Operazione
 DocType: Lead,Organization Name,Nome organizzazione
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Spese di vendita
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Comprare standard
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
@@ -903,7 +925,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Per {0} | {1} {2}
 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
@@ -912,7 +934,7 @@
 DocType: Company,Default Currency,Valuta Predefinita
 DocType: Contact,Enter designation of this Contact,Inserisci designazione di questo contatto
 DocType: Expense Claim,From Employee,Da Dipendente
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,Aggiungi Differenza
 DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data
 DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni
@@ -920,7 +942,7 @@
 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 +130,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 +131,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 +42,Contribution %,Contributo%
@@ -929,22 +951,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Progetto di collaborazione Invito
 DocType: Salary Slip,Deductions,Deduzioni
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Questo Log Batch Ora è stato fatturato.
 DocType: Salary Slip,Leave Without Pay,Lascia senza stipendio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning Errore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacity Planning Errore
 ,Trial Balance for Party,Bilancio di verifica per il partito
 DocType: Lead,Consultant,Consulente
 DocType: Salary Slip,Earnings,Rendimenti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Voce Finito {0} deve essere inserito per il tipo di fabbricazione ingresso
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura bilancio contabile
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura di vendita (anticipata)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Niente da chiedere
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Amministrazione
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Tipi di attività per i fogli Tempo
@@ -955,18 +978,18 @@
 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 '
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Si prega di impostare ID e-mail
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Si prega di impostare ID e-mail
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +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/config/buying.py +33,Supplier database.,Banca dati dei fornitori.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banca dati dei fornitori.
 DocType: Account,Balance Sheet,bilancio patrimoniale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore riceverà un promemoria in questa data per contattare il cliente
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Fiscale e di altre deduzioni salariali.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Debiti
@@ -980,6 +1003,7 @@
 DocType: Holiday,Holiday,Vacanza
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma non è applicabile per la fattura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Particolari di pagamento
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
@@ -993,19 +1017,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
 DocType: Contact,User ID,ID utente
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,vista Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,vista Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 su Ordine di vendita
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +412,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendo liquidato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendo liquidato
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro mastro contabile
 DocType: Stock Reconciliation,Difference Amount,Differenza Importo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Utili Trattenuti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Utili Trattenuti
 DocType: BOM Item,Item Description,Descrizione Articolo
 DocType: Payment Tool,Payment Mode,Modalità di pagamento
 DocType: Purchase Invoice,Is Recurring,È ricorrente
@@ -1013,7 +1038,7 @@
 DocType: Production Order,Qty To Manufacture,Qtà da Fabbricare
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenere la stessa tariffa per l'intero ciclo di acquisto
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporanea
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Apertura temporanea
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo per conto {0} deve essere sempre {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Valutazione tasso richiesto per la voce nella riga {0}
@@ -1028,8 +1053,8 @@
 ,Accounts Payable Summary,Conti pagabili Sommario
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} non è valido
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Piccolo
@@ -1037,7 +1062,7 @@
 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,Riferimento del conto {0} creato
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Riferimento del conto {0} creato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto riordino
 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
@@ -1045,12 +1070,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,agricoltura
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 apps/erpnext/erpnext/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
@@ -1060,19 +1085,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Venditore Sito
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stato ordine di produzione è {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stato ordine di produzione è {0}
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,per Fornitore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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),Somma totale (valuta Azienda)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Non hai trovato alcun oggetto chiamato {0}
 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
@@ -1080,10 +1106,10 @@
 DocType: Item,Website Item Groups,Sito gruppi di articoli
 DocType: Purchase Invoice,Total (Company Currency),Totale (Società Valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
-DocType: Journal Entry,Journal Entry,Journal Entry
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
 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
@@ -1092,6 +1118,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Richiesta di offerta del fornitore
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Sales Order,Recurring Upto,ricorrente Fino
 DocType: Attendance,HR Manager,HR Manager
@@ -1102,6 +1129,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
 DocType: Salary Slip,Earning,Rendimento
 DocType: Payment Tool,Party Account Currency,Partito Conto Valuta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valore corrente dopo ammortamento deve essere inferiore uguale a {0}
 ,BOM Browser,Sfoglia BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Aggiungere o dedurre
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se Budget annuale superato (per conto spese)
@@ -1116,21 +1144,22 @@
 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}
 DocType: Project,Start and End Dates,Date di inizio e fine
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Sconto Medio
 DocType: Address,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Features Setup,Features Setup,Configurazione Funzioni
+DocType: Asset,Depreciation Schedules,piani di ammortamento
 DocType: Item,Is Service Item,È il servizio Voce
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,transazioni valutarie
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Da {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Da {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operazione Descrizione
 DocType: Item,Will also apply to variants,Si applicheranno anche alle varianti
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossibile modificare Fiscal Year data di inizio e di fine anno fiscale una volta l'anno fiscale è stato salvato.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossibile modificare Fiscal Year data di inizio e di fine anno fiscale una volta l'anno fiscale è stato salvato.
 DocType: Quotation,Shopping Cart,Carrello spesa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Media giornaliera in uscita
 DocType: Pricing Rule,Campaign,Campagna
@@ -1144,8 +1173,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicazione
@@ -1153,8 +1182,8 @@
 DocType: Sales Invoice,Shipping Address Name,Indirizzo Shipping Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Piano dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,non può essere superiore a 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1176,11 +1205,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,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,Saldo a bilancio
-apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,Regola fiscale per le operazioni.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Compriamo questo articolo
 DocType: Address,Billing,Fatturazione
@@ -1190,12 +1219,15 @@
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,sub Assemblies
+DocType: Asset,Asset Name,Asset Nome
 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 +142,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Documento di trasporto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Affitto Ufficio
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Documento di trasporto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Richiesta di offerta può essere l&#39;accesso cliccando seguente link
+DocType: Asset,Number of Months in a Period,Numero di mesi in un periodo
 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
@@ -1212,19 +1244,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Totale ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Totale ({0})
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
 DocType: Sales Invoice,Source,Fonte
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Mostra chiusa
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Esercizio Data di inizio
 DocType: Employee External Work History,Total Experience,Esperienza totale
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow da investimenti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
 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 +86,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1233,7 +1266,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Dettaglio BOM N.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
 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 .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visita di manutenzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visita di manutenzione
 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: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
@@ -1247,7 +1280,6 @@
 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 +196,Brand master.,Marchio principale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 DocType: Sales Invoice Item,Brand Name,Nome Marchio
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Scatola
@@ -1275,7 +1307,7 @@
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Reclami per spese dell'azienda.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Receipt,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
@@ -1284,7 +1316,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Invia di nuovo pagamento Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,altri rapporti
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1294,26 +1326,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vista
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Richiesta di pagamento già esistente {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Precedente Esercizio non è chiuso
 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 account
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
-apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,Fornitore Tipo master.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 DocType: Purchase Invoice,Reference Document,Documento di riferimento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fatturato
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
@@ -1335,8 +1368,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variazione netta dei debiti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Verifica il tuo id e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente richiesto per ' Customerwise Discount '
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
 DocType: Quotation,Term Details,Dettagli termine
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve essere maggiore di 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Richiesta di Garanzia
@@ -1354,7 +1388,7 @@
 DocType: Employee,Permanent Address,Indirizzo permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Anticipo versato contro {0} {1} non può essere maggiore \ di Gran Totale {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Si prega di selezionare il codice articolo
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Si prega di selezionare il codice articolo
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ridurre Deduzione per aspettativa senza assegni (LWP)
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Per Warehouse (opzionale)
@@ -1364,15 +1398,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usata per l'entrata giacenza
 apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,Unità singola di un articolo.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crea una voce contabile per ogni movimento di scorta
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1389,33 +1423,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Importo Acquisto Gross
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","p. es. ""Banca Nazionale XYZ"""
+DocType: Asset,Depreciation Method,metodo di ammortamento
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
 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 +29,Shopping Cart is enabled,Carrello è abilitato
 DocType: Job Applicant,Applicant for a Job,Richiedente per un lavoro
 DocType: Production Plan Material Request,Production Plan Material Request,Piano di produzione Materiale Richiesta
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Ordini di Produzione non creati
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ordini di Produzione non creati
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,principale
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1423,31 +1459,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Riconciliazione Giacenza
 DocType: Territory,Territory Name,Territorio Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work- in- Progress Warehouse è necessario prima Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Work- in- Progress Warehouse è necessario prima Submit
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Indirizzi
+apps/erpnext/erpnext/hooks.py +91,Addresses,Indirizzi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,perizie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per una regola di trasporto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,L'articolo non può avere Ordine di Produzione.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,L'articolo non può avere Ordine di Produzione.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Il peso netto di questo package (calcolato automaticamente come somma dei pesi netti).
 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 +27,Time Logs for manufacturing.,Registri di tempo per la produzione.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} deve essere presentata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} deve essere presentata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tempo di log per le attività.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Versamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
 DocType: Quotation Item,Actual Qty,Q.tà reale
 DocType: Sales Invoice Item,References,Riferimenti
@@ -1458,6 +1495,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
+DocType: Request for Quotation Supplier,Send Email to Supplier,Invia e-mail a Fornitore
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 DocType: Packing Slip,To Package No.,A Pacchetto no
 DocType: Production Planning Tool,Material Requests,Richieste di materiale
@@ -1475,7 +1513,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Magazzino di consegna
 DocType: Stock Settings,Allowance Percent,Tolleranza Percentuale
 DocType: SMS Settings,Message Parameter,Parametro Messaggio
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Albero dei centri di costo finanziario.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Albero dei centri di costo finanziario.
 DocType: Serial No,Delivery Document No,Documento Consegna N.
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Ottenere elementi dal Acquisto Receipts
 DocType: Serial No,Creation Date,Data di Creazione
@@ -1507,41 +1545,43 @@
 ,Amount to Deliver,Importo da consegnare
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} creato
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creato
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
 ,Serial No Status,Serial No Stato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tavolo articolo non può essere vuoto
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Riga {0}: Per impostare {1} periodicità, differenza tra da e per la data \
  deve essere maggiore o uguale a {2}"
 DocType: Pricing Rule,Selling,Vendite
 DocType: Employee,Salary Information,Informazioni stipendio
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Dazi e tasse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Inserisci Data di riferimento
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway account non è configurato
 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: Production Order,Material Request Item,Voce di richiesta materiale
+DocType: Request for Quotation Item,Material Request Item,Voce di richiesta materiale
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Venduto
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rosso
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Tempo di installazione
 DocType: Sales Invoice,Accounting Details,Dettagli contabile
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminare tutte le Operazioni per questa Azienda
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Accantonamenti
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterio  di accettazione
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Si prega di inserire richieste materiale nella tabella di cui sopra
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Si prega di inserire richieste materiale nella tabella di cui sopra
 DocType: Item Attribute,Attribute Name,Nome Attributo
 DocType: Item Group,Show In Website,Mostra Nel Sito Web
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Gruppo
@@ -1549,6 +1589,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramma di Gantt di tutte le attività.
+DocType: Pricing Rule,Margin Type,Tipo margine
 DocType: Appraisal,For Employee Name,Per Nome Dipendente
 DocType: Holiday List,Clear Table,Pulisci Tabella
 DocType: Features Setup,Brands,Marchi
@@ -1556,20 +1597,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset è obbligatoria contro un Fixed Asset Articolo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di messa a punto la numerazione di serie per la partecipazione tramite Setup&gt; Numerazione Serie
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,coppia
+DocType: Asset,Depreciation Schedule,piano di ammortamento
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 DocType: Maintenance Schedule Detail,Actual Date,Data effettiva
 DocType: Item,Has Batch No,Ha Lotto N.
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
+DocType: Asset,Purchase Date,Data di acquisto
 DocType: Employee,Personal Details,Dettagli personali
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Si prega di impostare &#39;Asset Centro ammortamento dei costi&#39; in compagnia {0}
 ,Maintenance Schedules,Programmi di manutenzione
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
@@ -1583,23 +1629,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Includi Voci riconciliati
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,La voce {0} deve essere di tipo 'Cespite' così come {1} è una voce dell'attivo.
 DocType: HR Settings,HR Settings,Impostazioni HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Rimborso spese in attesa di approvazione. Solo il Responsabile Spese può modificarne lo stato.
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppo di Non-Group
 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/public/js/setup_wizard.js +272,Unit,Unità
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Si prega di specificare Azienda
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Post Vendita
 ,BOM Search,BOM Ricerca
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Chiusura (apertura + totali)
@@ -1608,29 +1653,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto 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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Articolo Prezzo aggiunto per {0} in Listino Prezzi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Articolo Prezzo aggiunto per {0} in Listino Prezzi {1}
 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
 DocType: Territory,Classification of Customers by region,Classificazione dei Clienti per regione
 DocType: Project,% Tasks Completed,% Attività Completate
 DocType: Project,Gross Margin,Margine lordo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Inserisci Produzione articolo prima
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Inserisci Produzione articolo prima
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calcolato equilibrio estratto conto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utente disabilitato
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Quotazione
 DocType: Salary Slip,Total Deduction,Deduzione totale
 DocType: Quotation,Maintenance User,Manutenzione utente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Costo Aggiornato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Costo Aggiornato
 DocType: Employee,Date of Birth,Data Compleanno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Contatto
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di messa a punto dei dipendenti Naming System in risorse umane&gt; Impostazioni HR
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
@@ -1642,8 +1688,8 @@
 ,SO Qty,SO Quantità
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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,Responsabile di produzione
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
+DocType: Request for Quotation,Manufacturing Manager,Responsabile di produzione
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Spedizioni
 DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
@@ -1651,12 +1697,12 @@
 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/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,Fornitori
+DocType: Asset,Supplier,Fornitori
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Utente {0} è disattivato
@@ -1665,7 +1711,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Currency Exchange,From Currency,Da Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
@@ -1675,11 +1721,11 @@
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in magazzino."
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Quantità deve essere 1, come elemento è legato ad un&#39;attività"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Bambino Elemento non dovrebbe essere un pacchetto di prodotti. Si prega di rimuovere voce `{0}` e risparmiare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancario
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nuovo Centro di costo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 (di solito fonte di fondi&gt; passività correnti&gt; tasse e diritti e creare un nuovo account (facendo clic su Add Child) di tipo &quot;tassa&quot; e fare parlare il tasso fiscale.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nuovo Centro di costo
 DocType: Bin,Ordered Quantity,Ordinato Quantità
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","p. es. "" Costruire strumenti per i costruttori """
 DocType: Quality Inspection,In Process,In Process
@@ -1692,10 +1738,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
 DocType: Quotation Item,Stock Balance,Archivio Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Tempo Logs creato:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Tempo Logs creato:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Seleziona account corretto
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Gruppo Discendenza
@@ -1713,13 +1760,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Si prega di specificare un Paese per questa regola di trasporto o controllare Spedizione in tutto il mondo
 DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debito A è richiesto
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
 DocType: Offer Letter Term,Offer Term,Termine Offerta
 DocType: Quality Inspection,Quality Manager,Responsabile Qualità
 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 +141,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Lettera Di Offerta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generare richieste di materiali (MRP) e ordini di produzione.
@@ -1727,22 +1774,22 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"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 +273,Price List {0} is disabled,Prezzo di listino {0} è disattivato
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prezzo di listino {0} è disattivato
 DocType: Manufacturing Settings,Allow Overtime,Consenti Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Corrente Tasso di Valutazione
 DocType: Item,Customer Item Codes,Codici Voce clienti
 DocType: Opportunity,Lost Reason,Perso Motivo
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Creare voci di pagamento nei confronti di ordini o fatture.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Creare voci di pagamento nei confronti di ordini o fatture.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1751,10 +1798,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nessuna busta paga trovata per il mese:
 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 +175,Serial No {0} not found,Serial No {0} non trovato
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} non trovato
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,I vostri clienti
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
 DocType: Leave Block List Date,Block Date,Data Blocco
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Applica ora
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Applica ora
 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 ."
@@ -1778,7 +1826,7 @@
 DocType: Employee,Employment Details,Dettagli Dipendente
 DocType: Employee,New Workplace,Nuovo posto di lavoro
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Imposta come Chiuso
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nessun articolo con codice a barre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nessun articolo con codice a barre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso No. Non può essere 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,Se si dispone di team di vendita e vendita Partners (Partner di canale) possono essere taggati e mantenere il loro contributo per l&#39;attività di vendita
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
@@ -1796,10 +1844,10 @@
 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 +608,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Material Transfer
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Voce {0} deve essere un elemento di vendita in {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
 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
@@ -1813,12 +1861,13 @@
 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: Process Payroll,Create Salary Slip,Creare busta paga
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importa posta elettronica da
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Invita come utente
 DocType: Features Setup,After Sale Installations,Installazioni Post Vendita
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Si prega di impostare {0} nell&#39;azienda {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} è completamente fatturato
 DocType: Workstation Working Hour,End Time,Ora fine
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condizioni contrattuali standard per la vendita o di acquisto.
@@ -1827,9 +1876,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,File da rinominare
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
@@ -1846,25 +1895,25 @@
 DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Gateway Account,Payment Account,Conto di Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Si prega di specificare Società di procedere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variazione netta dei crediti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,Accepted,Accettato
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com&#39;è. Questa azione non può essere annullata.
 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 alla quantità pianificata ({2}) nell'ordine di produzione {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore alla quantità pianificata ({2}) nell'ordine di produzione {3}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} non è inviato
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1873,7 +1922,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Elenco Indirizzi per Newsletter
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
 DocType: Authorization Rule,Authorized Value,Valore Autorizzato
@@ -1891,13 +1940,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} è chiuso
 DocType: Email Digest,How frequently?,Con quale frequenza?
 DocType: Purchase Receipt,Get Current Stock,Richiedi disponibilità
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vai al gruppo appropriato (di solito applicazione dei fondi&gt; Attività correnti&gt; conti bancari e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Banca&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Albero di Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Presente
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
 DocType: Production Order,Actual End Date,Data di fine effettiva
 DocType: Authorization Rule,Applicable To (Role),Applicabile a (Ruolo)
 DocType: Stock Entry,Purpose,Scopo
+DocType: Company,Fixed Asset Depreciation Settings,Impostazioni di ammortamento di immobilizzazioni
 DocType: Item,Will also apply for variants unless overrridden,Si applica anche per le varianti meno overrridden
 DocType: Purchase Invoice,Advances,Avanzamenti
 DocType: Production Order,Manufacture against Material Request,Fabbricazione contro Materiale Richiesta
@@ -1906,6 +1955,7 @@
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
 DocType: Campaign,Campaign-.####,Campagna . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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 / distributore / commissionario / affiliato / rivenditore che vende i prodotti delle aziende per una commissione.
 DocType: Customer Group,Has Child Node,Ha un Nodo Figlio
@@ -1956,12 +2006,14 @@
  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: Purchase Receipt Item,Recd Quantity,RECD Quantità
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Categoria account
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vai al gruppo appropriato (di solito 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: Journal Entry,Credit Note,Nota Credito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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à
@@ -1985,9 +2037,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,I miei indirizzi
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Ramo Organizzazione master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nessun dipendente per i criteri sopra selezionati o busta paga già creato
@@ -2014,7 +2066,7 @@
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo di account
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
 ,To Produce,per produrre
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Libro paga
 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"
@@ -2024,8 +2076,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acquistare oggetti Receipt
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizzazione dei moduli
 DocType: Account,Income Account,Conto Proventi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nessuna impostazione predefinita Indirizzo Template trovato. Si prega di crearne uno nuovo da Impostazioni&gt; Stampa ed Branding&gt; Indirizzo Template.
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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à
@@ -2047,21 +2100,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Traccia Contatti per settore Type.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Gestire cliente con raggruppamento ad albero
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nuovo Centro di costo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nuovo Centro di costo Nome
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
 DocType: Appraisal,HR User,HR utente
 DocType: Purchase Invoice,Taxes and Charges Deducted,Tasse e oneri dedotti
-apps/erpnext/erpnext/config/support.py +7,Issues,Questioni
+apps/erpnext/erpnext/hooks.py +90,Issues,Questioni
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stato deve essere uno dei {0}
 DocType: Sales Invoice,Debit To,Addebito a
 DocType: Delivery Note,Required only for sample item.,Richiesto solo per la voce di esempio.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} è disattivato
 DocType: Supplier,Billing Currency,Fatturazione valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Conto Economico
@@ -2075,10 +2129,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 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 +139,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
 DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
 DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
 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 +142,Quotation {0} is cancelled,Preventivo {0} è annullato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
@@ -2146,13 +2200,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,richiesto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nessun Commento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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 arretrato + Importo incasso - Deduzione totale
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Features Setup,Sales and Purchase,Vendita e Acquisto
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Cespite oggetto deve essere un elemento non-azione
 DocType: Supplier Quotation Item,Material Request No,Richiesta materiale No
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2173,7 +2228,7 @@
 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 giacenza
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 DocType: Payment Request,Recipient and Message,Destinatario e il messaggio
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
@@ -2187,7 +2242,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Selezione indirizzo del fornitore
 DocType: Quality Inspection,Quality Inspection,Controllo Qualità
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2209,11 +2264,12 @@
 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/config/buying.py +18,Request for quotation.,Richiesta di offerta.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Anticipo totale ({0}) contro l&#39;ordine {1} non può essere superiore al totale complessivo ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Anticipo totale ({0}) contro l&#39;ordine {1} non può essere superiore al totale complessivo ({2})
 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 +294,Price List Currency not selected,Listino Prezzi Valuta non selezionati
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2222,7 +2278,7 @@
 DocType: Installation Note Item,Against Document No,Per Documento N
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Gestire punti vendita
 DocType: Quality Inspection,Inspection Type,Tipo di ispezione
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Si prega di selezionare {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione Contrassegno
@@ -2237,6 +2293,7 @@
 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à
+DocType: Asset Category Account,Depreciation Expense Account,Ammortamento spese account
 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,Responsabile Spese
@@ -2250,7 +2307,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confermato
 DocType: Payment Gateway,Gateway,Ingresso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Inserisci la data alleviare .
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2264,18 +2321,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Magazzino accettazione
 DocType: Bank Reconciliation Detail,Posting Date,Data di registrazione
 DocType: Item,Valuation Method,Metodo di Valutazione
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Impossibile trovare il tasso di cambio per {0} a {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Impossibile trovare il tasso di cambio per {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Mezza giornata
 DocType: Sales Invoice,Sales Team,Team di vendita
 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 +410,[Error],[Errore]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serial No {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazzino del cliente (opzionale)
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
@@ -2301,14 +2359,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,Lascia Allocazione
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Richieste di materiale {0} creato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Richieste di materiale {0} creato
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Template di termini o di contratto.
 DocType: Purchase Invoice,Address and Contact,Indirizzo e contatto
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Fondo ammortamento account
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
+DocType: Asset,Expected Value After Useful Life,Valore atteso After Life utile
 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
@@ -2321,12 +2381,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} viene cancellato o chiuso
 DocType: Delivery Note,Track this Delivery Note against any Project,Sottoscrivi questa bolla di consegna contro ogni progetto
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Di cassa netto da investimenti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Account root non può essere eliminato
 ,Is Primary Address,È primario Indirizzo
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} deve essere presentata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Gestire indirizzi
-DocType: Pricing Rule,Item Code,Codice Articolo
+DocType: Asset,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
 DocType: Journal Entry,User Remark,Osservazioni utenti
@@ -2345,8 +2405,10 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Richieste Materiale
 DocType: Employee Education,School/University,Scuola / Università
 DocType: Payment Request,Reference Details,Riferimento Dettagli
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valore atteso Dopo vita utile deve essere inferiore a Gross Importo Acquisto
 DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
 ,Billed Amount,importo fatturato
+DocType: Asset,Double Declining Balance,Doppia valori residui
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ordine chiuso non può essere cancellato. Unclose per annullare.
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Ricevi aggiornamenti
@@ -2365,6 +2427,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,completamente ammortizzato
 ,Stock Projected Qty,Qtà Prevista Giacenza
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marcata presenze HTML
@@ -2372,25 +2435,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,N. di serie e batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Dettagliante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Disattiva in parole
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Voce del Programma di manutenzione
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Scoperto di conto bancario
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice Articolo&gt; Gruppo Articolo&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Prestiti garantiti
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Si prega di impostare gli account relativi ammortamenti nel settore Asset Categoria {0} o {1} società
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Apertura Balance Equità
 DocType: Appraisal,Appraisal,Valutazione
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail inviata al fornitore {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La Data si Ripete
 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 +187,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {0}
@@ -2398,7 +2464,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Workstation Working Hour,Start Time,Ora di inizio
 DocType: Item Price,Bulk Import Help,Bulk Import Aiuto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Seleziona Quantità
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Seleziona Quantità
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approvazione ruolo non può essere lo stesso ruolo la regola è applicabile ad
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Cancellati da questo Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Messaggio Inviato
@@ -2426,6 +2492,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margine totale
 DocType: Supplier,Supplier Details,Fornitore Dettagli
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
@@ -2439,7 +2506,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
 DocType: Payment Gateway Account,Default Payment Request Message,Predefinito Richiesta Pagamento Messaggio
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bancario e ai pagamenti
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bancario e ai pagamenti
 ,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
@@ -2447,17 +2514,17 @@
 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 +199,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
 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/config/hr.py +55,Leaves and Holiday,Foglie e vacanze
 DocType: Sales Order,Not Billed,Non Fatturata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nessun contatto ancora aggiunto.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
 DocType: Time Log,Batched for Billing,Raggruppati per la Fatturazione
@@ -2473,15 +2540,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Centro di ammortamento dei costi
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Data di acquisto di attività {0} non corrisponde con la data di acquisto della fattura
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Warehouse {0}: Società è obbligatoria
 ,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}
 DocType: Journal Entry,Stock Entry,Giacenza
 DocType: Account,Payable,pagabile
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debitori ({0})
-DocType: Project,Margin,Margine
+DocType: Pricing Rule,Margin,Margine
 DocType: Salary Slip,Arrear Amount,Importo posticipata
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuovi clienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Utile lordo %
@@ -2489,20 +2558,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidazione
 DocType: Newsletter,Newsletter List,Elenco Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Seleziona se si desidera inviare busta paga in posta a ciascun dipendente, mentre la presentazione foglio paga"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
 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 +57,Where manufacturing operations are carried.,Dove si svolgono le operazioni di fabbricazione.
 DocType: Stock Entry Detail,Source Warehouse,Fonte Warehouse
 DocType: Installation Note,Installation Date,Data di installazione
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
 DocType: Employee,Confirmation Date,conferma Data
 DocType: C-Form,Total Invoiced Amount,Totale Importo fatturato
 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: Account,Accumulated Depreciation,fondo ammortamento
 DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
 DocType: Payment Request,Email To,Invia una email a
 DocType: Lead,Lead Owner,Responsabile Contatto
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,È richiesta Magazzino
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,È richiesta Magazzino
 DocType: Employee,Marital Status,Stato civile
 DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale
 DocType: Time Log,Will be updated when billed.,Verrà aggiornato quando fatturati.
@@ -2510,11 +2582,12 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Consegnato
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Consegnato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Stesso fornitore è stato inserito più volte
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ordine di acquisto Articolo inserito
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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 .
@@ -2524,13 +2597,14 @@
 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 .
 DocType: Payment Request,Payment Details,Dettagli del pagamento
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
+DocType: Asset,Journal Entry for Scrap,Diario di rottami
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Registrazione di tutte le comunicazioni di tipo e-mail, telefono, chat, visita, ecc"
 DocType: Manufacturer,Manufacturers used in Items,Produttori utilizzati in Articoli
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Crea nuovo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2543,7 +2617,7 @@
 ,Stock Ledger,Inventario
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Vota: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Stipendio slittamento Deduzione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Selezionare un nodo primo gruppo.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Selezionare un nodo primo gruppo.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Dipendenti e presenze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Scopo deve essere uno dei {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Rimuovere riferimento del cliente, fornitore, partner commerciale e il piombo, in quanto è la vostra ditta"
@@ -2565,13 +2639,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Da {1}
 DocType: Task,depends_on,dipende da
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: Si prega di non creare account per Clienti e Fornitori
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: BOM Replace Tool,BOM Replace Tool,BOM Strumento di sostituzione
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
 DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Successivo data deve essere maggiore di Data Pubblicazione
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mostra fiscale break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Voce / {0}) è esaurito
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Successivo data deve essere maggiore di Data Pubblicazione
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fattura Data Pubblicazione
@@ -2586,7 +2661,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2600,7 +2675,7 @@
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2610,7 +2685,7 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Modelli
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
@@ -2621,7 +2696,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
@@ -2630,11 +2705,12 @@
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Tariffa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stagista
@@ -2642,7 +2718,7 @@
 DocType: Stock Entry,From BOM,Da Distinta 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 +96,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","p. es. Kg, Unità, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
@@ -2650,17 +2726,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Struttura salariale
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citazioni
 DocType: Hub Settings,Access Token,Token di accesso
 DocType: Sales Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
-DocType: Item,Is Fixed Asset Item,È Asset fisso Voce
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
 DocType: Purchase Invoice,Print Language,Stampa Lingua
 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"
+DocType: Asset,Number of Depreciations,Numero di ammortamenti
 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,Nome Anno
@@ -2668,13 +2744,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Ci sono più feste che giorni di lavoro questo mese.
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Nome partner vendite
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Richiesta di Citazioni
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importo Massimo Fattura
 DocType: Purchase Invoice Item,Image View,Visualizza immagine
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clienti
+DocType: Asset,Partially Depreciated,parzialmente ammortizzati
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
@@ -2690,13 +2768,13 @@
 DocType: Quotation,Maintenance Manager,Responsabile della manutenzione
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totale non può essere zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Corretto da
+DocType: Asset,Amended From,Corretto da
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2709,21 +2787,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Si prega di citare &#39;Conto / perdita di guadagno su Asset Disposal&#39; in compagnia
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Partita pagamenti con fatture
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Partita pagamenti con fatture
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Aggiungi al carrello
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Raggruppa per
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Abilitare / disabilitare valute.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Abilitare / disabilitare valute.
 DocType: Production Planning Tool,Get Material Request,Get Materiale Richiesta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,spese postali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,spese postali
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Presente totale
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Prospetti contabili
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Prospetti contabili
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2743,15 +2822,16 @@
 DocType: C-Form,Invoices,Fatture
 DocType: Job Opening,Job Title,Professione
 DocType: Features Setup,Item Groups in Details,Gruppi di articoli in Dettagli
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 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 +32,Visit report for maintenance call.,Visita rapporto per chiamata di manutenzione.
 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 +169,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: Item,Website Description,Descrizione del sito
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Variazione netta Patrimonio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
 ,Sales Register,Commerciale Registrati
 DocType: Quotation,Quotation Lost Reason,Motivo Preventivo Perso
@@ -2759,12 +2839,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Errore: {0}&gt; {1}
 DocType: Item,Attributes,Attributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Ottieni articoli
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Inserisci Scrivi Off conto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Ottieni articoli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Data
 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: C-Form,C-Form,C-Form
@@ -2776,18 +2857,18 @@
 DocType: Purchase Invoice,Mobile No,Num. Cellulare
 DocType: Payment Tool,Make Journal Entry,Crea Registro
 DocType: Leave Allocation,New Leaves Allocated,Nuove foglie allocato
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,commerciale
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Errore: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 DocType: Cost Center,Distribution Id,ID di Distribuzione
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Supplier Quotation,Supplier Address,Fornitore Indirizzo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo &#39;cespite&#39;
 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 +251,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2798,10 +2879,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
 DocType: Tax Rule,Billing State,Stato di fatturazione
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Trasferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Trasferimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Data di scadenza è obbligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
@@ -2821,20 +2902,22 @@
 DocType: GL Entry,Remarks,Osservazioni
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Inviare e-mail del fornitore
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Record di installazione per un numero di serie
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Tempo Log è stato fatturato
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si prega di impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Serie Naming
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Risultato provvisorio / Perdita (credito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Si prega di impostare il valore predefinito {0} in azienda {1}
@@ -2844,12 +2927,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di messa a punto la numerazione di serie per la partecipazione tramite Setup&gt; Numerazione Serie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+DocType: Asset,Straight Line,Retta
+DocType: Project User,Project User,progetto utente
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Sconti di vendita
@@ -2863,39 +2947,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numero di ordinazione
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner che verrà mostrato nella 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 +117,Add Child,Aggiungi una sottovoce
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,Aggiungi una sottovoce
 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/report/stock_balance/stock_balance.py +47,Opening Value,Valore di apertura
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
 DocType: Tax Rule,Billing Country,Paese di fatturazione
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Spese di rappresentanza
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Spese di rappresentanza
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La fattura di vendita {0} deve essere cancellata 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 +60,Applications for leave.,Richieste di Ferie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Spese legali
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Spese legali
 DocType: Sales Invoice,Posting Time,Tempo Distacco
 DocType: Sales Order,% Amount Billed,% Importo Fatturato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Spese telefoniche
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Spese telefoniche
 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.,Seleziona se vuoi forzare l'utente a selezionare una serie prima di salvare. Altrimenti sarà NO di default.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nessun Articolo con Numero di Serie {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Aperte Notifiche
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,spese dirette
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,spese dirette
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} è un indirizzo email valido in &#39;Notifica \ Indirizzo e-mail&#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: conto derivato {1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
@@ -2912,7 +2997,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Vendiamo questo articolo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornitore Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Quantità deve essere maggiore di 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Quantità deve essere maggiore di 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Desc Contatto
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo di foglie come casuale, malati ecc"
@@ -2923,11 +3008,12 @@
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tutti i contatti.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Fornitore di attività {0} non corrisponde con il fornitore nella fattura d&#39;acquisto
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,La materia prima non può essere lo stesso come voce principale
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Modello Stipendio master.
@@ -2943,12 +3029,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
 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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Valuta di fatturazione deve essere uguale alla valuta sia di comapany predefinito o valuta del conto intestato del partito
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,segretario
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se disable, &#39;In Words&#39; campo non saranno visibili in qualsiasi transazione"
@@ -2958,13 +3045,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Questo Log Batch Ora è stato annullato.
 ,Reqd By Date,Reqd Per Data
 DocType: Salary Slip Earning,Salary Slip Earning,Stipendio slittamento Guadagnare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Creditori
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Fila # {0}: N. di serie è obbligatoria
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Voce Wise fiscale Dettaglio
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2984,15 +3071,14 @@
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/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 +456,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Hub Settings,Name Token,Nome Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Selling standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} per fattura di vendita {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Inserisci unità di misura predefinita
-DocType: Project,Project Name,Nome del progetto
+DocType: Request for Quotation Item,Project Name,Nome del progetto
 DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
 DocType: Features Setup,Item Batch Nos,Numeri Lotto Articolo
@@ -3022,6 +3108,7 @@
 DocType: Sales Invoice,End Date,Data di Fine
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,transazioni di magazzino
 DocType: Employee,Internal Work History,Storia di lavoro interni
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Importo fondo ammortamento
 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
@@ -3029,7 +3116,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Società è obbligatoria, in quanto è la vostra ditta"
 DocType: Item Attribute,From Range,Da Gamma
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Articolo {0} ignorato poiché non è in Giacenza
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Invia questo ordine di produzione per l'ulteriore elaborazione .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Invia questo ordine di produzione per l'ulteriore elaborazione .
 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.","Per non applicare l'articolo Pricing in una determinata operazione, tutte le norme sui prezzi applicabili devono essere disabilitati."
 DocType: Company,Domain,Dominio
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Lavori
@@ -3041,6 +3128,7 @@
 DocType: Time Log,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3057,6 +3145,7 @@
 DocType: Sales Order,Delivery Date,Data Consegna
 DocType: Opportunity,Opportunity Date,Data Opportunità
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
+DocType: Request for Quotation Item,Request for Quotation Item,Richiesta di offerta Articolo
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,% Ordinato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
@@ -3071,11 +3160,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
 DocType: Accounts Settings,Accounts Settings,Impostazioni Conti
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Si prega di impostare &#39;Asset Disposal Account&#39; in compagnia {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Impianti e macchinari
 DocType: Sales Partner,Partner's Website,Sito del Partner
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Conti provvisori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Articolo Esploso
 DocType: Account,Auditor,Uditore
@@ -3084,21 +3174,22 @@
 DocType: Pricing Rule,Disable,Disattiva
 DocType: Project Task,Pending Review,In attesa recensione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Clicca qui per pagare
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} non può essere gettata, come è già {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Assente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Sales Order {0} non è presentata
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Aggiungere elementi da
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Sales Order {0} non è presentata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Aggiungere elementi da
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: conto Parent {1} non Bolong alla società {2}
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
 DocType: Account,Asset,attività
 DocType: Project Task,Task ID,ID attività
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","p. es. ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} non esiste
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3113,6 +3204,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Voce {0} è stato disabilitato
 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
@@ -3124,7 +3216,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Conti Gateway Setup.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Conti Gateway Setup.
 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
 ,Cash Flow,Flusso di cassa
@@ -3138,7 +3230,7 @@
 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 +132,Please find attached {0} #{1},In allegato {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},In allegato {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Banca equilibrio economico di cui Contabilità Generale
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome voce
@@ -3154,19 +3246,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Si prega di specificare da / a gamma
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
 DocType: BOM Replace Tool,Current BOM,DiBa Corrente
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Aggiungi Numero di Serie
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garanzia
 DocType: Production Order,Warehouses,Magazzini
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Stampa e Fermo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Stampa e Fermo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nodo Group
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Merci aggiornamento finiti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Merci aggiornamento finiti
 DocType: Workstation,per hour,all'ora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Acquisto
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Il saldo per il magazzino (con inventario continuo) verrà creato su 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 .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Importo pagato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
@@ -3196,7 +3287,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Applica ad Azienda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste una giacenza {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste una giacenza {0}
 DocType: Purchase Invoice,In Words,In Parole
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
 DocType: Production Planning Tool,Material Request For Warehouse,Richiesta di materiale per il magazzino
@@ -3209,9 +3300,11 @@
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Aderire
 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 +564,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Busta paga
+DocType: Pricing Rule,Margin Rate or Amount,Margine o alla quantità
 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
@@ -3221,7 +3314,7 @@
 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 +782,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Account
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3229,14 +3322,13 @@
 DocType: Customer,Sales Team Details,Vendite team Dettagli
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenziali opportunità di vendita.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Non valido {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si prega di impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Serie Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grandi magazzini
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Salvare il documento prima.
 DocType: Account,Chargeable,Addebitabile
 DocType: Company,Change Abbreviation,Change Abbreviazione
 DocType: Expense Claim Detail,Expense Date,Data Spesa
@@ -3254,14 +3346,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Development Business Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scopo visita manutenzione
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periodo
-,General Ledger,Libro mastro generale
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Libro mastro generale
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Visualizza Contatti
 DocType: Item Attribute Value,Attribute Value,Valore Attributo
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id deve essere unico, esiste già per {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email id deve essere unico, esiste già per {0}"
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o società {0}
 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>
@@ -3293,23 +3386,23 @@
 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 .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
 ,Project wise Stock Tracking,Progetto saggio Archivio monitoraggio
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Programma di manutenzione {0} esiste per {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programma di manutenzione {0} esiste per {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Q.tà reale (in origine/obiettivo)
 DocType: Item Customer Detail,Ref Code,Codice Rif
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Informazioni Dipendente.
 DocType: Payment Gateway,Payment Gateway,Casello stradale
 DocType: HR Settings,Payroll Settings,Impostazioni Payroll
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Invia ordine
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root non può avere un centro di costo genitore
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Seleziona Marchio ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse è obbligatoria
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (w) per 100px (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,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/manufacturing/doctype/production_order/production_order.py +342,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,Ottieni buoni in sospeso
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
@@ -3327,7 +3420,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Valuta di transazione deve essere uguale a pagamento moneta Gateway
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Ricevere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3335,14 +3428,14 @@
 DocType: Purchase Invoice,Submit on creation,Invia sulla creazione
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,I Miei Ordini
@@ -3363,10 +3456,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profilo
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,I prestiti non garantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,I prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
 DocType: Maintenance Schedule Detail,Scheduled Date,Data prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Totale versato Amt
@@ -3378,11 +3471,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,I vostri fornitori
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Di parte del fornitore No
 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
@@ -3391,12 +3485,12 @@
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Da {0} per {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore bloccato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ottieni entrate non riconciliate
 DocType: Payment Reconciliation,From Invoice Date,Da Data fattura
@@ -3405,7 +3499,7 @@
 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 +351,'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 +356,'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,Riferimento del conto
@@ -3418,7 +3512,7 @@
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Promemoria Compleanno per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
@@ -3432,15 +3526,15 @@
 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 +576,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Attività / attività del progetto.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generare buste paga
 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"" bisogna selezionarlo 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: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3460,8 +3554,9 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome Campagna obbligatorio
 DocType: Maintenance Visit,Maintenance Date,Data di manutenzione
 DocType: Purchase Receipt Item,Rejected Serial No,Rifiutato Serial No
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Anno data di inizio o di fine si sovrappone {0}. Per evitare di impostare azienda
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 DocType: 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.","Esempio:. ABCD. ##### Se è impostato 'serie' ma il Numero di Serie non è specificato nelle transazioni, verrà creato il numero di serie automatico in base a questa serie. Se si vuole sempre specificare il Numero di Serie per questo articolo. Lasciare vuoto."
 DocType: Upload Attendance,Upload Attendance,Carica presenze
@@ -3472,11 +3567,11 @@
 ,Sales Analytics,Analisi dei dati di vendita
 DocType: Manufacturing Settings,Manufacturing Settings,Impostazioni di Produzione
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurazione della posta elettronica
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Inserisci valuta predefinita in Azienda Maestro
 DocType: Stock Entry Detail,Stock Entry Detail,Dettaglio Giacenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Promemoria quotidiani
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nuovo Nome Account
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Servizio clienti
@@ -3486,11 +3581,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Percentuale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,L'articolo {0} deve essere un'Articolo in Vendita
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3498,11 +3594,12 @@
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
 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 +385,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
 DocType: Sales Partner,Partner Type,Tipo di partner
 DocType: Purchase Taxes and Charges,Actual,Attuale
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
 DocType: Purchase Invoice,Against Expense Account,Per Spesa Conto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 (di solito fonte di fondi&gt; passività correnti&gt; tasse e diritti e creare un nuovo account (facendo clic su Add Child) di tipo &quot;tassa&quot; e fare parlare il tasso fiscale.
 DocType: Production Order,Production Order,Ordine di produzione
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
 DocType: Quotation Item,Against Docname,Per Nome Doc
@@ -3521,18 +3618,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Riconciliati con successo
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Tax Rule,Validity,Validità
+DocType: Request for Quotation,Supplier Detail,Particolare Fornitore
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Importo fatturato
 DocType: Attendance,Attendance,Presenze
 apps/erpnext/erpnext/config/projects.py +55,Reports,Rapporti
 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 +508,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Modelli fiscali per le transazioni di acquisto.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelli fiscali per le transazioni di acquisto.
 ,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
@@ -3542,10 +3640,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Spese Amministrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Spese Amministrative
 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 +455,Change,Cambiamento
@@ -3553,6 +3651,7 @@
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","p. es. ""My Company LLC """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
+DocType: Asset Category,Asset Category Name,Asset Nome Categoria
 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 U.M.
@@ -3564,13 +3663,13 @@
 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 +559,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 +564,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 (da registro presenze)
 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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Lotto
@@ -3584,7 +3683,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Addetto alle vendite
 DocType: Sales Invoice,Cold Calling,Chiamata Fredda
 DocType: SMS Parameter,SMS Parameter,SMS Parametro
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Bilancio e Centro di costo
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Bilancio e Centro di costo
 DocType: Maintenance Schedule Item,Half Yearly,Semestrale
 DocType: Lead,Blog Subscriber,Abbonati Blog
 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 .
@@ -3615,9 +3714,9 @@
 DocType: Purchase Common,Purchase Common,Comuni di acquisto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice Articolo&gt; Gruppo Articolo&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3625,7 +3724,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fatture sollevate dai Clienti.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Account principale
@@ -3641,7 +3740,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
 DocType: Address,Office,Ufficio
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
@@ -3656,6 +3755,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Sconto e margine
 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: Deduction Type,Deduction Type,Tipo Deduzione
 DocType: Attendance,Half Day,Mezza Giornata
@@ -3676,7 +3776,7 @@
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,Operazione BOM
@@ -3684,22 +3784,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pagamento URL Messaggio
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Totale non pagato
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Il tempo log non è fatturabile
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
+DocType: Asset,Asset Category,Asset Categoria
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiale da Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiale da Fornitore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Accise Fattura
 DocType: Expense Claim,Employees Email Id,Email Dipendenti
 DocType: Employee Attendance Tool,Marked Attendance,Partecipazione Marcato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Passività correnti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Passività correnti
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,La q.tà reale è obbligatoria
@@ -3720,17 +3821,16 @@
 DocType: Item Attribute,Numeric Values,Valori numerici
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Allega Logo
 DocType: Customer,Commission Rate,Tasso Commissione
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Crea variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocco domande uscita da ufficio.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analitica
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrello è Vuoto
 DocType: Production Order,Actual Operating Cost,Costo operativo effettivo
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nessuna impostazione predefinita Indirizzo Template trovato. Si prega di crearne uno nuovo da Impostazioni&gt; Stampa ed Branding&gt; Indirizzo Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capitale Sociale
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
 DocType: Payment Gateway Account,Payment Gateway Account,Pagamento Conto Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Dopo il completamento pagamento reindirizzare utente a pagina selezionata.
@@ -3739,20 +3839,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,designer
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
+DocType: Asset,Current Value (After Depreciation),Valore corrente (al netto degli ammortamenti)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Distinte materiali
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Data Rif
@@ -3760,6 +3861,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Il Conto {0} non esiste
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 9d68a3e..2fb9d90 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,ディーラー
 DocType: Employee,Rented,賃貸
 DocType: POS Profile,Applicable for User,ユーザーに適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,あなたは本当にこの資産をスクラップしますか？
 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.,※取引内で計算されます。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事でのシステムの命名してくださいセットアップ社員&gt; HRの設定
 DocType: Purchase Order,Customer Contact,顧客の連絡先
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}ツリー
 DocType: Job Applicant,Job Applicant,求職者
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,オープンを表示
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,新しい休暇申請
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,バリエーションを表示
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ローン（負債）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),ローン（負債）
 DocType: Employee Education,Year of Passing,経過年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,在庫中
 DocType: Designation,Designation,肩書
@@ -64,7 +66,7 @@
 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 +642,Invoice,請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,年度は、{0}が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},新しい{0}：＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新しい{0}：＃{1}
 ,Sales Partners Commission,販売パートナー手数料
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,略語は5字以上使用することができません
 DocType: Payment Request,Payment Request,支払請求書
@@ -102,7 +104,7 @@
 DocType: Employee,Married,結婚してる
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0}のために許可されていません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,からアイテムを取得します
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 DocType: Payment Reconciliation,Reconcile,照合
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標
 DocType: BOM,Total Cost,費用合計
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動ログ：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
+DocType: Item,Is Fixed Asset,固定資産であります
 DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Employee,Mr,氏
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
@@ -156,7 +159,8 @@
 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,在庫経費
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1}凍結されています
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,在庫経費
 DocType: Newsletter,Email Sent?,メール送信済み？
 DocType: Journal Entry,Contra Entry,逆仕訳
 DocType: Production Order Operation,Show Time Logs,時間ログを表示
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,設置ステータス
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,アイテム{0}は仕入アイテムでなければなりません
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: BOM Replace Tool,New BOM,新しい部品表
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},アドバンス量は、より大きくすることはできません{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,「会社」を入力してください
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,財務によるキャッシュ・フロー
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割り当てから未使用の葉を追加
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
 DocType: Newsletter List,Total Subscribers,総登録者数
 ,Contact Name,担当者名
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 DocType: Payment Tool,Reference No,参照番号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,銀行のエントリ
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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} が見つかりません
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,通知制御
 DocType: Lead,Suggestions,提案
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,この地域用にアイテムグループごとの予算を設定します。また「配分」を設定することで、期間を含めることができます。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},倉庫{0}の親勘定グループを入力してください
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},倉庫{0}の親勘定グループを入力してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
 DocType: Supplier,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,最大5文字
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 apps/erpnext/erpnext/config/desktop.py +83,Learn,こちらをご覧ください
+DocType: Asset,Next Depreciation Date,次の減価償却日
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,従業員一人当たりの活動コスト
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},サプライヤ請求書なしでは購入請求書に存在する{0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,セールスパーソンツリーを管理します。
 DocType: Job Applicant,Cover Letter,カバーレター
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,明らかに優れた小切手および預金
 DocType: Item,Synced With Hub,ハブと同期
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]の単位（＃フォーム/商品/ {1}）[{2}]で見つかった（＃フォーム/倉庫/ {2}）
 DocType: Lead,Industry,業種
 DocType: Employee,Job Profile,職務内容
 DocType: 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,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,納品書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,納品書
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,月と年を選択してください
@@ -310,12 +317,12 @@
 「コピーしない」が設定されていない限り、アイテムの属性は、バリエーションにコピーされます"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,検討された注文合計
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,フィールド値「毎月繰り返し」を入力してください
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}はすでに期間の従業員{1}のために割り当てられた{2} {3}へ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,アイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
@@ -338,9 +345,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},シリアル番号 {0} は納品書 {1} に記載がありません
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,アイテム品質検査パラメータ
 DocType: Leave Application,Leave Approver Name,休暇承認者名
-,Schedule Date,期日
+DocType: Depreciation Schedule,Schedule Date,期日
 DocType: Packed Item,Packed Item,梱包済アイテム
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,購入取引のデフォルト設定
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,購入取引のデフォルト設定
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},活動タイプ- {1}に対する従業員{0}用に活動費用が存在します
 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,為替
@@ -349,6 +356,7 @@
 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",要求されるアイテム（計画数量と最小注文数量に基づきすべての倉庫を考慮して「在庫切れ」とされたもの）
+DocType: Request for Quotation,Request for Quotation,見積依頼
 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.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
@@ -389,15 +397,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
-DocType: Material Request Item,Required Date,要求日
+DocType: Request for Quotation Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,サプライヤーへのメッセージ
 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,未払い
@@ -419,17 +428,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,シリアル番号（保証期限）
@@ -438,6 +447,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,業務委託管理
+DocType: Project,Project will be accessible on the website to these users,プロジェクトでは、これらのユーザーにウェブサイト上でアクセスできるようになります
 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 +53,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
@@ -449,7 +459,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
@@ -460,7 +470,7 @@
 DocType: Production Plan Item,Pending Qty,保留中の数量
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
 DocType: Pricing Rule,Valid From,有効（〜から）
 DocType: Sales Invoice,Total Commission,手数料合計
 DocType: Pricing Rule,Sales Partner,販売パートナー
@@ -471,13 +481,13 @@
 配分を行なう場合には、「コストセンター」にこの「月次配分」を設定してください。"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,会計年度
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積値
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,会計年度の開始日は終了日より後にはできません
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,会計年度の開始日は終了日より後にはできません
 DocType: Warranty Claim,Resolution,課題解決
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},配送済：{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,買掛金勘定
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,再開アタッチメント
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,販売返品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,販売返品
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤー（ドロップ船）で配信
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,給与コンポーネント
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在顧客データベース
@@ -494,7 +504,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,在庫エントリが作成されるのに対する論理的な倉庫。
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,マスター
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,アップデート銀行取引日
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,アップデート銀行取引日
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},マイナス在庫エラー（{6}）アイテム {0} 倉庫 {1}の {4} {5} 内 {2} {3}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,タイムトラッキング
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度（会社）
@@ -522,27 +532,27 @@
 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,デフォルト原価
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,メンテナンス予定
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,メンテナンス予定
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",価格設定ルールは、顧客、顧客グループ、地域、サプライヤー、サプライヤータイプ、キャンペーン、販売パートナーなどに基づいて抽出されます
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在庫の純変更
 DocType: Employee,Passport Number,パスポート番号
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,マネージャー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,同じアイテムが複数回入力されています
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,営業担当者の目標
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,従業員又は当社のいずれかのための休日リストを設定してください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 DocType: Selling Settings,Customer Naming By,顧客名設定
+DocType: Depreciation Schedule,Depreciation Amount,減価償却額
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,期日
 DocType: Quotation Item,Item Balance,アイテムのバランス
 DocType: Sales Invoice,Packing List,梱包リスト
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,サプライヤーに与えられた発注
+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,消費済
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,作業時間
 DocType: Pricing Rule,Sales Manager,営業部長
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,グループへのグループ
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,マイプロジェクト
 DocType: Journal Entry,Write Off Amount,償却額
 DocType: Journal Entry,Bill No,請求番号
+DocType: Company,Gain/Loss Account on Asset Disposal,資産売却益/損失勘定
 DocType: Purchase Invoice,Quarterly,4半期ごと
 DocType: Selling Settings,Delivery Note Required,納品書必須
 DocType: Sales Order Item,Basic Rate (Company Currency),基本速度（会社通貨）
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,支払エントリがすでに作成されています
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,今年の合計請求
 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 +529,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0}は在庫アイテムではありません
 DocType: Mode of Payment Account,Default Account,デフォルトアカウント
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,週休日を選択してください
 DocType: Production Order Operation,Planned End Time,計画終了時間
 ,Sales Person Target Variance Item Group-Wise,（アイテムグループごとの）各営業ターゲット差違
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月次給与計算書。
 DocType: Item Group,Website Specifications,ウェブサイトの仕様
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},あなたのアドレステンプレート{0}にエラーがあります
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,新しいアカウント
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,新しいアカウント
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",複数の価格ルールは、同じ基準で存在し、優先順位を割り当てることにより、競合を解決してください。価格ルール：{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",複数の価格ルールは、同じ基準で存在し、優先順位を割り当てることにより、競合を解決してください。価格ルール：{0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -675,17 +689,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",仕訳 {0} が注文 {1} にリンクされていますが、この請求内で前受金として引かれるべきか、確認してください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,事務所維持費
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,最初のアイテムを入力してください
 DocType: Account,Liability,負債
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
 DocType: Company,Default Cost of Goods Sold Account,製品販売アカウントのデフォルト費用
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,価格表が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Process Payroll,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：不正な添付ファイル{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -693,7 +707,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,自分の請求書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,自分の請求書
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,行＃{0}：アセット{1}提出しなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,従業員が見つかりません
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
@@ -702,10 +717,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSVから在庫残高をアップロード
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,今すぐ送信
 ,Support Analytics,サポート分析
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,論理エラー：重複を見つける必要があります
 DocType: Item,Website Warehouse,ウェブサイトの倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最低請求額
 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 +267,C-Form records,Cフォームの記録
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Cフォームの記録
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,顧客とサプライヤー
 DocType: Email Digest,Email Digest Settings,メールダイジェスト設定
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,顧客問い合わせサポート
@@ -729,7 +745,7 @@
 DocType: Quotation Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,経費
@@ -766,14 +782,15 @@
 DocType: Supplier Quotation,Is Subcontracted,下請け
 DocType: Item Attribute,Item Attribute Values,アイテムの属性値
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,登録者表示
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,領収書
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
 DocType: Employee,Ms,女史
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,為替レートマスター
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,為替レートマスター
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,セールスパートナーとテリトリー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+DocType: Journal Entry,Depreciation Entry,減価償却のエントリ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,後藤カート
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
@@ -792,7 +809,7 @@
 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 +524,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
@@ -802,10 +819,10 @@
 DocType: Employee,Permanent Address Is,本籍地
 DocType: Production Order Operation,Operation completed for how many finished goods?,作業完了時の完成品数
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ブランド
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
 DocType: Employee,Exit Interview Details,インタビュー詳細を終了
 DocType: Item,Is Purchase Item,仕入アイテム
-DocType: Journal Entry Account,Purchase Invoice,仕入請求
+DocType: Asset,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,日付と終了日付を開くと、同年度内にあるべきです
@@ -815,21 +832,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},行 {0}：アイテム{1}のシリアル番号を指定してください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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 +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
 DocType: Job Opening,Publish on website,ウェブサイト上で公開
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,顧客への出荷
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,サプライヤの請求書の日付は、転記日を超えることはできません
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接収入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,配送のためのアイテムを選択
 DocType: Purchase Invoice,Additional Discount Percentage,追加割引パーセンテージ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,すべてのヘルプの動画のリストを見ます
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",行は{0}：請求書は、{1}は無効です、それは存在しません/キャンセルされる可能性があります。 \有効な請求書を入力してください。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
@@ -838,14 +858,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
 ,Employee Holiday Attendance,従業員の休日の出席
 DocType: Opportunity,Walk In,立入
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ストックエントリ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,ストックエントリ
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,移転済
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,作成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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.,"エラーが発生しました。
 フォームを保存していないことが原因だと考えられます。
@@ -857,7 +877,8 @@
 DocType: Holiday List,Holiday List Name,休日リストの名前
 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 +180,Qty for {0},{0}用数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,あなたは本当にこの廃棄資産を復元したいですか？
+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 +80,Leave Allocation Tool,休暇割当ツール
 DocType: Leave Block List,Leave Block List Dates,休暇リスト日付
@@ -870,7 +891,7 @@
 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 +547,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,割引
@@ -885,20 +906,21 @@
 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 +69,Selling Amount,販売額
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,時間ログ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,時間ログ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメントNo
 DocType: Issue,Issue,課題
+DocType: Asset,Scrapped,スクラップ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,アカウントは、当社と一致しません
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,募集
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,販売費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,販売費
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
@@ -915,7 +937,7 @@
 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 +18,Quotations received from Suppliers.,サプライヤーから受け取った見積。
+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,平均年齢
@@ -924,7 +946,7 @@
 DocType: Company,Default Currency,デフォルトの通貨
 DocType: Contact,Enter designation of this Contact,この連絡先の肩書を入力してください
 DocType: Expense Claim,From Employee,社員から
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,重要実行分野
@@ -932,7 +954,7 @@
 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 +130,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,貢献％
@@ -941,22 +963,23 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
 ,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,共通デフォルト設定
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,プロジェクトコラボレーション招待
 DocType: Salary Slip,Deductions,控除
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,この時間ログバッチは請求済みです
 DocType: Salary Slip,Leave Without Pay,無給休暇
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,キャパシティプランニングのエラー
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,キャパシティプランニングのエラー
 ,Trial Balance for Party,当事者用の試算表
 DocType: Lead,Consultant,コンサルタント
 DocType: Salary Slip,Earnings,収益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,期首残高
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,要求するものがありません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,要求するものがありません
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,マネジメント
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,タイムシート用活動タイプ
@@ -967,18 +990,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,電子メールIDを設定してください
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,電子メールIDを設定してください
 DocType: Item,UOMs,数量単位
 apps/erpnext/erpnext/stock/utils.py +171,{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/config/buying.py +33,Supplier database.,サプライヤーデータベース
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,サプライヤーデータベース
 DocType: Account,Balance Sheet,貸借対照表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,税その他給与控除
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
@@ -992,6 +1015,7 @@
 DocType: Holiday,Holiday,休日
 DocType: Leave Control Panel,Leave blank if considered for all branches,全支店が対象の場合は空白のままにします
 ,Daily Time Log Summary,日次時間ログの概要
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-フォームは、請求書には適用されません：{0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,未照合支払いの詳細
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
@@ -1005,19 +1029,20 @@
 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つの属性を指定してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,{0}の項目は非在庫項目でなければなりません
 DocType: Contact,User ID,ユーザー ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,元帳の表示
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,元帳の表示
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,配当金支払額
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,内部留保
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,内部留保
 DocType: BOM Item,Item Description,アイテム説明
 DocType: Payment Tool,Payment Mode,支払いモード
 DocType: Purchase Invoice,Is Recurring,繰り返し
@@ -1025,7 +1050,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,仮勘定期首
 ,Employee Leave Balance,従業員の残休暇数
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},行{0}の項目に必要な評価レート
@@ -1040,8 +1065,8 @@
 ,Accounts Payable Summary,買掛金の概要
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 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 +165,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,受注{0}は有効ではありません
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,S
@@ -1049,7 +1074,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,勘定科目{0}を作成しました
 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,達成計
@@ -1057,12 +1082,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,間接経費
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量は必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
 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,倉庫連絡先情報
@@ -1072,19 +1097,20 @@
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,納品書{0}は提出されていません
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
 DocType: Hub Settings,Seller Website,販売者のウェブサイト
 apps/erpnext/erpnext/controllers/selling_controller.py +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},製造指示のステータスは{0}です
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,サプライヤー用
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計（会社通貨）
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},呼ばれる任意の項目を見つけることができませんでした{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出費総額
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",「値へ」を0か空にする送料ルール条件しかありません
 DocType: Authorization Rule,Transaction,取引
@@ -1092,10 +1118,10 @@
 DocType: Item,Website Item Groups,ウェブサイトのアイテムグループ
 DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,シリアル番号{0}は複数回入力されています
-DocType: Journal Entry,Journal Entry,仕訳
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
 DocType: Salary Slip,Bank Account No.,銀行口座番号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
@@ -1104,6 +1130,7 @@
 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,作業所
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,見積サプライヤー要求
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ハードウェア
 DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Attendance,HR Manager,人事マネージャー
@@ -1114,6 +1141,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,査定テンプレート目標
 DocType: Salary Slip,Earning,収益
 DocType: Payment Tool,Party Account Currency,当事者アカウント通貨
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},減価償却後の電流値に等しい未満でなければなりません{0}
 ,BOM Browser,部品表（BOM）ブラウザ
 DocType: Purchase Taxes and Charges,Add or Deduct,増減
 DocType: Company,If Yearly Budget Exceeded (for expense account),年間予算（経費勘定のため）を超えた場合
@@ -1128,21 +1156,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},閉じるアカウントの通貨がでなければなりません{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
 DocType: Project,Start and End Dates,開始日と終了日
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,作業は空白にできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,機能設定
+DocType: Asset,Depreciation Schedules,減価償却スケジュール
 DocType: Item,Is Service Item,サービスアイテム
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,受付期間は、外部休暇割当期間にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
 DocType: Payment Request,Transaction Currency,取引通貨
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0}から | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},{0}から | {1} {2}
 DocType: BOM Operation,Operation Description,作業説明
 DocType: Item,Will also apply to variants,バリエーションにも適用されます
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,年度が保存されると会計年度の開始日と会計年度終了日を変更することはできません。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,キャンペーン
@@ -1156,8 +1185,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,固定資産の純変動
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},最大：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,会社用
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信ログ。
@@ -1165,8 +1194,8 @@
 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 +472,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100を超えることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1188,11 +1217,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,取引のための税ルール
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,取引のための税ルール
 DocType: Rename Tool,Type of document to rename.,名前を変更するドキュメント型
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,このアイテムを購入する
 DocType: Address,Billing,請求
@@ -1202,12 +1231,15 @@
 DocType: Quality Inspection,Readings,報告要素
 DocType: Stock Entry,Total Additional Costs,追加費用合計
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,組立部品
+DocType: Asset,Asset Name,アセット名
 DocType: Shipping Rule Condition,To Value,値
 DocType: Supplier,Stock Manager,在庫マネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,梱包伝票
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,事務所賃料
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,梱包伝票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,SMSゲートウェイの設定
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,見積依頼は、以下のリンクをクリックしてアクセスすることができます
+DocType: Asset,Number of Months in a Period,期間の月数
 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,作業所の労働時間
@@ -1224,19 +1256,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),計（{0}）
 DocType: Cost Center,Parent Cost Center,親コストセンター
 DocType: Sales Invoice,Source,ソース
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,ショー閉じ
 DocType: Leave Type,Is Leave Without Pay,無給休暇
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,支払テーブルにレコードが見つかりません
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,会計年度の開始日
 DocType: Employee External Work History,Total Experience,実績合計
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,投資活動によるキャッシュフロー
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,運送・転送料金
 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 +86,Transfer Materials for Manufacture,製造用資材配送
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,製造用資材配送
 DocType: Pricing Rule,For Price List,価格表用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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}の仕入額が見つかりません、会計エントリ（費用）を記帳するために必要とされています。
@@ -1246,7 +1279,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 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.,勘定科目表から新しいアカウントを作成してください
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,メンテナンスのための訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,メンテナンスのための訪問
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,倉庫での利用可能なバッチ数量
 DocType: Time Log Batch Detail,Time Log Batch Detail,時間ログバッチの詳細
 DocType: Landed Cost Voucher,Landed Cost Help,陸揚費用ヘルプ
@@ -1261,7 +1294,6 @@
 これは通常、システムの値と倉庫に実際に存在するものを同期させるために使用されます。"
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,納品書を保存すると表示される表記内。
 apps/erpnext/erpnext/config/stock.py +196,Brand master.,ブランドのマスター。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1289,7 +1321,7 @@
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +131,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,在庫負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,在庫負債
 DocType: Purchase Receipt,Supplier Warehouse,サプライヤー倉庫
 DocType: Opportunity,Contact Mobile No,連絡先携帯番号
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
@@ -1298,7 +1330,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,支払メールを再送信
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,その他のレポート
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,誕生日リマインダを停止
@@ -1308,26 +1340,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0}ビュー
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,現金の純変更
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系（控除）
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},支払い要求がすでに存在している{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},数量は{0}以下でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量は{0}以下でなければなりません
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,前会計年度が閉じられていません
 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 +40,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 +38,Supplier Type master.,サプライヤータイプマスター
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
 DocType: Purchase Invoice,Reference Document,参照文献
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％支払済
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,人事
@@ -1349,8 +1382,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,買掛金の純変動
 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',「顧客ごと割引」には顧客が必要です
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,銀行支払日と履歴を更新
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,銀行支払日と履歴を更新
 DocType: Quotation,Term Details,用語解説
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0より大きくなければなりません
 DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング（日数）
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,保証請求
@@ -1369,7 +1403,7 @@
 DocType: Employee,Permanent Address,本籍地
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0}への前払金として {1} は{2}の総計より大きくすることはできません
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,アイテムコードを選択してください。
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,アイテムコードを選択してください。
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),無給休暇（LWP）の控除減
 DocType: Territory,Territory Manager,地域マネージャ
 DocType: Packed Item,To Warehouse (Optional),倉庫に（オプション）
@@ -1379,15 +1413,15 @@
 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,マーケティング費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,アイテムの１単位
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
@@ -1405,33 +1439,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}を削除することができません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,アイテムごとの販売登録
+DocType: Asset,Gross Purchase Amount,総購入金額
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","例えば ""XYZ銀行 """
+DocType: Asset,Depreciation Method,減価償却法
 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 +29,Shopping Cart is enabled,ショッピングカートが有効になっています
 DocType: Job Applicant,Applicant for a Job,求職者
 DocType: Production Plan Material Request,Production Plan Material Request,生産・販売計画材質リクエスト
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,製造指示が作成されていません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,製造指示が作成されていません
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,メイン
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員のHTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
@@ -1439,31 +1475,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求職者
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,住所
+apps/erpnext/erpnext/hooks.py +91,Addresses,住所
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,鑑定
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,アイテムは製造指示を持つことができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,アイテムは製造指示を持つことができません
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,項目または倉庫に基づいてフィルタを設定してください
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),この梱包の正味重量。 （自動にアイテムの正味重量の合計が計算されます。）
 DocType: Sales Order,To Deliver and Bill,配送・請求する
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,製造用の時間ログ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,タスクの時間ログ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,支払
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ブランド
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",それは既にあるとして資産は、キャンセルすることはできません{0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,販売時に商品をまとめる
 DocType: Quotation Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
@@ -1474,6 +1511,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,属性 {1} の値 {0} は有効なアイテム属性値リストに存在しません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,同僚
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
+DocType: Request for Quotation Supplier,Send Email to Supplier,サプライヤに電子メールを送信
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 DocType: Packing Slip,To Package No.,対象梱包番号
 DocType: Production Planning Tool,Material Requests,材料要求
@@ -1491,7 +1529,7 @@
 DocType: Sales Order Item,Delivery Warehouse,配送倉庫
 DocType: Stock Settings,Allowance Percent,割合率
 DocType: SMS Settings,Message Parameter,メッセージパラメータ
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,金融原価センタのツリー。
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,金融原価センタのツリー。
 DocType: Serial No,Delivery Document No,納品文書番号
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,領収書からアイテムを取得
 DocType: Serial No,Creation Date,作成日
@@ -1523,29 +1561,31 @@
 ,Amount to Deliver,配送額
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,製品またはサービス
 DocType: Naming Series,Current Value,現在の値
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} 作成
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,複数の会計年度は、日付{0}のために存在します。年度で会社を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} 作成
 DocType: Delivery Note Item,Against Sales Order,対受注書
 ,Serial No Status,シリアル番号ステータス
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,アイテムテーブルは空白にすることはできません
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",行{0}：{1}の周期を設定するには、開始日から終了日までの期間が {2} 以上必要です
 DocType: Pricing Rule,Selling,販売
 DocType: Employee,Salary Information,給与情報
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,関税と税金
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,基準日を入力してください
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,ペイメントゲートウェイアカウントが設定されていません
 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: Production Order,Material Request Item,資材要求アイテム
+DocType: Request for Quotation Item,Material Request Item,資材要求アイテム
 apps/erpnext/erpnext/config/stock.py +85,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,この請求タイプの行数以上の行番号を参照することはできません
+DocType: Asset,Sold,販売：
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
 DocType: Installation Note,Installation Time,設置時間
@@ -1553,11 +1593,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,この会社の全ての取引を削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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}：注文番号{3}には完成品{2}個が必要なため、作業{1}は完了していません。
 時間ログから作業ステータスを更新してください"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,配分
 DocType: Quality Inspection Reading,Acceptance Criteria,合否基準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,上記の表の素材要求を入力してください。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,上記の表の素材要求を入力してください。
 DocType: Item Attribute,Attribute Name,属性名
 DocType: Item Group,Show In Website,ウェブサイトで表示
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,グループ
@@ -1565,6 +1605,7 @@
 ,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",ブランド名を追跡するための次の文書：納品書、機会、資材要求、アイテム、仕入発注、購入伝票、納品書、見積、請求、製品付属品、受注、シリアル番号
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,すべてのタスクのガントチャート
+DocType: Pricing Rule,Margin Type,証拠金の種類
 DocType: Appraisal,For Employee Name,従業員名用
 DocType: Holiday List,Clear Table,テーブルを消去
 DocType: Features Setup,Brands,ブランド
@@ -1572,20 +1613,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,顧客の住所と連絡先
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,行＃{0}：資産は、固定資産の項目に対する必須です
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,してください[設定]&gt; [ナンバリングシリーズを経由して出席するための設定採番シリーズ
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,組
+DocType: Asset,Depreciation Schedule,減価償却スケジュール
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 DocType: Maintenance Schedule Detail,Actual Date,実際の日付
 DocType: Item,Has Batch No,バッチ番号あり
 DocType: Delivery Note,Excise Page Number,物品税ページ番号
+DocType: Asset,Purchase Date,購入日
 DocType: Employee,Personal Details,個人情報詳細
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},会社の「資産減価償却原価センタ &#39;を設定してください{0}
 ,Maintenance Schedules,メンテナンス予定
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
@@ -1599,23 +1645,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
 DocType: HR Settings,HR Settings,人事設定
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,非グループのグループ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費計
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,単位
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,会社を指定してください
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,経費請求
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,経費請求
 DocType: Issue,Support,サポート
 ,BOM Search,部品表（BOM）検索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),期末（期首＋合計）
@@ -1624,29 +1669,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},決済日付は行{0}の小切手日付より前にすることはできません
 DocType: Salary Slip,Deduction,控除
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},アイテムの価格は価格表{1}に{0}のために追加
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},アイテムの価格は価格表{1}に{0}のために追加
 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,Gross Margin,売上総利益
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,最初の生産アイテムを入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,最初の生産アイテムを入力してください
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,計算された銀行報告書の残高
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,無効なユーザー
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,見積
 DocType: Salary Slip,Total Deduction,控除合計
 DocType: Quotation,Maintenance User,メンテナンスユーザー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,費用更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,費用更新
 DocType: Employee,Date of Birth,生年月日
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事でのシステムの命名してくださいセットアップ社員&gt; HRの設定
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
@@ -1658,8 +1704,8 @@
 ,SO Qty,受注数量
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
+DocType: Request for Quotation,Manufacturing Manager,製造マネージャー
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,梱包ごとに納品書を分割
 apps/erpnext/erpnext/hooks.py +71,Shipments,出荷
 DocType: Purchase Order Item,To be delivered to customer,顧客に配信します
@@ -1667,12 +1713,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨）
-DocType: Pricing Rule,Supplier,サプライヤー
+DocType: Asset,Supplier,サプライヤー
 DocType: C-Form,Quarter,四半期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雑費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,雑費
 DocType: Global Defaults,Default Company,デフォルトの会社
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,ユーザー{0}無効になっています
@@ -1681,7 +1727,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Currency Exchange,From Currency,通貨から
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},受注に必要な項目{0}
@@ -1691,11 +1737,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",行＃{0}：アイテムは、資産にリンクされているよう数量は、1でなければなりません
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子アイテムは、製品バンドルであってはなりません。項目を削除 `{0} &#39;と保存してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業務
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,新しいコストセンター
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",適切なグループファンド&gt;流動負債&gt;税金や関税の（通常はソースに移動し、新しいアカウントを作成します（子の追加クリックすることにより）タイプ「税」の税率に言及しません。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,新しいコストセンター
 DocType: Bin,Ordered Quantity,注文数
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Quality Inspection,In Process,処理中
@@ -1708,10 +1754,11 @@
 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,売掛金勘定
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},行＃{0}：アセット{1} {2}既にあります
 DocType: Quotation Item,Stock Balance,在庫残高
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,受注からの支払
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,時間ログを作成しました：
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,時間ログを作成しました：
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Employee,Blood Group,血液型
@@ -1729,13 +1776,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,デビットへが必要とされます
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
 DocType: Offer Letter Term,Offer Term,雇用契約条件
 DocType: Quality Inspection,Quality Manager,品質管理者
 DocType: Job Applicant,Job Opening,求人
 DocType: Payment Reconciliation,Payment Reconciliation,支払照合
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,担当者名を選択してください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,担当者名を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,雇用契約書
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,資材要求（MRP）と製造指示を生成
@@ -1743,22 +1790,22 @@
 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 +103,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,価格表{0}は無効になっています
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.,アイテム {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 +123,Create Payment Entries against Orders or Invoices.,注文または請求書に対する支払エントリを作成
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,注文または請求書に対する支払エントリを作成
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,ユーザーと権限
@@ -1767,10 +1814,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,シリアル番号 {0} は見つかりません
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,シリアル番号 {0} は見つかりません
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,あなたの顧客
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},あなたは、プロジェクトで共同作業に招待されました：{0}
 DocType: Leave Block List Date,Block Date,ブロック日付
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,今すぐ適用
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,今すぐ適用
 DocType: Sales Order,Not Delivered,未納品
 ,Bank Clearance Summary,銀行決済の概要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",日次・週次・月次のメールダイジェストを作成・管理
@@ -1794,7 +1842,7 @@
 DocType: Employee,Employment Details,雇用の詳細
 DocType: Employee,New Workplace,新しい職場
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,クローズに設定
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},バーコード{0}のアイテムはありません
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},バーコード{0}のアイテムはありません
 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,ページの上部にスライドショーを表示
@@ -1812,10 +1860,10 @@
 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 +608,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,資材配送
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},項目{0}が{1}での販売項目でなければなりません
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,保存した後、定期的に設定してください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,保存した後、定期的に設定してください
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -1830,12 +1878,13 @@
 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: Process Payroll,Create Salary Slip,給与伝票を作成する
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金源泉（負債）
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,従業員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,メールインポート元
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,ユーザーとして招待
 DocType: Features Setup,After Sale Installations,販売後設置
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},会社{1}に{0}を設定してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}は支払済です
 DocType: Workstation Working Hour,End Time,終了時間
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,販売・仕入用の標準的な契約条件
@@ -1844,9 +1893,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},行{0}内のアイテムのBOMを選択してください
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},行{0}内のアイテムのBOMを選択してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,医薬品
@@ -1863,25 +1912,25 @@
 DocType: Upload Attendance,Attendance To Date,出勤日
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Gateway Account,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,続行する会社を指定してください
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,売掛金の純変更
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無効な参照{0} {1}
 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}）より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,原材料は空白にできません。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,クイック仕訳
 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 +206,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}は提出されていません
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
@@ -1890,7 +1939,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,以下の製造指図が作成されています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,以下の製造指図が作成されています。
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,ニュースレターメーリングリスト
 DocType: Delivery Note,Transporter Name,輸送者名
 DocType: Authorization Rule,Authorized Value,認定値
@@ -1908,13 +1957,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}が閉じられています
 DocType: Email Digest,How frequently?,どのくらいの頻度？
 DocType: Purchase Receipt,Get Current Stock,在庫状況を取得
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",適切なグループ（通常、ファンドの応用&gt;流動資産&gt;銀行口座に移動して、タイプの）子の追加クリックすることにより（新しいアカウントを作成する &quot;銀行&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,部品表ツリー
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,マークプレゼント
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},メンテナンスの開始日は、シリアル番号{0}の納品日より前にすることはできません
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,目的
+DocType: Company,Fixed Asset Depreciation Settings,固定資産の減価償却の設定
 DocType: Item,Will also apply for variants unless overrridden,上書きされない限り、バリエーションについても適用されます
 DocType: Purchase Invoice,Advances,前払金
 DocType: Production Order,Manufacture against Material Request,素材のリクエストに対して製造
@@ -1923,6 +1972,7 @@
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,子ノードあり
@@ -1980,12 +2030,14 @@
 10. 追加／控除：
 追加か控除かを選択します"
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
+DocType: Asset Category Account,Asset Category Account,資産カテゴリーのアカウント
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",例「銀行」「現金払い」「クレジットカード払い」
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",適切なグループ（通常、ファンドの応用&gt;流動資産&gt;銀行口座に移動して、タイプの）子の追加クリックすることにより（新しいアカウントを作成する &quot;銀行&quot;
 DocType: Journal Entry,Credit Note,貸方票
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},完成数量は作業{1}において{0}を超えることはできません
 DocType: Features Setup,Quality,品質
@@ -2009,9 +2061,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,自分の住所
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,組織支部マスター。
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,デフォルト購入価格表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,上記の選択基準又は給与のスリップには従業員がすでに作成されていません
@@ -2038,7 +2090,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 apps/erpnext/erpnext/config/hr.py +93,Payroll,給与
 apps/erpnext/erpnext/accounts/doctype/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}も含まれている必要があります
@@ -2048,8 +2100,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,フォームのカスタマイズ
 DocType: Account,Income Account,収益勘定
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。 [設定]&gt; [印刷とブランディング&gt;アドレステンプレートから新しいものを作成してください。
 DocType: Payment Request,Amount in customer's currency,お客様の通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,重要責任分野
@@ -2071,21 +2124,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,業種によってリードを追跡
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,顧客グループツリーを管理します。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,新しいコストセンター名
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
 DocType: Appraisal,HR User,人事ユーザー
 DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
-apps/erpnext/erpnext/config/support.py +7,Issues,課題
+apps/erpnext/erpnext/hooks.py +90,Issues,課題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ステータスは{0}のどれかでなければなりません
 DocType: Sales Invoice,Debit To,借方計上
 DocType: Delivery Note,Required only for sample item.,サンプルアイテムにのみ必要です
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1}が無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,XL
 ,Profit and Loss Statement,損益計算書
@@ -2099,10 +2153,10 @@
 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,L
 DocType: C-Form Invoice Detail,Territory,地域
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,必要な訪問の数を記述してください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 DocType: Production Order Operation,Planned Start Time,計画開始時間
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,見積{0}はキャンセルされました
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,残高合計
@@ -2169,13 +2223,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}で使用可能な作業時間よりも長いため、複数の操作に分解してください
 ,Requested,要求済
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,備考がありません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,販売と仕入
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,固定資産項目は、非在庫アイテムでなければなりません
 DocType: Supplier Quotation Item,Material Request No,資材要求番号
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,顧客の通貨が会社の基本通貨に換算されるレート
@@ -2196,7 +2251,7 @@
 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,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 DocType: Payment Request,Recipient and Message,受信者とメッセージ
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
@@ -2210,7 +2265,7 @@
 DocType: Purchase Invoice,Select Supplier Address,サプライヤーアドレス]を選択
 DocType: Quality Inspection,Quality Inspection,品質検査
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,XS
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 DocType: Payment Request,Mute Email,ミュートメール
@@ -2232,11 +2287,12 @@
 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/config/buying.py +18,Request for quotation.,見積依頼。
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 DocType: Purchase Invoice Item,Valuation Rate,評価額
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,価格表の通貨が選択されていません
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,プロジェクト開始日
@@ -2245,7 +2301,7 @@
 DocType: Installation Note Item,Against Document No,文書番号に対して
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,セールスパートナーを管理します。
 DocType: Quality Inspection,Inspection Type,検査タイプ
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},{0}を選択してください
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,無印出席
@@ -2260,6 +2316,7 @@
 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,広告宣伝
+DocType: Asset Category Account,Depreciation Expense Account,減価償却費のアカウント
 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,経費承認者
@@ -2273,7 +2330,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認済
 DocType: Payment Gateway,Gateway,ゲートウェイ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,退職日を入力してください。
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,量／額
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,量／額
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
@@ -2287,18 +2344,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,承認済み倉庫
 DocType: Bank Reconciliation Detail,Posting Date,転記日付
 DocType: Item,Valuation Method,評価方法
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} {1}への為替レートを見つけることができません。
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} {1}への為替レートを見つけることができません。
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,マーク半日
 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 +410,[Error],[エラー]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,シリアル番号 {0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
 DocType: Sales Invoice Item,Customer Warehouse (Optional),カスタマー・ウェアハウス（オプション）
 DocType: Pricing Rule,Discount Percentage,割引率
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
@@ -2324,14 +2382,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,資材要求{0}は作成済
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,資材要求{0}は作成済
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,規約・契約用テンプレート
 DocType: Purchase Invoice,Address and Contact,住所・連絡先
 DocType: Supplier,Last Day of the Next Month,次月末日
 DocType: Employee,Feedback,フィードバック
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",前に割り当てることができないままに、{0}、休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように{1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
+DocType: Asset,Expected Value After Useful Life,耐用年数後期待値
 DocType: Item,Reorder level based on Warehouse,倉庫ごとの再注文レベル
 DocType: Activity Cost,Billing Rate,請求単価
 ,Qty to Deliver,配送数
@@ -2344,12 +2404,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1}キャンセルまたは閉じられています
 DocType: Delivery Note,Track this Delivery Note against any Project,任意のプロジェクトに対してこの納品書を追跡します
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,投資からの純キャッシュ・フロー
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,rootアカウントを削除することはできません
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,アセット{0}提出しなければなりません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},参照＃{0} 日付{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,住所管理
-DocType: Pricing Rule,Item Code,アイテムコード
+DocType: Asset,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
 DocType: Journal Entry,User Remark,ユーザー備考
@@ -2368,8 +2428,10 @@
 DocType: Production Planning Tool,Create Material Requests,資材要求を作成
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,リファレンス詳細
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,耐用年数後期待値は総購入金額未満でなければなりません
 DocType: Sales Invoice Item,Available Qty at Warehouse,倉庫の利用可能数量
 ,Billed Amount,請求金額
+DocType: Asset,Double Declining Balance,ダブル定率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,クローズド注文はキャンセルすることはできません。キャンセルする明らかにする。
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,アップデートを入手
@@ -2388,6 +2450,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',「終了日」は「開始日」の後にしてください。
+DocType: Asset,Fully Depreciated,完全に減価償却
 ,Stock Projected Qty,予測在庫数
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
@@ -2395,25 +2458,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,シリアル番号とバッチ
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,分
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 ,Qty to Receive,受領数
 DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
 DocType: Sales Partner,Retailer,小売業者
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
 DocType: Global Defaults,Disable In Words,言葉では無効
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,銀行当座貸越口座
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,担保ローン
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},資産カテゴリー{0}または当社との減価償却に関連するアカウントを設定してください。{1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,開始残高 資本
 DocType: Appraisal,Appraisal,査定
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},サプライヤに送信されたメール{0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,署名権者
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
@@ -2421,7 +2487,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,送信されたメッセージ
@@ -2449,6 +2515,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,総マージン
 DocType: Supplier,Supplier Details,サプライヤー詳細
 DocType: Expense Claim,Approval Status,承認ステータス
 DocType: Hub Settings,Publish Items to Hub,ハブにアイテムを公開
@@ -2462,7 +2529,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,顧客グループ／顧客
 DocType: Payment Gateway Account,Default Payment Request Message,デフォルト支払要求メッセージ
 DocType: Item Group,Check this if you want to show in website,ウェブサイトに表示したい場合チェック
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,銀行・決済
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,銀行・決済
 ,Welcome to ERPNext,ERPNextへようこそ
 DocType: Payment Reconciliation Payment,Voucher Detail Number,伝票詳細番号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,見積へのリード
@@ -2470,17 +2537,17 @@
 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 +199,Purchase Order {0} is not submitted,発注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,発注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,葉とホリデー
 DocType: Sales Order,Not Billed,未記帳
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,請求の一括処理
@@ -2496,15 +2563,17 @@
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
+DocType: Company,Asset Depreciation Cost Center,資産減価償却原価センタ
 DocType: Sales Order Item,Sales Order Date,受注日
 DocType: Sales Invoice Item,Delivered Qty,納品済数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0}資産の購入日、購入請求書の日付と一致しません
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Account,Payable,買掛
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),債務者（{0}）
-DocType: Project,Margin,マージン
+DocType: Pricing Rule,Margin,マージン
 DocType: Salary Slip,Arrear Amount,滞納額
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新規顧客
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,粗利益％
@@ -2512,20 +2581,23 @@
 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,給与明細を登録する時に、各従業員へメールで給与明細を送信したい場合チェック
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,総購入金額は必須です
 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 +57,Where manufacturing operations are carried.,製造作業が行なわれる場所
 DocType: Stock Entry Detail,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：アセット{1}の会社に属していない{2}
 DocType: Employee,Confirmation Date,確定日
 DocType: C-Form,Total Invoiced Amount,請求額合計
 DocType: Account,Sales User,販売ユーザー
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小個数は最大個数を超えることはできません
+DocType: Account,Accumulated Depreciation,減価償却累計額
 DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
 DocType: Payment Request,Email To,メールに
 DocType: Lead,Lead Owner,リード所有者
 DocType: Bin,Requested Quantity,要求された数量
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,倉庫が必要です
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,倉庫が必要です
 DocType: Employee,Marital Status,配偶者の有無
 DocType: Stock Settings,Auto Material Request,自動資材要求
 DocType: Time Log,Will be updated when billed.,記帳時に更新されます。
@@ -2533,11 +2605,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}％配送済
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,同一の供給者が複数回入力されました
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,発注アイテム供給済
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,会社名は、当社にすることはできません
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,印刷テンプレートのレターヘッド。
@@ -2547,13 +2620,14 @@
 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.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 DocType: Payment Request,Payment Details,支払詳細
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
+DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,納品書からアイテムを抽出してください
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.",電子メール、電話、チャット、訪問等すべてのやりとりの記録
 DocType: Manufacturer,Manufacturers used in Items,アイテムに使用されるメーカー
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,会社の丸め誤差コストセンターを指定してください
 DocType: Purchase Invoice,Terms,規約
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,新規作成
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,新規作成
 DocType: Buying Settings,Purchase Order Required,発注が必要です
 ,Item-wise Sales History,アイテムごとの販売履歴
 DocType: Expense Claim,Total Sanctioned Amount,認可額合計
@@ -2566,7 +2640,7 @@
 ,Stock Ledger,在庫元帳
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},レート：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,給与控除明細
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,はじめにグループノードを選択してください
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,はじめにグループノードを選択してください
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,従業員と出席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",それはあなたの会社の住所であるとして、顧客、サプライヤー、販売パートナーとリードの参照を削除します
@@ -2588,13 +2662,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：{1}から
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注：顧客やサプライヤーのためにアカウントを作成しないでください
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注：顧客やサプライヤーのためにアカウントを作成しないでください
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,次の日は、転記日付よりも大きくなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,表示減税アップ
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃フォーム/商品/ {0}）在庫切れです
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,次の日は、転記日付よりも大きくなければなりません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/accounts/party.py +289,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',製造活動に関与する場合、アイテムを「製造済」にすることができます
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,請求書の転記日付
@@ -2609,7 +2684,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",注意：支払が任意の参照に対して行われていない場合は、手動で仕訳を作成します
@@ -2623,7 +2698,7 @@
 DocType: Hub Settings,Publish Availability,公開可用性
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
 ,Stock Ageing,在庫エイジング
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2632,7 +2707,7 @@
 DocType: Purchase Order,Customer Contact Email,お客様の連絡先メールアドレス
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
 DocType: Sales Team,Contribution (%),寄与度（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
@@ -2643,7 +2718,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,確認のため会社名を再入力してください
@@ -2652,11 +2727,12 @@
 DocType: Journal Entry,Printing Settings,印刷設定
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
+DocType: Asset Category Account,Fixed Asset Account,固定資産勘定
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,インターン
@@ -2664,7 +2740,7 @@
 DocType: Stock Entry,From BOM,参照元部品表
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,半日休暇の開始日と終了日は同日でなければなりません
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",例「kg」「単位」「個数」「m」
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
@@ -2672,17 +2748,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,給与体系
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,名言集
 DocType: Hub Settings,Access Token,アクセストークン
 DocType: Sales Invoice Item,Serial No,シリアル番号
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,メンテナンス詳細を入力してください
-DocType: Item,Is Fixed Asset Item,固定資産アイテム
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,メンテナンス詳細を入力してください
 DocType: Purchase Invoice,Print Language,プリント言語
 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",長いプリント形式を使用している場合、この機能は、各ページのすべてのヘッダーとフッターに複数のページに印刷されるページを分割するために使用することができます
+DocType: Asset,Number of Depreciations,減価償却の数
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 DocType: Fiscal Year,Year Name,年の名前
@@ -2690,13 +2766,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,休日数が月営業日数を上回っています
 DocType: Product Bundle Item,Product Bundle Item,製品付属品アイテム
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,見積の依頼
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大請求額
 DocType: Purchase Invoice Item,Image View,画像を見る
 apps/erpnext/erpnext/config/selling.py +23,Customers,お客様
+DocType: Asset,Partially Depreciated,部分的に減価償却
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,期間日付が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリアントのためのデフォルトの単位は &#39;{0}&#39;テンプレートと同じである必要があります &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリアントのためのデフォルトの単位は &#39;{0}&#39;テンプレートと同じである必要があります &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
@@ -2712,13 +2790,13 @@
 DocType: Quotation,Maintenance Manager,メンテナンスマネージャー
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,合計はゼロにすることはできません
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,「最終受注からの日数」はゼロ以上でなければなりません
-DocType: C-Form,Amended From,修正元
+DocType: Asset,Amended From,修正元
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,繰り越す
@@ -2731,21 +2809,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,当社では「資産売却益/損失勘定」を明記してください
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,請求書と一致支払い
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,請求書と一致支払い
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),（肩書）に適用
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,カートに追加
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,グループ化
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,通貨の有効／無効を切り替え
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,通貨の有効／無効を切り替え
 DocType: Production Planning Tool,Get Material Request,素材のリクエストを取得します。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵便経費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,郵便経費
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計（数）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,総現在価値
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,会計ステートメント
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,会計ステートメント
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
@@ -2764,15 +2843,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),POSを開始
 apps/erpnext/erpnext/config/support.py +32,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,顧客グループ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: Item,Website Description,ウェブサイトの説明
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,資本の純変動
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
 ,Sales Register,販売登録
 DocType: Quotation,Quotation Lost Reason,失注理由
@@ -2780,12 +2860,13 @@
 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,顧客グループ名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,対伝票タイプ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},エラー：{0}&gt; {1}
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,項目を取得
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,償却勘定を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,項目を取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最終注文日
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
 DocType: C-Form,C-Form,C-フォーム
@@ -2797,18 +2878,18 @@
 DocType: Purchase Invoice,Mobile No,携帯番号
 DocType: Payment Tool,Make Journal Entry,仕訳を作成
 DocType: Leave Allocation,New Leaves Allocated,新しい有給休暇
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,営利企業
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},エラー：{0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 DocType: Cost Center,Distribution Id,配布ID
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,全ての製品またはサービス。
 DocType: Supplier Quotation,Supplier Address,サプライヤー住所
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',行{0}＃のアカウントタイプでなければなりません &quot;固定資産&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,出量
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
+apps/erpnext/erpnext/config/accounts.py +259,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,金融サービス
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},属性 {0} の値は、{3}の単位で {1} から {2}の範囲内でなければなりません
@@ -2819,10 +2900,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,貸方
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
 DocType: Tax Rule,Billing State,請求状況
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,移転
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,移転
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,期日は必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
 DocType: Journal Entry,Pay To / Recd From,支払先／受領元
 DocType: Naming Series,Setup Series,シリーズ設定
@@ -2842,20 +2923,22 @@
 DocType: GL Entry,Remarks,備考
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
 DocType: Journal Entry,Write Off Based On,償却基準
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,サプライヤーの電子メールを送ります
 DocType: Features Setup,POS View,POS表示
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,シリアル番号の設置レコード
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,次の日の昼と等しくなければならない月の日に繰り返し
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,次の日の昼と等しくなければならない月の日に繰り返し
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,指定してください
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,上記
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,タイムログは銘打たれています
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),暫定損益（貸方）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},会社{1}のデフォルト値{0}を設定してください
@@ -2865,12 +2948,13 @@
 ,Monthly Attendance Sheet,月次勤務表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,レコードが見つかりません
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,してください[設定]&gt; [ナンバリングシリーズを経由して出席するための設定採番シリーズ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,製品バンドルからアイテムを取得します。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,製品バンドルからアイテムを取得します。
+DocType: Asset,Straight Line,直線
+DocType: Project User,Project User,プロジェクトユーザー
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
 DocType: Features Setup,Sales Discounts,販売割引
@@ -2884,39 +2968,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,注文数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,製品リストの一番上に表示されるHTML／バナー
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,出荷数量を算出する条件を指定
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,子を追加
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,始値
 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,販売手数料
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,販売手数料
 DocType: Offer Letter Term,Value / Description,値／説明
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：アセット{1}提出することができない、それはすでに{2}
 DocType: Tax Rule,Billing Country,請求先の国
 ,Customers Not Buying Since Long Time,長期間受注の無い顧客
 DocType: Production Order,Expected Delivery Date,配送予定日
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,交際費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,交際費
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,休暇申請
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,訴訟費用
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,訴訟費用
 DocType: Sales Invoice,Posting Time,投稿時間
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,電話代
 DocType: Sales Partner,Logo,ロゴ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},シリアル番号{0}のアイテムはありません
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,オープン通知
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接経費
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,直接経費
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;は通知\メールアドレス」で無効なメールアドレスです
 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,旅費交通費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
@@ -2933,7 +3018,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),総請求金額（時間ログ経由）
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,このアイテムを売る
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,サプライヤーID
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量は、0より大きくなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,量は、0より大きくなければなりません
 DocType: Journal Entry,Cash Entry,現金エントリー
 DocType: Sales Partner,Contact Desc,連絡先説明
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",休暇の種類（欠勤・病欠など）
@@ -2944,11 +3029,12 @@
 DocType: Production Order,Total Operating Cost,営業費合計
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,全ての連絡先。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,資産{0}のサプライヤは、購買請求書にサプライヤと一致していません。
 DocType: Newsletter,Test Email Id,テスト用メールアドレス
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,原材料は、メインアイテムと同じにすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,給与テンプレートマスター
@@ -2964,12 +3050,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,優先請求先住所
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,課金通貨はデフォルトのcomapanyの通貨やパーティーのpaybleアカウントの通貨のどちらかに等しくなければなりません
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",無効にした場合、フィールドの言葉で &#39;は任意のトランザクションに表示されません
@@ -2979,13 +3066,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,この時間ログバッチはキャンセルされました
 ,Reqd By Date,要求済日付
 DocType: Salary Slip Earning,Salary Slip Earning,給与支給明細
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,債権者
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,債権者
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,行＃{0}：シリアル番号は必須です
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
 ,Item-wise Price List Rate,アイテムごとの価格表単価
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,送料を追加するためのルール
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
@@ -3005,15 +3092,14 @@
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Hub Settings,Name Token,名前トークン
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},納品書{1}に対する{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,デフォルトの単位を入力してください
-DocType: Project,Project Name,プロジェクト名
+DocType: Request for Quotation 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,アイテムバッチ番号
@@ -3044,6 +3130,7 @@
 DocType: Sales Invoice,End Date,終了日
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,株式取引
 DocType: Employee,Internal Work History,内部作業履歴
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,減価償却累計額の金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,未公開株式
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
@@ -3051,7 +3138,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",それはあなたの会社の住所であるとして同社は、必須です
 DocType: Item Attribute,From Range,範囲開始
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,アイテム{0}は在庫アイテムではないので無視されます
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,この製造指示書を提出して次の処理へ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,この製造指示書を提出して次の処理へ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",特定の処理／取引で価格設定ルールを適用させないようにするために、全てに適用可能な価格設定ルールを無効にする必要があります。
 DocType: Company,Domain,ドメイン
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ジョブズ
@@ -3063,6 +3150,7 @@
 DocType: Time Log,Additional Cost,追加費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),無給休暇（LWP）の所得減
@@ -3079,6 +3167,7 @@
 DocType: Sales Order,Delivery Date,納期
 DocType: Opportunity,Opportunity Date,機会日付
 DocType: Purchase Receipt,Return Against Purchase Receipt,領収書に対する返品
+DocType: Request for Quotation Item,Request for Quotation Item,見積明細の要求
 DocType: Purchase Order,To Bill,請求先
 DocType: Material Request,% Ordered,％注文済
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,出来高制
@@ -3093,11 +3182,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
 DocType: Accounts Settings,Accounts Settings,アカウント設定
 DocType: Customer,Sales Partner and Commission,販売パートナーと手数料
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},当社では「資産処分アカウント &#39;を設定してください{0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,仮勘定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Account,Auditor,監査人
@@ -3106,21 +3196,22 @@
 DocType: Pricing Rule,Disable,無効にする
 DocType: Project Task,Pending Review,レビュー待ち
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,お支払いには、ここをクリックして
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}",それは既にあるようアセット{0}は、廃棄することはできません。{1}
 DocType: Task,Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,顧客ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,マーク不在
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,終了時間は開始時間より大きくなければなりません
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,受注{0}は提出されていません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,から項目を追加します。
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,から項目を追加します。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：親口座{1}は会社{2}に属していません
 DocType: BOM,Last Purchase Rate,最新の仕入料金
 DocType: Account,Asset,資産
 DocType: Project Task,Task ID,タスクID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",例「MC」
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,バリエーションを有しているのでアイテム{0}の在庫は存在させることができません
 ,Sales Person-wise Transaction Summary,各営業担当者の取引概要
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,倉庫{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,選択した項目はバッチを持てません
@@ -3135,6 +3226,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,品質管理
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,{0}の項目が無効になっています
 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,従業員の職歴
@@ -3146,7 +3238,7 @@
 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,次の連絡先
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,セットアップゲートウェイアカウント。
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,セットアップゲートウェイアカウント。
 DocType: Employee,Employment Type,雇用の種類
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資産
 ,Cash Flow,現金流量
@@ -3160,7 +3252,7 @@
 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 +132,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,総勘定元帳のとおり銀行取引明細書の残高
 DocType: Job Applicant,Applicant Name,申請者名
 DocType: Authorization Rule,Customer / Item Name,顧客／アイテム名
@@ -3176,19 +3268,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,販売取引のデフォルト設定
 DocType: BOM Replace Tool,Current BOM,現在の部品表
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,シリアル番号を追加
 apps/erpnext/erpnext/config/support.py +43,Warranty,保証
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,印刷と固定化
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,グループノード
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,完成品更新
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,完成品更新
 DocType: Workstation,per hour,毎時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購買
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫（継続記録）のアカウントは、このアカウントの下に作成されます。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,支払額
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
@@ -3218,7 +3309,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません（もしかして：{0}）
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
 DocType: Leave Block List,Applies to Company,会社に適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
 DocType: Purchase Invoice,In Words,文字表記
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,今日は {0} の誕生日です！
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫への資材要求
@@ -3231,9 +3322,11 @@
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,参加します
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
+DocType: Pricing Rule,Margin Rate or Amount,マージン率や金額
 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,受注項目
@@ -3243,7 +3336,7 @@
 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 +782,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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}はすでに受領されています
@@ -3251,14 +3344,13 @@
 DocType: Customer,Sales Team Details,営業チームの詳細
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潜在的販売機会
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},無効な{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,デパート
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,先に文書を保存してください
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,先に文書を保存してください
 DocType: Account,Chargeable,請求可能
 DocType: Company,Change Abbreviation,略語を変更
 DocType: Expense Claim Detail,Expense Date,経費日付
@@ -3276,14 +3368,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,総勘定元帳
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,リードを表示
 DocType: Item Attribute Value,Attribute Value,属性値
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",メールアドレスは重複できません。すでに{0}に存在しています
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",メールアドレスは重複できません。すでに{0}に存在しています
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,{0}を選択してください
 DocType: Features Setup,To get Item Group in details table,詳細テーブルのアイテムグループを取得する
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},従業員のデフォルト休日リストを設定してください{0}または当社{0}
 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>
@@ -3315,23 +3408,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},メンテナンス予定{0}が {0}に対して存在しています
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},メンテナンス予定{0}が {0}に対して存在しています
 DocType: Stock Entry Detail,Actual Qty (at source/target),実際の数量（ソース/ターゲットで）
 DocType: Item Customer Detail,Ref Code,参照コード
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,従業員レコード
 DocType: Payment Gateway,Payment Gateway,ペイメントゲートウェイ
 DocType: HR Settings,Payroll Settings,給与計算の設定
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,注文する
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ルートには親コストセンターを指定できません
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ブランドを選択してください...
 DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,倉庫は必須です
 DocType: Supplier,Address and Contacts,住所・連絡先
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,課題解決者
@@ -3349,7 +3442,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,取引通貨は、ペイメントゲートウェイ通貨と同じでなければなりません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,受信
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,受信
 DocType: Maintenance Visit,Fully Completed,全て完了
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完了
 DocType: Employee,Educational Qualification,学歴
@@ -3357,14 +3450,14 @@
 DocType: Purchase Invoice,Submit on creation,作成時に提出
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,自分の注文
@@ -3385,10 +3478,10 @@
 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,メッセージを入力してください
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,POSプロフィール
+apps/erpnext/erpnext/config/accounts.py +258,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}は請求済です
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無担保ローン
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,無担保ローン
 DocType: Cost Center,Cost Center Name,コストセンター名
 DocType: Maintenance Schedule Detail,Scheduled Date,スケジュール日付
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,支出額合計
@@ -3400,11 +3493,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}がアクティブです。ステータスを「非アクティブ」にして続行してください。
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,サプライヤー型番
 DocType: Purchase Invoice,Contact,連絡先
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,から受け取りました
 DocType: Features Setup,Exports,エクスポート
@@ -3413,12 +3507,12 @@
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}： {1}のための{0}から
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ウェブサイトのイメージ{0}アイテムに添付{1}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,ウェブサイトのイメージ{0}アイテムに添付{1}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
@@ -3427,7 +3521,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,勘定科目
@@ -3440,7 +3534,7 @@
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,在庫資産
@@ -3454,15 +3548,15 @@
 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 +576,Item {0} is disabled,項目{0}が無効になっています
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,プロジェクト活動／タスク
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,給与明細を生成
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,毎月繰り返し
@@ -3482,8 +3576,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,年の開始日や終了日は、{0}と重なっています。会社を設定してください避けるために、
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新しいニュースレター
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例：ABCD #####
 取引にシリーズが設定されかつシリアル番号が記載されていない場合、自動シリアル番号は、このシリーズに基づいて作成されます。
@@ -3496,11 +3591,11 @@
 ,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 +91,Please enter default currency in Company Master,会社マスターにデフォルトの通貨を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},{0}と税ルールが衝突しています
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,新しいアカウント名
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,顧客サービス
@@ -3510,11 +3605,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,雇用候補者
 DocType: Notification Control,Prompt for Email on Submission of,提出するメールの指定
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,総割り当てられた葉は期間中の日数以上のもの
+DocType: Pricing Rule,Percentage,パーセンテージ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,デフォルト作業中倉庫
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,会計処理のデフォルト設定。
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,会計処理のデフォルト設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,アイテム{0}は販売アイテムでなければなりません
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,アイテム{0}は販売アイテムでなければなりません
 DocType: Naming Series,Update Series Number,シリーズ番号更新
 DocType: Account,Equity,株式
 DocType: Sales Order,Printing Details,印刷詳細
@@ -3522,11 +3618,12 @@
 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,組立部品を検索
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
 DocType: Sales Partner,Partner Type,パートナーの種類
 DocType: Purchase Taxes and Charges,Actual,実際
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
 DocType: Purchase Invoice,Against Expense Account,対経費
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",適切なグループファンド&gt;流動負債&gt;税金や関税の（通常はソースに移動し、新しいアカウントを作成します（子の追加クリックすることにより）タイプ「税」の税率に言及しません。
 DocType: Production Order,Production Order,製造指示
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
 DocType: Quotation Item,Against Docname,文書名に対して
@@ -3545,18 +3642,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,照合完了
 DocType: Production Order,Planned End Date,計画終了日
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,アイテムが保存される場所
 DocType: Tax Rule,Validity,正当性
+DocType: Request for Quotation,Supplier Detail,サプライヤーの詳細
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,請求された額
 DocType: Attendance,Attendance,出勤
 apps/erpnext/erpnext/config/projects.py +55,Reports,レポート
 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 +508,Posting date and posting time is mandatory,転記日時は必須です
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,購入取引用の税のテンプレート
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,購入取引用の税のテンプレート
 ,Item Prices,アイテム価格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,発注を保存すると表示される表記内。
 DocType: Period Closing Voucher,Period Closing Voucher,決算伝票
@@ -3566,10 +3664,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,差引計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,支払ツールを使用する権限がありません
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,変更
@@ -3577,6 +3675,7 @@
 DocType: Appraisal Goal,Score Earned,スコア獲得
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
+DocType: Asset Category,Asset Category Name,資産カテゴリ名
 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,総重量数量単位
@@ -3588,13 +3687,13 @@
 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 +559,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,バッチ
@@ -3608,7 +3707,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,営業担当
 DocType: Sales Invoice,Cold Calling,コールドコール（リードを育成せずに電話営業）
 DocType: SMS Parameter,SMS Parameter,SMSパラメータ
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,予算とコストセンター
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,予算とコストセンター
 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.,値に基づいて取引を制限するルールを作成
@@ -3639,9 +3738,9 @@
 DocType: Purchase Common,Purchase Common,仕入（共通）
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,サプライヤー見積{0}を作成
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
@@ -3649,7 +3748,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,顧客あて請求
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,親勘定
@@ -3665,7 +3764,7 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
 DocType: Address,Office,事務所
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
@@ -3680,6 +3779,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,バッチ目録
 DocType: Employee,Contract End Date,契約終了日
 DocType: Sales Order,Track this Sales Order against any Project,任意のプロジェクトに対して、この受注を追跡します
+DocType: Sales Invoice Item,Discount and Margin,ディスカウントとマージン
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,上記の基準に基づいて（配送するために保留中の）受注を取り込む
 DocType: Deduction Type,Deduction Type,控除の種類
 DocType: Attendance,Half Day,半日
@@ -3700,7 +3800,7 @@
 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}と債権又は債務のアカウントを選択してください。
+apps/erpnext/erpnext/accounts/party.py +234,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,月給登録
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
 DocType: BOM Operation,BOM Operation,部品表の操作
@@ -3708,22 +3808,23 @@
 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プロフィール
 DocType: Payment Gateway Account,Payment URL Message,ペイメントURLメッセージ
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：支払金額は残高を超えることはできません
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,未払合計
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,時間ログは請求できません
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
+DocType: Asset,Asset Category,資産カテゴリー
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,伝票を入力してください
 DocType: SMS Settings,Static Parameters,静的パラメータ
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,サプライヤーへの材質
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,サプライヤーへの材質
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,消費税の請求書
 DocType: Expense Claim,Employees Email Id,従業員メールアドレス
 DocType: Employee Attendance Tool,Marked Attendance,マークされた出席
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,流動負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,流動負債
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,実際の数量は必須です
@@ -3744,17 +3845,16 @@
 DocType: Item Attribute,Numeric Values,数値
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,ロゴを添付
 DocType: Customer,Commission Rate,手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,部門別休暇申請
 apps/erpnext/erpnext/config/stock.py +201,Analytics,分析論
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,カートは空です
 DocType: Production Order,Actual Operating Cost,実際の営業費用
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。 [設定]&gt; [印刷とブランディング&gt;アドレステンプレートから新しいものを作成してください。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,株式資本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,株式資本
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
 DocType: Payment Gateway Account,Payment Gateway Account,ペイメントゲートウェイアカウント
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支払い完了後、選択したページにユーザーをリダイレクトします。
@@ -3763,20 +3863,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
+DocType: Asset,Current Value (After Depreciation),現在値（減価償却後）
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,上記の表に受注を入力してください。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,上記の表に受注を入力してください。
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,部品表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,参照日付
@@ -3784,6 +3885,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,アカウント{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,アカウント{0}は存在しません
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index c577d10..472a30b 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,អ្នកចែកបៀ
 DocType: Employee,Rented,ជួល
 DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,តើអ្នកពិតជាចង់លុបចោលទ្រព្យសម្បត្តិនេះ?
 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.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,ដើមឈើ {0}
 DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
 DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,បង្ហាញតែការបើកចំហ
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាការប្រាក់ត្រូវតែមានដូចគ្នា {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,ចាកចេញកម្មវិធីថ្មី
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,បរិមាណដែលត្រូវទទួលទាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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,ការរចនា
@@ -64,7 +66,7 @@
 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 +642,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារជាតិ
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},ថ្មី {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},ថ្មី {0}: # {1}
 ,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
 DocType: Payment Request,Payment Request,ស្នើសុំការទូទាត់
@@ -102,7 +104,7 @@
 DocType: Employee,Married,រៀបការជាមួយ
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,ទទួលបានធាតុពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,គោលដៅនៅលើ
 DocType: BOM,Total Cost,ការចំណាយសរុប
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,កំណត់ហេតុសកម្មភាព:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
+DocType: Item,Is Fixed Asset,ជាទ្រព្យថេរ
 DocType: Expense Claim Detail,Claim Amount,ចំនួនពាក្យបណ្តឹង
 DocType: Employee,Mr,លោក
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
@@ -156,7 +159,8 @@
 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,ការចំណាយភាគហ៊ុន
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} ជាកក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,ការចំណាយភាគហ៊ុន
 DocType: Newsletter,Email Sent?,អ៊ីម៉ែល?
 DocType: Journal Entry,Contra Entry,ចូល contra
 DocType: Production Order Operation,Show Time Logs,បង្ហាញកំណត់ហេតុម៉ោង
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,ស្ថានភាពនៃការដំឡើង
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,ធាតុ {0} ត្រូវតែជាធាតុទិញ
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: BOM Replace Tool,New BOM,Bom ដែលថ្មី
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
 DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},កើតឡើងបន្ទាប់ {0} នឹងត្រូវបានបង្កើតនៅលើ {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},កើតឡើងបន្ទាប់ {0} នឹងត្រូវបានបង្កើតនៅលើ {1}
 DocType: Newsletter List,Total Subscribers,អតិថិជនសរុប
 ,Contact Name,ឈ្មោះទំនាក់ទំនង
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
 DocType: Payment Tool,Reference No,សេចក្តីយោងគ្មាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,ធាតុធនាគារ
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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;វត្ថុធាតុដើមការី &quot;តារាងក្នុងការទិញលំដាប់ {1}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,សេចក្តីជូនដំណឹងស្តីពីការត្រួតពិនិត្យ
 DocType: Lead,Suggestions,ការផ្តល់យោបល់
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ធាតុសំណុំថវិកាគ្រុបប្រាជ្ញានៅលើទឹកដីនេះ។ អ្នកក៏អាចរួមបញ្ចូលរដូវកាលដោយការកំណត់ការចែកចាយនេះ។
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},សូមបញ្ចូលក្រុមឪពុកម្តាយសម្រាប់ឃ្លាំងគណនី {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},សូមបញ្ចូលក្រុមឪពុកម្តាយសម្រាប់ឃ្លាំងគណនី {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ការទូទាត់ប្រឆាំងនឹង {0} {1} មិនអាចត្រូវបានធំជាងឆ្នើមចំនួន {2}
 DocType: Supplier,Address HTML,អាសយដ្ឋានរបស់ HTML
 DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,អតិបរមា 5 តួអក្សរ
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
 apps/erpnext/erpnext/config/desktop.py +83,Learn,រៀន
+DocType: Asset,Next Depreciation Date,រំលស់បន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},ក្រុមហ៊ុនផ្គត់ផ្គង់មានក្នុងវិក័យប័ត្រគ្មានវិក័យប័ត្រទិញ {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
 DocType: Job Applicant,Cover Letter,លិខិត
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,មូលប្បទានប័ត្រឆ្នើមនិងប្រាក់បញ្ញើដើម្បីជម្រះ
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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.,នៅក្នុងពាក្យ (នាំចេញ) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} គ្រឿង [{1}] (# សំណុំបែបបទ / ធាតុ / {1}) រកឃើញនៅក្នុង [{2}] (# សំណុំបែបបទ / ឃ្លាំង / {2})
 DocType: Lead,Industry,វិស័យឧស្សាហកម្ម
 DocType: Employee,Job Profile,ទម្រង់ការងារ
 DocType: 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,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,សូមជ្រើសខែនិងឆ្នាំ
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},សៀរៀល {0} គ្មានមិនមែនជាកម្មសិទ្ធិរបស់ដឹកជញ្ជូនចំណាំ {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ធាតុគុណភាពអធិការកិច្ចប៉ារ៉ាម៉ែត្រ
 DocType: Leave Application,Leave Approver Name,ទុកឱ្យឈ្មោះការអនុម័ត
-,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
+DocType: Depreciation Schedule,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
 DocType: Packed Item,Packed Item,ធាតុ packed
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,ការកំណត់លំនាំដើមសម្រាប់ការទិញប្រតិបត្តិការ។
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,ការកំណត់លំនាំដើមសម្រាប់ការទិញប្រតិបត្តិការ។
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},សកម្មភាពមានសម្រាប់ការចំណាយបុគ្គលិក {0} ប្រឆាំងនឹងប្រភេទសកម្មភាព - {1}
 apps/erpnext/erpnext/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,ការផ្លាស់ប្តូររូបិយវត្ថុ
@@ -346,6 +353,7 @@
 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: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
 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.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
 DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
 DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
-DocType: Material Request Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
+DocType: Request for Quotation Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
 DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,សារសម្រាប់ផ្គត់ផ្គង់
 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,គ្មានប្រាក់ខែ
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 ,Serial No Warranty Expiry,គ្មានផុតកំណត់ការធានាសៀរៀល
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
 DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
+DocType: Project,Project will be accessible on the website to these users,គម្រោងនឹងត្រូវបានចូលដំណើរការបាននៅលើគេហទំព័រទាំងនេះដល់អ្នកប្រើ
 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 +53,Account {0} does not belong to company: {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ធាតុ {0} គឺមិនត្រូវទិញរបស់របរ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,ធាតុ {0} គឺមិនត្រូវទិញរបស់របរ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,ដំណើ Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
 DocType: Pricing Rule,Valid From,មានសុពលភាពពី
 DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
 DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,តម្លៃបង្គរ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
 DocType: Warranty Claim,Resolution,ការដោះស្រាយ
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},បញ្ជូន: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,គណនីត្រូវបង់
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,ឯកសារភ្ជាប់ប្រវត្តិរូប
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
 DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,ត្រឡប់មកវិញការលក់
 DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,សមាសភាគប្រាក់បៀវត្ស។
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជនសក្តានុពល។
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,មួយឃ្លាំងសមប្រឆាំងនឹងធាតុដែលភាគហ៊ុនត្រូវបានធ្វើឡើង។
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,ថ្នាក់អនុបណ្ឌិត
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,កាលបរិច្ឆេទប្រតិបត្តិការធនាគារធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,កាលបរិច្ឆេទប្រតិបត្តិការធនាគារធ្វើឱ្យទាន់សម័យ
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,តាមដានពេលវេលា
 DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
 DocType: Packing Slip Item,DN Detail,ពត៌មានលំអិត DN
@@ -517,27 +527,27 @@
 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,អត្រាផ្សារលំនាំដើម
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,កាលវិភាគថែទាំ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធីគ្រប់គ្រង
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,ការដោះស្រាយកាលបរិច្ឆេទ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,សូមកំណត់បញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់ទាំងបុគ្គលិកឬក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
 DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
+DocType: Depreciation Schedule,Depreciation Amount,ចំនួនទឹកប្រាក់រំលស់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,ថ្ងៃថេរ
 DocType: Quotation Item,Item Balance,តុល្យភាពធាតុ
 DocType: Sales Invoice,Packing List,បញ្ជីវេចខ្ចប់
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ការបញ្ជាទិញដែលបានផ្ដល់ទៅឱ្យអ្នកផ្គត់ផ្គង់។
+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,ប្រើប្រាស់
@@ -552,8 +562,10 @@
 DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
 DocType: Pricing Rule,Sales Manager,ប្រធានផ្នែកលក់
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,ក្រុមដើម្បីគ្រុប
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,គម្រោងរបស់យើង
 DocType: Journal Entry,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
 DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
+DocType: Company,Gain/Loss Account on Asset Disposal,គណនីកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
 DocType: Purchase Invoice,Quarterly,ប្រចាំត្រីមាស
 DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
 DocType: Sales Order Item,Basic Rate (Company Currency),អត្រាការប្រាក់មូលដ្ឋាន (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -565,13 +577,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,វិក័យប័ត្រសរុបនៅឆ្នាំនេះ
 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 +529,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទដើមឈើ
@@ -594,6 +607,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Mode of Payment Account,Default Account,គណនីលំនាំដើម
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
 ,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
@@ -608,14 +622,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
 DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},មានកំហុសក្នុងការអាសយដ្ឋានទំព័រគំរូរបស់អ្នកគឺ {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,គណនីថ្មី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,គណនីថ្មី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព។ វិធានតម្លៃ: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព។ វិធានតម្លៃ: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
 DocType: Opportunity,Maintenance,ការថែរក្សា
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},លេខបង្កាន់ដៃទិញបានទាមទារសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},លេខបង្កាន់ដៃទិញបានទាមទារសម្រាប់ធាតុ {0}
 DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -644,17 +658,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ធាតុទិនានុប្បវត្តិ {0} ត្រូវបានផ្សារភ្ជាប់នឹងដីកាសម្រេច {1}, ពិនិត្យមើលថាតើវាគួរតែត្រូវបានដកមុននៅក្នុងវិក័យប័ត្រដែលជានេះ។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។
 DocType: Company,Default Cost of Goods Sold Account,តម្លៃលំនាំដើមនៃគណនីទំនិញលក់
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Process Payroll,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {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",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
@@ -662,7 +676,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Supplier Quotation,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
@@ -671,10 +686,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើឥឡូវ
 ,Support Analytics,ការគាំទ្រវិភាគ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,កំហុសឡូជីខល: ត្រូវបានរកឃើញត្រួតស៊ីគ្នា
 DocType: Item,Website Warehouse,វេបសាយឃ្លាំង
 DocType: Payment Reconciliation,Minimum Invoice Amount,ចំនួនវិក័យប័ត្រអប្បបរមា
 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 +267,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
 DocType: Email Digest,Email Digest Settings,ការកំណត់សង្ខេបអ៊ីម៉ែល
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ការគាំទ្រសំណួរពីអតិថិជន។
@@ -698,7 +714,7 @@
 DocType: Quotation Item,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
 DocType: Newsletter,Newsletter Manager,កម្មវិធីគ្រប់គ្រងព្រឹត្តិប័ត្រព័ត៌មាន
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ការចំណាយ
@@ -735,14 +751,15 @@
 DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
 DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,មើលអតិថិជន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,បង្កាន់ដៃទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,បង្កាន់ដៃទិញ
 ,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 DocType: Employee,Ms,លោកស្រី
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,ដៃគូការលក់និងទឹកដី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
+DocType: Journal Entry,Depreciation Entry,ចូលរំលស់
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,រទេះទៅ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
@@ -761,7 +778,7 @@
 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 +524,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
 DocType: Address,Shop,ហាងលក់
@@ -771,10 +788,10 @@
 DocType: Employee,Permanent Address Is,អាសយដ្ឋានគឺជាអចិន្រ្តៃយ៍
 DocType: Production Order Operation,Operation completed for how many finished goods?,ប្រតិបត្ដិការបានបញ្ចប់សម្រាប់ទំនិញដែលបានបញ្ចប់តើមានមនុស្សប៉ុន្មាន?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ម៉ាកនេះ
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,អនុញ្ញាតឱ្យមានឥទ្ធិពលមិន {0} បានឆ្លងកាត់សម្រាប់ធាតុ {1} ។
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,អនុញ្ញាតឱ្យមានឥទ្ធិពលមិន {0} បានឆ្លងកាត់សម្រាប់ធាតុ {1} ។
 DocType: Employee,Exit Interview Details,ពត៌មានលំអិតចេញពីការសម្ភាសន៍
 DocType: Item,Is Purchase Item,តើមានធាតុទិញ
-DocType: Journal Entry Account,Purchase Invoice,ការទិញវិក័យប័ត្រ
+DocType: Asset,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,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
@@ -784,21 +801,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;តារាង។"
 DocType: Job Opening,Publish on website,បោះពុម្ពផ្សាយនៅលើគេហទំព័រ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ការនាំចេញទៅកាន់អតិថិជន។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,វិក័យប័ត្រក្រុមហ៊ុនផ្គត់ផ្គង់កាលបរិច្ឆេទមិនអាចច្រើនជាងកាលបរិច្ឆេទប្រកាស
 DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ចំណូលប្រយោល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
 DocType: Purchase Invoice,Additional Discount Percentage,ការបញ្ចុះតម្លៃបន្ថែមទៀតភាគរយ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាតឱ្យអ្នកប្រើដើម្បីកែសម្រួលអត្រាតំលៃបញ្ជីនៅក្នុងប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",ជួរដេក {0}: វិក័យប័ត្រ {1} មិនត្រឹមត្រូវវាអាចនឹងត្រូវបានលុបចោល / មិនមានទេ។ \ សូមបញ្ចូលវិក័យប័ត្រដែលមានសុពលភាព
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
@@ -807,14 +827,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
 ,Employee Holiday Attendance,បុគ្គលិកវត្តមានថ្ងៃឈប់សម្រាក
 DocType: Opportunity,Walk In,ដើរក្នុង
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ធាតុភាគហ៊ុន
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,ធាតុភាគហ៊ុន
 DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរប្រាក់
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
@@ -824,7 +844,8 @@
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
 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 +180,Qty for {0},qty សម្រាប់ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
+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 +80,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
 DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
@@ -837,7 +858,7 @@
 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 +547,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,បញ្ចុះតំលៃ
@@ -852,20 +873,21 @@
 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 +69,Selling Amount,ចំនួនលក់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,ម៉ោងកំណត់ហេតុ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,ម៉ោងកំណត់ហេតុ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,បញ្ហា
+DocType: Asset,Scrapped,បោះបង់ចោល
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,គណនីមិនត្រូវគ្នាជាមួយក្រុមហ៊ុន
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ការជ្រើសរើសបុគ្គលិក
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,ចំណាយការលក់
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,ទិញស្ដង់ដារ
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
@@ -882,7 +904,7 @@
 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 +18,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
+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,អាយុជាមធ្យម
@@ -891,7 +913,7 @@
 DocType: Company,Default Currency,រូបិយប័ណ្ណលំនាំដើម
 DocType: Contact,Enter designation of this Contact,បញ្ចូលការរចនានៃទំនាក់ទំនងនេះ
 DocType: Expense Claim,From Employee,ពីបុគ្គលិក
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,គន្លឹះការសម្តែងតំបន់
@@ -899,7 +921,7 @@
 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 +130,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ពត៌មានវិក័យប័ត្ររបស់ C-សំណុំបែបបទ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការទូទាត់វិក័យប័ត្រផ្សះផ្សានិងយុត្តិធម៌
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,ការចូលរួមចំណែក%
@@ -908,22 +930,23 @@
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ផលិតកម្មលំដាប់ {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,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,លំនាំដើមជាសកល
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
 DocType: Salary Slip,Deductions,ការកាត់
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានផ្សព្វផ្សាយ។
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
 DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,ធាតុបានបញ្ចប់ {0} អាចត្រូវបានបញ្ចូលសម្រាប់ធាតុប្រភេទការផលិត
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,បើកសមតុល្យគណនី
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 +45,Types of activities for Time Sheets,ប្រភេទនៃសកម្មភាពសម្រាប់សន្លឹកម៉ោង
@@ -934,18 +957,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែល
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែល
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {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},ប្រវត្តិម៉ាស៊ីនឆូតកាត {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់អ្នកប្រើ: {1} និងក្រុមហ៊ុន {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
 DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
 DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,ពន្ធនិងការកាត់ប្រាក់ខែផ្សេងទៀត។
 DocType: Lead,Lead,ការនាំមុខ
 DocType: Email Digest,Payables,បង់
@@ -959,6 +982,7 @@
 DocType: Holiday,Holiday,ថ្ងៃឈប់សម្រាក
 DocType: Leave Control Panel,Leave blank if considered for all branches,ទុកទទេប្រសិនបើអ្នកចាត់ទុកថាជាសាខាទាំងអស់
 ,Daily Time Log Summary,ជារៀងរាល់ថ្ងៃពេលវេលាកំណត់ហេតុសង្ខេប
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C ទម្រង់គឺអាចអនុវត្តបានសម្រាប់វិក័យប័ត្រ: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,ពត៌មានលំអិតការទូទាត់ Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
 DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
@@ -972,19 +996,20 @@
 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,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,មើលសៀវភៅ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,មើលសៀវភៅ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភបង់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,ប្រាក់ចំណូលរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
 DocType: BOM Item,Item Description,ធាតុការពិពណ៌នាសង្ខេប
 DocType: Payment Tool,Payment Mode,របៀបទូទាត់ប្រាក់
 DocType: Purchase Invoice,Is Recurring,តើការកើតឡើង
@@ -992,7 +1017,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
 ,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុនៅក្នុងជួរដេក {0}
@@ -1007,8 +1032,8 @@
 ,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 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 +165,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ខ្នាតតូច
@@ -1016,7 +1041,7 @@
 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),ចំនួន 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,ប្រធានគណនី {0} បង្កើតឡើង
 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,សរុបសម្រេច
@@ -1024,12 +1049,12 @@
 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 +493,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,ការចំណាយដោយប្រយោល
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ជួរដេក {0}: Qty គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 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,ឃ្លាំងពត៌មានទំនាក់ទំនង
@@ -1039,19 +1064,20 @@
 DocType: Serial No,Serial No Details,គ្មានព័ត៌មានលំអិតសៀរៀល
 DocType: Purchase Invoice Item,Item Tax Rate,អត្រាអាករធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
 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},ស្ថានភាពលំដាប់ផលិតកម្មគឺ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,សម្រាប់ផ្គត់ផ្គង់
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
 DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},មិនបានរកឃើញធាតុណាមួយហៅថា {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ចេញសរុប
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",មានតែអាចជាលក្ខខណ្ឌមួយដែលមានការដឹកជញ្ជូនវិធាន 0 ឬតម្លៃវានៅទទេសម្រាប់ &quot;ឱ្យតម្លៃ&quot;
 DocType: Authorization Rule,Transaction,ប្រតិបត្តិការ
@@ -1059,10 +1085,10 @@
 DocType: Item,Website Item Groups,ក្រុមធាតុវេបសាយ
 DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,លេខសម្គាល់ {0} បានចូលច្រើនជាងមួយដង
-DocType: Journal Entry,Journal Entry,ធាតុទិនានុប្បវត្តិ
+DocType: Depreciation Schedule,Journal Entry,ធាតុទិនានុប្បវត្តិ
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
 DocType: Salary Slip,Bank Account No.,លេខគណនីធនាគារ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,នេះជាចំនួននៃការប្រតិបត្តិការបង្កើតចុងក្រោយជាមួយបុព្វបទនេះ
@@ -1071,6 +1097,7 @@
 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;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធនិងការចោទប្រកាន់ពីការគណនា
 DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,សំណើរសម្រាប់ការផ្គត់ផ្គង់សម្រង់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែករឹង
 DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
@@ -1081,6 +1108,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,គោលដៅវាយតម្លៃទំព័រគំរូ
 DocType: Salary Slip,Earning,រកប្រាក់ចំណូល
 DocType: Payment Tool,Party Account Currency,គណបក្សគណនីរូបិយប័ណ្ណ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},តម្លៃនាពេលបច្ចុប្បន្នបន្ទាប់ពីការរំលស់ត្រូវតែតិចជាងស្មើទៅនឹង {0}
 ,BOM Browser,កម្មវិធីរុករក Bom
 DocType: Purchase Taxes and Charges,Add or Deduct,បន្ថែមឬកាត់កង
 DocType: Company,If Yearly Budget Exceeded (for expense account),ប្រសិនបើមានថវិកាប្រចាំឆ្នាំលើសពី (សម្រាប់គណនីដែលការចំណាយ)
@@ -1095,21 +1123,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},រូបិយប័ណ្ណនៃគណនីបិទត្រូវតែជា {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ផលបូកនៃចំនួនពិន្ទុសម្រាប់ការគ្រាប់បាល់បញ្ចូលទីទាំងអស់គួរតែ 100. វាជា {0}
 DocType: Project,Start and End Dates,ចាប់ផ្តើមនិងបញ្ចប់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,ការរៀបចំលក្ខណៈពិសេស
+DocType: Asset,Depreciation Schedules,កាលវិភាគរំលស់
 DocType: Item,Is Service Item,តើមានធាតុសេវា
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
 DocType: Activity Cost,Projects,គម្រោងការ
 DocType: Payment Request,Transaction Currency,រូបិយប័ណ្ណប្រតិបត្តិការ
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ពី {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},ពី {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
 DocType: Item,Will also apply to variants,ក៏នឹងអនុវត្តទៅវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,យុទ្ធនាការឃោសនា
@@ -1123,8 +1152,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},អតិបរមា: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &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,សម្រាប់ក្រុមហ៊ុន
 apps/erpnext/erpnext/config/support.py +17,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
@@ -1132,8 +1161,8 @@
 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 +472,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,មិនអាចជាធំជាង 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
@@ -1154,11 +1183,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
 DocType: Rename Tool,Type of document to rename.,ប្រភេទនៃឯកសារដែលបានប្ដូរឈ្មោះ។
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,យើងទិញធាតុនេះ
 DocType: Address,Billing,វិក័យប័ត្រ
@@ -1168,12 +1197,15 @@
 DocType: Quality Inspection,Readings,អាន
 DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,សភាអនុ
+DocType: Asset,Asset Name,ឈ្មោះទ្រព្យសម្បត្តិ
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
 DocType: Supplier,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ការិយាល័យសំរាប់ជួល
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ការិយាល័យសំរាប់ជួល
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,សំណើរសុំឱ្យអាចមានសិទ្ធិចូលដំណើរការដកស្រង់ដោយចុចតំណខាងក្រោម
+DocType: Asset,Number of Months in a Period,ចំនួននៃខែនៅក្នុងរយៈពេលមួយ
 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,ស្ថានីយការងារការងារហួរ
@@ -1190,19 +1222,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,រដ្ឋាភិបាល
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,វ៉ារ្យ៉ង់ធាតុ
 DocType: Company,Services,ការផ្តល់សេវា
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),សរុប ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),សរុប ({0})
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
 DocType: Sales Invoice,Source,ប្រភព
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,បង្ហាញបានបិទ
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,កាលបរិច្ឆេទចាប់ផ្តើមក្នុងឆ្នាំហិរញ្ញវត្ថុ
 DocType: Employee External Work History,Total Experience,បទពិសោធន៍សរុប
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
 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 +86,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
 DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} មិនបានរកឃើញដែលត្រូវបានទាមទារដើម្បីកក់មានចំនួនធាតុ (ចំណាយ) ។ សូមនិយាយពីធាតុប្រឆាំងនឹងតម្លៃបញ្ជីតម្លៃទិញ។
@@ -1211,7 +1244,7 @@
 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.,សូមបង្កើតគណនីថ្មីមួយពីតារាងនៃគណនី។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,ថែទាំទស្សនកិច្ច
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,ថែទាំទស្សនកិច្ច
 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,ជំនួយការចំណាយបានចុះចត
@@ -1225,7 +1258,6 @@
 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 +196,Brand master.,ចៅហ្វាយម៉ាក។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
 DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
 DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,ប្រអប់
@@ -1253,7 +1285,7 @@
 DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
 apps/erpnext/erpnext/config/hr.py +131,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,បំណុលភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,បំណុលភាគហ៊ុន
 DocType: Purchase Receipt,Supplier Warehouse,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនងទូរស័ព្ទគ្មាន
 ,Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
@@ -1262,7 +1294,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,របាយការណ៍ផ្សេងទៀត
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,បញ្ឈប់ការរំលឹកខួបកំណើត
@@ -1272,26 +1304,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} មើល
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ការកាត់រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,មុនឆ្នាំហិរញ្ញវត្ថុមិនត្រូវបានបិទ
 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 +40,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 +38,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
 DocType: Purchase Invoice,Reference Document,ឯកសារជាឯកសារយោង
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,ការទិញការទទួល {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% បានបង់ប្រាក់
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",ការកំណត់សម្រាប់រទេះដើរទិញឥវ៉ាន់អនឡាញដូចជាវិធានការដឹកជញ្ជូនបញ្ជីតម្លៃល
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
@@ -1313,8 +1346,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីទូទាត់
 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 +129,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
 DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ត្រូវតែធំជាង 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,បណ្តឹងធានា
@@ -1332,7 +1366,7 @@
 DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ជំរុញបង់ប្រឆាំងនឹង {0} {1} មិនអាចច្រើន \ ជាងសរុប {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),កាត់បន្ថយការកាត់ស្នើសុំការអនុញ្ញាតដោយគ្មានប្រាក់ខែ (LWP)
 DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
 DocType: Packed Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
@@ -1342,15 +1376,15 @@
 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,ចំណាយទីផ្សារ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',កំណត់ហេតុពេលវេលាបាច់ {0} ត្រូវតែត្រូវបាន &quot;ផ្តល់ជូន&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',កំណត់ហេតុពេលវេលាបាច់ {0} ត្រូវតែត្រូវបាន &quot;ផ្តល់ជូន&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 +392,Warehouse required at Row No {0},ឃ្លាំងបានទាមទារនៅក្នុងជួរដេកគ្មាន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},ឃ្លាំងបានទាមទារនៅក្នុងជួរដេកគ្មាន {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,សូមបញ្ចូលឆ្នាំដែលមានសុពលភាពហិរញ្ញវត្ថុកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់
 DocType: Employee,Date Of Retirement,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍
 DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
@@ -1367,33 +1401,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
+DocType: Asset,Gross Purchase Amount,ចំនួនទឹកប្រាក់សរុបការទិញ
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",ឧទាហរណ៏ &quot;XYZ របស់ធនាគារជាតិ&quot;
+DocType: Asset,Depreciation Method,វិធីសាស្រ្តរំលស់
 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 +29,Shopping Cart is enabled,កន្រ្តកទំនិញត្រូវបានអនុញ្ញាត
 DocType: Job Applicant,Applicant for a Job,កម្មវិធីសម្រាប់ការងារ
 DocType: Production Plan Material Request,Production Plan Material Request,ផលិតកម្មសំណើសម្ភារៈផែនការ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,ដើមចម្បង
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
 DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
 DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
@@ -1401,31 +1437,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
 DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
 DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,អាសយដ្ឋាន
+apps/erpnext/erpnext/hooks.py +91,Addresses,អាសយដ្ឋាន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,វាយតម្ល្រ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},គ្មានបានចូលស្ទួនសៀរៀលសម្រាប់ធាតុ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,ធាតុមិនត្រូវបានអនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,ធាតុមិនត្រូវបានអនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល។
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាផលបូកនៃទម្ងន់សុទ្ធនៃធាតុ)
 DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
 DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,កំណត់ហេតុសម្រាប់ការផលិតវេលាម៉ោង។
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,កំណត់ហេតុពេលវេលាសម្រាប់ការងារ។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,ការទូទាត់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ម៉ាក
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
 DocType: Quotation Item,Actual Qty,ជាក់ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
@@ -1436,6 +1473,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,ធាតុ {0} គឺមិនមែនជាធាតុសៀរៀល
+DocType: Request for Quotation Supplier,Send Email to Supplier,ផ្ញើអ៊ីម៉ែលដើម្បីផ្គត់ផ្គង់
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
 DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
 DocType: Production Planning Tool,Material Requests,សំណើសម្ភារៈ
@@ -1453,7 +1491,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
 DocType: Stock Settings,Allowance Percent,ភាគរយសំវិធានធន
 DocType: SMS Settings,Message Parameter,ប៉ារ៉ាម៉ែត្រសារដែលបាន
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយហិរញ្ញវត្ថុ។
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយហិរញ្ញវត្ថុ។
 DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ទទួលបានធាតុពីបង្កាន់ដៃទិញ
 DocType: Serial No,Creation Date,កាលបរិច្ឆេទបង្កើត
@@ -1484,40 +1522,42 @@
 ,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ផលិតផលឬសេវាកម្ម
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} បង្កើតឡើង
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} បង្កើតឡើង
 DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,តារាងធាតុមិនអាចទទេ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ជួរដេក {0}: ដើម្បីកំណត់ {1} រយៈពេល, ភាពខុសគ្នារវាងពីនិងដើម្បីកាលបរិច្ឆេទ \ ត្រូវតែធំជាងឬស្មើទៅនឹង {2}"
 DocType: Pricing Rule,Selling,លក់
 DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,ការទូទាត់គណនី Gateway ដែលមិនត្រូវបានកំណត់រចនាសម្ព័ន្ធ
 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: Production Order,Material Request Item,ការស្នើសុំសម្ភារៈធាតុ
+DocType: Request for Quotation Item,Material Request Item,ការស្នើសុំសម្ភារៈធាតុ
 apps/erpnext/erpnext/config/stock.py +85,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,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
+DocType: Asset,Sold,លក់ចេញ
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
 DocType: Account,Frozen,ទឹកកក
 ,Open Production Orders,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
 DocType: Installation Note,Installation Time,ពេលដំឡើង
 DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,ការវិនិយោគ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,ការវិនិយោគ
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,តុល្យភាព
 DocType: Quality Inspection Reading,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,សូមបញ្ចូលសំណើសម្ភារៈនៅក្នុងតារាងខាងលើ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,សូមបញ្ចូលសំណើសម្ភារៈនៅក្នុងតារាងខាងលើ
 DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
 DocType: Item Group,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,ជាក្រុម
@@ -1525,6 +1565,7 @@
 ,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 +25,Gantt chart of all tasks.,គំនូសតាង Gantt ភារកិច្ចទាំងអស់។
+DocType: Pricing Rule,Margin Type,ប្រភេទរឹម
 DocType: Appraisal,For Employee Name,សម្រាប់ឈ្មោះបុគ្គលិក
 DocType: Holiday List,Clear Table,ជម្រះការតារាង
 DocType: Features Setup,Brands,ផលិតផលម៉ាក
@@ -1532,20 +1573,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់ប្រឆាំងនឹងធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីសម្រាប់ការចូលរួមចំនួនតាមរយៈការដំឡើង&gt; លេខរៀងកម្រងឯកសារ
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,គូ
+DocType: Asset,Depreciation Schedule,កាលវិភាគរំលស់
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
 DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
 DocType: Item,Has Batch No,មានបាច់គ្មាន
 DocType: Delivery Note,Excise Page Number,រដ្ឋាករលេខទំព័រ
+DocType: Asset,Purchase Date,ទិញកាលបរិច្ឆេទ
 DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;ទ្រព្យសម្បត្តិមជ្ឈមណ្ឌលតម្លៃរំលស់ &quot;នៅក្នុងក្រុមហ៊ុន {0}
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 ,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
@@ -1559,23 +1605,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,រួមបញ្ចូលធាតុសំរុះសំរួល
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,សរុបជាក់ស្តែង
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,អង្គភាព
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ប្តឹងទាមទារសំណងលើការចំណាយ
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
 DocType: Issue,Support,ការគាំទ្រ
 ,BOM Search,ស្វែងរក Bom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប)
@@ -1584,29 +1629,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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 លោកម៉ាស៊ីនឆូតកាតជាដើម
 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 +249,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},កាលបរិច្ឆេទបោសសំអាតមិនអាចជាមុនកាលបរិច្ឆេទពិនិត្យនៅក្នុងជួរដេកដែលបាន {0}
 DocType: Salary Slip,Deduction,ការដក
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 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 +137,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,សេចក្តីថ្លែងការណ៍របស់ធនាគារគណនាតុល្យភាព
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,អ្នកប្រើដែលបានបិទ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,សម្រង់
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
 DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ការចំណាយបន្ទាន់សម័យ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
@@ -1618,8 +1664,8 @@
 ,SO Qty,សូ Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
+DocType: Request for Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
 apps/erpnext/erpnext/hooks.py +71,Shipments,ការនាំចេញ
 DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
@@ -1627,12 +1673,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,សៀរៀល {0} មិនមានមិនមែនជារបស់ឃ្លាំងណាមួយឡើយ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ជួរដេក #
 DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Pricing Rule,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Asset,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: C-Form,Quarter,ត្រីមាស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ការចំណាយនានា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,ការចំណាយនានា
 DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,ប្រើ {0} ត្រូវបានបិទ
@@ -1641,7 +1687,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},លំដាប់ការលក់បានទាមទារសម្រាប់ធាតុ {0}
@@ -1651,11 +1697,11 @@
 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/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុត្រូវបានភ្ជាប់ទៅនឹងទ្រព្យសកម្មមួយ"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ធាតុកូនមិនគួរជាផលិតផលកញ្ចប់។ សូមយកធាតុ `{0}` និងរក្សាទុក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,វិស័យធនាគារ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,មជ្ឈមណ្ឌលការចំណាយថ្មីមួយ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; និងធ្វើការនិយាយពីអត្រាពន្ធ។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,មជ្ឈមណ្ឌលការចំណាយថ្មីមួយ
 DocType: Bin,Ordered Quantity,បរិមាណដែលត្រូវបានបញ្ជាឱ្យ
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
 DocType: Quality Inspection,In Process,ក្នុងដំណើរការ
@@ -1668,10 +1714,11 @@
 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,គណនីត្រូវទទួល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
 DocType: Quotation Item,Stock Balance,តុល្យភាពភាគហ៊ុន
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,កំណត់ហេតុបង្កើតឡើងវេលាម៉ោង:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,កំណត់ហេតុបង្កើតឡើងវេលាម៉ោង:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Item,Weight UOM,ទំងន់ UOM
 DocType: Employee,Blood Group,ក្រុមឈាម
@@ -1689,13 +1736,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
 DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
 DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
 DocType: Job Applicant,Job Opening,ពិធីបើកការងារ
 DocType: Payment Reconciliation,Payment Reconciliation,ការផ្សះផ្សាការទូទាត់
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,បច្ចេកវិទ្យា
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ផ្តល់ជូននូវលិខិត
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,បង្កើតសម្ភារៈសំណើរ (MRP) និងការបញ្ជាទិញផលិតផល។
@@ -1703,22 +1750,22 @@
 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 +103,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
 DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} មានតែគណនីឥណពន្ធអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណទានផ្សេងទៀត
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/get_item_details.py +272,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} ។
 DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
 DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,បង្កើតការប្រឆាំងនឹងការបញ្ជាទិញប្រាក់បង់ធាតុវិកិយប័ត្រឬ។
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,បង្កើតការប្រឆាំងនឹងការបញ្ជាទិញប្រាក់បង់ធាតុវិកិយប័ត្រឬ។
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,អ្នកប្រើនិងសិទ្ធិ
@@ -1727,10 +1774,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,អតិថិជនរបស់អ្នក
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,ដាក់ពាក្យឥឡូវនេះ
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,ដាក់ពាក្យឥឡូវនេះ
 DocType: Sales Order,Not Delivered,មិនបានផ្តល់
 ,Bank Clearance Summary,ធនាគារសង្ខេបបោសសំអាត
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
@@ -1754,7 +1802,7 @@
 DocType: Employee,Employment Details,ព័ត៌មានការងារ
 DocType: Employee,New Workplace,ញូការងារ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ដែលបានកំណត់ជាបិទ
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},គ្មានធាតុជាមួយនឹងលេខកូដ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},គ្មានធាតុជាមួយនឹងលេខកូដ {0}
 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,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
@@ -1772,10 +1820,10 @@
 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 +608,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},ធាតុ {0} ត្រូវតែជាធាតុលក់នៅ {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
@@ -1789,12 +1837,13 @@
 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: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ប្រភពមូលនិធិ (បំណុល)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,បុគ្គលិក
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,នាំចូលអ៊ីមែលពី
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,អញ្ជើញជាអ្នកប្រើប្រាស់
 DocType: Features Setup,After Sale Installations,បន្ទាប់ពីការដំឡើងលក់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},សូមកំណត់នៅ {0} {1} ក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ត្រូវបានផ្សព្វផ្សាយឱ្យបានពេញលេញ
 DocType: Workstation Working Hour,End Time,ពេលវេលាបញ្ចប់
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,លក្ខខណ្ឌនៃកិច្ចសន្យាស្តង់ដាមួយសម្រាប់ការលក់ឬទិញ។
@@ -1803,9 +1852,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ចំនួនលំដាប់ Purchse បានទាមទារសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},ចំនួនលំដាប់ Purchse បានទាមទារសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ឱសថ
@@ -1822,25 +1871,25 @@
 DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Gateway Account,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Newsletter,Test,ការធ្វើតេស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,សំណើសម្រាប់ធាតុ។
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោលបំណងផលិតដោយឡែកពីគ្នានឹងត្រូវបានបង្កើតសម្រាប់ធាតុដ៏ល្អគ្នាបានបញ្ចប់។
@@ -1849,7 +1898,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,បញ្ជីសំបុត្ររួមព្រឹត្តិប័ត្រព័ត៌មាន
 DocType: Delivery Note,Transporter Name,ឈ្មោះដឹកជញ្ជូន
 DocType: Authorization Rule,Authorized Value,តម្លៃដែលបានអនុញ្ញាត
@@ -1867,13 +1916,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} ត្រូវបានបិទ
 DocType: Email Digest,How frequently?,តើធ្វើដូចម្តេចឱ្យបានញឹកញាប់?
 DocType: Purchase Receipt,Get Current Stock,ទទួលបានភាគហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូមចូលទៅកាន់ក្រុមសមស្រប (ជាធម្មតាកម្មវិធីរបស់មូលនិធិ&gt; ទ្រព្យសកម្មបច្ចុប្បន្ន&gt; គណនីធនាគារនិងបង្កើតគណនីថ្មី (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;ធនាគារ&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,មែកធាងនៃលោក Bill នៃសម្ភារៈ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,លោក Mark បច្ចុប្បន្ន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទចាប់ផ្តើថែទាំមិនអាចត្រូវបានចែកចាយសម្រាប់ការមុនកាលបរិច្ឆេទសៀរៀលគ្មាន {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,គោលបំណង
+DocType: Company,Fixed Asset Depreciation Settings,ការកំណត់រំលស់ទ្រព្យសកម្មថេរ
 DocType: Item,Will also apply for variants unless overrridden,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់បានទេលុះត្រាតែ overrridden
 DocType: Purchase Invoice,Advances,បុ
 DocType: Production Order,Manufacture against Material Request,ការផលិតសម្ភារៈសំណើរប្រឆាំងនឹង
@@ -1882,6 +1931,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,មានថ្នាំងកុមារ
@@ -1912,12 +1962,14 @@
 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: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
+DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
 DocType: Tax Rule,Billing City,ទីក្រុងវិក័យប័ត្រ
 DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណនិមិត្តសញ្ញាលាក់
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូមចូលទៅកាន់ក្រុមសមស្រប (ជាធម្មតាកម្មវិធីរបស់មូលនិធិ&gt; ទ្រព្យសកម្មបច្ចុប្បន្ន&gt; គណនីធនាគារនិងបង្កើតគណនីថ្មី (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;ធនាគារ&quot;
 DocType: Journal Entry,Credit Note,ឥណទានចំណាំ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Qty បញ្ចប់មិនអាចមានច្រើនជាង {0} សម្រាប់ប្រតិបត្តិការ {1}
 DocType: Features Setup,Quality,ដែលមានគុណភាព
@@ -1941,9 +1993,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,អាសយដ្ឋានរបស់ខ្ញុំ
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ឬ
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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; ‧;
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,គ្មាននិយោជិតលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើឬប័ណ្ណប្រាក់បៀវត្សដែលបានបង្កើតរួច
@@ -1970,7 +2022,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,To Produce,ផលិត
 apps/erpnext/erpnext/config/hr.py +93,Payroll,បើកប្រាក់បៀវត្ស
 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} ត្រូវតែត្រូវបានរួមបញ្ចូល
@@ -1980,8 +2032,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់តាមបំណង
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,រកមិនឃើញអាសយដ្ឋានលំនាំដើមពុម្ព។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងម៉ាក&gt; អាស័យពុម្ព។
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,តំបន់ភារកិច្ចសំខាន់
@@ -2003,21 +2056,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
 DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
 DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
-apps/erpnext/erpnext/config/support.py +7,Issues,បញ្ហានានា
+apps/erpnext/erpnext/hooks.py +90,Issues,បញ្ហានានា
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ស្ថានភាពត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
 DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
 ,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
 ,Profit and Loss Statement,សេចក្តីថ្លែងការណ៍ប្រាក់ចំណេញនិងការបាត់បង់
@@ -2031,10 +2085,10 @@
 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 +139,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
 DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់អត្រាប្តូរប្រាក់ដើម្បីបម្លែងរូបិយប័ណ្ណមួយទៅមួយផ្សេងទៀត
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,សម្រង់ {0} ត្រូវបានលុបចោល
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ចំនួនសរុប
@@ -2090,13 +2144,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, បំបែកប្រតិបត្ដិការទៅក្នុងប្រតិបត្ដិការច្រើន"
 ,Requested,បានស្នើរសុំ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,គ្មានសុន្ទរកថា
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,ការលក់និងទិញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 DocType: Supplier Quotation Item,Material Request No,សម្ភារៈគ្មានសំណើរ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណអតិថិជនដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
@@ -2117,7 +2172,7 @@
 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 ការលក់
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ធាតុ {0} មិនមាន
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
 DocType: Payment Request,Recipient and Message,អ្នកទទួលនិងសារ
 DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
@@ -2131,7 +2186,7 @@
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
@@ -2153,11 +2208,12 @@
 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/config/buying.py +18,Request for quotation.,ស្នើសុំសម្រាប់សម្រង់។
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
 DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,ការចាប់ផ្តើមគម្រោងកាលបរិច្ឆេទ
@@ -2166,7 +2222,7 @@
 DocType: Installation Note Item,Against Document No,ប្រឆាំងនឹងការ Document No
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
 DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},សូមជ្រើស {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},សូមជ្រើស {0}
 DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,វត្តមានចំណាំទុក
@@ -2181,6 +2237,7 @@
 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,ការផ្សព្វផ្សាយ
+DocType: Asset Category Account,Depreciation Expense Account,គណនីរំលស់
 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,ការអនុម័តការចំណាយ
@@ -2194,7 +2251,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,បានបញ្ជាក់ថា
 DocType: Payment Gateway,Gateway,ផ្លូវចេញចូល
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
@@ -2208,18 +2265,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,ឃ្លាំងទទួលយក
 DocType: Bank Reconciliation Detail,Posting Date,ការប្រកាសកាលបរិច្ឆេទ
 DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ប្រារព្ធទិវាពាក់កណ្តាល
 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 +410,[Error],[កំហុសក្នុងការ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,សៀរៀលគ្មាន {0} មិនមាន
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ឃ្លាំងអតិថិជន (ជាជម្រើស)
 DocType: Pricing Rule,Discount Percentage,ភាគរយបញ្ចុះតំលៃ
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
@@ -2245,14 +2303,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
 DocType: Purchase Invoice,Address and Contact,អាស័យដ្ឋាននិងទំនាក់ទំនង
 DocType: Supplier,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
 DocType: Employee,Feedback,មតិអ្នក
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានបម្រុងទុកមុន {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
+DocType: Asset,Expected Value After Useful Life,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍
 DocType: Item,Reorder level based on Warehouse,កម្រិតនៃការរៀបចំដែលមានមូលដ្ឋានលើឃ្លាំង
 DocType: Activity Cost,Billing Rate,អត្រាវិក័យប័ត្រ
 ,Qty to Deliver,qty សង្គ្រោះ
@@ -2265,12 +2325,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ត្រូវបានលុបចោលឬបានបិទ
 DocType: Delivery Note,Track this Delivery Note against any Project,តាមដានការដឹកជញ្ជូនចំណាំនេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,សាច់ប្រាក់សុទ្ធពីការវិនិយោគ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,គណនី root មិនអាចត្រូវបានលុប
 ,Is Primary Address,គឺជាអាសយដ្ឋានបឋមសិក្សា
 DocType: Production Order,Work-in-Progress Warehouse,ការងារក្នុងវឌ្ឍនភាពឃ្លាំង
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,ទ្រព្យសកម្ម {0} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},សេចក្តីយោង # {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,គ្រប់គ្រងអាសយដ្ឋាន
-DocType: Pricing Rule,Item Code,ក្រមធាតុ
+DocType: Asset,Item Code,ក្រមធាតុ
 DocType: Production Planning Tool,Create Production Orders,បង្កើតការបញ្ជាទិញផលិតកម្ម
 DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
@@ -2289,8 +2349,10 @@
 DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
 DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
 DocType: Payment Request,Reference Details,សេចក្តីយោងលំអិត
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
 DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
 ,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
+DocType: Asset,Double Declining Balance,ការធ្លាក់ចុះទ្វេដងតុល្យភាព
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,គោលបំណងដែលបានបិទមិនអាចត្រូវបានលុបចោល។ unclosed ដើម្បីលុបចោល។
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
@@ -2309,6 +2371,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
+DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
@@ -2316,25 +2379,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,សៀរៀលទេនិងបាច់ &amp; ‧;
 DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,តំលៃឬ Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,នាទី
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 ,Qty to Receive,qty ទទួល
 DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
 DocType: Sales Partner,Retailer,ការលក់រាយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
 DocType: Global Defaults,Disable In Words,បិទនៅក្នុងពាក្យ
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,ធនាគាររូបារូប
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},សូមកំណត់ដែលទាក់ទងនឹងការរំលស់ក្នុងគណនីទ្រព្យសកម្មប្រភេទឬ {0} {1} ក្រុមហ៊ុន
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},អ៊ីម៉ែលដែលបានផ្ញើទៅឱ្យអ្នកផ្គត់ផ្គង់ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},ទុកឱ្យការអនុម័តត្រូវតែជាផ្នែកមួយនៃ {0}
@@ -2342,7 +2408,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,សារដែលបានផ្ញើ
@@ -2370,6 +2436,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,រឹមសរុប
 DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
 DocType: Hub Settings,Publish Items to Hub,បោះពុម្ពផ្សាយធាតុហាប់
@@ -2383,7 +2450,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
 DocType: Payment Gateway Account,Default Payment Request Message,លំនាំដើមរបស់សារស្នើសុំការទូទាត់
 DocType: Item Group,Check this if you want to show in website,ធីកប្រអប់នេះបើអ្នកចង់បង្ហាញនៅក្នុងគេហទំព័រ
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,ធនាគារនិងទូទាត់
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,ធនាគារនិងទូទាត់
 ,Welcome to ERPNext,សូមស្វាគមន៍មកកាន់ ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ពត៌មានលំអិតកាតមានទឹកប្រាក់ចំនួន
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,នាំឱ្យមានការសម្រង់
@@ -2391,17 +2458,17 @@
 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 +199,Purchase Order {0} is not submitted,ទិញលំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ទិញលំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,ស្លឹកនិងថ្ងៃឈប់សម្រាក
 DocType: Sales Order,Not Billed,មិនបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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 សម្រាប់វិក័យប័ត្រ
@@ -2417,15 +2484,17 @@
 DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
 DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
+DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,កាលបរិច្ឆេទនៃទ្រព្យសកម្មទិញ {0} មិនផ្គូផ្គងនឹងការទិញវិក័យប័ត្រនិងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,ឃ្លាំង {0}: ក្រុមហ៊ុនគឺជាការចាំបាច់
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},បាត់ខ្លួនរូបិយប័ណ្ណប្តូរប្រាក់អត្រាការប្រាក់សម្រាប់ {0}
 DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Account,Payable,បង់
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),កូនបំណុល ({0})
-DocType: Project,Margin,រឹម
+DocType: Pricing Rule,Margin,រឹម
 DocType: Salary Slip,Arrear Amount,បំណុលហួសកាលកំណត់ចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
@@ -2433,20 +2502,23 @@
 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,ពិនិត្យមើលប្រសិនបើអ្នកចង់ផ្ញើប័ណ្ណប្រាក់បៀវត្សក្នុងសំបុត្រទៅបុគ្គលិកគ្នាខណៈពេលដែលការដាក់ស្នើប័ណ្ណប្រាក់បៀវត្ស
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
 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 +57,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
 DocType: Stock Entry Detail,Source Warehouse,ឃ្លាំងប្រភព
 DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
 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: Account,Accumulated Depreciation,រំលស់បង្គរ
 DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
 DocType: Payment Request,Email To,ផ្ញើអ៊ីមែលទៅ
 DocType: Lead,Lead Owner,ការនាំមុខម្ចាស់
 DocType: Bin,Requested Quantity,បរិមាណបានស្នើ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,ឃ្លាំងត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,ឃ្លាំងត្រូវបានទាមទារ
 DocType: Employee,Marital Status,ស្ថានភាពគ្រួសារ
 DocType: Stock Settings,Auto Material Request,សម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Time Log,Will be updated when billed.,នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅពេលដែលបានផ្សព្វផ្សាយ។
@@ -2454,11 +2526,12 @@
 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 +115,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 +84,{0}% Delivered,{0}% ផ្តល់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
 DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,ក្រុមហ៊ុនផ្គត់ផ្គង់ដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ដីកាបង្គាប់របស់សហការីការទិញធាតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,ឈ្មោះក្រុមហ៊ុនមិនអាចត្រូវបានក្រុមហ៊ុន
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
@@ -2468,13 +2541,14 @@
 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: Payment Request,Payment Details,សេចក្ដីលម្អិតការបង់ប្រាក់
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
+DocType: Asset,Journal Entry for Scrap,ទិនានុប្បវត្តិធាតុសម្រាប់សំណល់អេតចាយ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ធាតុទិនានុប្បវត្តិ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","កំណត់ហេតុនៃការទំនាក់ទំនងទាំងអស់នៃប្រភេទអ៊ីមែលទូរស័ព្ទជជែកកំសាន្ត, ដំណើរទស្សនកិច្ច, ល"
 DocType: Manufacturer,Manufacturers used in Items,ក្រុមហ៊ុនផលិតដែលត្រូវបានប្រើនៅក្នុងធាតុ
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,សូមនិយាយពីមជ្ឈមណ្ឌលការចំណាយមូលបិទក្នុងក្រុមហ៊ុន
 DocType: Purchase Invoice,Terms,លក្ខខណ្ឌ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,បង្កើតថ្មី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,បង្កើតថ្មី
 DocType: Buying Settings,Purchase Order Required,ទិញលំដាប់ដែលបានទាមទារ
 ,Item-wise Sales History,ប្រវត្តិលក់ធាតុប្រាជ្ញា
 DocType: Expense Claim,Total Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាតសរុប
@@ -2487,7 +2561,7 @@
 ,Stock Ledger,ភាគហ៊ុនសៀវភៅ
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},អត្រាការប្រាក់: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ការកាត់គ្រូពេទ្យប្រហែលជាប្រាក់បៀវត្ស
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,ជ្រើសថ្នាំងជាក្រុមមួយជាលើកដំបូង។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,ជ្រើសថ្នាំងជាក្រុមមួយជាលើកដំបូង។
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,បុគ្គលិកនិងការចូលរួម
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},គោលបំណងត្រូវតែជាផ្នែកមួយនៃ {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","យកសេចក្ដីយោងរបស់អតិថិជនអ្នកផ្គត់ផ្គង់ដៃគូលក់និងការនាំមុខ, ដូចដែលវាគឺជាអាសយដ្ឋានក្រុមហ៊ុនរបស់អ្នក"
@@ -2509,13 +2583,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ពី {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
 DocType: BOM Replace Tool,BOM Replace Tool,Bom ជំនួសឧបករណ៍
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេសអាស័យដ្ឋានពុម្ពលំនាំដើមរបស់អ្នកមានប្រាជ្ញា
 DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,កាលបរិច្ឆេទបន្ទាប់ត្រូវតែធំជាងកាលបរិច្ឆេទប្រកាស
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# សំណុំបែបបទ / ធាតុ / {0}) គឺចេញពីស្តុក
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,កាលបរិច្ឆេទបន្ទាប់ត្រូវតែធំជាងកាលបរិច្ឆេទប្រកាស
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,កាលបរិច្ឆេទវិក្ក័យប័ត្រ
@@ -2530,7 +2605,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} គឺមិនមែនជាលេខបាច់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",ចំណាំ: ប្រសិនបើការទូទាត់មិនត្រូវបានធ្វើប្រឆាំងនឹងឯកសារយោងណាមួយដែលធ្វើឱ្យធាតុទិនានុប្បវត្តិដោយដៃ។
@@ -2544,7 +2619,7 @@
 DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
 ,Stock Ageing,ភាគហ៊ុន Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} &#39;{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2553,7 +2628,7 @@
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
 DocType: Sales Team,Contribution (%),ចំែណក (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,ទំព័រគំរូ
 DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
@@ -2564,7 +2639,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
@@ -2573,11 +2648,12 @@
 DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ឥណពន្ធសរុបត្រូវតែស្មើនឹងឥណទានសរុប។ ភាពខុសគ្នានេះគឺ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
+DocType: Asset Category Account,Fixed Asset Account,គណនីទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,ហាត់ការ
@@ -2585,7 +2661,7 @@
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ជាមូលដ្ឋាន
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,ប្រតិបតិ្តការភាគហ៊ុនមុនពេល {0} ត្រូវបានជាប់គាំង
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,គួរមានកាលបរិច្ឆេទដូចគ្នាជាពីកាលបរិច្ឆេទការឈប់ពាក់កណ្តាលថ្ងៃ
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
@@ -2593,17 +2669,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,សម្ភារៈបញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,សម្រង់ពាក្យ
 DocType: Hub Settings,Access Token,ការចូលដំណើរការ Token
 DocType: Sales Invoice Item,Serial No,សៀរៀលគ្មាន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
-DocType: Item,Is Fixed Asset Item,តើមានធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
 DocType: Purchase Invoice,Print Language,បោះពុម្ពភាសា
 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",ប្រសិនបើអ្នកមានទ្រង់ទ្រាយបោះពុម្ពជាយូរមកហើយដោយលក្ខណៈពិសេសនេះអាចត្រូវបានប្រើដើម្បីបំបែកទំព័រដែលត្រូវបោះពុម្ពលើទំព័រច្រើនដែលមានបឋមកថានិងបាតកថានៅលើទំព័រទាំងអស់គ្នា
+DocType: Asset,Number of Depreciations,ចំនួននៃការធ្លាក់ថ្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
@@ -2611,13 +2687,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
 DocType: Product Bundle Item,Product Bundle Item,ផលិតផលធាតុកញ្ចប់
 DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូការលក់
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,សំណើរពីតំលៃ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ចំនួនវិក័យប័ត្រអតិបរមា
 DocType: Purchase Invoice Item,Image View,មើលរូបភាព
 apps/erpnext/erpnext/config/selling.py +23,Customers,អតិថិជន
+DocType: Asset,Partially Depreciated,ធ្លាក់ថ្លៃដោយផ្នែក
 DocType: Issue,Opening Time,ម៉ោងបើក
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
 DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
@@ -2633,13 +2711,13 @@
 DocType: Quotation,Maintenance Manager,កម្មវិធីគ្រប់គ្រងថែទាំ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,សរុបមិនអាចជាសូន្យ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ &#39;ត្រូវតែធំជាងឬស្មើសូន្យ
-DocType: C-Form,Amended From,ធ្វើវិសោធនកម្មពី
+DocType: Asset,Amended From,ធ្វើវិសោធនកម្មពី
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,គណនីកុមារដែលមានសម្រាប់គណនីនេះ។ អ្នកមិនអាចលុបគណនីនេះ។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,អនុវត្តការទៅមុខ
@@ -2652,21 +2730,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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 +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,សូមនិយាយពី &#39;គណនី / ចំណេញនៅលើបោះចោលបាត់បង់ទ្រព្យសកម្ម &quot;ក្នុងក្រុមហ៊ុន
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,បញ្ចូលទៅក្នុងរទេះ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ក្រុមតាម
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
 DocType: Production Planning Tool,Get Material Request,ទទួលបានសម្ភារៈសំណើ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ចំណាយប្រៃសណីយ៍
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,ចំណាយប្រៃសណីយ៍
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
 DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ត្រូវតែត្រូវបានកាត់បន្ថយដោយ {1} ឬអ្នកគួរតែបង្កើនការអត់ឱនលើសចំណុះ
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,បច្ចុប្បន្នសរុប
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,របាយការណ៍គណនី
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,របាយការណ៍គណនី
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ហួរ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើឱ្យទាន់សម័យ \ ប្រើប្រាស់ហ៊ុនផ្សះផ្សា
@@ -2685,15 +2764,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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,ក្រុមផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
 DocType: Item,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
@@ -2701,12 +2781,13 @@
 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,ឈ្មោះក្រុមអតិថិជន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},កំហុស: {0}&gt; {1}
 DocType: Item,Attributes,គុណលក្ខណៈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,ទទួលបានធាតុ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,ទទួលបានធាតុ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
@@ -2718,18 +2799,18 @@
 DocType: Purchase Invoice,Mobile No,គ្មានទូរស័ព្ទដៃ
 DocType: Payment Tool,Make Journal Entry,ធ្វើឱ្យធាតុទិនានុប្បវត្តិ
 DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,ពាណិជ្ជ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},កំហុស: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ធាតុមេ {0} មិនត្រូវធាតុហ៊ុនមួយ
 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 +52,All Products or Services.,ផលិតផលឬសេវាកម្មទាំងអស់។
 DocType: Supplier Quotation,Supplier Address,ក្រុមហ៊ុនផ្គត់ផ្គង់អាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ចេញ Qty
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
+apps/erpnext/erpnext/config/accounts.py +259,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,សេវាហិរញ្ញវត្ថុ
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},តម្លៃសម្រាប់គុណលក្ខណៈ {0} ត្រូវតែនៅក្នុងជួរនៃ {1} ទៅ {2} នៅក្នុងការបង្កើននៃ {3}
@@ -2740,10 +2821,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,លំនាំដើមគណនីអ្នកទទួល
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,សេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
 DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
 DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
@@ -2763,20 +2844,22 @@
 DocType: GL Entry,Remarks,សុន្ទរកថា
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
 DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
 DocType: Features Setup,POS View,ម៉ាស៊ីនឆូតកាតមើល
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,ថ្ងៃកាលបរិច្ឆេទក្រោយនិងធ្វើម្តងទៀតនៅថ្ងៃនៃខែត្រូវតែស្មើ
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,ថ្ងៃកាលបរិច្ឆេទក្រោយនិងធ្វើម្តងទៀតនៅថ្ងៃនៃខែត្រូវតែស្មើ
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,សូមបញ្ជាក់
 DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ខាងលើ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,ពេលវេលាកំណត់ហេតុត្រូវបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,គណនី {0} មិនអាចជាក្រុមមួយ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},សូមកំណត់តម្លៃលំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
@@ -2786,12 +2869,13 @@
 ,Monthly Attendance Sheet,សន្លឹកវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បានរកឃើញថាគ្មានកំណត់ត្រា
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីសម្រាប់ការចូលរួមចំនួនតាមរយៈការដំឡើង&gt; លេខរៀងកម្រងឯកសារ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+DocType: Asset,Straight Line,បន្ទាត់ត្រង់
+DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {0} មិនត្រូវបានអនុញ្ញាតក្នុងការបើកចូល
 DocType: Features Setup,Sales Discounts,ការបញ្ចុះតម្លៃការលក់
@@ -2805,39 +2889,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ចំនួននៃលំដាប់
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ជា HTML / បដាដែលនឹងបង្ហាញនៅលើកំពូលនៃបញ្ជីផលិតផល។
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,បញ្ជាក់លក្ខខណ្ឌដើម្បីគណនាចំនួនប្រាក់លើការដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,បន្ថែមកុមារ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,តម្លៃពិធីបើក
 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,គណៈកម្មការលើការលក់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,គណៈកម្មការលើការលក់
 DocType: Offer Letter Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 ,Customers Not Buying Since Long Time,អតិថិជនមិនទិញតាំងពីលោកឡុងពេល
 DocType: Production Order,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ចំណាយកំសាន្ត
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,ចំណាយកំសាន្ត
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,កម្មវិធីសម្រាប់ការឈប់សម្រាក។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,ការចំណាយផ្នែកច្បាប់
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ការចំណាយផ្នែកច្បាប់
 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 +132,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
 DocType: Sales Partner,Logo,រូបសញ្ញា
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},គ្មានធាតុជាមួយសៀរៀលគ្មាន {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},គ្មានធាតុជាមួយសៀរៀលគ្មាន {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ការជូនដំណឹងបើកទូលាយ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ការចំណាយដោយផ្ទាល់
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,ការចំណាយដោយផ្ទាល់
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង &#39;ការជូនដំណឹង \ អាសយដ្ឋានអ៊ីមែល&#39;
 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,ការចំណាយការធ្វើដំណើរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ការចំណាយការធ្វើដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},គណនី {0}: គណនីមាតាបិតា {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
@@ -2854,7 +2939,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,យើងលក់ធាតុនេះ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
 DocType: Journal Entry,Cash Entry,ចូលជាសាច់ប្រាក់
 DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
@@ -2865,11 +2950,12 @@
 DocType: Production Order,Total Operating Cost,ថ្លៃប្រតិបត្តិការ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,ចំណាំ: ធាតុ {0} បានចូលច្រើនដង
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ទំនាក់ទំនងទាំងអស់។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,ក្រុមហ៊ុនផ្គត់ផ្គង់ទ្រព្យសកម្ម {0} មិនផ្គូផ្គងនឹងផ្គត់ផ្គង់ក្នុងការទិញវិក័យប័ត្រនេះ
 DocType: Newsletter,Test Email Id,ការធ្វើតេស្តអ៊ីម៉ែលលេខសម្គាល់
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,វត្ថុធាតុដើមមិនអាចជាដូចគ្នាដូចដែលធាតុដ៏សំខាន់
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,ចៅហ្វាយពុម្ពប្រាក់បៀវត្ស។
@@ -2885,12 +2971,13 @@
 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/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,វិក័យប័ត្រអាសយដ្ឋានដែលពេញចិត្ត
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើនឹងរូបិយប័ណ្ណទាំង comapany លំនាំដើមឬរូបិយប័ណ្ណគណនី payble របស់គណបក្ស
 DocType: Monthly Distribution Percentage,Percentage Allocation,ការបម្រុងទុកជាភាគរយ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,លេខាធិការ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",ប្រសិនបើបានបិទ &quot;នៅក្នុងពាក្យ&quot; វាលនឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
@@ -2900,13 +2987,13 @@
 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,ម្ចាស់បំណុល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,ម្ចាស់បំណុល
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,ជួរដេក # {0}: មិនស៊េរីគឺជាការចាំបាច់
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
 ,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
 DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍ជិតមកដល់
@@ -2926,15 +3013,14 @@
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ស្តង់ដាលក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
-DocType: Project,Project Name,ឈ្មោះគម្រោង
+DocType: Request for Quotation 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
@@ -2964,6 +3050,7 @@
 DocType: Sales Invoice,End Date,កាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ប្រតិបត្តិការភាគហ៊ុន
 DocType: Employee,Internal Work History,ប្រវត្តិការងារផ្ទៃក្នុង
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,ចំនួនទឹកប្រាក់រំលស់បង្គរ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,សមធម៌ឯកជន
 DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
 DocType: Account,Expense,ការចំណាយ
@@ -2971,7 +3058,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","ក្រុមហ៊ុនចាំបាច់, ដូចដែលវាគឺជាអាសយដ្ឋានក្រុមហ៊ុនរបស់អ្នក"
 DocType: Item Attribute,From Range,ពីជួរ
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,ធាតុ {0} មិនអើពើចាប់តាំងពីវាគឺមិនមានធាតុភាគហ៊ុន
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
 DocType: Company,Domain,ដែន
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,លោក Steve Jobs
@@ -2983,6 +3070,7 @@
 DocType: Time Log,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មកដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់បន្ថយរកស្នើសុំការអនុញ្ញាតដោយគ្មានការបង់ (LWP)
@@ -2999,6 +3087,7 @@
 DocType: Sales Order,Delivery Date,ដឹកជញ្ជូនកាលបរិច្ឆេទ
 DocType: Opportunity,Opportunity Date,កាលបរិច្ឆេទឱកាសការងារ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ការវិលត្រឡប់ពីការប្រឆាំងនឹងបង្កាន់ដៃទិញ
+DocType: Request for Quotation Item,Request for Quotation Item,ស្នើសុំសម្រាប់ធាតុសម្រង់
 DocType: Purchase Order,To Bill,លោក Bill
 DocType: Material Request,% Ordered,% លំដាប់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ម៉ៅការ
@@ -3013,11 +3102,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ ជួរឈរត្រូវទទេ
 DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
 DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},សូមកំណត់ &#39;គណនីបោះចោលទ្រព្យ &quot;នៅក្នុងក្រុមហ៊ុន {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,គណនីបណ្តោះអាសន្ន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ពណ៌ខ្មៅ
 DocType: BOM Explosion Item,BOM Explosion Item,ធាតុផ្ទុះ Bom
 DocType: Account,Auditor,សវនករ
@@ -3026,21 +3116,22 @@
 DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,សូមចុចទីនេះដើម្បីបង់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","ទ្រព្យសកម្ម {0} មិនអាចត្រូវបានបោះបង់ចោល, ដូចដែលវាមានរួចទៅ {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,លេខសម្គាល់អតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,លោក Mark អវត្តមាន
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,ទៅពេលត្រូវតែធំជាងពីពេលវេលា
 DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,បន្ថែមធាតុពី
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,បន្ថែមធាតុពី
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,ភារកិច្ចលេខសម្គាល់
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",ឧទាហរណ៏ &quot;ពិធីករ&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,ភាគហ៊ុនមិនអាចមានសម្រាប់ធាតុ {0} តាំងពីមានវ៉ារ្យ៉ង់
 ,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
@@ -3055,6 +3146,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,គ្រប់គ្រងគុណភាព
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
 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,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
@@ -3066,7 +3158,7 @@
 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,ទំនាក់ទំនងបន្ទាប់
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,រៀបចំគណនីច្រកផ្លូវ។
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,រៀបចំគណនីច្រកផ្លូវ។
 DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ទ្រព្យសកម្មថេរ
 ,Cash Flow,លំហូរសាច់ប្រាក់
@@ -3080,7 +3172,7 @@
 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 +132,Please find attached {0} #{1},សូមស្វែងរកការភ្ជាប់ {0} {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},សូមស្វែងរកការភ្ជាប់ {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,ធនាគារតុល្យភាពសេចក្តីថ្លែងការណ៍ដូចជាក្នុងសៀវភៅធំ
 DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
 DocType: Authorization Rule,Customer / Item Name,អតិថិជន / ធាតុឈ្មោះ
@@ -3096,19 +3188,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,ការកំណត់លំនាំដើមសម្រាប់លក់ប្រតិបត្តិការ។
 DocType: BOM Replace Tool,Current BOM,Bom នាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,បន្ថែមគ្មានសៀរៀល
 apps/erpnext/erpnext/config/support.py +43,Warranty,ការធានា
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,បោះពុម្ពនិងស្ថានី
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ថ្នាំងគ្រុប
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,ធ្វើឱ្យទាន់សម័យបានបញ្ចប់ផលិតផល
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,ធ្វើឱ្យទាន់សម័យបានបញ្ចប់ផលិតផល
 DocType: Workstation,per hour,ក្នុងមួយម៉ោង
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ការទិញ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនីសម្រាប់ឃ្លាំង (សារពើភ័ណ្ឌងូត) នឹងត្រូវបានបង្កើតឡើងក្រោមគណនីនេះ។
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 DocType: Company,Distribution,ចែកចាយ
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
@@ -3138,7 +3229,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ដើម្បីកាលបរិច្ឆេទគួរតែនៅចន្លោះឆ្នាំសារពើពន្ធ។ សន្មត់ថាដើម្បីកាលបរិច្ឆេទ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
 DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
 DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
@@ -3151,9 +3242,11 @@
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ប្រតិបត្តិការមិនត្រូវបានអនុញ្ញាតប្រឆាំងនឹងផលិតកម្មបានឈប់លំដាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,ចូលរួមជាមួយ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,កង្វះខាត Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
+DocType: Pricing Rule,Margin Rate or Amount,អត្រារឹមឬចំនួនទឹកប្រាក់
 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,ធាតុលំដាប់ការលក់
@@ -3163,7 +3256,7 @@
 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 +782,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} គ្មានត្រូវបានទទួលរួចហើយ
@@ -3171,14 +3264,13 @@
 DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
 DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ហាងលក់នាយកដ្ឋាន
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
 DocType: Account,Chargeable,បន្ទុក
 DocType: Company,Change Abbreviation,ការផ្លាស់ប្តូរអក្សរកាត់
 DocType: Expense Claim Detail,Expense Date,ការចំណាយកាលបរិច្ឆេទ
@@ -3196,14 +3288,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,ទូទៅសៀវភៅ
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,មើលតែងតែនាំឱ្យមាន
 DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","លេខសម្គាល់អ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","លេខសម្គាល់អ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,សូមជ្រើស {0} ដំបូង
 DocType: Features Setup,To get Item Group in details table,ដើម្បីទទួលបានធាតុ Group ក្នុងតារាងពត៌មានលំអិត
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិក {0} ឬ {0} ក្រុមហ៊ុន
 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>
@@ -3224,23 +3317,23 @@
 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,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),ជាក់ស្តែ Qty (នៅប្រភព / គោលដៅ)
 DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,កំណត់ត្រាបុគ្គលិក។
 DocType: Payment Gateway,Payment Gateway,ការទូទាត់
 DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
 apps/erpnext/erpnext/templates/pages/cart.html +22,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-ទម្រង់ពាក្យស្នើសុំ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,ឃ្លាំងគឺជាការចាំបាច់
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),រក្សាវាបណ្ដាញ 900px មិត្តភាព (សរសេរ) ដោយ 100px (ម៉ោង)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,បានដោះស្រាយដោយ
@@ -3258,7 +3351,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,ទទួលបាន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,ទទួលបាន
 DocType: Maintenance Visit,Fully Completed,បានបញ្ចប់យ៉ាងពេញលេញ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ពេញលេញ
 DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
@@ -3266,14 +3359,14 @@
 DocType: Purchase Invoice,Submit on creation,ដាក់ស្នើលើការបង្កើត
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
 DocType: Purchase Receipt Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,ការបញ្ជាទិញរបស់ខ្ញុំ
@@ -3294,10 +3387,10 @@
 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 +250,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/config/accounts.py +258,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} ផ្សព្វផ្សាយរួចហើយ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
 DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
 DocType: Maintenance Schedule Detail,Scheduled Date,កាលបរិច្ឆេទដែលបានកំណត់ពេល
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,សរុបបង់ AMT
@@ -3309,11 +3402,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},អនុញ្ញាតឱ្យមានឥទ្ធិពលមិន {0} បានឆ្លងកាត់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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;ដើម្បីដំណើរការ។
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
 DocType: Purchase Invoice,Contact,ការទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ទទួលបានពី
 DocType: Features Setup,Exports,ការនាំចេញ
@@ -3322,12 +3416,12 @@
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ពី {0} {1} សម្រាប់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
 DocType: Issue,Content Type,ប្រភេទមាតិការ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,កុំព្យូទ័រ
 DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,ធាតុ: {0} មិនមាននៅក្នុងប្រព័ន្ធ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,ធាតុ: {0} មិនមាននៅក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
@@ -3336,7 +3430,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,នាយកគណនី
@@ -3349,7 +3443,7 @@
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,ភាគហ៊ុនទ្រព្យសកម្ម
@@ -3363,15 +3457,15 @@
 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 +576,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},រយៈពេលចាប់ពីនិងរយៈពេលដើម្បីកាលបរិច្ឆេទចាំបាច់សម្រាប់កើតឡើង {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},រយៈពេលចាប់ពីនិងរយៈពេលដើម្បីកាលបរិច្ឆេទចាំបាច់សម្រាប់កើតឡើង {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",ទិញត្រូវតែត្រូវបានធីកបើកម្មវិធីសម្រាប់ការត្រូវបានជ្រើសរើសជា {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
@@ -3391,8 +3485,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,កាលបរិច្ឆេទចាប់ផ្ដើមកាលពីឆ្នាំឬកាលបរិច្ឆេទចុងត្រូវបានត្រួតស៊ីគ្នានឹង {0} ។ ដើម្បីជៀសវាងសូមកំណត់របស់ក្រុមហ៊ុន
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ព្រឹត្តិប័ត្រព័ត៌មានថ្មីមួយ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ឧទាហរណ៍: ។ ABCD ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
 DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
@@ -3403,11 +3498,11 @@
 ,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 +91,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ការប៉ះទង្គិចវិធានពន្ធជាមួយនឹង {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,ឈ្មោះគណនីថ្មី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,សេវាបំរើអតិថិជន
@@ -3417,11 +3512,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
 DocType: Notification Control,Prompt for Email on Submission of,ប្រអប់បញ្ចូលអ៊ីមែលនៅលើការដាក់
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ស្លឹកដែលបានបម្រុងទុកសរុបគឺមានច្រើនជាងថ្ងៃក្នុងអំឡុងពេលនេះ
+DocType: Pricing Rule,Percentage,ចំនួនភាគរយ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,ធាតុ {0} ត្រូវតែជាធាតុភាគហ៊ុន
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,ធាតុ {0} ត្រូវតែជាធាតុលក់
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,ធាតុ {0} ត្រូវតែជាធាតុលក់
 DocType: Naming Series,Update Series Number,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ
 DocType: Account,Equity,សមធម៌
 DocType: Sales Order,Printing Details,សេចក្ដីលម្អិតការបោះពុម្ព
@@ -3429,11 +3525,12 @@
 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,សភាអនុស្វែងរក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,ប្រឆាំងនឹងការចំណាយតាមគណនី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; និងធ្វើការនិយាយពីអត្រាពន្ធ។
 DocType: Production Order,Production Order,ផលិតកម្មលំដាប់
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,ការដំឡើងចំណាំ {0} ត្រូវបានដាក់ស្នើរួចទៅហើយ
 DocType: Quotation Item,Against Docname,ប្រឆាំងនឹងការ Docname
@@ -3452,18 +3549,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ការលក់រាយលក់ដុំនិងចែកចាយ
 DocType: Issue,First Responded On,ជាលើកដំបូងបានឆ្លើយតបនៅលើ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ឆ្នាំចាប់ផ្តើមកាលបរិច្ឆេទសារពើពន្ធឆ្នាំសារពើពន្ធបញ្ចប់និងកាលបរិច្ឆេទត្រូវបានកំណត់រួចហើយនៅក្នុងឆ្នាំសារពើពន្ធ {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
 DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
 DocType: Tax Rule,Validity,សុពលភាព
+DocType: Request for Quotation,Supplier Detail,ក្រុមហ៊ុនផ្គត់ផ្គង់លំអិត
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ចំនួន invoiced
 DocType: Attendance,Attendance,ការចូលរួម
 apps/erpnext/erpnext/config/projects.py +55,Reports,របាយការណ៍
 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 +508,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
 ,Item Prices,តម្លៃធាតុ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
 DocType: Period Closing Voucher,Period Closing Voucher,ប័ណ្ណបិទរយៈពេល
@@ -3473,10 +3571,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,ឃ្លាំងគោលដៅក្នុងជួរ {0} ត្រូវតែមានដូចគ្នាដូចដែលបញ្ជាទិញផលិតផល
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,មិនមានការអនុញ្ញាតឱ្យប្រើឧបករណ៍ការទូទាត់
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% s ដែលកើតឡើង
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% s ដែលកើតឡើង
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,ការផ្លាស់ប្តូរ
@@ -3484,6 +3582,7 @@
 DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",ឧទាហរណ៍ដូចជារឿង &quot;My ក្រុមហ៊ុន LLC បាន&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,រយៈពេលជូនដំណឹង
+DocType: Asset Category,Asset Category Name,ប្រភេទទ្រព្យសកម្មឈ្មោះ
 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
@@ -3495,13 +3594,13 @@
 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 +559,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទពន្ធលើមិនអាចជា &quot;វាយតម្លៃ &#39;ឬ&#39; វាយតម្លៃនិងសរុប &#39;ជាធាតុទាំងអស់នេះគឺជាធាតុដែលមិនមានភាគហ៊ុន
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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,ជំនាន់ទី
@@ -3515,7 +3614,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,ការលក់បុគ្គល
 DocType: Sales Invoice,Cold Calling,ហៅត្រជាក់
 DocType: SMS Parameter,SMS Parameter,ផ្ញើសារជាអក្សរប៉ារ៉ាម៉ែត្រ
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
 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.,បង្កើតច្បាប់ដើម្បីរឹតបន្តឹងការធ្វើប្រតិបត្តិការដោយផ្អែកលើតម្លៃ។
@@ -3546,9 +3645,9 @@
 DocType: Purchase Common,Purchase Common,ទិញទូទៅ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 DocType: Sales Invoice,Is POS,តើមានម៉ាស៊ីនឆូតកាត
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Production Order,Manufactured Qty,បានផលិត Qty
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
@@ -3556,7 +3655,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,គណនីមាតាឬបិតា
@@ -3572,7 +3671,7 @@
 DocType: Employee,Education,ការអប់រំ
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
 DocType: Address,Office,ការិយាល័យ
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
@@ -3587,6 +3686,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,សារពើភ័ណ្ឌបាច់
 DocType: Employee,Contract End Date,កាលបរិច្ឆេទការចុះកិច្ចសន្យាបញ្ចប់
 DocType: Sales Order,Track this Sales Order against any Project,តាមដានការបញ្ជាទិញលក់នេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
+DocType: Sales Invoice Item,Discount and Margin,ការបញ្ចុះតម្លៃនិងរឹម
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ការបញ្ជាទិញការលក់ទាញ (ដែលមិនទាន់សម្រេចបាននូវការផ្តល់) ដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យដូចខាងលើនេះ
 DocType: Deduction Type,Deduction Type,ប្រភេទកាត់កង
 DocType: Attendance,Half Day,ពាក់កណ្តាលថ្ងៃ
@@ -3607,7 +3707,7 @@
 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} ។
+apps/erpnext/erpnext/accounts/party.py +234,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,ប្រចាំខែប្រាក់ខែចុះឈ្មោះ
 DocType: Warranty Claim,If different than customer address,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
@@ -3615,22 +3715,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលបង់យ៉ាងហោចណាស់មួយជួរដេក
 DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
 DocType: Payment Gateway Account,Payment URL Message,សាររបស់ URL ដែលការទូទាត់
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ជួរដេក {0}: ចំនួនទឹកប្រាក់ទូទាត់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឆ្នើម
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,សរុបគ្មានប្រាក់ខែ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,កំណត់ហេតុពេលវេលាគឺមិន billable
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
+DocType: Asset,Asset Category,ប្រភេទទ្រព្យសកម្ម
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,សូមបញ្ចូលប័ណ្ណដោយដៃប្រឆាំងនឹង
 DocType: SMS Settings,Static Parameters,ប៉ារ៉ាម៉ែត្រឋិតិវន្ត
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
 DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
 DocType: Employee Attendance Tool,Marked Attendance,វត្តមានដែលបានសម្គាល់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
@@ -3651,17 +3752,16 @@
 DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,ភ្ជាប់រូបសញ្ញា
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
 apps/erpnext/erpnext/config/stock.py +201,Analytics,វិធីវិភាគ
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,រទេះទទេ
 DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,រកមិនឃើញអាសយដ្ឋានលំនាំដើមពុម្ព។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងម៉ាក&gt; អាស័យពុម្ព។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,រាជធានីហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,រាជធានីហ៊ុន
 DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
 DocType: Payment Gateway Account,Payment Gateway Account,គណនីទូទាត់
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,បន្ទាប់ពីការបញ្ចប់ការទូទាត់ប្តូរទិសអ្នកប្រើទំព័រដែលបានជ្រើស។
@@ -3670,20 +3770,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,អ្នករចនា
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
 DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
+DocType: Asset,Current Value (After Depreciation),តម្លៃបច្ចុប្បន្ន (បន្ទាប់ពីរំលស់)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
 ,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ជួរដេក {0}: គណបក្សប្រភេទនិងគណបក្សគឺត្រូវបានទាមទារសម្រាប់ការទទួលគណនី / បង់ {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,យោងកាលបរិច្ឆេទ
@@ -3691,6 +3792,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
 DocType: GL Entry,Is Opening,តើការបើក
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,គណនី {0} មិនមាន
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,គណនី {0} មិនមាន
 DocType: Account,Cash,ជាសាច់ប្រាក់
 DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 5c1843e..b7f23d6 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,ವ್ಯಾಪಾರಿ
 DocType: Employee,Rented,ಬಾಡಿಗೆ
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಆಸ್ತಿ ಸ್ಕ್ರ್ಯಾಪ್ ಬಯಸುತ್ತೀರಾ?
 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.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ಟ್ರೀ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,ತೆರೆದ ತೋರಿಸಿ
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
 DocType: Designation,Designation,ಹುದ್ದೆ
@@ -64,7 +66,7 @@
 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 +642,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},ಹೊಸ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},ಹೊಸ {0}: # {1}
 ,Sales Partners Commission,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಆಯೋಗ
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ಸಂಕ್ಷೇಪಣ ಹೆಚ್ಚು 5 ಪಾತ್ರಗಳು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Payment Request,Payment Request,ಪಾವತಿ ವಿನಂತಿ
@@ -102,7 +104,7 @@
 DocType: Employee,Married,ವಿವಾಹಿತರು
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
 DocType: BOM,Total Cost,ಒಟ್ಟು ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
+DocType: Item,Is Fixed Asset,ಸ್ಥಿರ ಆಸ್ತಿ
 DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು
 DocType: Employee,Mr,ಶ್ರೀ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
@@ -156,7 +159,8 @@
 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,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 DocType: Newsletter,Email Sent?,ಕಳುಹಿಸಲಾದ ಇಮೇಲ್ ?
 DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
 DocType: Production Order Operation,Show Time Logs,ಟೈಮ್ ತೋರಿಸಿ ದಾಖಲೆಗಳು
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,ಐಟಂ {0} ಖರೀದಿಸಿ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: BOM Replace Tool,New BOM,ಹೊಸ BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,ಕಂಪನಿ ನಮೂದಿಸಿ
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
 DocType: Newsletter List,Total Subscribers,ಒಟ್ಟು ಚಂದಾದಾರರು
 ,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,ಅಧಿಸೂಚನೆ ಕಂಟ್ರೋಲ್
 DocType: Lead,Suggestions,ಸಲಹೆಗಳು
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ಈ ಪ್ರದೇಶ ಮೇಲೆ ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಬಜೆಟ್ ಹೊಂದಿಸಲು . ನೀವು ಆದ್ದರಿಂದ ವಿತರಣೆ ಹೊಂದಿಸುವ ಮೂಲಕ ಋತುಗಳು ಒಳಗೊಳ್ಳಬಹುದು.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ಗೋದಾಮಿನ ಪೋಷಕ ಖಾತೆಯನ್ನು ಗುಂಪು ನಮೂದಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},ಗೋದಾಮಿನ ಪೋಷಕ ಖಾತೆಯನ್ನು ಗುಂಪು ನಮೂದಿಸಿ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/config/desktop.py +83,Learn,ಕಲಿಯಿರಿ
+DocType: Asset,Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಯಾವುದೇ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,ಮಾರಾಟಗಾರನ ಟ್ರೀ ನಿರ್ವಹಿಸಿ .
 DocType: Job Applicant,Cover Letter,ಕವರ್ ಲೆಟರ್
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,ಅತ್ಯುತ್ತಮ ಚೆಕ್ ಮತ್ತು ತೆರವುಗೊಳಿಸಲು ಠೇವಣಿಗಳ
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] ಘಟಕಗಳು (# ಫಾರ್ಮ್ / ಐಟಂ / {1}) [{2}] ಕಂಡುಬರುತ್ತದೆ (# ಫಾರ್ಮ್ / ವೇರ್ಹೌಸ್ / {2})
 DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ
 DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: 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,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ಐಟಂ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Leave Application,Leave Approver Name,ಅನುಮೋದಕ ಹೆಸರು ಬಿಡಿ
-,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
+DocType: Depreciation Schedule,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: Packed Item,Packed Item,ಪ್ಯಾಕ್ಡ್ ಐಟಂ
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},ಚಟುವಟಿಕೆ ವೆಚ್ಚ ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ ನೌಕರರ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ - {1}
 apps/erpnext/erpnext/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,ಕರೆನ್ಸಿ ವಿನಿಮಯ
@@ -348,6 +355,7 @@
 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",""" ಸ್ಟಾಕ್ ಔಟ್ "" ಇವು ವಿನಂತಿಸಿದ ಐಟಂಗಳನ್ನು ಯೋಜಿತ ಪ್ರಮಾಣ ಮತ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಆಧರಿಸಿ ಎಲ್ಲಾ ಗೋದಾಮುಗಳು ಪರಿಗಣಿಸಿ"
+DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
 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.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
-DocType: Material Request Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
+DocType: Request for Quotation Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,ಸರಬರಾಜುದಾರ ಸಂದೇಶ
 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,ವೇತನರಹಿತ
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 ,Serial No Warranty Expiry,ಸೀರಿಯಲ್ ಭರವಸೆಯಿಲ್ಲ ಅಂತ್ಯ
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
+DocType: Project,Project will be accessible on the website to these users,ಪ್ರಾಜೆಕ್ಟ್ ಈ ಬಳಕೆದಾರರಿಗೆ ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದಾಗಿದೆ
 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 +53,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ಐಟಂ {0} ಐಟಂ ಖರೀದಿ ಇಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,ಐಟಂ {0} ಐಟಂ ಖರೀದಿ ಇಲ್ಲ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Pricing Rule,Valid From,ಮಾನ್ಯ
 DocType: Sales Invoice,Total Commission,ಒಟ್ಟು ಆಯೋಗ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
@@ -471,13 +481,13 @@
 , ಈ ವಿತರಣಾ ಬಳಸಿಕೊಂಡು ಒಂದು ಬಜೆಟ್ ವಿತರಿಸಲು ** ವೆಚ್ಚ ಕೇಂದ್ರದಲ್ಲಿ ** ಈ ** ಮಾಸಿಕ ವಿತರಣೆ ಹೊಂದಿಸಲು **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ಕ್ರೋಢಿಕೃತ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಮಾಡಬಾರದು
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಮಾಡಬಾರದು
 DocType: Warranty Claim,Resolution,ವಿಶ್ಲೇಷಣ
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},ತಲುಪಿಸಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ಕೊಡಬೇಕಾದ ಖಾತೆ
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,ಪುನರಾರಂಭಿಸು ಲಗತ್ತು
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,ಸಂಬಳ ಘಟಕಗಳನ್ನು .
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ಸಂಭಾವ್ಯ ಗ್ರಾಹಕರು ಡೇಟಾಬೇಸ್ .
@@ -494,7 +504,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,ಮಾಸ್ಟರ್ಸ್
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,ಅಪ್ಡೇಟ್ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ದಿನಾಂಕ
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,ಅಪ್ಡೇಟ್ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ನಿರಾಕರಣೆಗಳು ಸ್ಟಾಕ್ ದೋಷ ( {6} ) ಐಟಂ {0} ಮೇಲೆ {1} ವೇರ್ಹೌಸ್ {2} {3} ಗೆ {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,ಟೈಮ್ ಟ್ರಾಕಿಂಗ್
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
@@ -522,27 +532,27 @@
 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,ಡೀಫಾಲ್ಟ್ ಕಾಸ್ಟಿಂಗ್ ದರ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ನಂತರ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಗ್ರಾಹಕ ಆಧಾರಿತ ಸೋಸುತ್ತವೆ, ಗ್ರಾಹಕ ಗುಂಪಿನ, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರ, ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ, ಪ್ರಚಾರ, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,ಮಾರಾಟಗಾರನ ಗುರಿ
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,ನೌಕರರ ಅಥವಾ ಕಂಪನಿ ಎರಡೂ ಒಂದು ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
+DocType: Depreciation Schedule,Depreciation Amount,ಸವಕಳಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,ಸ್ಥಿರ ಡೇಸ್
 DocType: Quotation Item,Item Balance,ಐಟಂ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice,Packing List,ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ಪೂರೈಕೆದಾರರು givenName ಗೆ ಆದೇಶಗಳನ್ನು ಖರೀದಿಸಲು .
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ಪೂರೈಕೆದಾರರು givenName ಗೆ ಆದೇಶಗಳನ್ನು ಖರೀದಿಸಲು .
 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,ಸೇವಿಸುವ
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
 DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,ಗ್ರೂಪ್ ಗ್ರೂಪ್
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,ನನ್ನ ಯೋಜನೆಗಳು
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
+DocType: Company,Gain/Loss Account on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 DocType: Purchase Invoice,Quarterly,ತ್ರೈಮಾಸಿಕ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
 DocType: Sales Order Item,Basic Rate (Company Currency),ಮೂಲ ದರದ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,ಈ ವರ್ಷ ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್
 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 +529,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Mode of Payment Account,Default Account,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
 ,Sales Person Target Variance Item Group-Wise,ಮಾರಾಟಗಾರನ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
 DocType: Item Group,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},ನಿಮ್ಮ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ದೋಷ {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,ಹೊಸ ಖಾತೆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,ಹೊಸ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಒಂದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಮಾಡಿ. ಬೆಲೆ ನಿಯಮಗಳು: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಒಂದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಮಾಡಿ. ಬೆಲೆ ನಿಯಮಗಳು: {0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} ಇದು ಈ ಸರಕುಪಟ್ಟಿ ಮುಂದುವರಿಸಿ ಎಂದು ನಿಲ್ಲಿಸಲು ಮಾಡಬೇಕು ವೇಳೆ {1}, ಪರಿಶೀಲಿಸಿ ಆರ್ಡರ್ ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
 DocType: Company,Default Cost of Goods Sold Account,ಸರಕುಗಳು ಮಾರಾಟ ಖಾತೆ ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Process Payroll,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Supplier Quotation,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV ಮೂಲಕ ಸ್ಟಾಕ್ ಸಮತೋಲನ ಅಪ್ಲೋಡ್ .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ಈಗ ಕಳುಹಿಸಿ
 ,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,ತಾರ್ಕಿಕ ದೋಷ: ಅತಿಕ್ರಮಿಸುವ ಹೇಗೆ ಮಾಡಬೇಕು
 DocType: Item,Website Warehouse,ವೆಬ್ಸೈಟ್ ವೇರ್ಹೌಸ್
 DocType: Payment Reconciliation,Minimum Invoice Amount,ಕನಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 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 +267,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ಗ್ರಾಹಕ ಮತ್ತು ಸರಬರಾಜುದಾರ
 DocType: Email Digest,Email Digest Settings,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ಗ್ರಾಹಕರಿಂದ ಬೆಂಬಲ ಪ್ರಶ್ನೆಗಳು .
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ವೆಚ್ಚಗಳು
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,subcontracted ಇದೆ
 DocType: Item Attribute,Item Attribute Values,ಐಟಂ ಲಕ್ಷಣ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ವೀಕ್ಷಿಸಿ ಚಂದಾದಾರರು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
 DocType: Employee,Ms,MS
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+DocType: Journal Entry,Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,ಗೊಟೊ ಕಾರ್ಟ್
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,ಖಾಯಂ ವಿಳಾಸ ಈಸ್
 DocType: Production Order Operation,Operation completed for how many finished goods?,ಆಪರೇಷನ್ ಎಷ್ಟು ಸಿದ್ಧಪಡಿಸಿದ ವಸ್ತುಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿತು?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ಬ್ರ್ಯಾಂಡ್
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
 DocType: Employee,Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
-DocType: Journal Entry Account,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
+DocType: Asset,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,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
@@ -808,21 +825,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ&#39; ನಕಲು ನಡೆಯಲಿದೆ."
 DocType: Job Opening,Publish on website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ಗ್ರಾಹಕರಿಗೆ ರವಾನಿಸಲಾಯಿತು .
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
 DocType: Purchase Invoice,Additional Discount Percentage,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","ರೋ {0}: ಸರಕುಪಟ್ಟಿ {1} ಅಮಾನ್ಯವಾಗಿದೆ, ಅದನ್ನು ರದ್ದುಪಡಿಸಲಾಗಿದೆ ಇರಬಹುದು / ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ. \ ಮಾನ್ಯ ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
 ,Employee Holiday Attendance,ನೌಕರರ ಹಾಲಿಡೇ ಅಟೆಂಡೆನ್ಸ್
 DocType: Opportunity,Walk In,ವಲ್ಕ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ವರ್ಗಾವಣೆಯ
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,ನನ್ನ ಕಾರ್ಟ್
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
 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 +180,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
+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 +80,Leave Allocation Tool,ಅಲೋಕೇಶನ್ ಉಪಕರಣ ಬಿಡಿ
 DocType: Leave Block List,Leave Block List Dates,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
@@ -861,7 +882,7 @@
 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 +547,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ರಿಯಾಯಿತಿ
@@ -876,20 +897,21 @@
 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 +69,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,ಸಮಯ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,ಸಮಯ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Issue,Issue,ಸಂಚಿಕೆ
+DocType: Asset,Scrapped,ಕೈಬಿಟ್ಟಿತು
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,ಖಾತೆ ಕಂಪನಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ನೇಮಕಾತಿ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
@@ -906,7 +928,7 @@
 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 +18,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
+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,ಸರಾಸರಿ ವಯಸ್ಸು
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ
 DocType: Contact,Enter designation of this Contact,ಈ ಸಂಪರ್ಕಿಸಿ ಅಂಕಿತವನ್ನು ಯನ್ನು
 DocType: Expense Claim,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,ಕೊಡುಗೆ%
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,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,ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
 DocType: Salary Slip,Deductions,ನಿರ್ಣಯಗಳಿಂದ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ಈ ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ಎನಿಸಿದೆ.
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
 ,Trial Balance for Party,ಪಕ್ಷದ ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Lead,Consultant,ಕನ್ಸಲ್ಟೆಂಟ್
 DocType: Salary Slip,Earnings,ಅರ್ನಿಂಗ್ಸ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,ಮನವಿ ನಥಿಂಗ್
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,ಮನವಿ ನಥಿಂಗ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ಆಡಳಿತ
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,ಟೈಮ್ ಹಾಳೆಗಳು ಚಟುವಟಿಕೆಗಳು ವಿಧಗಳು
@@ -958,18 +981,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,ಈಮೇಲ್ ಅಡ್ರೆಸ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ಈಮೇಲ್ ಅಡ್ರೆಸ್ ಹೊಂದಿಸಿ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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},ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} ಈಗಾಗಲೇ ಬಳಕೆದಾರ ದಾಖಲಿಸಿದವರು: {1} ಮತ್ತು ಕಂಪನಿ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,ತೆರಿಗೆ ಮತ್ತು ಇತರ ಸಂಬಳ ನಿರ್ಣಯಗಳಿಂದ .
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,ಹಾಲಿಡೇ
 DocType: Leave Control Panel,Leave blank if considered for all branches,ಎಲ್ಲಾ ಶಾಖೆಗಳನ್ನು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 ,Daily Time Log Summary,ದೈನಂದಿನ ಸಮಯ ಲಾಗಿನ್ ಸಾರಾಂಶ
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},ಸಿ ರೂಪ ಸರಕುಪಟ್ಟಿ ಅನ್ವಯಿಸುವುದಿಲ್ಲ: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,ರಾಜಿಯಾಗದ ಪಾವತಿ ವಿವರಗಳು
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
@@ -996,19 +1020,20 @@
 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,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
 DocType: BOM Item,Item Description,ಐಟಂ ವಿವರಣೆ
 DocType: Payment Tool,Payment Mode,ಪಾವತಿ ಮೋಡ್
 DocType: Purchase Invoice,Is Recurring,ಮರುಕಳಿಸುವ ಆಗಿದೆ
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},ಸತತವಾಗಿ ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ಸಾರಾಂಶ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 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 +165,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,ಖಾತೆ ತಲೆ {0} ದಾಖಲಿಸಿದವರು
 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,ಒಟ್ಟು ಸಾಧಿಸಿದ
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 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,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
 DocType: Hub Settings,Seller Website,ಮಾರಾಟಗಾರ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/controllers/selling_controller.py +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},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸ್ಥಿತಿ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},ಎಂಬ ಯಾವುದೇ ಐಟಂ ಸಿಗಲಿಲ್ಲ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ಒಟ್ಟು ಹೊರಹೋಗುವ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","ಕೇವಲ "" ಮೌಲ್ಯವನ್ನು "" 0 ಅಥವಾ ಖಾಲಿ ಮೌಲ್ಯದೊಂದಿಗೆ ಒಂದು ಹಡಗು ರೂಲ್ ಕಂಡಿಶನ್ ಇಡಬಹುದು"
 DocType: Authorization Rule,Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,ವೆಬ್ಸೈಟ್ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Purchase Invoice,Total (Company Currency),ಒಟ್ಟು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,ಕ್ರಮಸಂಖ್ಯೆ {0} ಒಮ್ಮೆ ಹೆಚ್ಚು ಪ್ರವೇಶಿಸಿತು
-DocType: Journal Entry,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
@@ -1095,6 +1121,7 @@
 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,ಕಾರ್ಯಸ್ಥಾನ
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,ಉದ್ಧರಣ ಸರಬರಾಜುದಾರ ವಿನಂತಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಗೋಲ್
 DocType: Salary Slip,Earning,ಗಳಿಕೆ
 DocType: Payment Tool,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರೆನ್ಸಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},ಸವಕಳಿ ನಂತರ ಪ್ರಸ್ತುತ ಮೌಲ್ಯ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
 ,BOM Browser,BOM ಬ್ರೌಸರ್
 DocType: Purchase Taxes and Charges,Add or Deduct,ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸುವ
 DocType: Company,If Yearly Budget Exceeded (for expense account),ವಾರ್ಷಿಕ ಬಜೆಟ್ (ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಗೆ) ಮೀರಿದ್ದಲ್ಲಿ
@@ -1119,21 +1147,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
 DocType: Project,Start and End Dates,ಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ದಿನಾಂಕ ಎಂಡ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,ವೈಶಿಷ್ಟ್ಯಗಳು ಸೆಟಪ್
+DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Item,Is Service Item,ಸೇವೆ ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 DocType: Payment Request,Transaction Currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ಗೆ {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},ಗೆ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,OperationDescription
 DocType: Item,Will also apply to variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಉಳಿಸಲಾಗಿದೆ ಒಮ್ಮೆ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,ದಂಡಯಾತ್ರೆ
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,ಕಂಪನಿ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ಸಂವಹನ ದಾಖಲೆ .
@@ -1156,8 +1185,8 @@
 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 +472,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
 DocType: Rename Tool,Type of document to rename.,ಬದಲಾಯಿಸಲು ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ .
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
 DocType: Address,Billing,ಬಿಲ್ಲಿಂಗ್
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,ರೀಡಿಂಗ್ಸ್
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
+DocType: Asset,Asset Name,ಆಸ್ತಿ ಹೆಸರು
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Supplier,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ಉದ್ಧರಣ ವಿನಂತಿ ಕೆಳಗಿನ ಲಿಂಕ್ ಕ್ಲಿಕ್ ಪ್ರವೇಶ ಮಾಡಬಹುದು
+DocType: Asset,Number of Months in a Period,ಒಂದು ಅವಧಿಯಲ್ಲಿ ತಿಂಗಳ ಸಂಖ್ಯೆ
 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,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),ಒಟ್ಟು ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),ಒಟ್ಟು ({0})
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Invoice,Source,ಮೂಲ
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,ಮುಚ್ಚಲಾಗಿದೆ ಶೋ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನುಭವ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 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 +86,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} ಕಂಡುಬಂದಿಲ್ಲ, ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ (ಹೊಣೆಗಾರಿಕೆ) ಪುಸ್ತಕ ಬೇಕಾಗಿತ್ತು. ಒಂದು ಖರೀದಿಸುವ ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಐಟಂ ಬೆಲೆ ನೀಡಿರಿ."
@@ -1236,7 +1269,7 @@
 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.,ಖಾತೆಗಳ ಚಾರ್ಟ್ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಿ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 DocType: Time Log Batch Detail,Time Log Batch Detail,ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ವಿವರ
 DocType: Landed Cost Voucher,Landed Cost Help,ಇಳಿಯಿತು ವೆಚ್ಚ ಸಹಾಯ
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,ಫೈರ್ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,ಪೆಟ್ಟಿಗೆ
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +131,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,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
 DocType: Purchase Receipt,Supplier Warehouse,ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Opportunity,Contact Mobile No,ಸಂಪರ್ಕಿಸಿ ಮೊಬೈಲ್ ನಂ
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,ಇತರ ವರದಿಗಳು
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,ಹಿಂದಿನ ಹಣಕಾಸು ವರ್ಷದ ಮುಚ್ಚಿಲ್ಲ
 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 +40,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 +38,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice,Reference Document,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 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',' Customerwise ಡಿಸ್ಕೌಂಟ್ ' ಅಗತ್ಯವಿದೆ ಗ್ರಾಹಕ
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
 DocType: Quotation,Term Details,ಟರ್ಮ್ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 ಹೆಚ್ಚು ಇರಬೇಕು
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ದಿನಗಳು) ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು \ {0} {1} ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ವಿರುದ್ಧ ಹಣ ಅಡ್ವಾನ್ಸ್ {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ ಕಡಿತಗೊಳಿಸು ಕಡಿಮೆ ( LWP )
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ಮ್ಯಾನೇಜರ್
 DocType: Packed Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
@@ -1367,15 +1401,15 @@
 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,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
+DocType: Asset,Gross Purchase Amount,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","ಉದಾಹರಣೆಗೆ ""XYZ ನ್ಯಾಷನಲ್ ಬ್ಯಾಂಕ್ """
+DocType: Asset,Depreciation Method,ಸವಕಳಿ ವಿಧಾನ
 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 +29,Shopping Cart is enabled,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಲಾಗುವುದು
 DocType: Job Applicant,Applicant for a Job,ಒಂದು ಜಾಬ್ ಅರ್ಜಿದಾರರ
 DocType: Production Plan Material Request,Production Plan Material Request,ಪ್ರೊಡಕ್ಷನ್ ಯೋಜನೆ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,ಮುಖ್ಯ
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
@@ -1426,31 +1462,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ಕೆಲಸ ಸಂ .
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,ವಿಳಾಸಗಳು
+apps/erpnext/erpnext/hooks.py +91,Addresses,ವಿಳಾಸಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,ರೀತಿಗೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,ಐಟಂ ಪ್ರೊಡಕ್ಷನ್ ಕ್ರಮಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,ಐಟಂ ಪ್ರೊಡಕ್ಷನ್ ಕ್ರಮಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಮೇಲೆ ಫಿಲ್ಟರ್ ಸೆಟ್ ಮಾಡಿ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ಈ ಪ್ಯಾಕೇಜ್ ನಿವ್ವಳ ತೂಕ . ( ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲ ಐಟಂಗಳನ್ನು ನಿವ್ವಳ ತೂಕ ಮೊತ್ತ ಎಂದು )
 DocType: Sales Order,To Deliver and Bill,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,ಉತ್ಪಾದನೆ ಸಮಯ ದಾಖಲೆಗಳು.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,ಕಾರ್ಯಗಳಿಗಾಗಿ ಟೈಮ್ ಲಾಗ್ .
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ಬೆಂಕಿ
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
 DocType: Quotation Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
+DocType: Request for Quotation Supplier,Send Email to Supplier,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ ಕಳುಹಿಸಿ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 DocType: Packing Slip,To Package No.,ನಂ ಕಟ್ಟಿನ
 DocType: Production Planning Tool,Material Requests,ವಸ್ತು ವಿನಂತಿಗಳು
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ಡೆಲಿವರಿ ವೇರ್ಹೌಸ್
 DocType: Stock Settings,Allowance Percent,ಭತ್ಯೆ ಪರ್ಸೆಂಟ್
 DocType: SMS Settings,Message Parameter,ಸಂದೇಶ ನಿಯತಾಂಕ
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,ಆರ್ಥಿಕ ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಟ್ರೀ.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,ಆರ್ಥಿಕ ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಟ್ರೀ.
 DocType: Serial No,Delivery Document No,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Serial No,Creation Date,ರಚನೆ ದಿನಾಂಕ
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,ಪ್ರಮಾಣವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ ಸೇವೆ
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: Delivery Note Item,Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
 ,Serial No Status,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,ಐಟಂ ಟೇಬಲ್ ಖಾಲಿ ಇರಕೂಡದು
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ಸಾಲು {0}: ಹೊಂದಿಸಲು {1} ಆವರ್ತನವು, ಮತ್ತು ದಿನಾಂಕ \
  ಗೆ ನಡುವಿನ ವ್ಯತ್ಯಾಸ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {2}"
 DocType: Pricing Rule,Selling,ವಿಕ್ರಯ
 DocType: Employee,Salary Information,ವೇತನ ಮಾಹಿತಿ
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ ಕಾನ್ಫಿಗರ್
 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: Production Order,Material Request Item,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಐಟಂ
+DocType: Request for Quotation Item,Material Request Item,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಐಟಂ
 apps/erpnext/erpnext/config/stock.py +85,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,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Asset,Sold,ಮಾರಾಟ
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
 DocType: Sales Invoice,Accounting Details,ಲೆಕ್ಕಪರಿಶೋಧಕ ವಿವರಗಳು
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ಈ ಕಂಪೆನಿಗೆ ಎಲ್ಲಾ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ಹಂಚಿಕೆಯು
 DocType: Quality Inspection Reading,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಮೂದಿಸಿ
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 DocType: Item Group,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,ಗುಂಪು
@@ -1552,6 +1592,7 @@
 ,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","ಕೆಳಗಿನ ದಾಖಲೆಗಳನ್ನು ಡೆಲಿವರಿ ಗಮನಿಸಿ, ಅವಕಾಶ, ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ, ಐಟಂ, ಆರ್ಡರ್ ಖರೀದಿಸಿ, ಖರೀದಿ ಚೀಟಿ, ಖರೀದಿದಾರ ರಸೀತಿ, ಉದ್ಧರಣ, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ, ಉತ್ಪನ್ನ ಕಟ್ಟು, ಮಾರಾಟದ ಆರ್ಡರ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಬ್ರ್ಯಾಂಡ್ ಹೆಸರಿನ ಟ್ರ್ಯಾಕ್"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,ಎಲ್ಲಾ ಕಾರ್ಯಗಳ ಗಂಟ್ ಚಾರ್ಟ್ .
+DocType: Pricing Rule,Margin Type,ಮಾರ್ಜಿನ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Appraisal,For Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Holiday List,Clear Table,ತೆರವುಗೊಳಿಸಿ ಟೇಬಲ್
 DocType: Features Setup,Brands,ಬ್ರಾಂಡ್ಸ್
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಸಂಖ್ಯಾ ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,ಜೋಡಿ
+DocType: Asset,Depreciation Schedule,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 DocType: Maintenance Schedule Detail,Actual Date,ನಿಜವಾದ ದಿನಾಂಕ
 DocType: Item,Has Batch No,ಬ್ಯಾಚ್ ನಂ ಹೊಂದಿದೆ
 DocType: Delivery Note,Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
+DocType: Asset,Purchase Date,ಖರೀದಿಸಿದ ದಿನಾಂಕ
 DocType: Employee,Personal Details,ವೈಯಕ್ತಿಕ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ&#39; ಸೆಟ್ {0}
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,ಮರುಕೌನ್ಸಿಲ್ ನಮೂದುಗಳು ಸೇರಿಸಿ
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,ಘಟಕ
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ಖರ್ಚು ಹಕ್ಕು
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ದಿನಾಂಕ ಸತತವಾಗಿ ಚೆಕ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Salary Slip,Deduction,ವ್ಯವಕಲನ
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 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 +137,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,ಲೆಕ್ಕಹಾಕಿದ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ಉದ್ಧರಣ
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Quotation,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
@@ -1645,8 +1691,8 @@
 ,SO Qty,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
+DocType: Request for Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
 apps/erpnext/erpnext/hooks.py +71,Shipments,ಸಾಗಣೆಗಳು
 DocType: Purchase Order Item,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
@@ -1654,12 +1700,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ರೋ #
 DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ
-DocType: Pricing Rule,Supplier,ಸರಬರಾಜುದಾರ
+DocType: Asset,Supplier,ಸರಬರಾಜುದಾರ
 DocType: C-Form,Quarter,ಕಾಲು ಭಾಗ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
 DocType: Global Defaults,Default Company,ಡೀಫಾಲ್ಟ್ ಕಂಪನಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,ಬಳಕೆದಾರ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಒಂದು ಆಸ್ತಿ ಲಿಂಕ್ ಇದೆ ಇರಬೇಕು"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ಮಕ್ಕಳ ಐಟಂ ಒಂದು ಉತ್ಪನ್ನ ಬಂಡಲ್ ಮಾಡಬಾರದು. ದಯವಿಟ್ಟು ಐಟಂ ಅನ್ನು ತೆಗೆದುಹಾಕಿ `{0}` ಮತ್ತು ಉಳಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ) ಮೂಲಕ ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ (ಮತ್ತು ಹಾಗೆ ತೆರಿಗೆ ಪ್ರಮಾಣ ಬಗ್ಗೆ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Quality Inspection,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
@@ -1695,10 +1741,11 @@
 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,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
 DocType: Quotation Item,Stock Balance,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,ಟೈಮ್ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,ಟೈಮ್ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Employee,Blood Group,ರಕ್ತ ಗುಂಪು
@@ -1716,13 +1763,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Offer Letter Term,Offer Term,ಆಫರ್ ಟರ್ಮ್
 DocType: Quality Inspection,Quality Manager,ಗುಣಮಟ್ಟದ ಮ್ಯಾನೇಜರ್
 DocType: Job Applicant,Job Opening,ಉದ್ಯೋಗಾವಕಾಶದ
 DocType: Payment Reconciliation,Payment Reconciliation,ಪಾವತಿ ಸಾಮರಸ್ಯ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ಪತ್ರ ನೀಡಲು
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ( MRP ) ಮತ್ತು ಉತ್ಪಾದನೆ ಮುಖಾಂತರವೇ .
@@ -1730,22 +1777,22 @@
 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 +103,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Production Order Operation,Completed Qty,ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ಪ್ರಸ್ತುತ ಮೌಲ್ಯಮಾಪನ ದರ
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,ಆದೇಶ ಅಥವಾ ಇನ್ವಾಯ್ಸ್ ವಿರುದ್ಧ ಪಾವತಿ ನಮೂದುಗಳು ರಚಿಸಿ.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ಆದೇಶ ಅಥವಾ ಇನ್ವಾಯ್ಸ್ ವಿರುದ್ಧ ಪಾವತಿ ನಮೂದುಗಳು ರಚಿಸಿ.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
@@ -1754,10 +1801,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,ಈಗ ಅನ್ವಯಿಸು
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,ಈಗ ಅನ್ವಯಿಸು
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
 ,Bank Clearance Summary,ಬ್ಯಾಂಕ್ ಕ್ಲಿಯರೆನ್ಸ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,ಉದ್ಯೋಗದ ವಿವರಗಳು
 DocType: Employee,New Workplace,ಹೊಸ ಕೆಲಸದ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ಮುಚ್ಚಲಾಗಿದೆ ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},ಬಾರ್ಕೋಡ್ ಐಟಂ ಅನ್ನು {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},ಬಾರ್ಕೋಡ್ ಐಟಂ ಅನ್ನು {0}
 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,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},ಐಟಂ {0} ಒಂದು ಮಾರಾಟದ ಐಟಂ ಇರಬೇಕು {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ಗಳಂತಹವು ( ಹೊಣೆಗಾರಿಕೆಗಳು )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,ನೌಕರರ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,ಆಮದು ಇಮೇಲ್
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,ಬಳಕೆದಾರ ಎಂದು ಆಹ್ವಾನಿಸಿ
 DocType: Features Setup,After Sale Installations,ಮಾರಾಟಕ್ಕೆ ಅನುಸ್ಥಾಪನೆಗಳು ನಂತರ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},ಕಂಪನಿ ಸೆಟ್ ದಯವಿಟ್ಟು {0} {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 DocType: Workstation Working Hour,End Time,ಎಂಡ್ ಟೈಮ್
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,ಮಾರಾಟದ ಅಥವಾ ಖರೀದಿಗಾಗಿ ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಒಪ್ಪಂದದ ವಿಚಾರದಲ್ಲಿ .
@@ -1830,9 +1879,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ಔಷಧೀಯ
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Gateway Account,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,Accepted,Accepted
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,ಸುದ್ದಿಪತ್ರ ಮೇಲ್ ಪಟ್ಟಿ
 DocType: Delivery Note,Transporter Name,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ಹೆಸರು
 DocType: Authorization Rule,Authorized Value,ಅಧಿಕೃತ ಮೌಲ್ಯ
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} ಮುಚ್ಚಲ್ಪಟ್ಟಿದೆ
 DocType: Email Digest,How frequently?,ಹೇಗೆ ಆಗಾಗ್ಗೆ ?
 DocType: Purchase Receipt,Get Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್&gt; ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು&gt; ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು ಹೋಗಿ ರೀತಿಯ ಮಕ್ಕಳ ಸೇರಿಸಿ) ಕ್ಲಿಕ್ಕಿಸಿ ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ ( &quot;ಬ್ಯಾಂಕ್&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ವಸ್ತುಗಳ ಬಿಲ್ ಟ್ರೀ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,ಮಾರ್ಕ್ ಪ್ರೆಸೆಂಟ್
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},ನಿರ್ವಹಣೆ ಆರಂಭ ದಿನಾಂಕ ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,ಉದ್ದೇಶ
+DocType: Company,Fixed Asset Depreciation Settings,ಸ್ಥಿರ ಆಸ್ತಿ ಸವಕಳಿ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Item,Will also apply for variants unless overrridden,Overrridden ಹೊರತು ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
 DocType: Purchase Invoice,Advances,ಅಡ್ವಾನ್ಸಸ್
 DocType: Production Order,Manufacture against Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ವಿರುದ್ಧ ತಯಾರಿಸಲು
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,ಮಗುವಿನ ನೋಡ್ ಹೊಂದಿದೆ
@@ -1959,12 +2009,14 @@
  9. ತೆರಿಗೆ ಅಥವಾ ಚಾರ್ಜ್ ಪರಿಗಣಿಸಿ: ತೆರಿಗೆ / ಚಾರ್ಜ್ ಮೌಲ್ಯಮಾಪನ ಮಾತ್ರ (ಒಟ್ಟು ಭಾಗವಾಗಿರದ) ಅಥವಾ ಮಾತ್ರ (ಐಟಂ ಮೌಲ್ಯವನ್ನು ಸೇರಿಸಲು ಮಾಡುವುದಿಲ್ಲ) ಒಟ್ಟು ಅಥವಾ ಎರಡೂ ವೇಳೆ ಈ ವಿಭಾಗದಲ್ಲಿ ನೀವು ಸೂಚಿಸಬಹುದು.
  10. ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸದಿರುವುದರ: ನೀವು ಸೇರಿಸಲು ಅಥವಾ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸುವ ಬಯಸುವ ಎಂದು."
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
+DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ಇ ಜಿ ಬ್ಯಾಂಕ್ , ನಗದು, ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್&gt; ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು&gt; ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು ಹೋಗಿ ರೀತಿಯ ಮಕ್ಕಳ ಸೇರಿಸಿ) ಕ್ಲಿಕ್ಕಿಸಿ ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ ( &quot;ಬ್ಯಾಂಕ್&quot;
 DocType: Journal Entry,Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} ಕಾರ್ಯಾಚರಣೆಗೆ {1}
 DocType: Features Setup,Quality,ಗುಣಮಟ್ಟ
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,ಮೇಲೆ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡ ಅಥವಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಯಾವುದೇ ಉದ್ಯೋಗಿ ಈಗಾಗಲೇ ರಚಿಸಿದ
@@ -2017,7 +2069,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ವೇತನದಾರರ
 apps/erpnext/erpnext/accounts/doctype/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} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,ಖರೀದಿ ರಸೀತಿ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಫಾರ್ಮ್ಸ್
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್&gt; ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಹೊಸದನ್ನು ರಚಿಸಲು.
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Taxes and Charges Deducted,ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
-apps/erpnext/erpnext/config/support.py +7,Issues,ತೊಂದರೆಗಳು
+apps/erpnext/erpnext/hooks.py +90,Issues,ತೊಂದರೆಗಳು
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ಸ್ಥಿತಿ ಒಂದು ಇರಬೇಕು {0}
 DocType: Sales Invoice,Debit To,ಡೆಬಿಟ್
 DocType: Delivery Note,Required only for sample item.,ಕೇವಲ ಮಾದರಿ ಐಟಂ ಅಗತ್ಯವಿದೆ .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
 ,Profit and Loss Statement,ಲಾಭ ಮತ್ತು ನಷ್ಟ ಹೇಳಿಕೆ
@@ -2078,10 +2132,10 @@
 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 +139,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ವಿನಿಮಯ ದರ ಇನ್ನೊಂದು ಒಂದು ಕರೆನ್ಸಿ ಪರಿವರ್ತಿಸಲು ಸೂಚಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
 ,Requested,ವಿನಂತಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Supplier Quotation Item,Material Request No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ನಂ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
@@ -2176,7 +2231,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 DocType: Payment Request,Recipient and Message,ಸ್ವೀಕರಿಸುವವರ ಮತ್ತು ಸಂದೇಶ
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ ಆಯ್ಕೆ
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,ಉದ್ಧರಣಾ ಫಾರ್ ವಿನಂತಿ.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಮಾರಾಟ ಐಟಂ&quot; &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot; ಅಲ್ಲಿ &quot;ಹೌದು&quot; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,ಡಾಕ್ಯುಮೆಂಟ್ ನಂ ವಿರುದ್ಧ
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ನಿರ್ವಹಿಸಿ.
 DocType: Quality Inspection,Inspection Type,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್
@@ -2240,6 +2296,7 @@
 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,ಜಾಹೀರಾತು
+DocType: Asset Category Account,Depreciation Expense Account,ಸವಕಳಿ ಖರ್ಚುವೆಚ್ಚ
 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,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ದೃಢಪಡಿಸಿದರು
 DocType: Payment Gateway,Gateway,ಗೇಟ್ವೇ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,ಮೊತ್ತ
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,ಮೊತ್ತ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
@@ -2267,18 +2324,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,ಅಕ್ಸೆಪ್ಟೆಡ್ ವೇರ್ಹೌಸ್
 DocType: Bank Reconciliation Detail,Posting Date,ದಿನಾಂಕ ಪೋಸ್ಟ್
 DocType: Item,Valuation Method,ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} ಗೆ ವಿನಿಮಯ ದರದ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} ಗೆ ವಿನಿಮಯ ದರದ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ಮಾರ್ಕ್ ಅರ್ಧ ದಿನ
 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 +410,[Error],[ದೋಷ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ಗ್ರಾಹಕ ಮಳಿಗೆ (ಐಚ್ಛಿಕ)
 DocType: Pricing Rule,Discount Percentage,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
@@ -2304,14 +2362,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,ನಿಯಮಗಳು ಅಥವಾ ಒಪ್ಪಂದದ ಟೆಂಪ್ಲೇಟು .
 DocType: Purchase Invoice,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Supplier,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Employee,Feedback,ಪ್ರತ್ಯಾದಾನ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ಮೊದಲು ಹಂಚಿಕೆ ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {0}, ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
+DocType: Asset,Expected Value After Useful Life,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ
 DocType: Item,Reorder level based on Warehouse,ವೇರ್ಹೌಸ್ ಆಧರಿಸಿ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ
 DocType: Activity Cost,Billing Rate,ಬಿಲ್ಲಿಂಗ್ ದರ
 ,Qty to Deliver,ಡೆಲಿವರ್ ಪ್ರಮಾಣ
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ರದ್ದು ಅಥವಾ ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Delivery Note,Track this Delivery Note against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಟ್ರ್ಯಾಕ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,ಹೂಡಿಕೆ ನಿವ್ವಳ ನಗದು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,ಆಸ್ತಿ {0} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
-DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
+DocType: Asset,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
 DocType: Employee Education,School/University,ಸ್ಕೂಲ್ / ವಿಶ್ವವಿದ್ಯಾಲಯ
 DocType: Payment Request,Reference Details,ರೆಫರೆನ್ಸ್ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
 DocType: Sales Invoice Item,Available Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
 ,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
+DocType: Asset,Double Declining Balance,ಡಬಲ್ ಕ್ಷೀಣಿಸಿದ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ಮುಚ್ಚಿದ ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ. ರದ್ದು ತೆರೆದಿಡು.
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
+DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,ಮಿನಿಟ್
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 ,Qty to Receive,ಸ್ವೀಕರಿಸುವ ಪ್ರಮಾಣ
 DocType: Leave Block List,Leave Block List Allowed,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
 DocType: Global Defaults,Disable In Words,ವರ್ಡ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ಆಸ್ತಿ ವರ್ಗ {0} ಅಥವಾ ಕಂಪನಿಯಲ್ಲಿ ಸವಕಳಿ ಸಂಬಂಧಿಸಿದ ಖಾತೆಗಳು ಸೆಟ್ ಮಾಡಿ {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},ಇಮೇಲ್ ಪೂರೈಕೆದಾರ ಕಳುಹಿಸಲಾಗುವುದು {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
@@ -2401,7 +2467,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,ಒಟ್ಟು ಅಂಚು
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
 DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 DocType: Hub Settings,Publish Items to Hub,ಹಬ್ ಐಟಂಗಳು ಪ್ರಕಟಿಸಿ
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
 DocType: Payment Gateway Account,Default Payment Request Message,ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ವಿನಂತಿ ಸಂದೇಶ
 DocType: Item Group,Check this if you want to show in website,ನೀವು ವೆಬ್ಸೈಟ್ ತೋರಿಸಲು ಬಯಸಿದರೆ ಈ ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,ಬ್ಯಾಂಕಿಂಗ್ ಮತ್ತು ಪಾವತಿಗಳು
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,ಬ್ಯಾಂಕಿಂಗ್ ಮತ್ತು ಪಾವತಿಗಳು
 ,Welcome to ERPNext,ERPNext ಸ್ವಾಗತ
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ಚೀಟಿ ವಿವರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,ಉದ್ಧರಣ ದಾರಿ
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,ಎಲೆಗಳು ಮತ್ತು ಹಾಲಿಡೇ
 DocType: Sales Order,Not Billed,ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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
@@ -2476,15 +2543,17 @@
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
+DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,ಆಸ್ತಿ {0} ದಿನಾಂಕ ಖರೀದಿ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),ಸಾಲಗಾರರು ({0})
-DocType: Project,Margin,ಕರೆ
+DocType: Pricing Rule,Margin,ಕರೆ
 DocType: Salary Slip,Arrear Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ಹೊಸ ಗ್ರಾಹಕರು
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
@@ -2492,20 +2561,23 @@
 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,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸುವಾಗ ಪ್ರತಿ ಉದ್ಯೋಗಿ ಮೇಲ್ ಸಂಬಳ ಸ್ಲಿಪ್ ಕಳುಹಿಸಲು ಬಯಸಿದರೆ ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
 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 +57,Where manufacturing operations are carried.,ಉತ್ಪಾದನಾ ಕಾರ್ಯಗಳ ಅಲ್ಲಿ ನಿರ್ವಹಿಸುತ್ತಾರೆ.
 DocType: Stock Entry Detail,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
 DocType: Employee,Confirmation Date,ದೃಢೀಕರಣ ದಿನಾಂಕ
 DocType: C-Form,Total Invoiced Amount,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 DocType: Account,Sales User,ಮಾರಾಟ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,ಮಿನ್ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Account,Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ
 DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
 DocType: Payment Request,Email To,ಇಮೇಲ್
 DocType: Lead,Lead Owner,ಲೀಡ್ ಮಾಲೀಕ
 DocType: Bin,Requested Quantity,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
 DocType: Employee,Marital Status,ವೈವಾಹಿಕ ಸ್ಥಿತಿ
 DocType: Stock Settings,Auto Material Request,ಆಟೋ ಉತ್ಪನ್ನ ವಿನಂತಿ
 DocType: Time Log,Will be updated when billed.,ಕೊಕ್ಕಿನ ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
@@ -2513,11 +2585,12 @@
 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 +115,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 +84,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,ಅದೇ ಪೂರೈಕೆದಾರ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,ಕಂಪೆನಿ ಹೆಸರು ಕಂಪನಿ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು letterheads .
@@ -2527,13 +2600,14 @@
 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 ಹೊಂದಿದೆ .
 DocType: Payment Request,Payment Details,ಪಾವತಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
+DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","ಮಾದರಿ ಇಮೇಲ್, ಫೋನ್, ಚಾಟ್, ಭೇಟಿ, ಇತ್ಯಾದಿ ಎಲ್ಲಾ ಸಂವಹನ ರೆಕಾರ್ಡ್"
 DocType: Manufacturer,Manufacturers used in Items,ವಸ್ತುಗಳ ತಯಾರಿಕೆಯಲ್ಲಿ ತಯಾರಕರು
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಬಗ್ಗೆ ದಯವಿಟ್ಟು
 DocType: Purchase Invoice,Terms,ನಿಯಮಗಳು
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,ಹೊಸ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,ಹೊಸ ರಚಿಸಿ
 DocType: Buying Settings,Purchase Order Required,ಆದೇಶ ಅಗತ್ಯವಿರುವ ಖರೀದಿಸಿ
 ,Item-wise Sales History,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ಇತಿಹಾಸ
 DocType: Expense Claim,Total Sanctioned Amount,ಒಟ್ಟು ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},ದರ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ಸಂಬಳದ ಸ್ಲಿಪ್ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,ಮೊದಲ ಗುಂಪು ನೋಡ್ ಆಯ್ಕೆ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,ಮೊದಲ ಗುಂಪು ನೋಡ್ ಆಯ್ಕೆ.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ನೌಕರರ ಮತ್ತು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ನಿಮ್ಮ ಕಂಪನಿಗೆ ವಿಳಾಸ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ, ಮಾರಾಟ ಪಾಲುದಾರ ಮತ್ತು ಪ್ರಮುಖ ಉಲ್ಲೇಖವನ್ನು ತೆಗೆದುಹಾಕಲು"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ಗೆ {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ಬದಲಿಗೆ ಸಾಧನ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,ಮುಂದಿನ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚು ಇರಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ಫಾರ್ಮ್ / ಐಟಂ / {0}) ಷೇರುಗಳ ಔಟ್
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,ಮುಂದಿನ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚು ಇರಬೇಕು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/accounts/party.py +289,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',ನೀವು ಉತ್ಪಾದನಾ ಚಟುವಟಿಕೆ ಒಳಗೊಂಡಿರುತ್ತವೆ ವೇಳೆ . ಐಟಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ' ತಯಾರಿಸುತ್ತದೆ '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ಸರಕುಪಟ್ಟಿ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","ಗಮನಿಸಿ: ಪಾವತಿ ಯಾವುದೇ ಉಲ್ಲೇಖ ವಿರುದ್ಧ ಹೋದರೆ, ಕೈಯಾರೆ ಜರ್ನಲ್ ನಮೂದನ್ನು ಮಾಡಲು."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
 ,Stock Ageing,ಸ್ಟಾಕ್ ಏಜಿಂಗ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
+DocType: Asset Category Account,Fixed Asset Account,ಸ್ಥಿರ ಆಸ್ತಿ ಖಾತೆಯನ್ನು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,ಆಂತರಿಕ
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,BOM ಗೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,ಸಂಬಳ ರಚನೆ
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ಉಲ್ಲೇಖಗಳು
 DocType: Hub Settings,Access Token,ಪ್ರವೇಶ ಟೋಕನ್
 DocType: Sales Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
-DocType: Item,Is Fixed Asset Item,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,Print Language,ಮುದ್ರಣ ಭಾಷಾ
 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","ನೀವು ದೀರ್ಘ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಹೊಂದಿದ್ದರೆ, ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಎಲ್ಲಾ ಪ್ರತಿ ಪುಟದಲ್ಲಿ ಶೀರ್ಷಿಕೆಗಳು ಮತ್ತು ಅಡಿಟಿಪ್ಪಣಿಗಳು ಬಹು ಪುಟಗಳನ್ನು ಮೇಲೆ ಮುದ್ರಿತ ಪುಟ ಬೇರ್ಪಡಿಸಲು ಬಳಸಬಹುದಾಗಿದೆ"
+DocType: Asset,Number of Depreciations,Depreciations ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
 DocType: Product Bundle Item,Product Bundle Item,ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ಗರಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 DocType: Purchase Invoice Item,Image View,ImageView
 apps/erpnext/erpnext/config/selling.py +23,Customers,ಗ್ರಾಹಕರು
+DocType: Asset,Partially Depreciated,ಭಾಗಶಃ Depreciated
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,ನಿರ್ವಹಣೆ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,ಒಟ್ಟು ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,' ಕೊನೆಯ ಆರ್ಡರ್ ರಿಂದ ಡೇಸ್ ' ಹೆಚ್ಚು ಅಥವಾ ಶೂನ್ಯಕ್ಕೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಇರಬೇಕು
-DocType: C-Form,Amended From,ಗೆ ತಿದ್ದುಪಡಿ
+DocType: Asset,Amended From,ಗೆ ತಿದ್ದುಪಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ&#39; ಸೂಚಿಸಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,ಕಾರ್ಟ್ ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ಗುಂಪಿನ
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
 DocType: Production Planning Tool,Get Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆಮ್ಟ್)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,ಲೆಕ್ಕಪರಿಶೋಧಕ ಹೇಳಿಕೆಗಳು
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,ಲೆಕ್ಕಪರಿಶೋಧಕ ಹೇಳಿಕೆಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ಗಂಟೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
@@ -2746,15 +2825,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 ಘಟಕಗಳು ಆದೇಶ ಇದ್ದರೆ . ನಿಮ್ಮ ಸೇವನೆ ನೀವು 110 ಘಟಕಗಳು ಸ್ವೀಕರಿಸಲು 10% ಅವಕಾಶವಿರುತ್ತದೆ ಇದೆ .
 DocType: Pricing Rule,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
@@ -2762,12 +2842,13 @@
 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,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},ದೋಷ: {0}&gt; {1}
 DocType: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
@@ -2779,18 +2860,18 @@
 DocType: Purchase Invoice,Mobile No,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Payment Tool,Make Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Leave Allocation,New Leaves Allocated,ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,ವ್ಯಾಪಾರದ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},ದೋಷ: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 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 +52,All Products or Services.,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಸೇವೆಗಳ .
 DocType: Supplier Quotation,Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
+apps/erpnext/erpnext/config/accounts.py +259,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,ಹಣಕಾಸು ಸೇವೆಗಳು
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} ಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ಗೆ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3}
@@ -2801,10 +2882,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,ಕೋಟಿ
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
 DocType: Features Setup,POS View,ಪಿಓಎಸ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,ಮುಂದಿನ ದಿನಾಂಕ ದಿನ ಮತ್ತು ತಿಂಗಳ ದಿನದಂದು ಪುನರಾವರ್ತಿಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,ಮುಂದಿನ ದಿನಾಂಕ ದಿನ ಮತ್ತು ತಿಂಗಳ ದಿನದಂದು ಪುನರಾವರ್ತಿಸಿ ಸಮನಾಗಿರಬೇಕು
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ಒಂದು ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ಮೇಲೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,ಟೈಮ್ ಲಾಗ್ ಖ್ಯಾತವಾದ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),ಹಂಗಾಮಿ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು {0} ಸೆಟ್ ದಯವಿಟ್ಟು {1}
@@ -2847,12 +2930,13 @@
 ,Monthly Attendance Sheet,ಮಾಸಿಕ ಹಾಜರಾತಿ ಹಾಳೆ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ಯಾವುದೇ ದಾಖಲೆ
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಸಂಖ್ಯಾ ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
+DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
 DocType: Features Setup,Sales Discounts,ಮಾರಾಟದ ರಿಯಾಯಿತಿಯು
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ಆರ್ಡರ್ ಸಂಖ್ಯೆ
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ಉತ್ಪನ್ನದ ಪಟ್ಟಿ ಮೇಲೆ ತೋರಿಸಿ thatwill ಎಚ್ಟಿಎಮ್ಎಲ್ / ಬ್ಯಾನರ್ .
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕ ಪರಿಸ್ಥಿತಿಗಳು ಸೂಚಿಸಿ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,ಮಕ್ಕಳ ಸೇರಿಸಿ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
 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,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
 DocType: Offer Letter Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 ,Customers Not Buying Since Long Time,ಗ್ರಾಹಕರು ರಿಂದ ಲಾಂಗ್ ಟೈಮ್ ಖರೀದಿ ಇಲ್ಲ
 DocType: Production Order,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,ರಜೆ ಅಪ್ಲಿಕೇಷನ್ಗಳಿಗೆ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,ಕಾನೂನು ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
 DocType: Sales Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,ಟೆಲಿಫೋನ್ ವೆಚ್ಚಗಳು
 DocType: Sales Partner,Logo,ಲೋಗೋ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ನೀವು ಉಳಿಸುವ ಮೊದಲು ಸರಣಿ ಆರಿಸಲು ಬಳಕೆದಾರರಿಗೆ ಒತ್ತಾಯಿಸಲು ಬಯಸಿದಲ್ಲಿ ಈ ಪರಿಶೀಲಿಸಿ . ನೀವು ಈ ಪರಿಶೀಲಿಸಿ ವೇಳೆ ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇರುತ್ತದೆ .
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಅನ್ನು {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ಓಪನ್ ಸೂಚನೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,ನೇರ ವೆಚ್ಚಗಳು
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;ಅಧಿಸೂಚನೆ \ ಇಮೇಲ್ ವಿಳಾಸ&#39; ಒಂದು ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸ
 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,ಪ್ರಯಾಣ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
 DocType: Journal Entry,Cash Entry,ನಗದು ಎಂಟ್ರಿ
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ಪ್ರಾಸಂಗಿಕ , ಅನಾರೋಗ್ಯ , ಇತ್ಯಾದಿ ಎಲೆಗಳ ಪ್ರಕಾರ"
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,ಸ್ವತ್ತಿನ ಸರಬರಾಜುದಾರ {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಪೂರೈಕೆದಾರ ಜೊತೆ ಹೊಂದುವುದಿಲ್ಲ
 DocType: Newsletter,Test Email Id,ಟೆಸ್ಟ್ ಮಿಂಚಂಚೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,ಕಚ್ಚಾ ವಸ್ತು ಮುಖ್ಯ ಐಟಂ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,ಸಂಬಳ ಮಾಸ್ಟರ್ ಟೆಂಪ್ಲೆಟ್ .
@@ -2946,12 +3032,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,ಮೆಚ್ಚಿನ ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ payble ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,ಕಾರ್ಯದರ್ಶಿ
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಕ್ಷೇತ್ರದಲ್ಲಿ ವರ್ಡ್ಸ್ &#39;ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಗೋಚರಿಸುವುದಿಲ್ಲ"
@@ -2961,13 +3048,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,ಈ ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ.
 ,Reqd By Date,ಬೇಕಾಗಿದೆ ದಿನಾಂಕ ಮೂಲಕ
 DocType: Salary Slip Earning,Salary Slip Earning,ಸಂಬಳದ ಸ್ಲಿಪ್ ದುಡಿಯುತ್ತಿದ್ದ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,ಸಾಲ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ ಕಡ್ಡಾಯ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
-DocType: Project,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
+DocType: Request for Quotation 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,ಐಟಂ ಬ್ಯಾಚ್ ಸೂಲ
@@ -3026,6 +3112,7 @@
 DocType: Sales Invoice,End Date,ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್
 DocType: Employee,Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","ನಿಮ್ಮ ಕಂಪನಿಗೆ ವಿಳಾಸ ಕಂಪನಿ, ಕಡ್ಡಾಯ"
 DocType: Item Attribute,From Range,ವ್ಯಾಪ್ತಿಯ
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಕಾರಣ ಐಟಂ {0} ಕಡೆಗಣಿಸಲಾಗುತ್ತದೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ಮತ್ತಷ್ಟು ಪ್ರಕ್ರಿಯೆಗೆ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸಲ್ಲಿಸಿ .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,ಮತ್ತಷ್ಟು ಪ್ರಕ್ರಿಯೆಗೆ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ಒಂದು ನಿರ್ಧಿಷ್ಟ ವ್ಯವಹಾರಕ್ಕೆ ಬೆಲೆ ನಿಯಮ ಅನ್ವಯಿಸುವುದಿಲ್ಲ, ಎಲ್ಲಾ ಅನ್ವಯಿಸುವ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು."
 DocType: Company,Domain,ಡೊಮೈನ್
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ಉದ್ಯೋಗ
@@ -3045,6 +3132,7 @@
 DocType: Time Log,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ವೇತನ ಇಲ್ಲದೆ ರಜೆ ದುಡಿಯುತ್ತಿದ್ದ ಕಡಿಮೆ ( LWP )
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕ
 DocType: Opportunity,Opportunity Date,ಅವಕಾಶ ದಿನಾಂಕ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ವಿರುದ್ಧ ಪುನರಾಗಮನ
+DocType: Request for Quotation Item,Request for Quotation Item,ಉದ್ಧರಣ ಐಟಂ ವಿನಂತಿ
 DocType: Purchase Order,To Bill,ಬಿಲ್
 DocType: Material Request,% Ordered,% ಆದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
@@ -3075,11 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಅಂಕಣ ಖಾಲಿಯಾಗಿರಬೇಕು
 DocType: Accounts Settings,Accounts Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖಾತೆಗಳು
 DocType: Customer,Sales Partner and Commission,ಮಾರಾಟದ ಸಂಗಾತಿ ಮತ್ತು ಆಯೋಗದ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ವಿಲೇವಾರಿ ಖಾತೆ&#39; ಸೆಟ್ ಮಾಡಿ {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,ತಾತ್ಕಾಲಿಕ ಖಾತೆಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ಬ್ಲಾಕ್
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ಸ್ಫೋಟ ಐಟಂ
 DocType: Account,Auditor,ಆಡಿಟರ್
@@ -3088,21 +3178,22 @@
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,ಪಾವತಿ ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ {0} ನಿಷ್ಕ್ರಿಯವಾಗಲ್ಪಟ್ಟವು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ಗ್ರಾಹಕ ಗುರುತು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,ಟೈಮ್ ಟೈಮ್ ಗೆ ಹೆಚ್ಚು ಇರಬೇಕು ಗೆ
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},ವೇರ್ಹೌಸ್ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿಗೆ ಸದಸ್ಯ ಮಾಡುವುದಿಲ್ಲ {2}
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
 DocType: Project Task,Task ID,ಟಾಸ್ಕ್ ಐಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","ಇ ಜಿ "" ಎಂಸಿ """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್ {0} ರಿಂದ ವೇರಿಯಂಟ್
 ,Sales Person-wise Transaction Summary,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 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,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
@@ -3128,7 +3220,7 @@
 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,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳನ್ನು.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳನ್ನು.
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
 ,Cash Flow,ಕ್ಯಾಶ್ ಫ್ಲೋ
@@ -3142,7 +3234,7 @@
 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 +132,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,ಜನರಲ್ ಲೆಡ್ಜರ್ ಪ್ರಕಾರ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Job Applicant,Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು
 DocType: Authorization Rule,Customer / Item Name,ಗ್ರಾಹಕ / ಐಟಂ ಹೆಸರು
@@ -3158,19 +3250,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,ವ್ಯಾಪ್ತಿ / ರಿಂದ ಸೂಚಿಸಿ
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: BOM Replace Tool,Current BOM,ಪ್ರಸ್ತುತ BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,ಸೀರಿಯಲ್ ನಂ ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/support.py +43,Warranty,ಖಾತರಿ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,ಮುದ್ರಣ ಮತ್ತು ಸ್ಟೇಷನರಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ಗುಂಪು ನೋಡ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,ಅಪ್ಡೇಟ್ ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,ಅಪ್ಡೇಟ್ ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ಖರೀದಿ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,ಮೊತ್ತವನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Leave Block List,Applies to Company,ಕಂಪನಿ ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice,In Words,ವರ್ಡ್ಸ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
 DocType: Production Planning Tool,Material Request For Warehouse,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿ
@@ -3213,9 +3304,11 @@
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
+DocType: Pricing Rule,Margin Rate or Amount,ಮಾರ್ಜಿನ್ ದರ ಅಥವಾ ಪ್ರಮಾಣ
 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,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
@@ -3225,7 +3318,7 @@
 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 +782,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -3233,14 +3326,13 @@
 DocType: Customer,Sales Team Details,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
 DocType: Account,Chargeable,ಪೂರಣಮಾಡಬಲ್ಲ
 DocType: Company,Change Abbreviation,ಬದಲಾವಣೆ ಸಂಕ್ಷೇಪಣ
 DocType: Expense Claim Detail,Expense Date,ಖರ್ಚು ದಿನಾಂಕ
@@ -3258,14 +3350,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ವೀಕ್ಷಿಸಿ ಕಾರಣವಾಗುತ್ತದೆ
 DocType: Item Attribute Value,Attribute Value,ಮೌಲ್ಯ ಲಕ್ಷಣ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ಇಮೇಲ್ ಐಡಿ ಅನನ್ಯ ಇರಬೇಕು , ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ಇಮೇಲ್ ಐಡಿ ಅನನ್ಯ ಇರಬೇಕು , ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Features Setup,To get Item Group in details table,ವಿವರಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಐಟಂ ಗುಂಪು ಪಡೆಯಲು
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {0}
 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>
@@ -3297,23 +3390,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Stock Entry Detail,Actual Qty (at source/target),ನಿಜವಾದ ಪ್ರಮಾಣ ( ಮೂಲ / ಗುರಿ )
 DocType: Item Customer Detail,Ref Code,ಉಲ್ಲೇಖ ಕೋಡ್
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
 DocType: Payment Gateway,Payment Gateway,ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ
 DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ರೂಟ್ ಪೋಷಕರು ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ಆಯ್ಕೆ ಬ್ರ್ಯಾಂಡ್ ...
 DocType: Sales Invoice,C-Form Applicable,ಅನ್ವಯಿಸುವ ಸಿ ಆಕಾರ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,ಪರಿಹರಿಸಲಾಗುವುದು
@@ -3331,7 +3424,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಕರೆನ್ಸಿ ಅದೇ ಇರಬೇಕು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,ಸ್ವೀಕರಿಸಿ
 DocType: Maintenance Visit,Fully Completed,ಸಂಪೂರ್ಣವಾಗಿ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ಕಂಪ್ಲೀಟ್
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
@@ -3367,10 +3460,10 @@
 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,ಕಳುಹಿಸುವ ಮೊದಲು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Cost Center,Cost Center Name,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
 DocType: Maintenance Schedule Detail,Scheduled Date,ಪರಿಶಿಷ್ಟ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,ಒಟ್ಟು ಪಾವತಿಸಿದ ಆಮ್ಟ್
@@ -3382,11 +3475,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. ಅದರ ಸ್ಥಿತಿ 'ನಿಷ್ಕ್ರಿಯ' ಮುಂದುವರೆಯಲು ಮಾಡಿ.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
 DocType: Purchase Invoice,Contact,ಸಂಪರ್ಕಿಸಿ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Features Setup,Exports,ರಫ್ತು
@@ -3395,12 +3489,12 @@
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
@@ -3409,7 +3503,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,ಖಾತೆ ಹೆಡ್
@@ -3422,7 +3516,7 @@
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
@@ -3436,15 +3530,15 @@
 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 +576,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ಖರೀದಿ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
@@ -3464,8 +3558,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,ವರ್ಷದ ಆರಂಭದ ದಿನಾಂಕ ಅಥವಾ ಅಂತಿಮ ದಿನಾಂಕ {0} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ. ತಪ್ಪಿಸಲು ಕಂಪನಿ ಸೆಟ್ ಮಾಡಿ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ಹೊಸ ಸುದ್ದಿಪತ್ರ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ಉದಾಹರಣೆಗೆ:. ಸರಣಿ ಹೊಂದಿಸಲಾಗಿದೆ ಮತ್ತು ಸೀರಿಯಲ್ ಯಾವುದೇ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಉಲ್ಲೇಖಿಸಲ್ಪಟ್ಟಿಲ್ಲ ವೇಳೆ ABCD ##### 
 , ನಂತರ ಸ್ವಯಂಚಾಲಿತ ಕ್ರಮಸಂಖ್ಯೆ ಈ ಸರಣಿ ಮೇಲೆ ನಡೆಯಲಿದೆ. ನೀವು ಯಾವಾಗಲೂ ಸ್ಪಷ್ಟವಾಗಿ ಈ ಐಟಂ ಸೀರಿಯಲ್ ನಾವು ಬಗ್ಗೆ ಬಯಸಿದರೆ. ಈ ಜಾಗವನ್ನು ಖಾಲಿ ಬಿಡುತ್ತಾರೆ."
@@ -3477,11 +3572,11 @@
 ,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 +91,Please enter default currency in Company Master,CompanyMaster ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,CompanyMaster ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ನಮೂದಿಸಿ
 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 +206,New Account Name,ಹೊಸ ಖಾತೆ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,ಗ್ರಾಹಕ ಸೇವೆ
@@ -3491,11 +3586,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ಆಫರ್ ಅಭ್ಯರ್ಥಿ ಒಂದು ಜಾಬ್.
 DocType: Notification Control,Prompt for Email on Submission of,ಸಲ್ಲಿಕೆ ಇಮೇಲ್ ಪ್ರಾಂಪ್ಟಿನಲ್ಲಿ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ದಿನಗಳ ಹೆಚ್ಚಿನದಾಗಿದೆ
+DocType: Pricing Rule,Percentage,ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ಪ್ರೋಗ್ರೆಸ್ ಉಗ್ರಾಣದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕೆಲಸ
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,ಐಟಂ {0} ಸೇಲ್ಸ್ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,ಐಟಂ {0} ಸೇಲ್ಸ್ ಐಟಂ ಇರಬೇಕು
 DocType: Naming Series,Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
 DocType: Account,Equity,ಇಕ್ವಿಟಿ
 DocType: Sales Order,Printing Details,ಮುದ್ರಣ ವಿವರಗಳು
@@ -3503,11 +3599,12 @@
 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,ಹುಡುಕು ಉಪ ಅಸೆಂಬ್ಲೀಸ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ) ಮೂಲಕ ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ (ಮತ್ತು ಹಾಗೆ ತೆರಿಗೆ ಪ್ರಮಾಣ ಬಗ್ಗೆ.
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
@@ -3526,18 +3623,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
 DocType: Tax Rule,Validity,ವಾಯಿದೆ
+DocType: Request for Quotation,Supplier Detail,ಸರಬರಾಜುದಾರ ವಿವರ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/config/projects.py +55,Reports,ವರದಿಗಳು
 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 +508,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ವ್ಯವಹಾರ ಖರೀದಿ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
 ,Item Prices,ಐಟಂ ಬೆಲೆಗಳು
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Period Closing Voucher,Period Closing Voucher,ಅವಧಿ ಮುಕ್ತಾಯ ಚೀಟಿ
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,ಬದಲಾವಣೆ
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+DocType: Asset Category,Asset Category Name,ಆಸ್ತಿ ವರ್ಗ ಹೆಸರು
 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
@@ -3569,13 +3668,13 @@
 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 +559,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,ಗುಂಪು
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,ಮಾರಾಟಗಾರ
 DocType: Sales Invoice,Cold Calling,ಶೀತಲ ದೂರವಾಣಿ
 DocType: SMS Parameter,SMS Parameter,ಎಸ್ಎಂಎಸ್ ನಿಯತಾಂಕಗಳನ್ನು
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
 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.,ಮೌಲ್ಯಗಳ ಆಧಾರದ ವ್ಯವಹಾರ ನಿರ್ಬಂಧಿಸಲು ನಿಯಮಗಳನ್ನು ರಚಿಸಿ .
@@ -3620,9 +3719,9 @@
 DocType: Purchase Common,Purchase Common,ಸಾಮಾನ್ಯ ಖರೀದಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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 ಪ್ರಮಾಣ
@@ -3630,7 +3729,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,ಪೋಷಕರ ಖಾತೆಯ
@@ -3646,7 +3745,7 @@
 DocType: Employee,Education,ಶಿಕ್ಷಣ
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
 DocType: Address,Office,ಕಚೇರಿ
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
@@ -3661,6 +3760,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,ಬ್ಯಾಚ್ ಇನ್ವೆಂಟರಿ
 DocType: Employee,Contract End Date,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ
 DocType: Sales Order,Track this Sales Order against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರ್ಯಾಕ್
+DocType: Sales Invoice Item,Discount and Margin,ರಿಯಾಯಿತಿ ಮತ್ತು ಮಾರ್ಜಿನ್
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ( ತಲುಪಿಸಲು ಬಾಕಿ ) ಮಾರಾಟ ಆದೇಶಗಳನ್ನು ಪುಲ್
 DocType: Deduction Type,Deduction Type,ಕಡಿತವು ಕೌಟುಂಬಿಕತೆ
 DocType: Attendance,Half Day,ಅರ್ಧ ದಿನ
@@ -3681,7 +3781,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,ಮಾಸಿಕ ವೇತನ ನೋಂದಣಿ
 DocType: Warranty Claim,If different than customer address,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
@@ -3689,22 +3789,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 DocType: Payment Gateway Account,Payment URL Message,ಪಾವತಿ URL ಸಂದೇಶ
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,ಪೇಯ್ಡ್ ಒಟ್ಟು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,ಟೈಮ್ ಲಾಗ್ ಬಿಲ್ ಮಾಡಬಹುದಾದ ಅಲ್ಲ
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
+DocType: Asset,Asset Category,ಆಸ್ತಿ ವರ್ಗ
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,ಕೈಯಾರೆ ವಿರುದ್ಧ ರಶೀದಿ ನಮೂದಿಸಿ
 DocType: SMS Settings,Static Parameters,ಸ್ಥಾಯೀ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
 DocType: Expense Claim,Employees Email Id,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
 DocType: Employee Attendance Tool,Marked Attendance,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
@@ -3725,17 +3826,16 @@
 DocType: Item Attribute,Numeric Values,ಸಂಖ್ಯೆಯ ಮೌಲ್ಯಗಳನ್ನು
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
 apps/erpnext/erpnext/config/stock.py +201,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್&gt; ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಹೊಸದನ್ನು ರಚಿಸಲು.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,ಬಂಡವಾಳ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,ಬಂಡವಾಳ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 DocType: Payment Gateway Account,Payment Gateway Account,ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ಪಾವತಿ ನಂತರ ಆಯ್ಕೆ ಪುಟ ಬಳಕೆದಾರ ಮರುನಿರ್ದೇಶನ.
@@ -3744,20 +3844,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
+DocType: Asset,Current Value (After Depreciation),ಪ್ರಸ್ತುತ ಮೌಲ್ಯ (ಸವಕಳಿ ನಂತರ)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
@@ -3765,6 +3866,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 2e07644..86a3cb2 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,상인
 DocType: Employee,Rented,대여
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,당신은 정말이 자산을 스크랩 하시겠습니까?
 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.,* 트랜잭션에서 계산됩니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,하십시오&gt; 인적 자원에 HR 설정을 시스템 이름 지정 설치 직원
 DocType: Purchase Order,Customer Contact,고객 연락처
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 트리
 DocType: Job Applicant,Job Applicant,구직자
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,오픈보기
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,새로운 허가 신청
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,쇼 변형
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,수량
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),대출 (부채)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,재고 있음
 DocType: Designation,Designation,Designation
@@ -64,7 +66,7 @@
 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 +642,Invoice,송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},신규 {0} : # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},신규 {0} : # {1}
 ,Sales Partners Commission,영업 파트너위원회
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,약어는 5 개 이상의 문자를 가질 수 없습니다
 DocType: Payment Request,Payment Request,지불 요청
@@ -102,7 +104,7 @@
 DocType: Employee,Married,결혼 한
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,에서 항목을 가져 오기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 DocType: Payment Reconciliation,Reconcile,조정
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,대상에
 DocType: BOM,Total Cost,총 비용
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,활동 로그 :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
+DocType: Item,Is Fixed Asset,고정 자산입니다
 DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Employee,Mr,씨
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
@@ -156,7 +159,8 @@
 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,재고 비용
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} 냉동입니다
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,재고 비용
 DocType: Newsletter,Email Sent?,이메일 전송?
 DocType: Journal Entry,Contra Entry,콘트라 항목
 DocType: Production Order Operation,Show Time Logs,시간 표시 로그
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,설치 상태
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,{0} 항목을 구매 상품이어야합니다
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: BOM Replace Tool,New BOM,신규 BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,회사를 입력하십시오
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Financing의 순 현금
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
 DocType: Newsletter List,Total Subscribers,총 구독자
 ,Contact Name,담당자 이름
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 DocType: Payment Tool,Reference No,참조 번호
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,은행 입장
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,알림 제어
 DocType: Lead,Suggestions,제안
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,이 지역에 상품 그룹 현명한 예산을 설정합니다.또한 배포를 설정하여 계절성을 포함 할 수 있습니다.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},웨어 하우스의 부모 계정 그룹을 입력하세요 {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},웨어 하우스의 부모 계정 그룹을 입력하세요 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
 DocType: Supplier,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,최대 5 자
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 apps/erpnext/erpnext/config/desktop.py +83,Learn,배우다
+DocType: Asset,Next Depreciation Date,다음 감가 상각 날짜
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},공급 업체 송장 번호는 구매 송장에 존재 {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,판매 인 나무를 관리합니다.
 DocType: Job Applicant,Cover Letter,커버 레터
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,뛰어난 수표 및 취소 예금
 DocType: Item,Synced With Hub,허브와 동기화
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,순환 참조 오류
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]의 단위 (# 양식 / 상품 / {1}) {2}]에서 발견 (# 양식 / 창고 / {2})
 DocType: Lead,Industry,산업
 DocType: Employee,Job Profile,작업 프로필
 DocType: 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,송장 유형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,상품 수령증
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,상품 수령증
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,월 및 연도를 선택하세요
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,고려 총 주문
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,필드 값을 '이달의 날 반복'을 입력하십시오
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},일련 번호 {0} 배달 주에 속하지 않는 {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,상품 품질 검사 매개 변수
 DocType: Leave Application,Leave Approver Name,승인자 이름을 남겨주세요
-,Schedule Date,일정 날짜
+DocType: Depreciation Schedule,Schedule Date,일정 날짜
 DocType: Packed Item,Packed Item,포장 된 상품
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,트랜잭션을 구입을위한 기본 설정.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,트랜잭션을 구입을위한 기본 설정.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},활동 비용은 활동 유형에 대해 직원 {0} 존재 - {1}
 apps/erpnext/erpnext/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,환전
@@ -348,6 +355,7 @@
 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","""재고 없음""이다 요구되는 항목은 예상 수량 및 최소 주문 수량에 따라 모든 창고를 고려"
+DocType: Request for Quotation,Request for Quotation,견적 요청
 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.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
-DocType: Material Request Item,Required Date,필요한 날짜
+DocType: Request for Quotation Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,공급 업체에 대한 메시지
 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,지불하지 않은
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 ,Serial No Warranty Expiry,일련 번호 보증 만료
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,관리 하도급
+DocType: Project,Project will be accessible on the website to these users,프로젝트는 이러한 사용자에게 웹 사이트에 액세스 할 수 있습니다
 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 +53,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,항목 {0} 항목을 구매하지 않습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,항목 {0} 항목을 구매하지 않습니다
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,보류 수량
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
 DocType: Pricing Rule,Valid From,유효
 DocType: Sales Invoice,Total Commission,전체위원회
 DocType: Pricing Rule,Sales Partner,영업 파트너
@@ -471,13 +481,13 @@
 ,이 분포를 사용하여 예산을 분배 ** 비용 센터에서 **이 ** 월간 배포를 설정하려면 **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,금융 / 회계 연도.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,누적 값
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,회계 연도의 시작 날짜는 회계 연도 종료 날짜보다 크지 않아야한다
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,회계 연도의 시작 날짜는 회계 연도 종료 날짜보다 크지 않아야한다
 DocType: Warranty Claim,Resolution,해상도
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},배달 : {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,채무 계정
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,이력서 첨부
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,판매로 돌아 가기
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,급여항목
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,잠재 고객의 데이터베이스.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,재고 항목이 만들어지는에 대해 논리적 창고.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,석사
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,업데이트 은행 거래 날짜
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,업데이트 은행 거래 날짜
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},음의 재고 오류 ({6}) 항목에 대한 {0} 창고 {1}에 {2} {3}에서 {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,시간 추적
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
@@ -522,27 +532,27 @@
 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,기본 원가 계산 속도
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,유지 보수 일정
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,유지 보수 일정
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","그런 가격 설정 규칙은 고객에 따라 필터링됩니다, 고객 그룹, 지역, 공급 업체, 공급 업체 유형, 캠페인, 판매 파트너 등"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,재고의 순 변화
 DocType: Employee,Passport Number,여권 번호
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,관리자
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Based On'과  'Group By'는 달라야 합니다.
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,직원 또는 회사 중 하나에 대한 휴일 목록을 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
+DocType: Depreciation Schedule,Depreciation Amount,감가 상각 금액
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,고정 일
 DocType: Quotation Item,Item Balance,상품 잔액
 DocType: Sales Invoice,Packing List,패킹리스트
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,공급 업체에 제공 구매 주문.
+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,소비
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,운영 시간
 DocType: Pricing Rule,Sales Manager,영업 관리자
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,그룹에 그룹
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,내 프로젝트
 DocType: Journal Entry,Write Off Amount,금액을 상각
 DocType: Journal Entry,Bill No,청구 번호
+DocType: Company,Gain/Loss Account on Asset Disposal,자산 처분 이익 / 손실 계정
 DocType: Purchase Invoice,Quarterly,분기 별
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
 DocType: Sales Order Item,Basic Rate (Company Currency),기본 요금 (회사 통화)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,결제 항목이 이미 생성
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,올해 총 결제
 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 +529,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,나무의 종류
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} 재고 상품이 아닌
 DocType: Mode of Payment Account,Default Account,기본 계정
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
 ,Sales Person Target Variance Item Group-Wise,영업 사원 대상 분산 상품 그룹 와이즈
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,월급의 문.
 DocType: Item Group,Website Specifications,웹 사이트 사양
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},당신의 주소 템플릿에 오류가 있습니다 {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,새 계정
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,새 계정
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",여러 가격 규칙은 동일한 기준으로 존재 우선 순위를 할당하여 충돌을 해결하십시오. 가격 규칙 : {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",여러 가격 규칙은 동일한 기준으로 존재 우선 순위를 할당하여 충돌을 해결하십시오. 가격 규칙 : {0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","분개 {0}이이 송장 사전으로 당겨 할 필요가있는 경우 {1}, 확인 주문에 연결되어 있습니다."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,사무실 유지 비용
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Account,Liability,부채
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
 DocType: Company,Default Cost of Goods Sold Account,제품 판매 계정의 기본 비용
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,가격 목록을 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Process Payroll,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,내 송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,내 송장
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,검색된 직원이 없습니다
 DocType: Supplier Quotation,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV를 통해 재고의 균형을 업로드 할 수 있습니다.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,지금 보내기
 ,Support Analytics,지원 분석
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,논리적 오류 : 중복 발견해야한다
 DocType: Item,Website Warehouse,웹 사이트 창고
 DocType: Payment Reconciliation,Minimum Invoice Amount,최소 송장 금액
 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 +267,C-Form records,C 형태의 기록
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C 형태의 기록
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,고객 및 공급 업체
 DocType: Email Digest,Email Digest Settings,알림 이메일 설정
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,고객 지원 쿼리.
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,비용
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,하청
 DocType: Item Attribute,Item Attribute Values,항목 속성 값
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,보기 가입자
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,구입 영수증
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
 DocType: Employee,Ms,MS
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,통화 환율 마스터.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,통화 환율 마스터.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,판매 파트너 및 지역
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+DocType: Journal Entry,Depreciation Entry,감가 상각 항목
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,고토 장바구니
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,영구 주소는
 DocType: Production Order Operation,Operation completed for how many finished goods?,작업이 얼마나 많은 완제품 완료?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,브랜드
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
 DocType: Employee,Exit Interview Details,출구 인터뷰의 자세한 사항
 DocType: Item,Is Purchase Item,구매 상품입니다
-DocType: Journal Entry Account,Purchase Invoice,구매 송장
+DocType: Asset,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,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
@@ -808,21 +825,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;항목에 대한 모든 포장 항목에 대해 동일한 경우, 그 값이 주요 항목 테이블에 입력 할 수는 값이 테이블 &#39;목록 포장&#39;을 복사됩니다."
 DocType: Job Opening,Publish on website,웹 사이트에 게시
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,고객에게 선적.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,공급 업체 송장 날짜 게시 날짜보다 클 수 없습니다
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,간접 소득
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,전송 항목 선택
 DocType: Purchase Invoice,Additional Discount Percentage,추가 할인 비율
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",행 {0} : 송장이 {1}이 취소 될 수 있습니다 / 존재하지 않는에게 잘못되었습니다. \ 유효한 송장을 입력하세요
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
 ,Employee Holiday Attendance,직원 휴일 출석
 DocType: Opportunity,Walk In,걷다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,재고 항목
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,재고 항목
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,옮겨진
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,확인
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,내 장바구니
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
 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 +180,Qty for {0},대한 수량 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
+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 +80,Leave Allocation Tool,할당 도구를 남겨
 DocType: Leave Block List,Leave Block List Dates,차단 목록 날짜를 남겨
@@ -861,7 +882,7 @@
 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 +547,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,할인
@@ -876,20 +897,21 @@
 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 +69,Selling Amount,판매 금액
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,시간 로그
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,시간 로그
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 DocType: Serial No,Creation Document No,작성 문서 없음
 DocType: Issue,Issue,이슈
+DocType: Asset,Scrapped,폐기
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,계정은 회사와 일치하지 않습니다
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,신병 모집
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,영업 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,영업 비용
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
@@ -906,7 +928,7 @@
 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 +18,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
+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,평균 연령
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,기본 통화
 DocType: Contact,Enter designation of this Contact,이 연락처의 지정을 입력
 DocType: Expense Claim,From Employee,직원에서
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,핵심 성과 지역
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-양식 송장 세부 정보
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,결제 조정 송장
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,공헌 %
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,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,글로벌 기본값
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,프로젝트 협력 초대
 DocType: Salary Slip,Deductions,공제
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,이 시간 로그 일괄 청구하고있다.
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,용량 계획 오류
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,용량 계획 오류
 ,Trial Balance for Party,파티를위한 시산표
 DocType: Lead,Consultant,컨설턴트
 DocType: Salary Slip,Earnings,당기순이익
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,개시 잔고
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,요청하지 마
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,요청하지 마
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,관리
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,시간 시트를위한 활동의 종류
@@ -958,18 +981,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,이메일 ID를 설정하십시오
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,이메일 ID를 설정하십시오
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {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,UOM 변환 계수
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,공급 업체 데이터베이스.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,공급 업체 데이터베이스.
 DocType: Account,Balance Sheet,대차 대조표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,세금 및 기타 급여 공제.
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,휴일
 DocType: Leave Control Panel,Leave blank if considered for all branches,모든 지점을 고려하는 경우 비워 둡니다
 ,Daily Time Log Summary,매일 시간 로그 요약
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C 형은 송장에 대해 적용 할 수 없습니다 : {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,비 조정 지불 세부 사항
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
@@ -996,19 +1020,20 @@
 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,속성 테이블에서 하나 이상의 속성을 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
 DocType: Contact,User ID,사용자 ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,보기 원장
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,보기 원장
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,배당금 지급
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,이익 잉여금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,이익 잉여금
 DocType: BOM Item,Item Description,항목 설명
 DocType: Payment Tool,Payment Mode,지불 방식
 DocType: Purchase Invoice,Is Recurring,반복인가
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,임시 열기
 ,Employee Leave Balance,직원 허가 밸런스
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},행 항목에 필요한 평가 비율 {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,미지급금 합계
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 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 +165,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,작은
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,계정 머리 {0} 생성
 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,전체 달성
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 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,창고 연락처 정보
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
 DocType: Hub Settings,Seller Website,판매자 웹 사이트
 apps/erpnext/erpnext/controllers/selling_controller.py +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},생산 오더의 상태는 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,공급 업체
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},라는 항목을 찾을 수 없습니다 {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,총 발신
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","전용 ""값을""0 또는 빈 값을 발송하는 규칙 조건이있을 수 있습니다"
 DocType: Authorization Rule,Transaction,거래
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,웹 사이트 상품 그룹
 DocType: Purchase Invoice,Total (Company Currency),총 (회사 통화)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,일련 번호 {0} 번 이상 입력
-DocType: Journal Entry,Journal Entry,분개
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
 DocType: Salary Slip,Bank Account No.,은행 계좌 번호
 DocType: Naming Series,This is the number of the last created transaction with this prefix,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다
@@ -1095,6 +1121,7 @@
 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,워크스테이션
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,견적 공급 업체 요청
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,하드웨어
 DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Attendance,HR Manager,HR 관리자
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,평가 템플릿 목표
 DocType: Salary Slip,Earning,당기순이익
 DocType: Payment Tool,Party Account Currency,파티 계정 환율
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},감가 상각 후 현재 가치와 동일 미만이어야합니다 {0}
 ,BOM Browser,BOM 브라우저
 DocType: Purchase Taxes and Charges,Add or Deduct,추가 공제
 DocType: Company,If Yearly Budget Exceeded (for expense account),연간 예산 (비용 계정) 초과하는 경우
@@ -1119,21 +1147,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
 DocType: Project,Start and End Dates,시작 날짜를 종료
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,기능 설정
+DocType: Asset,Depreciation Schedules,감가 상각 스케줄
 DocType: Item,Is Service Item,서비스 항목은
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
 DocType: Payment Request,Transaction Currency,거래 통화
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},에서 {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},에서 {0} | {1} {2}
 DocType: BOM Operation,Operation Description,작업 설명
 DocType: Item,Will also apply to variants,또한 변형에 적용됩니다
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,회계 연도 시작 날짜와 회계 연도가 저장되면 회계 연도 종료 날짜를 변경할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,캠페인
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,고정 자산의 순 변화
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},최대 : {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,회사
 apps/erpnext/erpnext/config/support.py +17,Communication log.,통신 로그.
@@ -1156,8 +1185,8 @@
 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 +472,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100보다 큰 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,거래에 대한 세금 규칙.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,거래에 대한 세금 규칙.
 DocType: Rename Tool,Type of document to rename.,이름을 바꿀 문서의 종류.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,우리는이 품목을 구매
 DocType: Address,Billing,청구
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,읽기
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,서브 어셈블리
+DocType: Asset,Asset Name,자산 이름
 DocType: Shipping Rule Condition,To Value,값
 DocType: Supplier,Stock Manager,재고 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,포장 명세서
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,사무실 임대
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,포장 명세서
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,견적 요청은 다음 링크를 클릭하여 액세스 할 수 있습니다
+DocType: Asset,Number of Months in a Period,기간의 개월 수
 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,워크 스테이션 작업 시간
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,통치 체제
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),전체 ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),전체 ({0})
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
 DocType: Sales Invoice,Source,소스
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,쇼 폐쇄
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,지불 테이블에있는 레코드 없음
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,회계 연도의 시작 날짜
 DocType: Employee External Work History,Total Experience,총 체험
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,포장 명세서 (들) 취소
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,투자의 현금 흐름
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 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 +86,Transfer Materials for Manufacture,제조에 대한 전송 재료
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,제조에 대한 전송 재료
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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}을 (를) 찾을 수 없습니다, 회계 항목 (비용)을 예약하는 데 필요합니다.구매 가격 목록에 대해 품목 가격을 언급하시기 바랍니다."
@@ -1236,7 +1269,7 @@
 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.,계정 차트에서 새로운 계정을 생성 해주세요.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,유지 보수 방문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,유지 보수 방문
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,창고에서 사용 가능한 배치 수량
 DocType: Time Log Batch Detail,Time Log Batch Detail,시간 로그 일괄 처리 정보
 DocType: Landed Cost Voucher,Landed Cost Help,착륙 비용 도움말
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,브랜드 마스터.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,상자
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +131,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,재고 부채
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,재고 부채
 DocType: Purchase Receipt,Supplier Warehouse,공급 업체 창고
 DocType: Opportunity,Contact Mobile No,연락처 모바일 없음
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,지불 이메일을 다시 보내
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,기타 보고서
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,정지 생일 알림
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0}보기
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,현금의 순 변화
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},수량 이하이어야한다 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},수량 이하이어야한다 {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,이전 회계 연도가 종료되지 않습니다
 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 +40,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 +38,Supplier Type master.,공급 유형 마스터.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
 DocType: Purchase Invoice,Reference Document,참조 문헌
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0} % 청구
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,외상 매입금의 순 변화
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,귀하의 이메일 ID를 확인하십시오
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Customerwise 할인'을 위해 필요한 고객
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
 DocType: Quotation,Term Details,용어의 자세한 사항
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0보다 커야합니다
 DocType: Manufacturing Settings,Capacity Planning For (Days),(일)에 대한 용량 계획
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,보증 청구
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,영구 주소
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",총계보다 \ {0} {1} 초과 할 수 없습니다에 대해 지불 사전 {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,품목 코드를 선택하세요
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,품목 코드를 선택하세요
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),무급 휴직 공제를 줄 (LWP)
 DocType: Territory,Territory Manager,지역 관리자
 DocType: Packed Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
@@ -1367,15 +1401,15 @@
 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,마케팅 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,항목의 하나의 단위.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',시간 로그 일괄 {0} '제출'해야
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,상품이 많다는 판매 등록
+DocType: Asset,Gross Purchase Amount,총 구매 금액
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","예)  ""XYZ 국립 은행 """
+DocType: Asset,Depreciation Method,감가 상각 방법
 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 +29,Shopping Cart is enabled,장바구니가 활성화됩니다
 DocType: Job Applicant,Applicant for a Job,작업에 대한 신청자
 DocType: Production Plan Material Request,Production Plan Material Request,생산 계획 자료 요청
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,생성 된 NO 생성 주문하지
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,생성 된 NO 생성 주문하지
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,주요 기능
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
@@ -1426,31 +1462,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,작업을 위해 신청자.
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,주소
+apps/erpnext/erpnext/hooks.py +91,Addresses,주소
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,감정
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,항목은 생산 주문을 할 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,항목은 생산 주문을 할 수 없습니다.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,상품 또는웨어 하우스를 기반으로 필터를 설정하십시오
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),이 패키지의 순 중량. (항목의 순 중량의 합으로 자동으로 계산)
 DocType: Sales Order,To Deliver and Bill,제공 및 법안
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,제조 시간 로그.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,작업 시간에 로그인합니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,지불
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,상표
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,판매 상품을 동시에 번들.
 DocType: Quotation Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
+DocType: Request for Quotation Supplier,Send Email to Supplier,공급자에게 이메일 보내기
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 DocType: Packing Slip,To Package No.,번호를 패키지에
 DocType: Production Planning Tool,Material Requests,자료 요청
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,배송 창고
 DocType: Stock Settings,Allowance Percent,대손 충당금 비율
 DocType: SMS Settings,Message Parameter,메시지 매개 변수
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,금융 코스트 센터의 나무.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,금융 코스트 센터의 나무.
 DocType: Serial No,Delivery Document No,납품 문서 없음
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,구매 영수증에서 항목 가져 오기
 DocType: Serial No,Creation Date,만든 날짜
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,금액 제공하는
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,제품 또는 서비스
 DocType: Naming Series,Current Value,현재 값
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} 생성
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} 생성
 DocType: Delivery Note Item,Against Sales Order,판매 주문에 대해
 ,Serial No Status,일련 번호 상태
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,항목 테이블은 비워 둘 수 없습니다
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","행 {0} : 설정하려면 {1} 주기성에서 날짜와 \
 에 차이는보다 크거나 같아야합니다 {2}"
 DocType: Pricing Rule,Selling,판매
 DocType: Employee,Salary Information,급여정보
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,관세 및 세금
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,참고 날짜를 입력 해주세요
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,지불 게이트웨이 계정이 구성되어 있지 않습니다
 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: Production Order,Material Request Item,자료 요청 항목
+DocType: Request for Quotation Item,Material Request Item,자료 요청 항목
 apps/erpnext/erpnext/config/stock.py +85,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,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
+DocType: Asset,Sold,판매
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
 DocType: Installation Note,Installation Time,설치 시간
 DocType: Sales Invoice,Accounting Details,회계 세부 사항
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,이 회사의 모든 거래를 삭제
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,투자
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,할당
 DocType: Quality Inspection Reading,Acceptance Criteria,허용 기준
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,위의 표에 자료 요청을 입력하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,위의 표에 자료 요청을 입력하세요
 DocType: Item Attribute,Attribute Name,속성 이름
 DocType: Item Group,Show In Website,웹 사이트에 표시
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,그릅
@@ -1552,6 +1592,7 @@
 ,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","다음의 서류 배달 참고, 기회, 자료 요청, 상품, 구매 주문, 구매 바우처, 구매자 영수증, 견적, 견적서, 제품 번들, 판매 주문, 일련 번호에 브랜드 이름을 추적"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,모든 작업의 Gantt 차트.
+DocType: Pricing Rule,Margin Type,여백 유형
 DocType: Appraisal,For Employee Name,직원 이름에
 DocType: Holiday List,Clear Table,표 지우기
 DocType: Features Setup,Brands,상표
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,고객 주소 및 연락처
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,행 # {0} : 자산은 고정 자산 항목에 대해 필수입니다
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정이 번호 시리즈&gt; 설정을 통해 출석을 위해 일련 번호하세요
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,페어링
+DocType: Asset,Depreciation Schedule,감가 상각 일정
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜
 DocType: Item,Has Batch No,일괄 없음에게 있습니다
 DocType: Delivery Note,Excise Page Number,소비세의 페이지 번호
+DocType: Asset,Purchase Date,구입 날짜
 DocType: Employee,Personal Details,개인 정보
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},회사의 &#39;자산 감가 상각 비용 센터&#39;를 설정하십시오 {0}
 ,Maintenance Schedules,관리 스케줄
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,조정 됨 항목을 포함
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다
 DocType: HR Settings,HR Settings,HR 설정
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,실제 총
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,단위
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,회사를 지정하십시오
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,비용 청구
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
 ,BOM Search,BOM 검색
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),닫기 (+ 합계 열기)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},통관 날짜 행 체크인 날짜 이전 할 수 없습니다 {0}
 DocType: Salary Slip,Deduction,공제
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 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,Gross Margin,매출 총 이익률
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,계산 된 은행 잔고 잔액
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,사용하지 않는 사용자
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,인용
 DocType: Salary Slip,Total Deduction,총 공제
 DocType: Quotation,Maintenance User,유지 보수 사용자
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,비용 업데이트
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,비용 업데이트
 DocType: Employee,Date of Birth,생일
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,하십시오&gt; 인적 자원에 HR 설정을 시스템 이름 지정 설치 직원
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
@@ -1645,8 +1691,8 @@
 ,SO Qty,SO 수량
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
+DocType: Request for Quotation,Manufacturing Manager,제조 관리자
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
 apps/erpnext/erpnext/hooks.py +71,Shipments,선적
 DocType: Purchase Order Item,To be delivered to customer,고객에게 전달 될
@@ -1654,12 +1700,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,행 #
 DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서
-DocType: Pricing Rule,Supplier,공급 업체
+DocType: Asset,Supplier,공급 업체
 DocType: C-Form,Quarter,지구
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,기타 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,기타 비용
 DocType: Global Defaults,Default Company,기본 회사
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,{0} 사용자가 비활성화되어 있습니다
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Currency Exchange,From Currency,통화와
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",행 번호 {0} 항목이 자산에 링크로 수량은 1이어야합니다
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,하위 항목은 제품 번들이어야한다. 항목을 제거`{0}`와 저장하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,은행
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,새로운 비용 센터
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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;의) 아이를 추가 클릭하여 (새로운 계정을 만들고 않습니다.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,새로운 비용 센터
 DocType: Bin,Ordered Quantity,주문 수량
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Quality Inspection,In Process,처리 중
@@ -1695,10 +1741,11 @@
 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,채권 계정
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
 DocType: Quotation Item,Stock Balance,재고 대차
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,지불에 판매 주문
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,시간 로그 생성 :
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,시간 로그 생성 :
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Employee,Blood Group,혈액 그룹
@@ -1716,13 +1763,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,직불 카드에 대한이 필요합니다
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
 DocType: Offer Letter Term,Offer Term,행사 기간
 DocType: Quality Inspection,Quality Manager,품질 관리자
 DocType: Job Applicant,Job Opening,구인
 DocType: Payment Reconciliation,Payment Reconciliation,결제 조정
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,기술
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,편지를 제공
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,자료 요청 (MRP) 및 생산 오더를 생성합니다.
@@ -1730,22 +1777,22 @@
 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 +103,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
 DocType: Production Order Operation,Completed Qty,완료 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,가격 목록 {0} 비활성화
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,현재 평가 비율
 DocType: Item,Customer Item Codes,고객 상품 코드
 DocType: Opportunity,Lost Reason,분실 된 이유
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,주문 또는 송장에 대한 지불 항목을 만듭니다.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,주문 또는 송장에 대한 지불 항목을 만듭니다.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,사용자 및 권한
@@ -1754,10 +1801,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,발견되지 일련 번호 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,발견되지 일련 번호 {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,고객
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
 DocType: Leave Block List Date,Block Date,블록 날짜
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,지금 적용
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,지금 적용
 DocType: Sales Order,Not Delivered,전달되지 않음
 ,Bank Clearance Summary,은행 정리 요약
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,고용 세부 사항
 DocType: Employee,New Workplace,새로운 직장
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,휴일로 설정
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},바코드 가진 항목이 없습니다 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},바코드 가진 항목이 없습니다 {0}
 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,페이지의 상단에 슬라이드 쇼보기
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,전송 자료
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},항목 {0}에서 판매 항목이어야합니다 {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,저장 한 후 반복 설정하십시오
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),자금의 출처 (부채)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,종업원
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,가져 오기 이메일
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,사용자로 초대하기
 DocType: Features Setup,After Sale Installations,판매 설치 후
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},회사에서 {0} 설정하십시오 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다.
 DocType: Workstation Working Hour,End Time,종료 시간
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,판매 또는 구매를위한 표준 계약 조건.
@@ -1830,9 +1879,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,제약
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,날짜 출석
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Gateway Account,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,채권에 순 변경
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},잘못된 참조 {0} {1}
 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},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,다음 생산 오더가 생성했다 :
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,다음 생산 오더가 생성했다 :
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,뉴스 레터 메일 링리스트
 DocType: Delivery Note,Transporter Name,트랜스 포터의 이름
 DocType: Authorization Rule,Authorized Value,공인 값
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} 닫혀
 DocType: Email Digest,How frequently?,얼마나 자주?
 DocType: Purchase Receipt,Get Current Stock,현재 재고을보세요
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",해당 그룹 (일반적으로 펀드의 응용 프로그램&gt; 현재 자산&gt; 은행 계좌로 이동 유형) 자녀 추가를 클릭하여 (새 계정을 만들 &quot;은행&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,재료 명세서 (BOM)의 나무
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,마크 선물
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},유지 보수 시작 날짜 일련 번호에 대한 배달 날짜 이전 할 수 없습니다 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,용도
+DocType: Company,Fixed Asset Depreciation Settings,고정 자산 감가 상각 설정
 DocType: Item,Will also apply for variants unless overrridden,overrridden가 아니면 변형 적용됩니다
 DocType: Purchase Invoice,Advances,선수금
 DocType: Production Order,Manufacture against Material Request,자료 요청에 대해 제조
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
 DocType: Campaign,Campaign-.####,캠페인.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,아이 노드에게 있습니다
@@ -1959,12 +2009,14 @@
  9.에 대한 세금이나 요금을 고려 세금 / 수수료는 평가만을위한 것입니다 (총의 일부가 아닌) 또는 만 (항목에 가치를 추가하지 않습니다) 총 또는 모두 경우이 섹션에서는 사용자가 지정할 수 있습니다.
  10.추가 공제 : 추가하거나 세금을 공제할지 여부를 선택합니다."
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
+DocType: Asset Category Account,Asset Category Account,자산 분류 계정
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","예) 은행, 현금, 신용 카드"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",해당 그룹 (일반적으로 펀드의 응용 프로그램&gt; 현재 자산&gt; 은행 계좌로 이동 유형) 자녀 추가를 클릭하여 (새 계정을 만들 &quot;은행&quot;
 DocType: Journal Entry,Credit Note,신용 주
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},완성 된 수량보다 더 할 수 없습니다 {0} 조작에 대한 {1}
 DocType: Features Setup,Quality,품질
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,내 주소
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,조직 분기의 마스터.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,기본 구매 가격 목록
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,위의 선택 기준 또는 급여 명세서에 대한 어떤 직원이 이미 만들어
@@ -2017,7 +2069,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 apps/erpnext/erpnext/config/hr.py +93,Payroll,급여
 apps/erpnext/erpnext/accounts/doctype/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}도 포함해야
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,구매 영수증 항목
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,사용자 정의 양식
 DocType: Account,Income Account,수익 계정
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,디폴트 주소 템플릿을 찾을 수 없습니다. 설정&gt; 인쇄 및 브랜딩&gt; 주소 템플릿에서 새 일을 만드십시오.
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,주요 책임 지역
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,스톡 설정
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,새로운 비용 센터의 이름
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
 DocType: Appraisal,HR User,HR 사용자
 DocType: Purchase Invoice,Taxes and Charges Deducted,차감 세금과 요금
-apps/erpnext/erpnext/config/support.py +7,Issues,문제
+apps/erpnext/erpnext/hooks.py +90,Issues,문제
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},상태 중 하나 여야합니다 {0}
 DocType: Sales Invoice,Debit To,To 직불
 DocType: Delivery Note,Required only for sample item.,단지 샘플 항목에 필요합니다.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,아주 큰
 ,Profit and Loss Statement,손익 계산서
@@ -2078,10 +2132,10 @@
 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 +139,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,환율이 통화를 다른 통화로 지정
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,견적 {0} 취소
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,총 발행 금액
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, 여러 작업으로 작업을 분해"
 ,Requested,요청
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,없음 비고
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,판매 및 구매
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,고정 자산 항목은 재고 항목 있어야합니다
 DocType: Supplier Quotation Item,Material Request No,자료 요청 없음
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,고객의 통화는 회사의 기본 통화로 변환하는 속도에
@@ -2176,7 +2231,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 DocType: Payment Request,Recipient and Message,받는 사람 및 메시지
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,선택 공급 업체 주소
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,견적 요청.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;아니오&quot;와 &quot;판매 상품은&quot; &quot;주식의 항목으로&quot;여기서 &quot;예&quot;인 항목을 선택하고 다른 제품 번들이없는하세요
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,가격리스트 통화 선택하지
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,프로젝트 시작 날짜
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,문서 번호에 대하여
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,판매 파트너를 관리합니다.
 DocType: Quality Inspection,Inspection Type,검사 유형
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},선택하세요 {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,표시되지 않은 출석
@@ -2240,6 +2296,7 @@
 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,광고
+DocType: Asset Category Account,Depreciation Expense Account,감가 상각 비용 계정
 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,지출 승인
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,확인 된
 DocType: Payment Gateway,Gateway,게이트웨이
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
@@ -2267,18 +2324,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,허용 창고
 DocType: Bank Reconciliation Detail,Posting Date,등록일자
 DocType: Item,Valuation Method,평가 방법
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0}에 대한 환율을 찾을 수 없습니다 {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0}에 대한 환율을 찾을 수 없습니다 {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,마크 반나절
 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 +410,[Error],[오류]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Sales Invoice Item,Customer Warehouse (Optional),고객웨어 하우스 (선택 사항)
 DocType: Pricing Rule,Discount Percentage,할인 비율
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
@@ -2304,14 +2362,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,자료 요청 {0} 생성
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,자료 요청 {0} 생성
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,조건 또는 계약의 템플릿.
 DocType: Purchase Invoice,Address and Contact,주소와 연락처
 DocType: Supplier,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Employee,Feedback,피드백
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","이전에 할당 할 수없는 남기기 {0}, 휴가 균형이 이미 반입 전달 미래 휴가 할당 기록되었습니다로 {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
+DocType: Asset,Expected Value After Useful Life,내용 연수 후 예상 값
 DocType: Item,Reorder level based on Warehouse,웨어 하우스를 기반으로 재정렬 수준
 DocType: Activity Cost,Billing Rate,결제 비율
 ,Qty to Deliver,제공하는 수량
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} 취소 또는 폐쇄
 DocType: Delivery Note,Track this Delivery Note against any Project,모든 프로젝트에 대해이 배달 주를 추적
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,투자에서 순 현금
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,자산 {0} 제출해야합니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,주소를 관리
-DocType: Pricing Rule,Item Code,상품 코드
+DocType: Asset,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
 DocType: Journal Entry,User Remark,사용자 비고
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,자료 요청을 만듭니다
 DocType: Employee Education,School/University,학교 / 대학
 DocType: Payment Request,Reference Details,참조 세부 사항
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
 DocType: Sales Invoice Item,Available Qty at Warehouse,창고에서 사용 가능한 수량
 ,Billed Amount,청구 금액
+DocType: Asset,Double Declining Balance,이중 체감
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,청산 주문이 취소 할 수 없습니다. 취소 열다.
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,업데이트 받기
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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','시작일자'는  '마감일자' 이전이어야 합니다
+DocType: Asset,Fully Depreciated,완전 상각
 ,Stock Projected Qty,재고 수량을 예상
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,일련 번호 및 배치
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,값 또는 수량
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,분
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 ,Qty to Receive,받도록 수량
 DocType: Leave Block List,Leave Block List Allowed,차단 목록은 허용 남겨
 DocType: Sales Partner,Retailer,소매상 인
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
 DocType: Global Defaults,Disable In Words,단어에서 해제
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,당좌 차월 계정
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,보안 대출
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},자산 카테고리 {0} 또는 회사의 감가 상각 관련 계정을 설정하십시오 {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,잔액 지분
 DocType: Appraisal,Appraisal,펑가
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},공급 업체에 보낸 이메일 {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,공인 서명자
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
@@ -2401,7 +2467,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,보낸 메시지
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,총 마진
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
 DocType: Expense Claim,Approval Status,승인 상태
 DocType: Hub Settings,Publish Items to Hub,허브에 항목을 게시
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,고객 그룹 / 고객
 DocType: Payment Gateway Account,Default Payment Request Message,기본 지불 요청 메시지
 DocType: Item Group,Check this if you want to show in website,당신이 웹 사이트에 표시 할 경우이 옵션을 선택
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,은행 및 결제
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,은행 및 결제
 ,Welcome to ERPNext,ERPNext에 오신 것을 환영합니다
 DocType: Payment Reconciliation Payment,Voucher Detail Number,바우처 세부 번호
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,리드고객에게 견적?
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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,Opening 날짜
 DocType: Journal Entry,Remark,비고
 DocType: Purchase Receipt Item,Rate and Amount,속도 및 양
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,잎과 휴일
 DocType: Sales Order,Not Billed,청구되지 않음
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,두 창고는 같은 회사에 속해 있어야합니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,결제를위한 일괄 처리
@@ -2476,15 +2543,17 @@
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
+DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
 DocType: Sales Invoice Item,Delivered Qty,납품 수량
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0} 자산의 구입 날짜는 구매 송장 날짜가 일치하지 않습니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
 DocType: Journal Entry,Stock Entry,재고 항목
 DocType: Account,Payable,지급
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),채무자 ({0})
-DocType: Project,Margin,마진
+DocType: Pricing Rule,Margin,마진
 DocType: Salary Slip,Arrear Amount,연체 금액
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,신규 고객
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,매출 총 이익 %
@@ -2492,20 +2561,23 @@
 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,당신이 급여 명세서를 제출하는 동안 각 직원에게 우편으로 급여 명세서를 보내려면 확인
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
 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 +57,Where manufacturing operations are carried.,제조 작업은 어디를 수행한다.
 DocType: Stock Entry Detail,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
 DocType: Employee,Confirmation Date,확인 일자
 DocType: C-Form,Total Invoiced Amount,총 송장 금액
 DocType: Account,Sales User,판매 사용자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,최소 수량이 최대 수량보다 클 수 없습니다
+DocType: Account,Accumulated Depreciation,감가 상각 누계액
 DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
 DocType: Payment Request,Email To,이메일
 DocType: Lead,Lead Owner,리드 소유자
 DocType: Bin,Requested Quantity,요청한 수량
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,창고가 필요합니다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,창고가 필요합니다
 DocType: Employee,Marital Status,결혼 여부
 DocType: Stock Settings,Auto Material Request,자동 자료 요청
 DocType: Time Log,Will be updated when billed.,청구 할 때 업데이트됩니다.
@@ -2513,11 +2585,12 @@
 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 +115,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 +84,{0}% Delivered,{0} % 배달
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,동일한 공급자는 여러 번 입력 된
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,구매 주문 상품 공급
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,회사 이름은 회사가 될 수 없습니다
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,인쇄 템플릿에 대한 편지 머리.
@@ -2527,13 +2600,14 @@
 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: Payment Request,Payment Details,지불 세부 사항
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
+DocType: Asset,Journal Entry for Scrap,스크랩에 대한 분개
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","형 이메일, 전화, 채팅, 방문 등의 모든 통신 기록"
 DocType: Manufacturer,Manufacturers used in Items,항목에 사용 제조 업체
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,회사에 라운드 오프 비용 센터를 언급 해주십시오
 DocType: Purchase Invoice,Terms,약관
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,새로 만들기
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,새로 만들기
 DocType: Buying Settings,Purchase Order Required,주문 필수에게 구입
 ,Item-wise Sales History,상품이 많다는 판매 기록
 DocType: Expense Claim,Total Sanctioned Amount,전체 금액의인가를
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,재고 원장
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},속도 : {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,급여 공제 전표
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,첫 번째 그룹 노드를 선택합니다.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,첫 번째 그룹 노드를 선택합니다.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,직원 및 출석
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","이 회사 주소로, 고객, 공급 업체, 판매 대리점 및 리드의 참조를 제거"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}에서 {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
 DocType: BOM Replace Tool,BOM Replace Tool,BOM 교체도구
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,국가 현명한 기본 주소 템플릿
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,다음 날짜 게시 날짜보다 커야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,쇼 세금 해체
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# 양식 / 상품 / {0}) 품절
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,다음 날짜 게시 날짜보다 커야합니다
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/accounts/party.py +289,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',당신이 생산 활동에 참여합니다.항목을 활성화는 '제조'
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,송장 전기 일
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","참고 : 지불은 어떤 기준에 의해 만들어진되지 않은 경우, 수동 분개를합니다."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,가용성을 게시
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,생년월일은 오늘보다 클 수 없습니다.
 ,Stock Ageing,재고 고령화
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,인쇄 설정
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
+DocType: Asset Category Account,Fixed Asset Account,고정 자산 계정
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,인턴
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,BOM에서
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,다른 날짜로 반나절 휴직 일로부터 동일해야합니다
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","예) kg, 단위, NOS, M"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,급여 체계
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,견적
 DocType: Hub Settings,Access Token,액세스 토큰
 DocType: Sales Invoice Item,Serial No,일련 번호
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
-DocType: Item,Is Fixed Asset Item,고정 자산 상품에게 있습니다
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
 DocType: Purchase Invoice,Print Language,인쇄 언어
 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","당신이 긴 프린트 형식이있는 경우,이 기능은 각 페이지의 모든 머리글과 바닥 글과 함께 여러 페이지에 인쇄 할 페이지를 분할 할 수 있습니다"
+DocType: Asset,Number of Depreciations,감가 상각의 수
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 DocType: Fiscal Year,Year Name,올해의 이름
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
 DocType: Product Bundle Item,Product Bundle Item,번들 제품 항목
 DocType: Sales Partner,Sales Partner Name,영업 파트너 명
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,견적 요청
 DocType: Payment Reconciliation,Maximum Invoice Amount,최대 송장 금액
 DocType: Purchase Invoice Item,Image View,이미지보기
 apps/erpnext/erpnext/config/selling.py +23,Customers,고객
+DocType: Asset,Partially Depreciated,부분적으로 상각
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,일자 및 끝
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,유지 관리 관리자
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,총은 제로가 될 수 없습니다
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'마지막 주문 날짜' 이후의 날짜를 지정해 주세요.
-DocType: C-Form,Amended From,개정
+DocType: Asset,Amended From,개정
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,이월하다
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,회사의 &#39;자산 처분 이익 / 손실 계정&#39;을 언급하십시오
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,송장과 일치 결제
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,송장과 일치 결제
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,쇼핑 카트에 담기
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,그룹으로
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
 DocType: Production Planning Tool,Get Material Request,자료 요청을 받으세요
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,우편 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,우편 비용
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,전체 현재
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,회계 문
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,회계 문
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,시간
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
@@ -2746,15 +2825,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),시작 판매 시점 (POS)
 apps/erpnext/erpnext/config/support.py +32,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 대를 주문한 경우. 당신의 수당은 다음 110 단위를받을 10 % 허용된다.
 DocType: Pricing Rule,Customer Group,고객 그룹
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: Item,Website Description,웹 사이트 설명
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,자본에 순 변경
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
 ,Sales Register,판매 등록
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
@@ -2762,12 +2842,13 @@
 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,고객 그룹 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,바우처 형식에 대한
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},오류 : {0}&gt; {1}
 DocType: Item,Attributes,속성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,항목 가져 오기
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,마지막 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
 DocType: C-Form,C-Form,C-양식
@@ -2779,18 +2860,18 @@
 DocType: Purchase Invoice,Mobile No,모바일 없음
 DocType: Payment Tool,Make Journal Entry,저널 항목을 만듭니다
 DocType: Leave Allocation,New Leaves Allocated,할당 된 새로운 잎
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,광고 방송
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},오류 : {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 DocType: Cost Center,Distribution Id,배신 ID
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,모든 제품 또는 서비스.
 DocType: Supplier Quotation,Supplier Address,공급 업체 주소
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
+apps/erpnext/erpnext/config/accounts.py +259,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,금융 서비스
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위로 {3}
@@ -2801,10 +2882,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,미수금 기본
 DocType: Tax Rule,Billing State,결제 주
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,이체
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,이체
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,마감일은 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
 DocType: Journal Entry,Pay To / Recd From,지불 / 수취처
 DocType: Naming Series,Setup Series,설치 시리즈
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,Remarks
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원료 상품 코드
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,공급 업체 이메일 보내기
 DocType: Features Setup,POS View,POS보기
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,일련 번호의 설치 기록
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,다음 날짜의 날짜와 동일해야한다 이달의 날에 반복
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,다음 날짜의 날짜와 동일해야한다 이달의 날에 반복
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,를 지정하십시오
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,위
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,시간 로그 청구되었습니다
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),임시 이익 / 손실 (신용)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},회사에 기본값 {0}을 설정하십시오 {1}
@@ -2847,12 +2930,13 @@
 ,Monthly Attendance Sheet,월간 출석 시트
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,검색된 레코드가 없습니다
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정이 번호 시리즈&gt; 설정을 통해 출석을 위해 일련 번호하세요
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+DocType: Asset,Straight Line,일직선
+DocType: Project User,Project User,프로젝트 사용자
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
 DocType: Sales Team,Contact No.,연락 번호
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익' 타입 계정  {0}은 입력하도록 하용되지 않습니다
 DocType: Features Setup,Sales Discounts,매출 할인
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,주문 번호
 DocType: Item Group,HTML / Banner that will show on the top of product list.,제품 목록의 상단에 표시됩니다 HTML / 배너입니다.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,배송 금액을 계산하는 조건을 지정합니다
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,자식 추가
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,영업 가치
 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,판매에 대한 수수료
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,판매에 대한 수수료
 DocType: Offer Letter Term,Value / Description,값 / 설명
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 ,Customers Not Buying Since Long Time,장기 휴면 고객
 DocType: Production Order,Expected Delivery Date,예상 배송 날짜
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,접대비
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,접대비
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,휴가 신청.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,법률 비용
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,법률 비용
 DocType: Sales Invoice,Posting Time,등록시간
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,전화 비용
 DocType: Sales Partner,Logo,로고
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,당신은 저장하기 전에 시리즈를 선택하도록 강제하려는 경우이 옵션을 선택합니다.당신이 선택하면 기본이되지 않습니다.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},시리얼 번호와 어떤 항목이 없습니다 {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,열기 알림
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,직접 비용
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,직접 비용
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;알림 \ 이메일 주소&#39;잘못된 이메일 주소입니다
 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,여행 비용
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),총 결제 금액 (시간 로그를 통해)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,우리는이 품목을
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,공급 업체 아이디
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,수량이 0보다 커야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,수량이 0보다 커야합니다
 DocType: Journal Entry,Cash Entry,현금 항목
 DocType: Sales Partner,Contact Desc,연락처 제품 설명
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","캐주얼, 병 등과 같은 잎의 종류"
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,총 영업 비용
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,모든 연락처.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,자산의 공급 업체 {0} 구매 송장의 공급 업체와 일치하지 않습니다
 DocType: Newsletter,Test Email Id,테스트 이메일 아이디
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,원료의 주요 항목과 동일 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,급여 템플릿 마스터.
@@ -2946,12 +3032,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,선호하는 결제 주소
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,결제 통화 중 기본의 comapany의 통화 또는 파티의 payble 계정 통화와 동일해야합니다
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,비서
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",사용하지 않으면 필드 &#39;단어에서&#39;트랜잭션에 표시되지 않습니다
@@ -2961,13 +3048,13 @@
 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,채권자
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,채권자
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,행 번호 {0} : 일련 번호는 필수입니다
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 세부 정보
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,비용을 추가하는 규칙.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
@@ -2987,15 +3074,14 @@
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Hub Settings,Name Token,이름 토큰
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
-DocType: Project,Project Name,프로젝트 이름
+DocType: Request for Quotation 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
@@ -3025,6 +3111,7 @@
 DocType: Sales Invoice,End Date,끝 날짜
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,주식 거래
 DocType: Employee,Internal Work History,내부 작업 기록
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,누적 감가 상각 금액
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,사모
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
@@ -3032,7 +3119,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",이 회사 주소로 회사는 필수입니다
 DocType: Item Attribute,From Range,범위에서
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,그것은 재고 품목이 아니기 때문에 {0} 항목을 무시
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,추가 처리를 위해이 생산 주문을 제출합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,추가 처리를 위해이 생산 주문을 제출합니다.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",특정 트랜잭션에서 가격 규칙을 적용하지 않으려면 모두 적용 가격 규칙 비활성화해야합니다.
 DocType: Company,Domain,도메인
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,채용 정보
@@ -3044,6 +3131,7 @@
 DocType: Time Log,Additional Cost,추가 비용
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),무급 휴직 적립 감소 (LWP)
@@ -3060,6 +3148,7 @@
 DocType: Sales Order,Delivery Date,* 인수일
 DocType: Opportunity,Opportunity Date,기회 날짜
 DocType: Purchase Receipt,Return Against Purchase Receipt,구매 영수증에 대해 반환
+DocType: Request for Quotation Item,Request for Quotation Item,견적 항목에 대한 요청
 DocType: Purchase Order,To Bill,빌
 DocType: Material Request,% Ordered,% 발주
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,일한 분량에 따라 공임을 지급받는 일
@@ -3074,11 +3163,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} 항목을 직렬 제 칼럼에 대한 설정이 비어 있어야하지
 DocType: Accounts Settings,Accounts Settings,계정 설정
 DocType: Customer,Sales Partner and Commission,판매 파트너 및위원회
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},회사의 &#39;자산 처분 계정&#39;으로 설정하십시오 {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,임시 계정
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,검정
 DocType: BOM Explosion Item,BOM Explosion Item,BOM 폭발 상품
 DocType: Account,Auditor,감사
@@ -3087,21 +3177,22 @@
 DocType: Pricing Rule,Disable,사용 안함
 DocType: Project Task,Pending Review,검토 중
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,클릭해서 결재하기
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","이미 같이 자산 {0}, 폐기 될 수 없다 {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,고객 아이디
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,마크 결석
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,시간은 시간보다는 커야하는 방법
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,에서 항목 추가
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,에서 항목 추가
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""","예) ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,상품에 대한 존재할 수 없다 재고 {0} 이후 변종이있다
 ,Sales Person-wise Transaction Summary,판매 사람이 많다는 거래 요약
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,선택한 항목이 배치를 가질 수 없습니다
@@ -3116,6 +3207,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,품질 관리
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
 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,직원 외부 일 역사
@@ -3127,7 +3219,7 @@
 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,다음 연락
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,설치 게이트웨이를 차지한다.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,설치 게이트웨이를 차지한다.
 DocType: Employee,Employment Type,고용 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,고정 자산
 ,Cash Flow,현금 흐름
@@ -3141,7 +3233,7 @@
 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 +132,Please find attached {0} #{1},첨부 {0} # {1} 찾기
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},첨부 {0} # {1} 찾기
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,총계정 원장에 따라 은행 잔고 잔액
 DocType: Job Applicant,Applicant Name,신청자 이름
 DocType: Authorization Rule,Customer / Item Name,고객 / 상품 이름
@@ -3157,19 +3249,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,트랜잭션을 판매의 기본 설정.
 DocType: BOM Replace Tool,Current BOM,현재 BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,일련 번호 추가
 apps/erpnext/erpnext/config/support.py +43,Warranty,보증
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,인쇄 및 정지
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,그룹 노드
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,업데이트 완성품
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,업데이트 완성품
 DocType: Workstation,per hour,시간당
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,구매
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,지불 금액
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
@@ -3199,7 +3290,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
 DocType: Leave Block List,Applies to Company,회사에 적용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
 DocType: Purchase Invoice,In Words,즉
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
 DocType: Production Planning Tool,Material Request For Warehouse,창고 자재 요청
@@ -3212,9 +3303,11 @@
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
+DocType: Pricing Rule,Margin Rate or Amount,여백 비율 또는 금액
 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,판매 주문 품목
@@ -3224,7 +3317,7 @@
 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 +782,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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}이 (가) 이미 수신 된
@@ -3232,14 +3325,13 @@
 DocType: Customer,Sales Team Details,판매 팀의 자세한 사항
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},잘못된 {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,백화점
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,먼저 문서를 저장합니다.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,먼저 문서를 저장합니다.
 DocType: Account,Chargeable,청구
 DocType: Company,Change Abbreviation,변경 요약
 DocType: Expense Claim Detail,Expense Date,비용 날짜
@@ -3257,14 +3349,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,원장
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,보기 오퍼
 DocType: Item Attribute Value,Attribute Value,속성 값
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","이메일 ID가 고유해야합니다, 이미 존재 {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","이메일 ID가 고유해야합니다, 이미 존재 {0}"
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,먼저 {0}를 선택하세요
 DocType: Features Setup,To get Item Group in details table,자세한 내용은 테이블에 항목 그룹을 얻으려면
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {0}
 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>
@@ -3296,23 +3389,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},유지 보수 일정은 {0}에있는 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},유지 보수 일정은 {0}에있는 {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),실제 수량 (소스 / 대상에서)
 DocType: Item Customer Detail,Ref Code,참조 코드
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,직원 기록.
 DocType: Payment Gateway,Payment Gateway,지불 게이트웨이
 DocType: HR Settings,Payroll Settings,급여 설정
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,장소 주문
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,루트는 부모의 비용 센터를 가질 수 없습니다
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,선택 브랜드 ...
 DocType: Sales Invoice,C-Form Applicable,해당 C-양식
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,창고는 필수입니다
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,에 의해 해결
@@ -3330,7 +3423,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,거래 통화는 지불 게이트웨이 통화와 동일해야합니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,수신
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,수신
 DocType: Maintenance Visit,Fully Completed,완전히 완료
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0} % 완료
 DocType: Employee,Educational Qualification,교육 자격
@@ -3338,14 +3431,14 @@
 DocType: Purchase Invoice,Submit on creation,창조에 제출
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,내 주문
@@ -3366,10 +3459,10 @@
 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 +250,Point-of-Sale Profile,판매 시점 프로필
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,무담보 대출
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,무담보 대출
 DocType: Cost Center,Cost Center Name,코스트 센터의 이름
 DocType: Maintenance Schedule Detail,Scheduled Date,예약 된 날짜
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,총 유료 AMT 사의
@@ -3381,11 +3474,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}.상태 '비활성'이 진행하시기 바랍니다.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,공급 업체 부품 번호
 DocType: Purchase Invoice,Contact,연락처
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,에서 수신
 DocType: Features Setup,Exports,수출
@@ -3394,12 +3488,12 @@
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
@@ -3408,7 +3502,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,계정 헤드
@@ -3421,7 +3515,7 @@
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,재고 자산
@@ -3435,15 +3529,15 @@
 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 +576,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,프로젝트 활동 / 작업.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,급여 전표 생성
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",해당 법령에가로 선택된 경우 구매 확인해야합니다 {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,이달의 날 반복
@@ -3463,8 +3557,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,올해의 시작 날짜 또는 종료 날짜 {0}과 중첩된다. 회사를 설정하시기 바랍니다 방지하려면
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,새로운 뉴스
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","예 :. 시리즈가 설정되고 일련 번호가 트랜잭션에 언급되지 않은 경우 ABCD ##### 
  후 자동 일련 번호는이 시리즈를 기반으로 생성됩니다.당신은 항상 명시 적으로이 항목에 대한 일련 번호를 언급합니다. 이 비워 둡니다."
@@ -3476,11 +3571,11 @@
 ,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 +91,Please enter default currency in Company Master,회사 마스터에 기본 통화를 입력 해주십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},와 세금 규칙 충돌 {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,새 계정 이름
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,고객 서비스
@@ -3490,11 +3585,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,제공 후보 작업.
 DocType: Notification Control,Prompt for Email on Submission of,제출의 전자 우편을위한 프롬프트
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,총 할당 잎이 기간에 일 이상이다
+DocType: Pricing Rule,Percentage,백분율
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,{0} 항목을 재고 품목 수 있어야합니다
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,진행웨어 하우스의 기본 작업
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,회계 거래의 기본 설정.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,회계 거래의 기본 설정.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,항목 {0} 판매 품목이어야합니다
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,항목 {0} 판매 품목이어야합니다
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
 DocType: Account,Equity,공평
 DocType: Sales Order,Printing Details,인쇄 세부 사항
@@ -3502,11 +3598,12 @@
 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,검색 서브 어셈블리
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,비용 계정에 대한
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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;의) 아이를 추가 클릭하여 (새로운 계정을 만들고 않습니다.
 DocType: Production Order,Production Order,생산 주문
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
 DocType: Quotation Item,Against Docname,docName 같은 반대
@@ -3525,18 +3622,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,성공적으로 조정 됨
 DocType: Production Order,Planned End Date,계획 종료 날짜
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,항목이 저장되는 위치.
 DocType: Tax Rule,Validity,효력
+DocType: Request for Quotation,Supplier Detail,공급 업체 세부 정보
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,송장에 청구 된 금액
 DocType: Attendance,Attendance,출석
 apps/erpnext/erpnext/config/projects.py +55,Reports,보고서
 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 +508,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,트랜잭션을 구입을위한 세금 템플릿.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,트랜잭션을 구입을위한 세금 템플릿.
 ,Item Prices,상품 가격
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
 DocType: Period Closing Voucher,Period Closing Voucher,기간 결산 바우처
@@ -3546,10 +3644,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,변경
@@ -3557,6 +3655,7 @@
 DocType: Appraisal Goal,Score Earned,점수 획득
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
+DocType: Asset Category,Asset Category Name,자산 범주 이름
 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
@@ -3568,13 +3667,13 @@
 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 +559,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,일괄처리
@@ -3588,7 +3687,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,영업 사원
 DocType: Sales Invoice,Cold Calling,콜드 콜링
 DocType: SMS Parameter,SMS Parameter,SMS 매개 변수
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,예산 및 비용 센터
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,예산 및 비용 센터
 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.,값을 기준으로 거래를 제한하는 규칙을 만듭니다.
@@ -3619,9 +3718,9 @@
 DocType: Purchase Common,Purchase Common,공동 구매
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
@@ -3629,7 +3728,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,고객에게 제기 지폐입니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,부모 계정
@@ -3645,7 +3744,7 @@
 DocType: Employee,Education,교육
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
 DocType: Address,Office,사무실
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
@@ -3660,6 +3759,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,배치 재고
 DocType: Employee,Contract End Date,계약 종료 날짜
 DocType: Sales Order,Track this Sales Order against any Project,모든 프로젝트에 대해이 판매 주문을 추적
+DocType: Sales Invoice Item,Discount and Margin,할인 및 마진
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,위의 기준에 따라 (전달하기 위해 출원 중) 판매 주문을 당겨
 DocType: Deduction Type,Deduction Type,공제 유형
 DocType: Attendance,Half Day,반나절
@@ -3680,7 +3780,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,월급 등록
 DocType: Warranty Claim,If different than customer address,만약 고객 주소와 다른
 DocType: BOM Operation,BOM Operation,BOM 운영
@@ -3688,22 +3788,23 @@
 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 프로필
 DocType: Payment Gateway Account,Payment URL Message,지불 URL 메시지
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,행 {0} : 결제 금액 잔액보다 클 수 없습니다
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,무급 총
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,소요시간 로그는 청구되지 않습니다
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
+DocType: Asset,Asset Category,자산의 종류
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,수동에 대해 바우처를 입력하세요
 DocType: SMS Settings,Static Parameters,정적 매개 변수
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,공급 업체에 소재
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,소비세 송장
 DocType: Expense Claim,Employees Email Id,직원 이드 이메일
 DocType: Employee Attendance Tool,Marked Attendance,표시된 출석
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,유동 부채
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,유동 부채
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,실제 수량은 필수입니다
@@ -3724,17 +3825,16 @@
 DocType: Item Attribute,Numeric Values,숫자 값
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,로고 첨부
 DocType: Customer,Commission Rate,위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,해석학
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,바구니가 비어 있습니다
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,디폴트 주소 템플릿을 찾을 수 없습니다. 설정&gt; 인쇄 및 브랜딩&gt; 주소 템플릿에서 새 일을 만드십시오.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,자본금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,자본금
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
 DocType: Payment Gateway Account,Payment Gateway Account,지불 게이트웨이 계정
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,결제 완료 후 선택한 페이지로 사용자를 리디렉션.
@@ -3743,20 +3843,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
+DocType: Asset,Current Value (After Depreciation),현재 가치 (감가 상각 후)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,재료 명세서 (BOM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,참조 날짜
@@ -3764,6 +3865,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,계정 {0}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index b73f5f7..5922fe5 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Tirgotājs
 DocType: Employee,Rented,Īrēts
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
 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ā.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Rādīt open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series Atjaunots Veiksmīgi
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Jauns atvaļinājuma pieteikums
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Rādīt Variants
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Daudzums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredītiem (pasīvi)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Konti tabula nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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ā
 DocType: Designation,Designation,Apzīmējums
@@ -64,7 +66,7 @@
 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 +642,Invoice,Pavadzīme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Aizstāvēšana
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Jaunais {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Jaunais {0}: # {1}
 ,Sales Partners Commission,Sales Partners Komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Saīsinājums nedrīkst būt vairāk par 5 rakstzīmes
 DocType: Payment Request,Payment Request,Maksājuma pieprasījums
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Precējies
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Aizliegts {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Dabūtu preces no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitāte Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,Vai pamatlīdzekļa
 DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Visi Contact
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} ir sasalis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Akciju Izdevumi
 DocType: Newsletter,Email Sent?,Nosūtīts e-pasts?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Rādīt Time Baļķi
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Instalācijas statuss
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Postenis {0} jābūt iegāde punkts
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Jaunais BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Ievadiet Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Neto naudas no finansēšanas
 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 +217,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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
 ,Contact Name,Contact Name
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 DocType: Payment Tool,Reference No,Atsauces Nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,bankas ieraksti
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Paziņošana Control
 DocType: Lead,Suggestions,Ieteikumi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Komplekta Grupa gudrs budžetu šajā teritorijā. Jūs varat arī sezonalitāti, iestatot Distribution."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Ievadiet mātes kontu grupu, par noliktavu {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Ievadiet mātes kontu grupu, par noliktavu {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Mācīties
+DocType: Asset,Next Depreciation Date,Nākamais Nolietojums Datums
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitāte izmaksas uz vienu darbinieku
 DocType: Accounts Settings,Settings for Accounts,Iestatījumi kontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Piegādātājs Invoice Nr pastāv pirkuma rēķina {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Pārvaldīt pārdošanas persona Tree.
 DocType: Job Applicant,Cover Letter,Pavadvēstule
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,"Izcilas Čeki un noguldījumi, lai nodzēstu"
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Nepareiza Parole
 DocType: Item,Variant Of,Variants
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
 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: 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."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} vienības [{1}] (# veidlapa / preci / {1}) atrasts [{2}] (# veidlapa / Noliktava / {2})
 DocType: Lead,Industry,Rūpniecība
 DocType: Employee,Job Profile,Darba Profile
 DocType: Newsletter,Newsletter,Biļetens
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Piegāde Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Piegāde Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Iestatīšana Nodokļi
 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 +381,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kopā Order Uzskata
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Select postenis
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postenis kvalitātes pārbaudes parametrs
 DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinātāja Vārds
-,Schedule Date,Grafiks Datums
+DocType: Depreciation Schedule,Schedule Date,Grafiks Datums
 DocType: Packed Item,Packed Item,Iepakotas postenis
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Noklusējuma iestatījumi pārdošanas darījumus.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Noklusējuma iestatījumi pārdošanas darījumus.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitāte Cost pastāv Darbinieku {0} pret darbības veida - {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.,"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
@@ -346,6 +353,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Pieprasījums piedāvājumam
 DocType: Workstation,Working Hours,Darba laiks
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday meistars.
-DocType: Material Request Item,Required Date,Nepieciešamais Datums
+DocType: Request for Quotation Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Vēstījums piegādātājs
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
 DocType: Employee,Health Concerns,Veselības problēmas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Nesamaksāts
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 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 +315,Managing Subcontracting,Managing Apakšuzņēmēji
+DocType: Project,Project will be accessible on the website to these users,Projekts būs pieejams tīmekļa vietnē ar šo lietotāju
 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 +53,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Pieaugums nevar būt 0
 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 +86,Item {0} is not Purchase Item,Postenis {0} nav Iegādājieties postenis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Postenis {0} nav Iegādājieties postenis
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Kamēr Daudz
 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 +126,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 +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Finanšu / grāmatvedības gadā.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Uzkrātās vērtības
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Piegādāts: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Maksājama konts
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,atsākt Pielikums
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Sales Return
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Algu sastāvdaļas.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database potenciālo klientu.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update Bankas Darījumu datumi
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update Bankas Darījumu datumi
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Ievadiet pirkuma čeka pirmais
 DocType: Buying Settings,Supplier Naming By,Piegādātājs nosaukšana Līdz
 DocType: Activity Type,Default Costing Rate,Default Izmaksu Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Uzturēšana grafiks
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto Izmaiņas sarakstā
 DocType: Employee,Passport Number,Pases numurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Lūdzu noteikt brīvdienu sarakstu nu darbinieka vai Sabiedrībai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,nolietojums Summa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Pārveidot uz Group
 DocType: Activity Cost,Activity Type,Pasākuma veids
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Pasludināts Summa
 DocType: Supplier,Fixed Days,Fiksētie dienas
 DocType: Quotation Item,Item Balance,Prece Balance
 DocType: Sales Invoice,Packing List,Iepakojums Latviešu
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Pirkuma pasūtījumu dota piegādātājiem.
+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/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ā
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Darbība laiks
 DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Group grupas
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mani projekti
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
 DocType: Journal Entry,Bill No,Bill Nr
+DocType: Company,Gain/Loss Account on Asset Disposal,Gain / zaudējumu aprēķins par aktīva atsavināšana
 DocType: Purchase Invoice,Quarterly,Ceturkšņa
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company valūta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Maksājums ieraksts ir jau radīta
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Kopā norēķinu šogad
 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 +529,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: Production Order Operation,Planned End Time,Plānotais Beigu laiks
 ,Sales Person Target Variance Item Group-Wise,Sales Person Mērķa Variance Prece Group-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mēnešalga paziņojumu.
 DocType: Item Group,Website Specifications,Website specifikācijas
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tur ir kļūda jūsu adrešu veidni {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Jauns konts
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Jauns konts
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: No {0} tipa {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {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.,Grāmatvedības Ierakstus var veikt pret lapu mezgliem. Ieraksti pret grupām nav atļauts.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Ievadiet Prece pirmais
 DocType: Account,Liability,Atbildība
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Default pārdotās produkcijas ražošanas izmaksas konta
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Cenrādis nav izvēlēts
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mani Rēķini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mani Rēķini
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Neviens darbinieks atrasts
 DocType: Supplier Quotation,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Augšupielādēt akciju līdzsvaru caur csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nosūtīt tagad
 ,Support Analytics,Atbalsta Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Loģiska kļūda: Must atrast pārklāšanās
 DocType: Item,Website Warehouse,Mājas lapa Noliktava
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultāts ir mazāks par vai vienāds ar 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form ieraksti
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form ieraksti
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Klientu un piegādātāju
 DocType: Email Digest,Email Digest Settings,E-pasta Digest iestatījumi
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Atbalsta vaicājumus no klientiem.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Tiek slēgti apakšuzņēmuma līgumi
 DocType: Item Attribute,Item Attribute Values,Postenis Prasme Vērtības
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Skatīt ES PVN reģistrā
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Pirkuma čeka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Valūtas maiņas kurss meistars.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Valūtas maiņas kurss meistars.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Pārdošanas Partneri un teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} jābūt aktīvam
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} jābūt aktīvam
+DocType: Journal Entry,Depreciation Entry,nolietojums Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Grozs
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Pirkuma rēķins
+DocType: Asset,Purchase Invoice,Pirkuma rēķins
 DocType: Stock Ledger Entry,Voucher Detail No,Kuponu Detail Nr
 DocType: Stock Entry,Total Outgoing Value,Kopā Izejošais vērtība
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Atvēršanas datums un aizvēršanas datums ir jāatrodas vienā fiskālā gada
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Izpildes laiks Datums
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ir obligāta. Varbūt Valūtas ieraksts nav izveidots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Par &quot;produkts saišķis&quot; vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no &quot;iepakojumu sarakstu&quot; tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru &quot;produkts saišķis&quot; posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts &quot;iepakojumu sarakstu galda."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Par &quot;produkts saišķis&quot; vienību, noliktavu, Serial Nr un partijas Nr tiks uzskatīta no &quot;iepakojumu sarakstu&quot; tabulā. Ja Noliktavu un partijas Nr ir vienādas visiem iepakojuma vienības par jebkuru &quot;produkts saišķis&quot; posteni, šīs vērtības var ievadīt galvenajā postenis tabulas vērtības tiks kopēts &quot;iepakojumu sarakstu galda."
 DocType: Job Opening,Publish on website,Publicēt mājas lapā
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Sūtījumiem uz klientiem.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Piegādātājs Rēķina datums nevar būt lielāks par norīkošanu Datums
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Netieša Ienākumi
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Uzstādīt Maksājuma summa = Outstanding Summa
 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 +672,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Izvēlieties Prece pārneses
 DocType: Purchase Invoice,Additional Discount Percentage,Papildu Atlaide procentuālā
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rinda {0}: Rēķinu {1} ir nederīgs, tas varētu tikt atcelts / neeksistē. \ Lūdzu, ievadiet derīgu rēķinu"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku dzimšanas dienu atgādinājumus
 ,Employee Holiday Attendance,Darbinieku Holiday apmeklējums
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Krājumu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Krājumu
 DocType: Item,Inspection Criteria,Pārbaudes kritēriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nodota
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Padarīt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Padarīt
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
 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 +5,My Cart,Grozs
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Holiday Latviešu Name
 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 +180,Qty for {0},Daudz par {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Vai jūs tiešām vēlaties atjaunot šo metāllūžņos aktīvu?
+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 +80,Leave Allocation Tool,Atstājiet Allocation rīks
 DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
 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 +547,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Atlaide
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkuma čeka postenis
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Pārdošanas apjoms
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Laiks Baļķi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Laiks Baļķi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,metāllūžņos
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,vervēšana
 DocType: BOM Operation,Operation,Operācija
 DocType: Lead,Organization Name,Organizācijas nosaukums
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Pārdošanas izmaksas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard Pirkšana
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Uz {0} | {1}{2}
 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
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Default Valūtas
 DocType: Contact,Enter designation of this Contact,Ievadiet cilmes šo kontaktadresi
 DocType: Expense Claim,From Employee,No darbinieka
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Ieguldījums%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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."
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projektu Sadarbība Ielūgums
 DocType: Salary Slip,Deductions,Atskaitījumi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Šoreiz Log Partijas ir jāmaksā.
 DocType: Salary Slip,Leave Without Pay,Bezalgas atvaļinājums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning kļūda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacity Planning kļūda
 ,Trial Balance for Party,Trial Balance uz pusi
 DocType: Lead,Consultant,Konsultants
 DocType: Salary Slip,Earnings,Peļņa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,"Gatavo postenis {0} ir jāieraksta, lai ražošana tipa ierakstu"
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
 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 +473,Nothing to request,Nekas pieprasīt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Vadība
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Darbības veidi uz laiku lapām
@@ -935,18 +958,18 @@
 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"
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Lūdzu iestatīt e-pasta ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Lūdzu iestatīt e-pasta ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Postenis kodekss nevar mainīt Serial Nr
 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/config/buying.py +33,Supplier database.,Piegādātājs datu bāze.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Piegādātājs datu bāze.
 DocType: Account,Balance Sheet,Bilance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Nodokļu un citu algas atskaitījumi.
 DocType: Lead,Lead,Potenciālie klienti
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Brīvdiena
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nav piemērojams rēķinam: {0}
 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ā
@@ -973,19 +997,20 @@
 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ā"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
 DocType: Contact,User ID,Lietotāja ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,View Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Izmaksātajām dividendēm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Izmaksātajām dividendēm
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Grāmatvedības Ledger
 DocType: Stock Reconciliation,Difference Amount,Starpība Summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nesadalītā peļņa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Nesadalītā peļņa
 DocType: BOM Item,Item Description,Vienība Apraksts
 DocType: Payment Tool,Payment Mode,Maksājumu Mode
 DocType: Purchase Invoice,Is Recurring,Vai Atkārtojas
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Pagaidu atklāšana
 ,Employee Leave Balance,Darbinieku Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Kreditoru kopsavilkums
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mazs
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Konts galva {0} izveidots
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kopā Izpildīts
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 apps/erpnext/erpnext/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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Pārdevējs Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
 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 +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Piegādātājam
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Neatradām nevienu objektu nosaukumu {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Mājas lapa punkts Grupas
 DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
-DocType: Journal Entry,Journal Entry,Journal Entry
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
 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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Pieprasījums citāts Piegādātāja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Detaļas
 DocType: Sales Order,Recurring Upto,Periodisks Līdz pat
 DocType: Attendance,HR Manager,HR vadītājs
@@ -1082,6 +1109,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Pašreizējā vērtība pēc amortizācijas jābūt mazākam nekā vienādam ar {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Pievienot vai atrēķināt
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ja Gada budžets pārsniedz (par izdevumu kontu)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Sākuma un beigu datumi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Vidēji Atlaide
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Grāmatvedība
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Asset,Depreciation Schedules,amortizācijas grafiki
 DocType: Item,Is Service Item,Vai Service postenis
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,darījuma valūta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},No {0} | {1}{2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},No {0} | {1}{2}
 DocType: BOM Operation,Operation Description,Darbība Apraksts
 DocType: Item,Will also apply to variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad saimnieciskais gads ir saglabāts."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad saimnieciskais gads ir saglabāts."
 DocType: Quotation,Shopping Cart,Grozs
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Izejošais
 DocType: Pricing Rule,Campaign,Kampaņa
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sakaru žurnāls.
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
 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 +472,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nevar būt lielāks par 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Mēs Pirkt šo preci
 DocType: Address,Billing,Norēķinu
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Rādījumus
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Kompleksi
+DocType: Asset,Asset Name,Asset Name
 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 +142,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Iepakošanas Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office Rent
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Iepakošanas Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS vārti iestatījumi
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Pieprasījums citāts var piekļūt, noklikšķinot uz šīs saites,"
+DocType: Asset,Number of Months in a Period,Mēnešu skaits periodā
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valdība
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Kopā ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Kopā ({0})
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
 DocType: Sales Invoice,Source,Avots
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Rādīt slēgts
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: Employee External Work History,Total Experience,Kopā pieredze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Packing Slip (s) atcelts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Naudas plūsma no ieguldījumu
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
 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 +86,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
 DocType: Pricing Rule,For Price List,Par cenrādi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Uzturēšana Apmeklēt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Uzturēšana Apmeklēt
 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: Landed Cost Voucher,Landed Cost Help,Izkrauti izmaksas Palīdzība
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Brand master.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs Type
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kaste
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Akciju Saistības
 DocType: Purchase Receipt,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,citas Ziņojumi
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} View
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto izmaiņas naudas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Iepriekšējais finanšu gads nav slēgts
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Piegādātājs Type meistars.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Piegādātājs Type meistars.
 DocType: Purchase Order Item,Supplier Part Number,Piegādātājs Part Number
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
 DocType: Purchase Invoice,Reference Document,atsauces dokuments
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Jāmaksā
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto izmaiņas Kreditoru
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Lūdzu, apstipriniet savu e-pasta id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Klientam nepieciešams ""Customerwise Atlaide"""
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
 DocType: Quotation,Term Details,Term Details
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} nedrīkst būt lielāks par 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning For (dienas)
 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ā.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantijas prasību
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Pastāvīga adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izmaksāto avansu pret {0} {1} nevar būt lielāks \ nekā Kopsumma {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Lūdzu izvēlieties kodu
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Lūdzu izvēlieties kodu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Samazināt atvieglojumus par Bezalgas atvaļinājums (LWP)
 DocType: Territory,Territory Manager,Teritorija vadītājs
 DocType: Packed Item,To Warehouse (Optional),Lai Noliktava (pēc izvēles)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Viena vienība posteņa.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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
+DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","piemēram, ""XYZ National Bank"""
+DocType: Asset,Depreciation Method,nolietojums metode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
 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 +29,Shopping Cart is enabled,Grozs ir iespējots
 DocType: Job Applicant,Applicant for a Job,Pretendents uz darbu
 DocType: Production Plan Material Request,Production Plan Material Request,Ražošanas plāns Materiāls pieprasījums
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Galvenais
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Padarīt pirkuma pasūtījuma
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
 DocType: Territory,Territory Name,Teritorija Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adreses
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adreses
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,vērtējumi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Prece nav atļauts būt Ražošanas uzdevums.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Prece nav atļauts būt Ražošanas uzdevums.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
 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: 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 +27,Time Logs for manufacturing.,Laika Baļķi ražošanā.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Laiks Pieteikties uz uzdevumiem.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Maksājums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
 DocType: Quotation Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
+DocType: Request for Quotation Supplier,Send Email to Supplier,Sūtīt e-pastu uz Piegādātāja
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 DocType: Packing Slip,To Package No.,Iesaiņot No.
 DocType: Production Planning Tool,Material Requests,Materiālu pieprasījumi
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Piegāde Noliktava
 DocType: Stock Settings,Allowance Percent,Pabalsts Percent
 DocType: SMS Settings,Message Parameter,Message parametrs
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree finanšu izmaksu centriem.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree finanšu izmaksu centriem.
 DocType: Serial No,Delivery Document No,Piegāde Dokuments Nr
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dabūtu preces no pirkumu čekus
 DocType: Serial No,Creation Date,Izveides datums
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Summa rīkoties
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} izveidots
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} izveidots
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
 ,Serial No Status,Sērijas Nr statuss
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Postenis tabula nevar būt tukšs
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rinda {0}: Lai iestatītu {1} periodiskumu, atšķirība no un uz datuma \ jābūt lielākam par vai vienādam ar {2}"
 DocType: Pricing Rule,Selling,Pārdod
 DocType: Employee,Salary Information,Alga informācija
 DocType: Sales Person,Name and Employee ID,Nosaukums un darbinieku ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Nodevas un nodokļi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Ievadiet Atsauces datums
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Maksājumu Gateway konts nav konfigurēts
 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: Production Order,Material Request Item,Materiāls Pieprasījums postenis
+DocType: Request for Quotation Item,Material Request Item,Materiāls Pieprasījums postenis
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Pārdots
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Sarkans
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Uzstādīšana laiks
 DocType: Sales Invoice,Accounting Details,Grāmatvedības Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,"Dzēst visas darījumi, par šo uzņēmumu"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,piešķīrumi
 DocType: Quality Inspection Reading,Acceptance Criteria,Pieņemšanas kritēriji
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 DocType: Item Group,Show In Website,Show In Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupa
@@ -1527,6 +1567,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Ganta shēma visiem uzdevumiem.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,Par darbinieku Vārds
 DocType: Holiday List,Clear Table,Skaidrs tabula
 DocType: Features Setup,Brands,Brands
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset obligāti pret ilgtermiņa ieguldījumu postenim
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lūdzu uzstādīšana numerācijas sēriju apmeklējums izmantojot Setup&gt; numerācija Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pāris
+DocType: Asset,Depreciation Schedule,nolietojums grafiks
 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: Asset,Purchase Date,Pirkuma datums
 DocType: Employee,Personal Details,Personīgie Details
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Lūdzu noteikt &quot;nolietojuma izmaksas centrs&quot; uzņēmumā {0}
 ,Maintenance Schedules,Apkopes grafiki
 ,Quotation Trends,Citāts tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Iekļaut jāsaskaņo Ieraksti
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Group Non-Group
 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/public/js/setup_wizard.js +272,Unit,Vienība
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Lūdzu, norādiet Company"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
 ,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)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
 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
 DocType: Territory,Classification of Customers by region,Klasifikācija klientiem pa reģioniem
 DocType: Project,% Tasks Completed,% Uzdevumi Pabeigti
 DocType: Project,Gross Margin,Bruto peļņa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Aprēķinātais Bankas pārskats bilance
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invalīdiem lietotāju
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Izmaksas Atjaunots
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Izmaksas Atjaunots
 DocType: Employee,Date of Birth,Dzimšanas datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
 DocType: Production 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Daudz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
+DocType: Request for Quotation,Manufacturing Manager,Ražošanas vadītājs
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Sūtījumi
 DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Dažādi izdevumi
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"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 +350,"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 +363,"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 +139,User {0} is disabled,Lietotāja {0} ir invalīds
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Currency Exchange,From Currency,No Valūta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Daudz jābūt 1, jo punkts ir saistīts ar aktīvu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Bērnu Prece nedrīkst būt Product Bundle. Lūdzu, noņemiet objektu `{0}` un saglabāt"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banku
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Jaunais Izmaksu centrs
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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šā grupā (parasti finansējuma avots&gt; īstermiņa saistībām&gt; nodokļiem un nodevām un izveidot jaunu kontu (noklikšķinot uz Add Child) tipa &quot;nodokli&quot; un to pieminēt nodokļa likmi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Jaunais Izmaksu centrs
 DocType: Bin,Ordered Quantity,Sakārtots daudzums
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Quality Inspection,In Process,In process
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Laiks Baļķi izveidots:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Laiks Baļķi izveidots:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Item,Weight UOM,Svars UOM
 DocType: Employee,Blood Group,Asins Group
@@ -1691,13 +1738,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Lūdzu, norādiet valsti šim Shipping noteikuma vai pārbaudīt Worldwide Shipping"
 DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debets ir nepieciešama
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
 DocType: Offer Letter Term,Offer Term,Piedāvājums Term
 DocType: Quality Inspection,Quality Manager,Kvalitātes vadītājs
 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 +141,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Akcija vēstule
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Izveidot Materiāls Pieprasījumi (MRP) un pasūtījumu.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Cenrādis {0} ir invalīds
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cenrādis {0} ir invalīds
 DocType: Manufacturing Settings,Allow Overtime,Atļaut Virsstundas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Pašreizējais Vērtēšanas Rate
 DocType: Item,Customer Item Codes,Klientu punkts Codes
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Izveidot Maksājumu Ieraksti pret rīkojumiem vai rēķinos.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Izveidot Maksājumu Ieraksti pret rīkojumiem vai rēķinos.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nē alga slip atrasts mēnesi:
 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 +175,Serial No {0} not found,Sērijas Nr {0} nav atrasts
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Sērijas Nr {0} nav atrasts
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Jūsu klienti
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
 DocType: Leave Block List Date,Block Date,Block Datums
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Pieteikties tagad
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Pieteikties tagad
 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."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Nodarbinātības Details
 DocType: Employee,New Workplace,Jaunajā darbavietā
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Uzstādīt kā Slēgts
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Pozīcijas ar svītrkodu {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Pozīcijas ar svītrkodu {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. nevar būt 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,"Ja jums ir pārdošanas komandas un Sale Partneri (kanāla partneri), tās var iezīmētas un saglabāt savu ieguldījumu pārdošanas aktivitātes"
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Materiāls
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Prece {0} ir jābūt Sales Ir {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Izveidot algas lapu
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importēt e-pastu no
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Uzaicināt kā lietotājs
 DocType: Features Setup,After Sale Installations,Pēc Pārdod Iekārtas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Lūdzu noteikt {0} uzņēmumā {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 DocType: Workstation Working Hour,End Time,Beigu laiks
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standarta līguma noteikumi par pārdošanu vai pirkšanu.
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Gateway Account,Payment Account,Maksājumu konts
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto izmaiņas debitoru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,Accepted,Pieņemts
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0}{1} nav iesniegta
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Biļetens Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorizēts Value
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} ir slēgts
 DocType: Email Digest,How frequently?,Cik bieži?
 DocType: Purchase Receipt,Get Current Stock,Saņemt krājumam
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Iet uz atbilstošā grupā (parasti piemērošana fondu&gt; apgrozāmo līdzekļu&gt; bankas kontos un izveidot jaunu kontu (noklikšķinot uz Add Child) tipa &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill Materiālu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
 DocType: Production Order,Actual End Date,Faktiskais beigu datums
 DocType: Authorization Rule,Applicable To (Role),Piemērojamais Lai (loma)
 DocType: Stock Entry,Purpose,Nolūks
+DocType: Company,Fixed Asset Depreciation Settings,Pamatlīdzekļu nolietojuma Settings
 DocType: Item,Will also apply for variants unless overrridden,"Attieksies arī uz variantiem, ja vien overrridden"
 DocType: Purchase Invoice,Advances,Avansa
 DocType: Production Order,Manufacture against Material Request,Rūpniecība pret Material pieprasījuma
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd daudzums
-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}
+DocType: Asset Category Account,Asset Category Account,Asset kategorija konts
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","piemēram, Bank, Cash, Credit Card"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Iet uz atbilstošā grupā (parasti piemērošana fondu&gt; apgrozāmo līdzekļu&gt; bankas kontos un izveidot jaunu kontu (noklikšķinot uz Add Child) tipa &quot;Banka&quot;
 DocType: Journal Entry,Credit Note,Kredīts Note
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mani adreses
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizācija filiāle meistars.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Neviens darbinieks par iepriekš izvēlētajiem kritērijiem vai algu paslīdēt jau izveidots
@@ -1972,7 +2024,7 @@
 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 +200,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ā '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Algas
 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ī"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkuma čeka Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Pielāgošana Veidlapas
 DocType: Account,Income Account,Ienākumu konta
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nē noklusējuma Adrese Template atrasts. Lūdzu, izveidojiet jaunu no Setup&gt; Poligrāfija un Brendings&gt; Adrese veidnē."
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Jaunais Izmaksu centrs Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Nodokļi un maksājumi Atskaitīts
-apps/erpnext/erpnext/config/support.py +7,Issues,Jautājumi
+apps/erpnext/erpnext/hooks.py +90,Issues,Jautājumi
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statuss ir jābūt vienam no {0}
 DocType: Sales Invoice,Debit To,Debets
 DocType: Delivery Note,Required only for sample item.,Nepieciešams tikai paraugu posteni.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} ir invalīds
 DocType: Supplier,Billing Currency,Norēķinu valūta
 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
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
 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 +139,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
 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 +142,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
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Pieprasīts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nav Piezīmes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju postenis
 DocType: Supplier Quotation Item,Material Request No,Materiāls Pieprasījums Nr
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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ā"
@@ -2119,7 +2174,7 @@
 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ā
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 DocType: Payment Request,Recipient and Message,Saņēmējs un Message
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Select Piegādātājs adrese
 DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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."
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Pieprasīt citāts.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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 par kopsummā ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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 par kopsummā ({2})
 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 +294,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Pret dokumentā Nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Pārvaldīt tirdzniecības partneri.
 DocType: Quality Inspection,Inspection Type,Inspekcija Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Lūdzu, izvēlieties {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Nemarķēta apmeklējums
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Nolietojums Izdevumu konts
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Apstiprināts
 DocType: Payment Gateway,Gateway,Vārti
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Ievadiet atbrīvojot datumu.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nevar atrast valūtas kursu {0} uz {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nevar atrast valūtas kursu {0} uz {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
 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 +410,[Error],[Kļūda]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Klientu Noliktava (pēc izvēles)
 DocType: Pricing Rule,Discount Percentage,Atlaide procentuālā
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
@@ -2247,14 +2305,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,Atstājiet sadale
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Šablons noteikumiem vai līgumu.
 DocType: Purchase Invoice,Address and Contact,Adrese un kontaktinformācija
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Uzkrātais nolietojums konts
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
+DocType: Asset,Expected Value After Useful Life,"Paredzams, vērtība pēc Noderīga Life"
 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
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ir atcelts vai aizvērts
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekot šim pavadzīmi pret jebkuru projektu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Neto naudas no Investing
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root konts nevar izdzēst
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} jāiesniedz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Pārvaldīt adreses
-DocType: Pricing Rule,Item Code,Postenis Code
+DocType: Asset,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Izveidot Materiāls Pieprasījumi
 DocType: Employee Education,School/University,Skola / University
 DocType: Payment Request,Reference Details,Atsauce Details
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Pieejams Daudz at Warehouse
 ,Billed Amount,Jāmaksā Summa
+DocType: Asset,Double Declining Balance,Paātrināto norakstīšanas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,"Slēgta rīkojumu nevar atcelt. Atvērt, lai atceltu."
 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
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'"
+DocType: Asset,Fully Depreciated,pilnībā amortizēta
 ,Stock Projected Qty,Stock Plānotais Daudzums
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Ievērojama Apmeklējumu HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Sērijas Nr un partijas
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Mazumtirgotājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Atslēgt vārdos
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Banka Overdrafts konts
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; postenis Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Nodrošināti aizdevumi
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Lūdzu noteikt nolietojuma saistīti konti aktīvu kategorijā {0} vai Uzņēmumu {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Atklāšanas Balance Equity
 DocType: Appraisal,Appraisal,Novērtējums
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-pasts nosūtīts piegādātājam {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datums tiek atkārtots
 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 +187,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
@@ -2344,7 +2410,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk Importa Palīdzība
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Izvēlieties Daudzums
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Izvēlieties Daudzums
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Apstiprinot loma nevar būt tāds pats kā loma noteikums ir piemērojams
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Atteikties no šo e-pastu Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ziņojums nosūtīts
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Kopā Margin
 DocType: Supplier,Supplier Details,Piegādātājs Details
 DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 DocType: Hub Settings,Publish Items to Hub,Publicēt preces Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientu Group / Klientu
 DocType: Payment Gateway Account,Default Payment Request Message,Default maksājuma pieprasījums Message
 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/config/accounts.py +118,Banking and Payments,Banku un maksājumi
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Banku un maksājumi
 ,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,Potenciālais klients -> Piedāvājums (quotation)
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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
 DocType: Notification Control,Quotation Message,Citāts Message
 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/config/hr.py +55,Leaves and Holiday,Lapas un brīvdienu
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Izkrauti izmaksas kuponu Summa
 DocType: Time Log,Batched for Billing,Batched par rēķinu
@@ -2419,15 +2486,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Aktīvu amortizācijas izmaksas Center
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Pirkuma datums aktīva {0} nesakrīt ar pirkuma rēķina datumu
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Noliktava {0}: Uzņēmums ir obligāta
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Maksājams
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debitori ({0})
-DocType: Project,Margin,Robeža
+DocType: Pricing Rule,Margin,Robeža
 DocType: Salary Slip,Arrear Amount,Arrear Summa
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Jauni klienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto peļņa%
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Klīrenss Datums
 DocType: Newsletter,Newsletter List,Biļetens Latviešu
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Pārbaudiet, vai jūs vēlaties nosūtīt algas paslīdēt pastu uz katru darbinieku, vienlaikus iesniedzot algu slīdēšanas"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
 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 +57,Where manufacturing operations are carried.,"Gadījumos, kad ražošanas darbības tiek veiktas."
 DocType: Stock Entry Detail,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
 DocType: C-Form,Total Invoiced Amount,Kopā Rēķinā summa
 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: Account,Accumulated Depreciation,uzkrātais nolietojums
 DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
 DocType: Payment Request,Email To,E-pastu
 DocType: Lead,Lead Owner,Lead Īpašnieks
 DocType: Bin,Requested Quantity,Pieprasītā daudzums
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Noliktava ir nepieciešama
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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ā."
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Pasludināts
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Pasludināts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma Daudz {2} (definēts postenī).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Pats piegādātājs ir ievadīts vairākas reizes
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pasūtījuma Prece Kopā
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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."
 DocType: Payment Request,Payment Details,Maksājumu informācija
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Journal Entry metāllūžņos
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
 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 +73,"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"
 DocType: Manufacturer,Manufacturers used in Items,Ražotāji izmanto preces
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Izveidot Jauns
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Alga Slip atskaitīšana
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Izvēlieties grupas mezglu pirmās.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Izvēlieties grupas mezglu pirmās.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Darbinieku un apmeklējums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Noņemt atsauci klientu, piegādātāju, pārdošanas partneris un svina, jo tas ir jūsu uzņēmums adrese"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: No {1}
 DocType: Task,depends_on,depends_on
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Nākamais datums nedrīkst būt lielāks par norīkošanu Datums
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Rādīt nodokļu break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / postenis / {0}) ir no krājumiem
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Nākamais datums nedrīkst būt lielāks par norīkošanu Datums
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/accounts/party.py +289,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"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Rēķina Posting Date
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,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 +101,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
 DocType: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Pamatlīdzekļa konts
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investīciju banku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Likme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interns
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,No BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Algu struktūra
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Par Noliktava
 DocType: Employee,Offer Date,Piedāvājums Datums
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citāti
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,Sērijas Nr
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
-DocType: Item,Is Fixed Asset Item,Ir ilgtermiņa ieguldījumu postenim
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
 DocType: Purchase Invoice,Print Language,print valoda
 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ē"
+DocType: Asset,Number of Depreciations,Skaits nolietojuma
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Pieprasījums citāti
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimālais Rēķina summa
 DocType: Purchase Invoice Item,Image View,Image View
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienti
+DocType: Asset,Partially Depreciated,daļēji to nolietojums
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktava
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Uzturēšana vadītājs
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kopā nevar būt nulle
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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"
-DocType: C-Form,Amended From,Grozīts No
+DocType: Asset,Amended From,Grozīts No
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Lūdzu, norādiet &quot;Gain / zaudējumu aprēķinā par aktīvu aizvākšanu&quot; uzņēmumā"
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Maksājumi ar rēķini
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Maksājumi ar rēķini
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Pievienot grozam
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
 DocType: Production Planning Tool,Get Material Request,Iegūt Material pieprasījums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Pasta izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Pasta izdevumi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Kopā Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,grāmatvedības pārskati
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,grāmatvedības pārskati
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Rēķini
 DocType: Job Opening,Job Title,Amats
 DocType: Features Setup,Item Groups in Details,Postenis Grupas detaļās
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 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 +32,Visit report for maintenance call.,Apmeklējiet pārskatu uzturēšanas zvanu.
 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 +169,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: Item,Website Description,Mājas lapa Apraksts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto pašu kapitāla izmaiņas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
 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
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Kļūda: {0}&gt; {1}
 DocType: Item,Attributes,Atribūti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Saņemt Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ievadiet norakstīt kontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Saņemt Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Pēdējā pasūtījuma datums
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
 DocType: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile Nr
 DocType: Payment Tool,Make Journal Entry,Padarīt Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Jaunas lapas Piešķirtie
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Tirdzniecības
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Kļūda: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Visi produkti vai pakalpojumi.
 DocType: Supplier Quotation,Supplier Address,Piegādātājs adrese
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Daudz
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
 DocType: Tax Rule,Billing State,Norēķinu Valsts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Nodošana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Nodošana
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date ir obligāts
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Setup Series
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Piezīmes
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Laiks Log ir jāmaksā
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konts {0} nevar būt Group
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Pagaidu peļņa / zaudējumi (kredīts)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Lūdzu iestatīt noklusēto vērtību {0} kompānijā {1}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lūdzu uzstādīšana numerācijas sēriju apmeklējums izmantojot Setup&gt; numerācija Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+DocType: Asset,Straight Line,Taisne
+DocType: Project User,Project User,projekta User
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'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: Features Setup,Sales Discounts,Pārdošanas Atlaides
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Pievienot Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,atklāšanas Value
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisijas apjoms
 DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
 DocType: Tax Rule,Billing Country,Norēķinu Country
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Izklaides izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Izklaides izdevumi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Pieteikumi atvaļinājuma.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Juridiskie izdevumi
 DocType: Sales Invoice,Posting Time,Norīkošanu laiks
 DocType: Sales Order,% Amount Billed,% Summa Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefona izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefona izdevumi
 DocType: Sales Partner,Logo,Logotips
 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.,"Atzīmējiet šo, ja vēlaties, lai piespiestu lietotājam izvēlēties vairākus pirms saglabāšanas. Nebūs noklusējuma, ja jūs pārbaudīt šo."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Pozīcijas ar Serial Nr {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Atvērt Paziņojumi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Tiešie izdevumi
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Tiešie izdevumi
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} ir nederīgs e-pasta adresi &quot;Paziņojums \ e-pasta adrese&quot;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
 DocType: Journal Entry,Cash Entry,Naudas Entry
 DocType: Sales Partner,Contact Desc,Contact Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Veids lapām, piemēram, gadījuma, slimības uc"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Piegādātājs Aktīva {0} nesakrīt ar piegādātāja pirkuma rēķina
 DocType: Newsletter,Test Email Id,Tests Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Izejvielas nevar būt tāds pats kā galveno posteni
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Algu veidni meistars.
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtā vai partijas payble konta valūtā
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretārs
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ja atslēgt, &quot;ar vārdiem&quot; laukā nebūs redzams jebkurā darījumā"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Šoreiz Log Partijas ir atcelts.
 ,Reqd By Date,Reqd pēc datuma
 DocType: Salary Slip Earning,Salary Slip Earning,Alga Slip krāšana
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditori
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditori
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Sērijas numurs ir obligāta
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postenis Wise Nodokļu Detail
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Piegādātājs Citāts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/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 +456,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Hub Settings,Name Token,Nosaukums Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
-DocType: Project,Project Name,Projekta nosaukums
+DocType: Request for Quotation Item,Project Name,Projekta nosaukums
 DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
 DocType: Features Setup,Item Batch Nos,Vienība Partijas Nr
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Beigu datums
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,akciju Darījumi
 DocType: Employee,Internal Work History,Iekšējā Work Vēsture
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Uzkrātais nolietojums Summa
 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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Uzņēmums ir obligāta, jo tas ir jūsu uzņēmums adrese"
 DocType: Item Attribute,From Range,No Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"{0} priekšmets ignorēt, jo tas nav akciju postenis"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Iesniedz šo ražošanas kārtību tālākai apstrādei.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Iesniedz šo ražošanas kārtību tālākai apstrādei.
 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.","Nepiemērot cenošanas Reglamenta konkrētā darījumā, visi piemērojamie Cenu noteikumi būtu izslēgta."
 DocType: Company,Domain,Domēns
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Darbs
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Piegāde Datums
 DocType: Opportunity,Opportunity Date,Iespēja Datums
 DocType: Purchase Receipt,Return Against Purchase Receipt,Atgriezties Pret pirkuma čeka
+DocType: Request for Quotation Item,Request for Quotation Item,Pieprasījums citāts posteni
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Sakārtoti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Gabaldarbs
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Postenis {0} nav setup Serial Nr. Kolonnas jābūt tukšs
 DocType: Accounts Settings,Accounts Settings,Konti Settings
 DocType: Customer,Sales Partner and Commission,Pārdošanas Partner un Komisija
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Lūdzu noteikt &quot;aktīva atsavināšana konts&quot; uzņēmumā {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Iekārtas un ierīces
 DocType: Sales Partner,Partner's Website,Partnera Website
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Pagaidu konti
 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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Atslēgt
 DocType: Project Task,Pending Review,Kamēr apskats
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Klikšķiniet šeit, lai maksāt"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nevar tikt izmesta, jo tas jau ir {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Nekonstatē
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Pievienot preces no
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Pievienot preces no
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Noliktava {0}: Mātes vērā {1} nav Bolong uzņēmumam {2}
 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/public/js/setup_wizard.js +20,"e.g. ""MC""","piemēram, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Noliktava {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Prece {0} ir atspējota
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Gateway konti.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Gateway konti.
 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
 ,Cash Flow,Naudas plūsma
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Pievienoju {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Pievienoju {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
 DocType: Authorization Rule,Customer / Item Name,Klients / vienības nosaukums
@@ -3098,19 +3190,18 @@
 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"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Noklusējuma iestatījumi pārdošanas darījumu.
 DocType: BOM Replace Tool,Current BOM,Pašreizējā BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Pievienot Sērijas nr
 apps/erpnext/erpnext/config/support.py +43,Warranty,garantija
 DocType: Production Order,Warehouses,Noliktavas
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print un stacionārās
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print un stacionārās
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Mezgls
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Atjaunināt Pabeigts preces
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Atjaunināt Pabeigts preces
 DocType: Workstation,per hour,stundā
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Samaksātā summa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Attiecas uz Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
 DocType: Purchase Invoice,In Words,In Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Šodien ir {0} 's dzimšanas diena!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiāls Pieprasījums pēc noliktavu
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Darījums nav atļauts pret pārtrauca ražošanu Pasūtīt {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,pievienoties
 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 +564,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 +569,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
+DocType: Pricing Rule,Margin Rate or Amount,"Maržinālā ātrumu vai lielumu,"
 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
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3266,13 @@
 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 +17,Potential opportunities for selling.,Potenciālie iespējas pārdot.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Nederīga {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departaments veikali
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
@@ -3198,14 +3290,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,General Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Skatīt Leads
 DocType: Item Attribute Value,Attribute Value,Atribūta vērtība
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-pasta id ir unikāls, kas jau pastāv {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-pasta id ir unikāls, kas jau pastāv {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {0}
 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>
@@ -3226,23 +3319,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
 ,Project wise Stock Tracking,Projekts gudrs Stock izsekošana
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Uzturēšana Kalendārs {0} nepastāv pret {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Uzturēšana Kalendārs {0} nepastāv pret {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiskā Daudz (pie avota / mērķa)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbinieku ieraksti.
 DocType: Payment Gateway,Payment Gateway,Maksājumu Gateway
 DocType: HR Settings,Payroll Settings,Algas iestatījumi
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Pasūtīt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nevar būt vecāks izmaksu centru
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izvēlēties Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Piemērojamais
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Noliktava ir obligāta
 DocType: Supplier,Address and Contacts,Adrese un kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Darījuma valūta jābūt tāds pats kā maksājumu Gateway valūtu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Saņemt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Iesniegt radīšanas
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mani Pasūtījumi
@@ -3296,10 +3389,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profils
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nenodrošināti aizdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
 DocType: Maintenance Schedule Detail,Scheduled Date,Plānotais datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Kopējais apmaksātais Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Jūsu Piegādātāji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Piegādātājs daļas nr
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: No {0} uz {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
 DocType: Payment Reconciliation,From Invoice Date,No rēķina datuma
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projekta aktivitāte / uzdevums.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Izveidot algas lapas
 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: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Gadu sākuma datums vai beigu datums ir pārklāšanās ar {0}. Lai izvairītos lūdzu iestatītu uzņēmumu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Jauns izdevums
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {0}
 DocType: 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.","Piemērs:. ABCD ##### Ja sērija ir iestatīts un sērijas Nr darījumos nav minēts, tad automātiskā sērijas numurs tiks veidotas, pamatojoties uz šajā sērijā. Ja jūs vienmēr vēlas skaidri norādīt Serial Nr par šo priekšmetu. šo atstāj tukšu."
 DocType: Upload Attendance,Upload Attendance,Augšupielāde apmeklējums
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Pārdošanas Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Ražošanas iestatījumi
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Iestatīšana E-pasts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Ievadiet noklusējuma valūtu Uzņēmuma Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Ievadiet noklusējuma valūtu Uzņēmuma Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Ikdienas atgādinājumi
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Jaunais Konta nosaukums
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Klientu apkalpošana
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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ā
+DocType: Pricing Rule,Percentage,procentuālā attiecība
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
 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"
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Postenis {0} jābūt Pārdošanas punkts
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
 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 +385,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktisks
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
 DocType: Purchase Invoice,Against Expense Account,Pret Izdevumu kontu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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šā grupā (parasti finansējuma avots&gt; īstermiņa saistībām&gt; nodokļiem un nodevām un izveidot jaunu kontu (noklikšķinot uz Add Child) tipa &quot;nodokli&quot; un to pieminēt nodokļa likmi.
 DocType: Production Order,Production Order,Ražošanas rīkojums
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
 DocType: Quotation Item,Against Docname,Pret Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Production Order,Planned End Date,Plānotais beigu datums
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Tax Rule,Validity,Derīgums
+DocType: Request for Quotation,Supplier Detail,piegādātājs Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rēķinā summa
 DocType: Attendance,Attendance,Apmeklētība
 apps/erpnext/erpnext/config/projects.py +55,Reports,ziņojumi
 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 +508,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratīvie izdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administratīvie izdevumi
 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 +455,Change,Maiņa
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Kategorijas nosaukums
 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
@@ -3497,13 +3596,13 @@
 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 +559,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 +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Partijas
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS parametrs
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budžets un izmaksu centrs
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budžets un izmaksu centrs
 DocType: Maintenance Schedule Item,Half Yearly,Pusgada
 DocType: Lead,Blog Subscriber,Blog Abonenta
 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."
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Pirkuma kopējā
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Piegādātājs Citāts {0} izveidots
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
 DocType: Sales Invoice,Is POS,Ir POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; postenis Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Mātes vērā
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Atlaides un Margin
 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: Deduction Type,Deduction Type,Atskaitīšana Type
 DocType: Attendance,Half Day,Half Day
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
-apps/erpnext/erpnext/accounts/party.py +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}."
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Maksājuma URL Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Kopā Neapmaksāta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Laiks Log nav saņemts rēķins
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
+DocType: Asset,Asset Category,Asset kategorija
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiāls piegādātājam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Akcīzes Invoice
 DocType: Expense Claim,Employees Email Id,Darbinieki e-pasta ID
 DocType: Employee Attendance Tool,Marked Attendance,ievērojama apmeklējums
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Tekošo saistību
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Tekošo saistību
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Skaitliskām vērtībām
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Pievienojiet Logo
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Padarīt Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Padarīt Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Grozs ir tukšs
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nē noklusējuma Adrese Template atrasts. Lūdzu, izveidojiet jaunu no Setup&gt; Poligrāfija un Brendings&gt; Adrese veidnē."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Pamatkapitāls
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
 DocType: Payment Gateway Account,Payment Gateway Account,Maksājumu Gateway konts
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pēc maksājuma pabeigšanas novirzīt lietotāju uz izvēlētā lapā.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
+DocType: Asset,Current Value (After Depreciation),Pašreizējā vērtība (pēc amortizācijas)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,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 +408,"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 +413,"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 +13,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 +409, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Materiālu rēķins
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datums
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Konts {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konts {0} nepastāv
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 8a48b7a..ac286ab 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Изнајмени
 DocType: POS Profile,Applicable for User,Применливи за пристап
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
 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.,* Ќе се пресметува во трансакцијата.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} дрвото
 DocType: Job Applicant,Job Applicant,Работа на апликантот
@@ -34,27 +34,29 @@
 DocType: Department,Department,Оддел
 DocType: Purchase Order,% Billed,% Опишан
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Девизниот курс мора да биде иста како {0} {1} ({2})
-DocType: Sales Invoice,Customer Name,Име на купувачи
+DocType: Sales Invoice,Customer Name,Име на Клиент
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +100,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
-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: 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.,"Глави (или групи), против кои се направени на сметководствените ставки и рамнотежи се одржува."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Show open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серија успешно ажурирани
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Нов Оставете апликација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Прикажи Варијанти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Кол
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (Пасива)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Залиха
 DocType: Designation,Designation,Ознака
@@ -64,7 +66,7 @@
 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 +642,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
@@ -75,13 +77,13 @@
 DocType: Delivery Note,Vehicle No,Возило Не
 apps/erpnext/erpnext/public/js/pos/pos.js +557,Please select Price List,Ве молиме изберете Ценовник
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
-DocType: Employee,Holiday List,Одмор Листа
+DocType: Employee,Holiday List,Список со Празници
 DocType: Time Log,Time Log,Време Влез
 apps/erpnext/erpnext/public/js/setup_wizard.js +180,Accountant,Сметководител
 DocType: Cost Center,Stock User,Акциите пристап
-DocType: Company,Phone No,Телефон No
+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 +131,New {0}: #{1},Нов {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Нов {0}: # {1}
 ,Sales Partners Commission,Продај Партнери комисија
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Кратенка не може да има повеќе од 5 знаци
 DocType: Payment Request,Payment Request,Барање за исплата
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Брак
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Се предмети од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 DocType: Payment Reconciliation,Reconcile,Помират
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
@@ -111,7 +113,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Lead,Person Name,Име лице
-DocType: Sales Invoice Item,Sales Invoice Item,Продај фактура Точка
+DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Отпише трошоците центар
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,акции на извештаи
@@ -138,12 +140,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +324,Please select Company first,Ве молиме изберете ја првата компанија
 DocType: Employee Education,Under Graduate,Под Додипломски
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,На цел
-DocType: BOM,Total Cost,Вкупно трошоци
+DocType: BOM,Total Cost,Вкупно Трошоци
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Влез активност:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
+DocType: Item,Is Fixed Asset,Е фиксни средства
 DocType: Expense Claim Detail,Claim Amount,Износ барање
 DocType: Employee,Mr,Г-дин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
@@ -156,7 +159,8 @@
 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,Акции Трошоци
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} е замрзнат
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Акции Трошоци
 DocType: Newsletter,Email Sent?,Е-мејл испратен?
 DocType: Journal Entry,Contra Entry,Контра Влегување
 DocType: Production Order Operation,Show Time Logs,Прикажи Време на дневници
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Инсталација Статус
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Точка {0} мора да биде Набавка Точка
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ќе се ажурира откако Продажната Фактура е поднесена.
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,"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 +170,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: BOM Replace Tool,New BOM,Нов Бум
@@ -191,7 +195,7 @@
 DocType: SMS Settings,Enter url parameter for message,Внесете URL параметар за порака
 apps/erpnext/erpnext/config/stock.py +102,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/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Мора да се примени Ценовник за Купување или Продажба
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Датум на инсталација не може да биде пред датумот на испорака за Точка {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на Ценовник стапка (%)
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
@@ -208,21 +212,21 @@
 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 +79,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Ве молиме внесете компанијата
-DocType: Delivery Note Item,Against Sales Invoice Item,Против Продај фактура Точка
+DocType: Delivery Note Item,Against Sales Invoice Item,Во однос на Артикал од Продажна фактура
 ,Production Orders in Progress,Производство налози во прогрес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Нето паричен тек од финансирањето
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
-DocType: Newsletter List,Total Subscribers,Вкупно претплатници
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
+DocType: Newsletter List,Total Subscribers,Вкупно Претплатници
 ,Contact Name,Име за Контакт
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Нема опис даден
@@ -235,12 +239,12 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 DocType: Payment Tool,Reference No,Референтен број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Банката записи
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
-DocType: Stock Entry,Sales Invoice No,Продај фактура Не
+DocType: Stock Entry,Sales Invoice No,Продажна Фактура Бр.
 DocType: Material Request Item,Min Order Qty,Минимална Подреди Количина
 DocType: Lead,Do Not Contact,Не го допирајте
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Развивач на софтвер
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -257,14 +261,14 @@
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потврди налози од клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбиени Кол
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Поле достапни на испорака, цитатноста, Продај фактура, Продај Побарувања"
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Поле достапно во Испратница, Понуда, Продажна Фактура, Продажна Нарачка"
 DocType: SMS Settings,SMS Sender Name,SMS испраќачот Име
 DocType: Contact,Is Primary Contact,Е основно Контакт
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +36,Time Log has been Batched for Billing,Време Логирајте се дозирани за наплата
 DocType: Notification Control,Notification Control,Известување за контрола
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет точка група-мудар буџети на оваа територија. Вие исто така може да вклучува и сезоната со поставување на дистрибуција.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ве молиме внесете група родител сметка за магацин {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Ве молиме внесете група родител сметка за магацин {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
 DocType: Supplier,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
@@ -275,45 +279,48 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Макс 5 знаци
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Научат
+DocType: Asset,Next Depreciation Date,Следна Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Трошоци активност по вработен
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Добавувачот фактура не постои во Набавка фактура {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Управување со продажбата на лице дрвото.
 DocType: Job Applicant,Cover Letter,мотивационо писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Најдобро Чекови и депозити да се расчисти
 DocType: Item,Synced With Hub,Синхронизираат со Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Погрешна лозинка
 DocType: Item,Variant Of,Варијанта на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&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.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единици на [{1}] (# Форма / точка / {1}) се најде во [{2}] (# Форма / складиште / {2})
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профил работа
 DocType: 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,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Потврда за испорака
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Ве молиме изберете месец и година
 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.","Сите области поврзани со увоз како валута, девизен курс, вкупниот увоз, голема вкупно итн се достапни во Набавка прием, Добавувачот цитат, купување фактура, нарачка итн"
+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 +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Ред Смета
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Разгледани Нарачки
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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: 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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Сериски № {0} не му припаѓа на испорака Забелешка {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Точка испитување квалитет Параметар
 DocType: Leave Application,Leave Approver Name,Остави Approver Име
-,Schedule Date,Распоред Датум
+DocType: Depreciation Schedule,Schedule Date,Распоред Датум
 DocType: Packed Item,Packed Item,Спакувани Точка
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Стандардните поставувања за купување трансакции.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Стандардните поставувања за купување трансакции.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Постои цена активност за вработените {0} од тип активност - {1}
 apps/erpnext/erpnext/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,Размена на валута
@@ -346,6 +353,7 @@
 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;, со оглед на сите магацини врз основа на проектираните Количина и минимум цел количество: Контакт лице"
+DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
 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.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
@@ -364,7 +372,7 @@
 DocType: Purchase Invoice,Yearly,Годишно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,Ве молиме внесете цена центар
 DocType: Journal Entry Account,Sales Order,Продај Побарувања
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Ср. Продажниот курс
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Среден Продажен курс
 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,% Инсталирана
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
-DocType: Material Request Item,Required Date,Бараниот датум
+DocType: Request for Quotation Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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 Оцени / Печатење Износ"
+DocType: Request for Quotation,Message for Supplier,Порака за Добавувачот
 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,Неплатени
@@ -402,7 +411,7 @@
 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,Вкупно лисја распределени е задолжително
+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 +24,Attendance record.,Присуство евиденција.
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не постои
 DocType: Pricing Rule,Valid Upto,Важи до
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 ,Serial No Warranty Expiry,Сериски Нема гаранција Важи
@@ -435,18 +444,19 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Управување Склучување
+DocType: Project,Project will be accessible on the website to these users,Проектот ќе биде достапен на веб страната за овие корисници
 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 +53,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Кратенка веќе се користи за друга компанија
 DocType: Selling Settings,Default Customer Group,Стандардната група на потрошувачи
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако оневозможи, полето &quot;Заоблени Вкупно &#39;не ќе бидат видливи во секоја трансакција"
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако е оневозможено, полето 'Вкупно заокружено' нема да биде видливо во сите трансакции"
 DocType: BOM,Operating Cost,Оперативните трошоци
 DocType: Sales Order Item,Gross Profit,Бруто добивка
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Зголемување не може да биде 0
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Точка {0} не е купување Точка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Точка {0} не е купување Точка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
@@ -457,9 +467,9 @@
 DocType: Production Plan Item,Pending Qty,Во очекување на Количина
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
 DocType: Pricing Rule,Valid From,Важи од
-DocType: Sales Invoice,Total Commission,Вкупно комисија
+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.
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Финансиски / пресметковната година.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Акумулирана вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
 DocType: Project Task,Project Task,Проектна задача
-,Lead Id,Водач Id
-DocType: C-Form Invoice Detail,Grand Total,Големиот Вкупно
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Почеток Датумот не треба да биде поголема од фискалната година Крај Датум
+,Lead Id,Потенцијален клиент Id
+DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Почеток Датумот не треба да биде поголема од фискалната година Крај Датум
 DocType: Warranty Claim,Resolution,Резолуција
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Испорачани: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Треба да се плати сметката
@@ -481,16 +491,16 @@
 DocType: Job Applicant,Resume Attachment,продолжи Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Продажбата Враќање
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
 apps/erpnext/erpnext/config/hr.py +115,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 +22,Customer database.,Клиент база на податоци.
-DocType: Quotation,Quotation To,Котација на
+DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,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/stock/doctype/item/item.py +707,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.,Логична Магацински против кои се направени записи парк.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Мајстори
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Ажурирање банка Термини Трансакција
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Ажурирање банка Термини Трансакција
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативна состојба Грешка ({6}) за ставката {0} во складиште {1} на {2} {3} во {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Следење на времето
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
@@ -518,29 +528,29 @@
 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,Чини стандардниот курс
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Распоред за одржување
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Распоред за одржување
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Потоа цени Правила се филтрирани врз основа на клиент, група на потрошувачи, територија, Добавувачот, Набавувачот Тип на кампањата, продажба партнер итн"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нето промени во Инвентар
 DocType: Employee,Passport Number,Број на пасош
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менаџер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Продажбата на лице Цели
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Ве молиме да се постави летни Листа за или на вработените или на компанијата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
+DocType: Depreciation Schedule,Depreciation Amount,амортизација Износ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Фиксни дена
 DocType: Quotation Item,Item Balance,точка Состојба
 DocType: Sales Invoice,Packing List,Листа на пакување
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Купување на налози со оглед на добавувачите.
+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,Проекти пристап
+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 +141,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
 DocType: Company,Round Off Cost Center,Заокружување на цена центар
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Операција Време
 DocType: Pricing Rule,Sales Manager,Менаџер за продажба
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Група до група
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,моите проекти
 DocType: Journal Entry,Write Off Amount,Отпише Износ
 DocType: Journal Entry,Bill No,Бил Не
+DocType: Company,Gain/Loss Account on Asset Disposal,Добивка / загуба сметка за располагање со средства
 DocType: Purchase Invoice,Quarterly,Квартален
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
 DocType: Sales Order Item,Basic Rate (Company Currency),Основната стапка (Фирма валута)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Плаќање Влегување веќе е создадена
 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/buying/doctype/supplier/supplier.js +67,Total billing this year,Вкупно платежна оваа година
+apps/erpnext/erpnext/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Вкупно Наплата оваа година
 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 +529,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Тип на дрвото
@@ -580,7 +593,7 @@
 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 +176,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против ваучер типот мора да биде еден од Продај Побарувања, Продај фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +176,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Во однос на Тип на Ваучер мора да биде едно од Продажни Нарачки, Продажна Фактура или Влез во Журнал"
 DocType: Project,Estimated Cost,Проценетите трошоци
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Воздухопловна
 DocType: Journal Entry,Credit Card Entry,Кредитна картичка за влез
@@ -594,7 +607,8 @@
 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 +91,{0} is not a stock Item,{0} не е парк Точка
 DocType: Mode of Payment Account,Default Account,Стандардно профил
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Водач мора да се постави ако можност е направена од олово
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Production Order Operation,Planned End Time,Планирани Крај
 ,Sales Person Target Variance Item Group-Wise,Продажбата на лице Целна група Варијанса точка-wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечен извештај плата.
 DocType: Item Group,Website Specifications,Веб-страница Спецификации
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Има грешка во Вашата адреса шаблонот {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Нова сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Нова сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Повеќе Правила Цена постои со истите критериуми, ве молиме да го реши конфликтот со давање приоритет. Правила Цена: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Повеќе Правила Цена постои со истите критериуми, ве молиме да го реши конфликтот со давање приоритет. Правила Цена: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Весник Влегување {0} е поврзана против Ред {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Канцеларија Одржување трошоци
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Account,Liability,Одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
 DocType: Company,Default Cost of Goods Sold Account,Стандардно трошоците на продадени производи профил
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ценовник не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Process Payroll,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Мои Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Мои Фактури
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не се пронајдени вработен
 DocType: Supplier Quotation,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
@@ -671,14 +686,15 @@
 DocType: SMS Center,All Customer Contact,Сите корисници Контакт
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Внеси акции рамнотежа преку CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Испрати Сега
-,Support Analytics,Поддршка анализи
+,Support Analytics,Поддршка Аналитика
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Логичка грешка: Мора да се преклопуваат
 DocType: Item,Website Warehouse,Веб-страница Магацински
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минималниот износ на фактура
 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 +267,C-Form records,C-Форма записи
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Форма записи
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Клиентите и вршителите
 DocType: Email Digest,Email Digest Settings,E-mail билтени Settings
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддршка прашања од потрошувачите.
+apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддршка queries од потрошувачи.
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да им овозможи на &quot;Точка на продажба&quot; карактеристики
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
@@ -697,9 +713,9 @@
 DocType: Shopping Cart Settings,Enable Checkout,овозможи Работа
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Нарачка на плаќање
 DocType: Quotation Item,Projected Qty,Проектирани Количина
-DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
+DocType: Sales Invoice,Payment Due Date,Плаќање најдоцна до Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,Трошоци
@@ -707,7 +723,7 @@
 ,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,Износот на Бил
+,Amount to Bill,Износ за Наплата
 DocType: Company,Registration Details,Детали за регистрација
 DocType: Item Reorder,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
@@ -726,31 +742,32 @@
 ,Available Qty,На располагање Количина
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходниот ред Вкупно
 DocType: Salary Slip,Working Days,Работни дена
-DocType: Serial No,Incoming Rate,Дојдовни стапка
+DocType: Serial No,Incoming Rate,Влезна Цена
 DocType: Packing Slip,Gross Weight,Бруто тежина на апаратот
 apps/erpnext/erpnext/public/js/setup_wizard.js +44,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: 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,Види претплатници
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Купување Потврда
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
 DocType: Employee,Ms,Г-ѓа
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Валута на девизниот курс господар.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Валута на девизниот курс господар.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Продај Партнери и територија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Бум {0} мора да биде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Бум {0} мора да биде активен
+DocType: Journal Entry,Depreciation Entry,амортизација за влез
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Оди кошничката
 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,Вкупниот износ
+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_balance/stock_balance.py +53,Balance Value,Биланс вредност
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
@@ -772,34 +789,37 @@
 DocType: Employee,Permanent Address Is,Постојана адреса е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операцијата заврши за колку готовите производи?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
 DocType: Employee,Exit Interview Details,Излез Интервју Детали за
 DocType: Item,Is Purchase Item,Е Набавка Точка
-DocType: Journal Entry Account,Purchase Invoice,Купување на фактура
+DocType: Asset,Purchase Invoice,Купување на фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детална Не
-DocType: Stock Entry,Total Outgoing Value,Вкупниот појдовен вредност
+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 Request,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 ,е задолжително. Можеби рекорд Девизен не е создадена за
+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 +110,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &quot;Пакување Листа на &#39;табелата."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &quot;Пакување Листа на &#39;табелата."
 DocType: Job Opening,Publish on website,Објавуваат на веб-страницата
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Пратки на клиентите.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Датум на Добавувачот фактура не може да биде поголем од објавувањето Датум
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Индиректни доход
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Вкупно пораки (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+DocType: SMS Center,Total Message(s),Вкупно пораки
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Одберете ја изборната ставка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнителен попуст Процент
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изберете Account главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Ред {0}: Фактура {1} е валиден, тоа може да биде откажана / не постои. \ Ве молиме внесете валидна фактура"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
@@ -808,16 +828,16 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
 ,Employee Holiday Attendance,Вработен Холидеј Публика
 DocType: Opportunity,Walk In,Прошетка во
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Акции записи
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Акции записи
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Трансферираните
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,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/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,Моја кошничка
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Цел типот мора да биде еден од {0}
 DocType: Lead,Next Contact Date,Следна Контакт Датум
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
 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 +180,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
+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 +80,Leave Allocation Tool,Остави алатката Распределба
 DocType: Leave Block List,Leave Block List Dates,Остави Забрани Листа Датуми
@@ -838,12 +859,12 @@
 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 +547,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Купување Попусти
-DocType: Workstation,Wages,Платите
+DocType: Workstation,Wages,Плати
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Ќе се ажурира само ако Време Вклучи се &#39;Платимите &quot;
 DocType: Project,Internal,Внатрешна
 DocType: Task,Urgent,Итно
@@ -853,23 +874,24 @@
 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 +69,Selling Amount,Продажба Износ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Време на дневници
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Време на дневници
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,Прашање
+DocType: Asset,Scrapped,укинат
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Сметка не се поклопува со компанијата
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,вработување
 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;се предмети од Набавка Разписки&quot; копчето
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Трошоци за продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Трошоци за продажба
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
-DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
+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,Контакт инфо
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,Цитати добиени од добавувачи.
+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,Просечна возраст
@@ -891,16 +913,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +235,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,Од вработените
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+DocType: Expense Claim,From Employee,Од Вработен
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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/setup_wizard/industry_type.py +54,Transportation,Превоз
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и годината:
+apps/erpnext/erpnext/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 +130,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
+DocType: SMS Center,Total Characters,Вкупно Карактери
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Учество%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,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.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
+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,Глобална Стандардни
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Проектот Соработка Покана
 DocType: Salary Slip,Deductions,Одбивања
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Овој пат се Влез Batch се фактурирани.
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Капацитет Грешка планирање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Капацитет Грешка планирање
 ,Trial Balance for Party,Судскиот биланс за партија
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Приходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отворање Сметководство Биланс
-DocType: Sales Invoice Advance,Sales Invoice Advance,Продај фактура напредување
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ништо да побара
+DocType: Sales Invoice Advance,Sales Invoice Advance,Продажна Про-Фактура
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,За управување со
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Типови на активности за време на работниците
@@ -935,20 +958,20 @@
 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;
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Ве молиме да се постави е-мејл ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ве молиме да се постави е-мејл ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,UOM конверзија Фактор
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Снабдувач база на податоци.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдувач база на податоци.
 DocType: Account,Balance Sheet,Биланс на состојба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Данок и други намалувања на платите.
-DocType: Lead,Lead,Водач
+DocType: Lead,Lead,Потенцијален клиент
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Account,Warehouse,Магацин
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
@@ -957,12 +980,13 @@
 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: Holiday,Holiday,Празник
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставете го празно ако се земе предвид за сите гранки
 ,Daily Time Log Summary,Дневен Време Пријавете се Резиме
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-форма не е применлив за фактура: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусогласеност за исплата
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
-DocType: Global Defaults,Disable Rounded Total,Оневозможи заоблени Вкупно
+DocType: Global Defaults,Disable Rounded Total,Оневозможи Вкупно заокружено
 DocType: Lead,Call,Повик
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +410,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
@@ -971,21 +995,22 @@
 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,Работа
+DocType: Maintenance Visit Purpose,Work Done,Работата е завршена
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Точка {0} мора да биде точка на не-акции
 DocType: Contact,User ID,ID на корисникот
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Види Леџер
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Види Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,Задржана добивка
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Задржана добивка
 DocType: BOM Item,Item Description,Опис
 DocType: Payment Tool,Payment Mode,Начин на плаќање
 DocType: Purchase Invoice,Is Recurring,Е Повторувачки
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Привремено отворање
 ,Employee Leave Balance,Вработен Остави Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Вреднување курс потребен за ставка во ред {0}
@@ -1004,12 +1029,12 @@
 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/selling/doctype/quotation/quotation.py +33,Item {0} must be Sales Item,Точка {0} мора да биде Продажбата Точка
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,до
-DocType: Item,Lead Time in days,Водач Време во денови
+DocType: Item,Lead Time in days,Потенцијален клиент Време во денови
 ,Accounts Payable Summary,Сметки се плаќаат Резиме
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 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 +165,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Сметка главата {0} создаде
 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,Вкупно Постигнати
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 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,Магацински Контакт Инфо
@@ -1040,38 +1065,40 @@
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; поле, која може да биде точка, точка група или бренд."
 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},Производство статус е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,За Добавувачот
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,Вкупниот појдовен
+DocType: Purchase Invoice,Grand Total (Company Currency),Сѐ Вкупно (Валута на Фирма)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Не ја најде било ставка наречена {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Вкупно Тековно
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Може да има само еден испорака Правило Состојба со 0 или празно вредност за &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,Веб-страница Точка групи
-DocType: Purchase Invoice,Total (Company Currency),Вкупно (Фирма валута)
+DocType: Purchase Invoice,Total (Company Currency),Вкупно (Валута на Фирма )
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Сериски број {0} влегоа повеќе од еднаш
-DocType: Journal Entry,Journal Entry,Весник Влегување
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс
 DocType: Quality Inspection Reading,Reading 8,Читање 8
 DocType: Sales Partner,Agent,Агент
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање пријави врз основа на&quot;"
+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,Работна станица
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Барање за прибирање понуди Добавувачот
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Хардвер
 DocType: Sales Order,Recurring Upto,Повторувачки Upto
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
@@ -1082,35 +1109,37 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Цел
 DocType: Salary Slip,Earning,Заработуваат
 DocType: Payment Tool,Party Account Currency,Партија Валута профил
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Сегашна вредност по амортизација треба да биде помалку од еднаква на {0}
 ,BOM Browser,Бум Browser
 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 +167,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Вкупно цел вредност
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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,Стареењето опсег од 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,Можете да направите најавите време само против поднесено цел производство
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
-apps/erpnext/erpnext/config/crm.py +68,"Newsletters to contacts, leads.","Билтенот на контакти, води."
+apps/erpnext/erpnext/config/crm.py +68,"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}
 DocType: Project,Start and End Dates,Отпочнување и завршување
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Операции не може да се остави празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Карактеристики подесување
+DocType: Asset,Depreciation Schedules,амортизација Распоред
 DocType: Item,Is Service Item,Е послужната ствар
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валута
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Од {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операција Опис
 DocType: Item,Will also apply to variants,Ќе важат и за варијанти
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени фискалната година Почеток Датум и фискалната година Крај Датум еднаш на фискалната година е спасен.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Кампања
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нето промени во основни средства
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},Макс: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,За компанијата
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација се логирате.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,не може да биде поголема од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1155,26 +1184,29 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Правило данок за трансакции.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Правило данок за трансакции.
 DocType: Rename Tool,Type of document to rename.,Вид на документ да се преименува.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Ние купуваме Оваа содржина
 DocType: Address,Billing,Платежна
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Вкупно даноци и такси (Фирма валута)
+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/public/js/setup_wizard.js +269,Sub Assemblies,Под собранија
+DocType: Asset,Asset Name,Име на средства
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Supplier,Stock Manager,Акции менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Пакување фиш
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Канцеларијата изнајмување
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Поставките за поставка на SMS портал
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Барање за прибирање на понуди може да се пристап со кликнување на следниов линк
+DocType: Asset,Number of Months in a Period,Број на месеци во период
 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,Работна станица работен час
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Владата
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Вкупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Вкупно ({0})
 DocType: Cost Center,Parent Cost Center,Родител цена центар
 DocType: Sales Invoice,Source,Извор
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Прикажи затворени
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не се пронајдени во табелата за платен записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Финансиска година Почеток Датум
 DocType: Employee External Work History,Total Experience,Вкупно Искуство
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Пакување фиш (и) откажани
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Парични текови од инвестициони
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Товар и товар пријави
 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 +86,Transfer Materials for Manufacture,Пренос на материјали за изработка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Пренос на материјали за изработка
 DocType: Pricing Rule,For Price List,За Ценовник
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} не е пронајден, кои се потребни да се резервира влез сметководството (сметка). Ве молиме спомнете ставка цена од купување на ценовникот."
@@ -1212,7 +1245,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
 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.,Ве молиме да се создаде нова сметка од сметковниот план.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Одржување Посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Одржување Посета
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Достапни Серија Количина на складиште
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Вклучи Серија Детална
 DocType: Landed Cost Voucher,Landed Cost Help,Слета Цена Помош
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Бренд господар.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Кутија
@@ -1242,7 +1274,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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,Водач Име
+DocType: Address,Lead Name,Име на Потенцијален клиент
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,Отворање берза Биланс
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора да се појави само еднаш
@@ -1254,16 +1286,16 @@
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +131,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,Акции Обврски
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Акции Обврски
 DocType: Purchase Receipt,Supplier Warehouse,Добавувачот Магацински
 DocType: Opportunity,Contact Mobile No,Контакт Мобилни Не
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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.,Да ги пратите предмети со помош на баркод. Вие ќе бидете во можност да влезат предмети во Испратница и Продај фактура со скенирање на баркод на ставка.
+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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Препратат на плаќање E-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,други извештаи
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,Стоп роденден потсетници
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Види
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нето промени во Пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Претходната финансиска година не е затворен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (во денови)
-DocType: Quotation Item,Quotation Item,Цитат Точка
+DocType: Quotation Item,Quotation Item,Артикал од Понуда
 DocType: Account,Account Name,Име на сметка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Добавувачот Тип господар.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
 DocType: Purchase Invoice,Reference Document,референтен документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Опишан
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
@@ -1304,7 +1337,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +240,Row {0}: Payment amount can not be negative,Ред {0}: износот за исплата не може да биде негативен
-DocType: Expense Claim,Total Amount Reimbursed,Вкупниот износ Надоместени
+DocType: Expense Claim,Total Amount Reimbursed,Вкупен износ Надоместени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 DocType: Payment Reconciliation,Payments,Плаќања
@@ -1314,51 +1347,52 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нето промени во сметки се плаќаат
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ве молиме да се провери вашата e-mail проект
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Клиент потребни за &quot;Customerwise попуст&quot;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Ажурирање на датуми банка плаќање со списанија.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Ажурирање на датуми банка плаќање со списанија.
 DocType: Quotation,Term Details,Рок Детали за
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора да биде поголем од 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирање на капацитет за (во денови)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Гаранција побарување
-,Lead Details,Водач Детали за
+,Lead Details,Детали за Потенцијален клиент
 DocType: Pricing Rule,Applicable For,Применливи за
-DocType: Bank Reconciliation,From Date,Од датум
+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,Спакувани Теми
 apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,Гаранција побарување врз Сериски број
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Заменете одредена Бум во сите други BOMs каде што се користи тоа. Таа ќе ја замени старата Бум линк, ажурирање на трошоците и регенерира &quot;Бум експлозија Точка&quot; маса, како за нови Бум"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',&quot;Вкупно&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',„Вкупно“
 DocType: Shopping Cart Settings,Enable Shopping Cart,Овозможи Кошничка
 DocType: Employee,Permanent Address,Постојана адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Однапред платени против {0} {1} не може да биде поголема \ отколку Вкупен збир {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Ве молиме изберете код ставка
+						than Grand Total {2}",Авансно платени во однос на {0} {1} не може да биде поголемо \ од Сѐ Вкупно {2}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Ве молиме изберете код ставка
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Намалување Одбивање за неплатено отсуство (LWP)
 DocType: Territory,Territory Manager,Територија менаџер
 DocType: Packed Item,To Warehouse (Optional),До Магацински (опционално)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
-DocType: Selling Settings,Selling Settings,Продажба Settings
+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,Маркетинг трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Една единица на некој објект.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
+DocType: Leave Allocation,Total Leaves Allocated,Вкупно Отсуства Распределени
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Address,Postal,Поштенските
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +171,ERPNext Setup Complete!,ERPNext Setup Complete!
 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,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
+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 +155,Please select {0} first.,Ве молиме изберете {0} прво.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Нов контакт
 DocType: Territory,Parent Territory,Родител Територија
@@ -1368,65 +1402,68 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,Точка-мудар Продажбата Регистрирај се
+DocType: Asset,Gross Purchase Amount,Бруто купување износ
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","на пример, &quot;XYZ Народната банка&quot;"
+DocType: Asset,Depreciation Method,амортизација Метод
 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/report/budget_variance_report/budget_variance_report.py +61,Total Target,Вкупно Целна вредност
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Кошничка е овозможено
 DocType: Job Applicant,Applicant for a Job,Подносителот на барањето за работа
 DocType: Production Plan Material Request,Production Plan Material Request,Производство план материјал Барање
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Нема производство наредби создаде
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Нема производство наредби создаде
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Главните
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносителот на барањето за работа.
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Адреси
+apps/erpnext/erpnext/hooks.py +91,Addresses,Адреси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,оценувања
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Точка не е дозволено да има цел производство.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Точка не е дозволено да има цел производство.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Поставете филтер врз основа на точка или Магацински
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето-тежината на овој пакет. (Се пресметува автоматски како збир на нето-тежината на предмети)
 DocType: Sales Order,To Deliver and Bill,Да дава и Бил
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Време на дневници за производство.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Време Пријавете се за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Плаќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Бовча предмети на времето на продажба.
 DocType: Quotation Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,Точка {0} не е серијали Точка
+DocType: Request for Quotation Supplier,Send Email to Supplier,Прати e-mail до снабдувачот
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 DocType: Packing Slip,To Package No.,Пакет бр
 DocType: Production Planning Tool,Material Requests,материјал барања
@@ -1444,27 +1482,27 @@
 DocType: Activity Cost,Activity Cost,Цена активност
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Конзумира Количина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од овој испорака (Само Предлог)
+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 +126,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;
+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,Додаток Процент
 DocType: SMS Settings,Message Parameter,Порака Параметар
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Дрвото на Центрите финансиски трошоци.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Дрвото на Центрите финансиски трошоци.
 DocType: Serial No,Delivery Document No,Испорака л.к
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Се предмети од Набавка Разписки
 DocType: Serial No,Creation Date,Датум на креирање
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Точка {0} се појавува неколку пати во Ценовникот {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажба треба да се провери, ако е применливо за е избран како {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажбата мора да се провери, ако Применливо за е избрано како {0}"
 DocType: Production Plan Material Request,Material Request Date,Материјал Барање Датум
-DocType: Purchase Order Item,Supplier Quotation Item,Добавувачот Цитат Точка
+DocType: Purchase Order Item,Supplier Quotation Item,Артикал од Понуда од Добавувач
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Оневозможува создавање на време логови против производство наредби. Операции нема да бидат следени од цел производство
 DocType: 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/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликнете на копчето 'Направете Продажна Фактура' за да се креирате нова Продажна Фактура.
 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,Ве молиме наведете стандардна валута во компанијата Мајсторот и Глобал Стандардни
@@ -1486,68 +1524,76 @@
 ,Amount to Deliver,Износ за да овозможи
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Производ или услуга
 DocType: Naming Series,Current Value,Сегашна вредност
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} создаден
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} создаден
 DocType: Delivery Note Item,Against Sales Order,Против Продај Побарувања
 ,Serial No Status,Сериски № Статус
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Точка маса не може да биде празна
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: За да го поставите {1} поените, разликата помеѓу од и до денес \ мора да биде поголем или еднаков на {2}"
-DocType: Pricing Rule,Selling,Продажба
+DocType: Pricing Rule,Selling,Продажби
 DocType: Employee,Salary Information,Плата Информации
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Давачки и даноци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Ве молиме внесете референтен датум
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Исплата Портал сметка не е конфигуриран
 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: Production Order,Material Request Item,Материјал Барање Точка
+DocType: Request for Quotation Item,Material Request Item,Материјал Барање Точка
 apps/erpnext/erpnext/config/stock.py +85,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,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
+DocType: Asset,Sold,продаден
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Детали за сметководство
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Бришење на сите трансакции за оваа компанија
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,алокации
 DocType: Quality Inspection Reading,Acceptance Criteria,Прифаќање критериуми
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Ве молиме внесете Материјал Барања во горната табела
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ве молиме внесете Материјал Барања во горната табела
 DocType: Item Attribute,Attribute Name,Атрибут Име
 DocType: Item Group,Show In Website,Прикажи Во вебсајт
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,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 +25,Gantt chart of all tasks.,Gantt шема на сите задачи.
+DocType: Pricing Rule,Margin Type,маргина Тип
 DocType: Appraisal,For Employee Name,За име на вработениот
 DocType: Holiday List,Clear Table,Јасно Табела
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Фактура бр
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
-DocType: Activity Cost,Costing Rate,Чини стапка
+DocType: Activity Cost,Costing Rate,Цена на Чинење
 ,Customer Addresses And Contacts,Адресите на клиентите и контакти
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Ред # {0}: Асет е задолжително против фиксни средства Точка
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молам поставете брои серија за присуство преку поставување&gt; нумерација Серија
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Пар
+DocType: Asset,Depreciation Schedule,амортизација Распоред
 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: Asset,Purchase Date,Дата на продажба
 DocType: Employee,Personal Details,Лични податоци
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Поставете &quot;Асет Амортизација трошоците центар во компанијата {0}
 ,Maintenance Schedules,Распоред за одржување
-,Quotation Trends,Трендови цитат
+,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1561,67 +1607,67 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Вклучи се помири записи
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Вкупно Крај
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Ве молиме назначете фирма,"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,Сметка побарувања
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
 ,BOM Search,Бум Барај
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затворање (отворање + одделение)
+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,Плата по час
+DocType: Workstation,Wages per hour,Плати по час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Датум дозвола не може да биде пред датумот проверка во ред {0}
 DocType: Salary Slip,Deduction,Одбивање
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 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,Gross Margin,Бруто маржа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Ве молиме внесете Производство стварта прв
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Ве молиме внесете Производство стварта прв
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Пресметаната извод од банка биланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,корисник со посебни потреби
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Цитат
-DocType: Salary Slip,Total Deduction,Вкупно Одбивање
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Понуда
+DocType: Salary Slip,Total Deduction,Вкупно Расходи
 DocType: Quotation,Maintenance User,Одржување пристап
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Цена освежено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Цена освежено
 DocType: Employee,Date of Birth,Датум на раѓање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+DocType: Opportunity,Customer / Lead Address,Клиент / Потенцијален клиент адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис на работата
 DocType: Purchase Order Item,Qty as per Stock UOM,Количина како на берза 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: 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 +179,"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 +178,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
+DocType: Appraisal,Calculate Total Score,Пресметај Вкупен резултат
+DocType: Request for Quotation,Manufacturing Manager,Производство менаџер
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Сплит за испорака во пакети.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Пратки
 DocType: Purchase Order Item,To be delivered to customer,Да бидат доставени до клиентите
@@ -1629,35 +1675,35 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ред #
 DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута)
-DocType: Pricing Rule,Supplier,Добавувачот
+DocType: Asset,Supplier,Добавувачот
 DocType: C-Form,Quarter,Четвртина
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Останати трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Останати трошоци
 DocType: Global Defaults,Default Company,Стандардно компанијата
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Корисник {0} е исклучен
-DocType: Leave Application,Total Leave Days,Вкупно Остави дена
+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 +175,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Currency Exchange,From Currency,Од валутен
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Стапка (Фирма валута)
+DocType: Purchase Invoice Item,Rate (Company Currency),Цена (Валута на Фирма)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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/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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Ред # {0}: Количина мора да биде 1, како точка е поврзана со средства"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Точка дете не треба да биде производ Бовча. Ве молиме отстранете точка &#39;{0}&#39; и спаси
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на &quot;Генерирање Распоред&quot; да се добие распоред
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Нова цена центар
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; и се спомнуваат даночна стапка.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Нова цена центар
 DocType: Bin,Ordered Quantity,Нареди Кол
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
 DocType: Quality Inspection,In Process,Во процесот
@@ -1668,12 +1714,13 @@
 DocType: Account,Fixed Asset,Основни средства
 apps/erpnext/erpnext/config/stock.py +305,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
-DocType: Time Log Batch,Total Billing Amount,Вкупно регистрации Износ
+DocType: Time Log Batch,Total Billing Amount,Вкупен Износ на Наплата
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Побарувања профил
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
 DocType: Quotation Item,Stock Balance,Биланс на акции
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Продај Побарувања на плаќање
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Време на дневници на креирање:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Време на дневници на креирање:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Employee,Blood Group,Крвна група
@@ -1690,37 +1737,37 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Дебитна Да се бара
+DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Дебитна Да се бара
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Менаџер за квалитет
 DocType: Job Applicant,Job Opening,Отворање работа
 DocType: Payment Reconciliation,Payment Reconciliation,Плаќање помирување
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологија
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Понуда писмо
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генерирање Материјал Барања (MRP) и производство наредби.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,Total Invoiced Amt,Вкупниот фактуриран Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,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 +103,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ценовник {0} е исклучен
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тековни Вреднување стапка
 DocType: Item,Customer Item Codes,Клиент Точка Код
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Креирај Плаќање записи против налози или фактури.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Креирај Плаќање записи против налози или фактури.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Корисници и дозволи
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Сериски № {0} не е пронајдена
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Сериски № {0} не е пронајдена
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Вашите клиенти
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
 DocType: Leave Block List Date,Block Date,Датум на блок
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Аплицирај сега
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Аплицирај сега
 DocType: Sales Order,Not Delivered,Не Дадени
 ,Bank Clearance Summary,Банката Чистење Резиме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Креирање и управување со дневни, неделни и месечни Е-содржините."
@@ -1746,7 +1794,7 @@
 DocType: SMS Log,Sender Name,Испраќачот Име
 DocType: POS Profile,[Select],[Избери]
 DocType: SMS Log,Sent To,Испратени до
-DocType: Payment Request,Make Sales Invoice,Направи Продај фактура
+DocType: Payment Request,Make Sales Invoice,Направи Продажна Фактура
 DocType: Company,For Reference Only.,За повикување само.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Однапред Износ
@@ -1756,13 +1804,13 @@
 DocType: Employee,Employment Details,Детали за вработување
 DocType: Employee,New Workplace,Нов работен простор
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Постави како Затворено
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Не точка со Баркод {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Не точка со Баркод {0}
 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 +86,Stores,Продавници
-DocType: Time Log,Projects Manager,Менаџер проекти
+DocType: Time Log,Projects Manager,Проект менаџер
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Пренос на материјал
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Ставката {0} мора да биде на продажба точка во {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Поставете се повторуваат по спасување
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Креирај Плата фиш
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Извор на фондови (Пасива)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Вработен
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз-маил од
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Покани како пристап
 DocType: Features Setup,After Sale Installations,По продажбата Инсталации
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Поставете {0} во компанијата {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 DocType: Workstation Working Hour,End Time,Крајот на времето
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандардна условите на договорот за продажба или купување.
@@ -1805,16 +1854,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,Продај Побарувања задолжителни
 DocType: Purchase Invoice,Credit To,Кредитите за
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активни води / клиенти
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Активни Потенцијални клиенти / Клиенти
 DocType: Employee Education,Post Graduate,Постдипломски
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Распоред за одржување Детална
 DocType: Quality Inspection Reading,Reading 9,Читање 9
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Gateway Account,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нето промени во Побарувања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,Accepted,Прифатени
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалидна референца {0} {1}
-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: Payment Tool,Total Payment Amount,Вкупен Износ на исплата
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Брзо весник Влегување
 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 +206,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} не е поднесен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,се создадени по производство наредби:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,се создадени по производство наредби:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Билтен Поштенски Листа
 DocType: Delivery Note,Transporter Name,Превозник Име
 DocType: Authorization Rule,Authorized Value,Овластен Вредност
@@ -1859,7 +1908,7 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Вкупно Отсутни
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
 apps/erpnext/erpnext/config/stock.py +185,Unit of Measure,Единица мерка
-DocType: Fiscal Year,Year End Date,Година Крај Датум
+DocType: Fiscal Year,Year End Date,Годината завршува на Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
 DocType: Lead,Opportunity,Можност
 DocType: Salary Structure Earning,Salary Structure Earning,Структура плата Заработувајќи
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} е затворен
 DocType: Email Digest,How frequently?,Колку често?
 DocType: Purchase Receipt,Get Current Stock,Добие моменталната залиха
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Оди на соодветната група (обично Примена на фондови&gt; Тековни средства&gt; Сметки и да се создаде нова сметка (со кликање на Додади за деца) од типот &quot;Банка&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дрвото на Бил на материјали
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Марк Тековен
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Почеток одржување датум не може да биде пред датумот на испорака за серија № {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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),Применливи To (Споредна улога)
 DocType: Stock Entry,Purpose,Цел
+DocType: Company,Fixed Asset Depreciation Settings,Амортизацијата на основните средства Settings
 DocType: Item,Will also apply for variants unless overrridden,"Ќе се казни и варијанти, освен ако overrridden"
 DocType: Purchase Invoice,Advances,Напредокот
 DocType: Production Order,Manufacture against Material Request,Производство од материјали Барање
@@ -1884,6 +1933,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,Има Јазол дете
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Кол
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
+DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","на пример, банка, пари, кредитни картички"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Оди на соодветната група (обично Примена на фондови&gt; Тековни средства&gt; Сметки и да се создаде нова сметка (со кликање на Додади за деца) од типот &quot;Банка&quot;
 DocType: Journal Entry,Credit Note,Кредитна Забелешка
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Завршено Количина не може да биде повеќе од {0} за работа {1}
 DocType: Features Setup,Quality,Квалитет
@@ -1928,7 +1980,7 @@
 DocType: Material Request,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,Клиент / Водечки Име
+DocType: Opportunity,Customer / Lead Name,Клиент / Потенцијален клиент
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +69,Clearance Date not mentioned,Чистење Датум кои не се споменати
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Им овозможи на производството со цел
@@ -1938,14 +1990,14 @@
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-DocType: Salary Structure,Total Earning,Вкупно Заработувајќи
+DocType: Salary Structure,Total Earning,Вкупно Заработка
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мои адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Организација гранка господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,Стандардно Купување Ценовник
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Веќе создаде ниту еден вработен за горе избраните критериуми или плата се лизга
@@ -1955,7 +2007,7 @@
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Bank Reconciliation,To Date,Датум
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
-DocType: Purchase Invoice,Total Taxes and Charges,Вкупно даноци и такси
+DocType: Purchase Invoice,Total Taxes and Charges,Вкупно Даноци и Такси
 DocType: Employee,Emergency Contact,Итни Контакт
 DocType: Item,Quality Parameters,Параметри за квалитет
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,Леџер
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Даноци
 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} исто така, мора да бидат вклучени"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купување Потврда Теми
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализација форми
 DocType: Account,Income Account,Сметка приходи
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Не стандардна адреса Шаблон најде. Ве молиме да се создаде нов една од поставување&gt; Печатење и Брендирање&gt; Адреса дефиниција.
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Клучна одговорност Површина
@@ -2002,51 +2055,52 @@
 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 +168,Track Leads by Industry Type.,Песна води од страна на индустриски тип.
+apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Нова цена центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
 DocType: Appraisal,HR User,HR пристап
 DocType: Purchase Invoice,Taxes and Charges Deducted,Даноци и давачки одземени
-apps/erpnext/erpnext/config/support.py +7,Issues,Прашања
+apps/erpnext/erpnext/hooks.py +90,Issues,Прашања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус мора да биде еден од {0}
 DocType: Sales Invoice,Debit To,Дебит
 DocType: Delivery Note,Required only for sample item.,Потребно е само за примерок точка.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Добивка и загуба Изјава
 DocType: Bank Reconciliation Detail,Cheque Number,Чек број
 DocType: Payment Tool Detail,Payment Tool Detail,Плаќање алатката Детална
 ,Sales Browser,Продажбата Browser
-DocType: Journal Entry,Total Credit,Вкупно кредитни
+DocType: Journal Entry,Total Credit,Вкупно Должи
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +362,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 +139,Please mention no of visits required,Ве молиме спомнете Број на посети бара
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведете курс за претворање на еден валута во друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Цитат {0} е откажана
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Вкупно преостанатиот износ за наплата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,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,Ценовник мајстор
 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/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Ве молиме да се создаде клиент од водечкиот {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
@@ -2075,9 +2129,9 @@
 DocType: Account,Accounts User,Кориснички сметки
 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),Ако повеќе од еден пакет од ист тип (за печатење)
-DocType: C-Form Invoice Detail,Net Total,Вкупно нето
+DocType: C-Form Invoice Detail,Net Total,Нето Вкупно
 DocType: Bin,FCFS Rate,FCFS стапка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Платежна (Продај фактура)
+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)
@@ -2092,26 +2146,27 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, се прекине работењето во повеќе операции"
 ,Requested,Побарано
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Нема забелешки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,Продажба и купување
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Фиксни средства точка мора да биде точка на не-акции
 DocType: Supplier Quotation Item,Material Request No,Материјал Барање Не
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,Управување со Територија на дрвото.
-DocType: Journal Entry Account,Sales Invoice,Продај фактура
+DocType: Journal Entry Account,Sales Invoice,Продажна Фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
 DocType: Sales Invoice Item,Time Log Batch,Време Пријавете се Batch
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,Ве молиме изберете Примени попуст на
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Плата фиш Created
 DocType: Company,Default Receivable Account,Стандардно побарувања профил
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Создаде банка за влез на вкупниот износ на платата исплатена за над избраните критериуми
+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,Полугодишен
@@ -2119,7 +2174,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 DocType: Payment Request,Recipient and Message,Примачот и порака
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Изберете Добавувачот адреса
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Барање за прибирање НА ПОНУДИ.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ве молиме одберете ја изборната ставка каде што &quot;Дали берза Точка&quot; е &quot;Не&quot; и &quot;е продажба точка&quot; е &quot;Да&quot; и не постои друг Бовча производ
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно однапред ({0}) против нарачка {1} не може да биде поголема од Големиот вкупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ценовник Валута не е избрано
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Почеток на проектот Датум
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Против л.к
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Управуваат со продажбата партнери.
 DocType: Quality Inspection,Inspection Type,Тип на инспекцијата
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Ве молиме изберете {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,необележани Публика
@@ -2183,6 +2239,7 @@
 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,Маркетинг
+DocType: Asset Category Account,Depreciation Expense Account,Амортизација сметка сметка
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврди
 DocType: Payment Gateway,Gateway,Портал
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Ве молиме внесете ослободување датум.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,АМТ
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,АМТ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Прифатени Магацински
 DocType: Bank Reconciliation Detail,Posting Date,Датум на објавување
 DocType: Item,Valuation Method,Начин на вреднување
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Не може да се најде на девизниот курс за {0} до {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Не може да се најде на девизниот курс за {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марк Половина ден
 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 +410,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Сериски № {0} не постои
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Магацински клиентите (опционално)
 DocType: Pricing Rule,Discount Percentage,Процент попуст
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Материјал Барања {0} создаден
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Материјал Барања {0} создаден
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Дефиниција на условите или договор.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
 DocType: Supplier,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Employee,Feedback,Повратна информација
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Одмор не може да се одвои пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
+DocType: Asset,Expected Value After Useful Life,Предвидена вредност По корисен век
 DocType: Item,Reorder level based on Warehouse,Ниво врз основа на промените редоследот Магацински
 DocType: Activity Cost,Billing Rate,Платежна стапка
 ,Qty to Deliver,Количина да Избави
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} е укинат или затворени
 DocType: Delivery Note,Track this Delivery Note against any Project,Следење на овој Испратница против било кој проект
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Нето парични текови од инвестициони
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root сметката не може да се избришат
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Асет {0} мора да се поднесе
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Управуваат со адреси
-DocType: Pricing Rule,Item Code,Точка законик
+DocType: Asset,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
 DocType: Journal Entry,User Remark,Корисникот Напомена
@@ -2281,7 +2341,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,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 +163,Tax template for selling transactions.,Данок дефиниција за продажба трансакции.
+apps/erpnext/erpnext/config/selling.py +163,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,Менаџер сметки
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Креирај Материјал Барања
 DocType: Employee Education,School/University,Училиште / Факултет
 DocType: Payment Request,Reference Details,Референца Детали
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,На располагање Количина на складиште
 ,Billed Amount,Фактурирани Износ
+DocType: Asset,Double Declining Balance,Двоен опаѓачки баланс
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Затворена за да не може да биде укинат. Да отворат за да откажете.
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Добијат ажурирања
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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;
+DocType: Asset,Fully Depreciated,целосно амортизираните
 ,Stock Projected Qty,Акции Проектирани Количина
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
@@ -2318,40 +2381,43 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Сериски Не и серија
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Количина
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 ,Qty to Receive,Количина да добијам
 DocType: Leave Block List,Leave Block List Allowed,Остави Забрани листата на дозволени
 DocType: Sales Partner,Retailer,Трговија на мало
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
 DocType: Global Defaults,Disable In Words,Оневозможи со зборови
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Банка пречекорување на профилот
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Препорачана кредити
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Поставете Амортизација поврзани сметки во Категорија Средства {0} или куќа {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Салдо инвестициски фондови
 DocType: Appraisal,Appraisal,Процена
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Е-мејл испратен до снабдувачот {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се повторува
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овластен потписник
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупниот откуп на трошоци (преку купување фактура)
+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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Пораката испратена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,Сметка со дете јазли не можат да се постават како Леџер
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Стапка по која Ценовник валута е претворена во основна валута купувачи
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
-DocType: BOM Operation,Hour Rate,Стапка на час
+DocType: BOM Operation,Hour Rate,Цена на час
 DocType: Stock Settings,Item Naming By,Точка грабеж на име со
 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,Материјал е пренесен за производство
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Вкупно Маргина
 DocType: Supplier,Supplier Details,Добавувачот Детали за
 DocType: Expense Claim,Approval Status,Статус на Одобри
 DocType: Hub Settings,Publish Items to Hub,Објавуваат Теми на Hub
@@ -2385,25 +2452,25 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Клиент група / клиентите
 DocType: Payment Gateway Account,Default Payment Request Message,Стандардно плаќање Порака со барање
 DocType: Item Group,Check this if you want to show in website,Обележете го ова ако сакате да се покаже во веб-страница
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Банкарство и плаќања
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Банкарство и плаќања
 ,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/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: 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 +199,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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,Цитат порака
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
+DocType: Notification Control,Quotation Message,Понуда порака
 DocType: Issue,Opening Date,Отворање датум
 DocType: Journal Entry,Remark,Напомена
-DocType: Purchase Receipt Item,Rate and Amount,Стапка и износот
+DocType: Purchase Receipt Item,Rate and Amount,Цена и Износ
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Лисја и Холидеј
 DocType: Sales Order,Not Billed,Не Опишан
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Двете Магацински мора да припаѓа на истата компанија
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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 за регистрации
@@ -2417,17 +2484,19 @@
 apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,Публика Марк вработените во Масовно
 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,Серија цитат
+DocType: Shopping Cart Settings,Quotation Series,Серија на Понуди
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
+DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
 DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Дата на продажба на средството {0} не се поклопува со датум на купување фактура
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Account,Payable,Треба да се плати
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Должници ({0})
-DocType: Project,Margin,маргина
+DocType: Pricing Rule,Margin,маргина
 DocType: Salary Slip,Arrear Amount,Arrear Износ
 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 +72,Gross Profit %,Бруто добивка%
@@ -2435,20 +2504,23 @@
 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,Проверете дали сакате да испратите плата се лизга во пошта до секој вработен при испраќањето на плата се лизга
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
 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/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Најмалку едно мора да биде избрано од Продажби или Купување
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Каде што се врши производните операции.
 DocType: Stock Entry Detail,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
 DocType: Employee,Confirmation Date,Потврда Датум
-DocType: C-Form,Total Invoiced Amount,Вкупниот фактуриран износ
+DocType: C-Form,Total Invoiced Amount,Вкупно Фактуриран износ
 DocType: Account,Sales User,Продажбата пристап
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Мин Количина не може да биде поголем од Макс Количина
+DocType: Account,Accumulated Depreciation,Акумулираната амортизација
 DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
 DocType: Payment Request,Email To,Е-пошта
-DocType: Lead,Lead Owner,Водач сопственик
+DocType: Lead,Lead Owner,Сопственик на Потенцијален клиент
 DocType: Bin,Requested Quantity,бараната количина
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Се бара магацин
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Се бара магацин
 DocType: Employee,Marital Status,Брачен статус
 DocType: Stock Settings,Auto Material Request,Авто материјал Барање
 DocType: Time Log,Will be updated when billed.,Ќе биде обновен кога фактурирани.
@@ -2456,27 +2528,29 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Тековни Бум и Нов Бум не може да биде ист
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% Дадени
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Ист снабдувач се внесени повеќе пати
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Нарачка точка Опрема што се испорачува
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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/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/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.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 DocType: Payment Request,Payment Details,Детали за плаќањата
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
+DocType: Asset,Journal Entry for Scrap,Весник за влез Отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Рекорд на сите комуникации од типот пошта, телефон, чет, посета, итн"
 DocType: Manufacturer,Manufacturers used in Items,Производителите користат во Предмети
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Ве молиме спомнете заокружуваат цена центар во компанијата
 DocType: Purchase Invoice,Terms,Услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Креирај нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Креирај нова
 DocType: Buying Settings,Purchase Order Required,Нарачка задолжителни
 ,Item-wise Sales History,Точка-мудар Продажбата Историја
 DocType: Expense Claim,Total Sanctioned Amount,Вкупно санкционира Износ
@@ -2489,10 +2563,10 @@
 ,Stock Ledger,Акции Леџер
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Гласај: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата се лизга Дедукција
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Изберете група јазол во прв план.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Изберете група јазол во прв план.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Вработените и Публика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Целта мора да биде еден од {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Отстрани повикување на клиент, добавувач, продажбата партнер и олово, како што е на вашата компанија адреса"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Отстрани повикување на клиент, добавувач, продажен партнер и потенцијален клиент, бидејќи е ваша адреса на фирма"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,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,Форуми во заедницата
@@ -2511,17 +2585,18 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Следниот датум мора да биде поголема од објавувањето Датум
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Шоуто данок распадот
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Форма / точка / {0}) е надвор од акциите
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Следниот датум мора да биде поголема од објавувањето Датум
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/accounts/party.py +289,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;
 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: 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,Од АМЦ
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + отпише сума не може да биде поголема од Гранд Вкупно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + Отпишана сума не може да биде поголемо од Сѐ Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Забелешка: Ако плаќањето не е направена на секое повикување, направи весник влез рачно."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
 ,Stock Ageing,Акции стареење
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
@@ -2566,28 +2641,29 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,Вкупно Најдобро Амт
-DocType: Time Log Batch,Total Hours,Вкупно часови
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,Вкупен Неизмирен Изн.
+DocType: Time Log Batch,Total Hours,Вкупно Часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Побарува мора да биде еднаков со Вкупно Должи. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
+DocType: Asset Category Account,Fixed Asset Account,Фиксни средства на сметката
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
-DocType: Purchase Invoice Item,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: Newsletter,A Lead with this email id should exist,Потенцијален клиент со овој email id треба да постои
 DocType: Stock Entry,From BOM,Од бирото
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Датум треба да биде иста како и од датумот за половина ден одмор
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","на пр Kg, единица бр, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
@@ -2595,34 +2671,36 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Структура плата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Понуди
 DocType: Hub Settings,Access Token,Пристап знак
 DocType: Sales Invoice Item,Serial No,Сериски Не
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
-DocType: Item,Is Fixed Asset Item,Е фиксни средства Точка
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
 DocType: Purchase Invoice,Print Language,Печати јазик
 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","Ако имате долга формати за печатење, оваа функција може да се користи за разделување на страницата треба да се печати на повеќе страници со сите заглавјето и подножјето на секоја страница"
+DocType: Asset,Number of Depreciations,Број на амортизација
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
-DocType: Fiscal Year,Year Name,Име година
+DocType: Fiscal Year,Year Name,Име на Година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
 DocType: Product Bundle Item,Product Bundle Item,Производ Бовча Точка
 DocType: Sales Partner,Sales Partner Name,Продажбата партнер Име
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Барање за прибирање на понуди
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максималниот износ на фактура
 DocType: Purchase Invoice Item,Image View,Слика Види
 apps/erpnext/erpnext/config/selling.py +23,Customers,клиентите
+DocType: Asset,Partially Depreciated,делумно амортизираат
 DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Од и до датуми потребни
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
-DocType: Delivery Note Item,From Warehouse,Од магацин
-DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
+DocType: Delivery Note Item,From Warehouse,Од Магацин
+DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и Вкупно
 DocType: Tax Rule,Shipping City,Превозот Сити
 apps/erpnext/erpnext/stock/doctype/item/item.js +59,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,Набавка пристап
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Одржување менаџер
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Вкупно не може да биде нула
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Дена од денот на Ред&quot; мора да биде поголем или еднаков на нула
-DocType: C-Form,Amended From,Изменет Од
+DocType: Asset,Amended From,Изменет Од
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Пренесување
@@ -2652,28 +2730,29 @@
 DocType: Issue,Raised By (Email),Покренати од страна на (E-mail)
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Генералниот
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одземе кога категорија е за 'Вреднување' или 'Вреднување и Вкупно'
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Ве молиме наведете &quot;добивка / загуба сметка за располагање со средства во компанијата
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Сериски броеви кои се потребни за серијали Точка {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Натпреварот плаќања со фактури
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Натпреварот плаќања со фактури
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Додади во кошничка
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Со група
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Овозможи / оневозможи валути.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Овозможи / оневозможи валути.
 DocType: Production Planning Tool,Get Material Request,Земете материјал Барање
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштенски трошоци
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (АМТ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Поштенски трошоци
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (Износ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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 +56,Total Present,Вкупно Тековен
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,сметководствени извештаи
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Вкупно Сегашно
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,сметководствени извештаи
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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/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,Водач Тип
+DocType: Lead,Lead Type,Потенцијален клиент Тип
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Сите овие предмети веќе се фактурира
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да биде одобрена од страна на {0}
@@ -2687,28 +2766,30 @@
 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 +346,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Почеток Point-of-продажба (ПОС)
 apps/erpnext/erpnext/config/support.py +32,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,Група на потрошувачи
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: Item,Website Description,Веб-сајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нето промени во капиталот
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
 ,Sales Register,Продажбата Регистрирај се
-DocType: Quotation,Quotation Lost Reason,Заборавена Причина цитат
+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,Клиент Име на групата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,Против ваучер Тип
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 DocType: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Се предмети
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ве молиме внесете го отпише профил
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Се предмети
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последните Ред Датум
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
 DocType: C-Form,C-Form,C-Форма
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Мобилни Не
 DocType: Payment Tool,Make Journal Entry,Направете весник Влегување
 DocType: Leave Allocation,New Leaves Allocated,Нови лисја Распределени
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Комерцијален
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 DocType: Cost Center,Distribution Id,Id дистрибуција
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Сите производи или услуги.
 DocType: Supplier Quotation,Supplier Address,Добавувачот адреса
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Количина
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
+apps/erpnext/erpnext/config/accounts.py +259,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,Финансиски Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредноста за атрибутот {0} мора да биде во рамките на опсегот на {1} до {2} во зголемувања од {3}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
 DocType: Tax Rule,Billing State,Платежна држава
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Трансфер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Трансфер
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Поради Датум е задолжително
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
 DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
@@ -2765,35 +2846,38 @@
 DocType: GL Entry,Remarks,Забелешки
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Точка законик
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Испрати Добавувачот пораки
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Инсталација рекорд за сериски број
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,ден следниот датум и Повторете на Денот од месецот мора да биде еднаква
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,ден следниот датум и Повторете на Денот од месецот мора да биде еднаква
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ве молиме наведете
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Над
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Време се Вклучи се фактурирани
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 DocType: Salary Slip,Earning & Deduction,Заработувајќи &amp; Одбивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,На сметка {0} не може да биде група
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Привремени Добивка / загуба (кредитни)
-DocType: Sales Invoice,Return Against Sales Invoice,Врати против Продај фактура
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +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,Вкупно приходи
+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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молам поставете брои серија за присуство преку поставување&gt; нумерација Серија
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Се предмети од производот Бовча
+DocType: Asset,Straight Line,Права линија
+DocType: Project User,Project User,корисник на проектот
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
 DocType: Features Setup,Sales Discounts,Попусти за продажба
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Број на нарачка
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Банер кои ќе се појавуваат на врвот од листата на производи.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведете услови за да се пресмета износот за испорака
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Додади детето
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,отворање вредност
 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,Комисијата за Продажба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Комисијата за Продажба
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 ,Customers Not Buying Since Long Time,"Клиентите не за купување, бидејќи долго време"
 DocType: Production Order,Expected Delivery Date,Се очекува испорака датум
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
-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 +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Забава трошоци
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Апликации за отсуство.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Правни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Правни трошоци
 DocType: Sales Invoice,Posting Time,Праќање пораки во Време
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Телефонски трошоци
 DocType: Sales Partner,Logo,Логото
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Обележете го ова ако сакате да ги принуди на корисникот за да изберете серија пред зачувување. Нема да има стандардно Ако ја изберете оваа.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Не ставка со Сериски Не {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Не ставка со Сериски Не {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворен Известувања
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Директни трошоци
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Директни трошоци
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} е валиден e-mail адреса во &quot;Известување \ Email адреса&quot;
 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,Патни трошоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
@@ -2847,16 +2932,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Условна казна
 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,Вкупно исплатен износ
+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/setup_wizard/install_fixtures.py +137,Planning,Планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +20,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),Вкупно регистрации Износ (преку Време на дневници)
+DocType: Project,Total Billing Amount (via Time Logs),Вкупен Износ на Наплата (преку Временски дневници)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Ние продаваме Оваа содржина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id снабдувач
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Количина треба да биде поголем од 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Количина треба да биде поголем од 0
 DocType: Journal Entry,Cash Entry,Кеш Влегување
 DocType: Sales Partner,Contact Desc,Контакт Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип на листовите како повик, болни итн"
@@ -2864,14 +2949,15 @@
 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,Вкупно оперативни трошоци
+DocType: Production Order,Total Operating Cost,Вкупни Оперативни трошоци
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сите контакти.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Добавувачот на средства {0} не се поклопува со снабдувачот во купување на фактура
 DocType: Newsletter,Test Email Id,Тест-мејл ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Суровина којашто не може да биде иста како главна точка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Плата дефиниција господар.
@@ -2883,16 +2969,17 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Кратенка задолжително
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Ви благодариме за вашиот интерес во зачлениш на нашиот ажурирања
 ,Qty to Transfer,Количина да се Трансфер на
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати да се води или клиенти.
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Понуди до Потенцијални клиенти или Клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,Најпосакувана платежна адреса
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Платежна валута мора да биде еднаков на валута или comapany е стандардно или валута payble сметка партијата
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ако го исклучите, &quot;Во зборовите&quot; поле нема да бидат видливи во секоја трансакција"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Овој пат се Влез Batch е откажан.
 ,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,Доверителите
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Доверителите
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Ред # {0}: Сериски Не е задолжително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудриот Данок Детална
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Понуда од Добавувач
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
@@ -2919,24 +3006,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,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,Вкупната варијанса
+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,Од олово
+DocType: Customer,From Lead,Од Потенцијален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Hub Settings,Name Token,Име знак
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} против Продај фактура {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
-DocType: Project,Project Name,Име на проектот
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} во однос на Продажна фактура {1}
+DocType: Request for Quotation 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,Точка Серија броеви
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Крај Датум
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,акции трансакции
 DocType: Employee,Internal Work History,Внатрешна работа Историја
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Акумулирана амортизација Износ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Компанијата е задолжително, како што е на вашата компанија адреса"
 DocType: Item Attribute,From Range,Од Опсег
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Точка {0} игнорира, бидејќи тоа не е предмет на акции"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Пратете овој производството со цел за понатамошна обработка.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Пратете овој производството со цел за понатамошна обработка.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не се применуваат Цените правило во одредена трансакција, сите важечки правила на цените треба да биде исклучен."
 DocType: Company,Domain,Домен
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Вработувања
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Намалување на заработка за неплатено отсуство (LWP)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Датум на испорака
 DocType: Opportunity,Opportunity Date,Можност Датум
 DocType: Purchase Receipt,Return Against Purchase Receipt,Врати против Набавка Потврда
+DocType: Request for Quotation Item,Request for Quotation Item,Барање за прибирање понуди Точка
 DocType: Purchase Order,To Bill,Бил
 DocType: Material Request,% Ordered,Нареди%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Плаќаат на парче
@@ -3015,11 +3104,12 @@
 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,Сметки Settings
 DocType: Customer,Sales Partner and Commission,Продажба партнер и на Комисијата
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Поставете &quot;Средства Отстранување сметка во Друштвото {0}
 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 Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремени сметки
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Привремени сметки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,Бум експлозија Точка
 DocType: Account,Auditor,Ревизор
@@ -3027,22 +3117,23 @@
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
 DocType: Project Task,Pending Review,Во очекување Преглед
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Кликни тука за да плати
-DocType: Task,Total Expense Claim (via Expense Claim),Вкупно расходи барање (преку трошоците барање)
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Кликнете тука за да платите
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Асет {0} не може да се уништи, како што е веќе {1}"
+DocType: Task,Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарување за Расход)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id на купувачи
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Марк Отсутни
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Додадете ставки од
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Додадете ставки од
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,Задача проект
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","на пример, &quot;MC&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,Акции не може да постои на точка {0} бидејќи има варијанти
 ,Sales Person-wise Transaction Summary,Продажбата на лице-мудар Преглед на трансакциите
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Магацински {0} не постои
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,Управување со квалитет
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Точка {0} е исклучена
 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,Вработен Надворешни Историја работа
@@ -3068,7 +3160,7 @@
 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,Следна Контакт
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Портал сметки поставување.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Портал сметки поставување.
 DocType: Employee,Employment Type,Тип на вработување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"Основни средства,"
 ,Cash Flow,Готовински тек
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Ви доставуваме # {0} {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ви доставуваме # {0} {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,"Извод од банка биланс, како на генералниот Леџер"
 DocType: Job Applicant,Applicant Name,Подносител на барањето Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Item Име
@@ -3092,25 +3184,24 @@
 
 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","Агрегат група ** ** Теми во друг ** ** точка. Ова е корисно ако се занимаваат со одредени предмети ** ** во пакет и ќе се одржи акции на пакуваните ** ** предмети, а не на агрегат ** ** точка. Пакетот ** ** Точка ќе има &quot;Дали берза точка&quot;, како &quot;Не&quot; и &quot;е продажба точка&quot;, како &quot;Да&quot;. На пример: Ако се продаваат лаптопи и ранци одделно и да имаат специјална цена ако клиентот купува двете, тогаш лаптоп + ранец ќе биде нов производ Бовча точка. Забелешка: Бум = Бил на материјали"
+Note: BOM = Bill of Materials","Агрегат група на **артикли ** во друг **артикал**. Ова е корисно ако одредени **артикли ** ги групирате во пакет и одржувате количина на пакуваните **артикли** а не на агрегат **артикал**. Пакетот **артикал** ќе има ""Е каталошки артикал"" како ""Не"" и ""Е продажен артикал"" како ""Да"". На пример: Ако продавате лаптопи и ранци одделно и имате специјална цена ако клиентот ги купува двата артикли, тогаш Лаптоп + Ранец ќе биде нов Пакет производ. Забелешка: СНМ = Список на материјали"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Сериски Не е задолжително за Точка {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ве молиме наведете од / до движат
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
-apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Стандардните поставувања за продажба трансакции.
+apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Стандардни нагодувања за продажни трансакции.
 DocType: BOM Replace Tool,Current BOM,Тековни Бум
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додади Сериски Не
 apps/erpnext/erpnext/config/support.py +43,Warranty,гаранција
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Печати и Стационарни
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Јазол
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Ажурирање на готовите производи
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Ажурирање на готовите производи
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,купување
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Уплатениот износ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
@@ -3133,14 +3224,14 @@
 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
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддршка Аналитика
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Отстранете ги сите
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанијата се водат за исчезнати во магацини {0}
 DocType: POS Profile,Terms and Conditions,Услови и правила
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
 DocType: Leave Block List,Applies to Company,Се однесува на компанијата
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
 DocType: Purchase Invoice,In Words,Со зборови
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Барање За Магацински
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
+DocType: Pricing Rule,Margin Rate or Amount,Маржа стапка или Износ
 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,Продај Побарувања Точка
@@ -3165,22 +3258,21 @@
 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 +782,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
 DocType: Salary Slip,Net Pay,Нето плати
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериски № {0} е веќе доби
 ,Requested Items To Be Transferred,Бара предмети да бидат префрлени
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
-DocType: Expense Claim,Total Claimed Amount,Вкупно Тврдеше Износ
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалните можности за продажба.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Неважечки {0}
+DocType: Expense Claim,Total Claimed Amount,Вкупен Износ на Побарувања
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијални можности за продажба.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Неважечки {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Боледување
 DocType: Email Digest,Email Digest,Е-билтени
 DocType: Delivery Note,Billing Address Name,Платежна адреса Име
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Одделот на мало
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зачувај го документот во прв план.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Зачувај го документот во прв план.
 DocType: Account,Chargeable,Наплатени
 DocType: Company,Change Abbreviation,Промена Кратенка
 DocType: Expense Claim Detail,Expense Date,Датум на сметка
@@ -3198,14 +3290,15 @@
 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,Прикажи ги води
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Општи Леџер
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Прикажи ги Потенцијалните клиенти
 DocType: Item Attribute Value,Attribute Value,Вредноста на атрибутот
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail проект мора да биде уникатен, веќе постои за {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-mail проект мора да биде уникатен, веќе постои за {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Ве молиме изберете {0} Првиот
 DocType: Features Setup,To get Item Group in details table,За да се добие Точка група во детали маса
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Серија {0} од точка {1} е истечен.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Поставете стандардно летни Листа за вработените {0} или куќа {0}
 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>
@@ -3226,23 +3319,23 @@
 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,Проектот мудро берза за следење
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Постои Распоред за одржување {0} од {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Постои Распоред за одржување {0} од {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Крај Количина (на изворот на / target)
 DocType: Item Customer Detail,Ref Code,Реф законик
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Вработен евиденција.
 DocType: Payment Gateway,Payment Gateway,Исплата Портал
 DocType: HR Settings,Payroll Settings,Settings Даноци
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Поставите цел
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може да има цена центар родител
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изберете бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-Форма Применливи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Складиште е задолжително
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Реши со
@@ -3255,12 +3348,12 @@
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Покажуваат &quot;Залиха&quot; или &quot;Не во парк&quot; врз основа на акции на располагање во овој склад.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Бил на материјали (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Просечно време преземени од страна на снабдувачот да испорача
-DocType: Time Log,Hours,Часа
+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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Валута трансакција мора да биде иста како и за исплата портал валута
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Добивате
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Добивате
 DocType: Maintenance Visit,Fully Completed,Целосно завршен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Целосно
 DocType: Employee,Educational Qualification,Образовните квалификации
@@ -3268,27 +3361,27 @@
 DocType: Purchase Invoice,Submit on creation,Достават на создавањето
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 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 +187,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,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,Одделение
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Вкупни вредности
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Нарачани да бидат испорачани
 DocType: Account,Income,Приходи
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Нешто не беше во ред!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Продажната Фактура {0} веќе е поднесена
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Фискалната година {0} не постои
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Датум на завршување
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Фирма валута)
@@ -3296,13 +3389,13 @@
 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,Ве молиме внесете ја пораката пред испраќањето
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Продажба Профил
+apps/erpnext/erpnext/config/accounts.py +258,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} веќе најавена
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необезбедени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
 DocType: Maintenance Schedule Detail,Scheduled Date,Закажаниот датум
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Вкупно исплатените Амт
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Вкупно Исплатени изн.
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Пораки поголема од 160 карактери ќе бидат поделени во повеќе пораки
 DocType: Purchase Receipt Item,Received and Accepted,Примени и прифатени
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; за да продолжите.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Добавувачот Дел Не
 DocType: Purchase Invoice,Contact,Контакт
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Добиени од
 DocType: Features Setup,Exports,Извозот
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Од {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
 DocType: Issue,Content Type,Типот на содржина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Точка: {0} не постои во системот
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Точка: {0} не постои во системот
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
@@ -3338,20 +3432,20 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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 +164,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),Вкупно разликата вредност (Out - Во)
+DocType: Stock Entry,Total Value Difference (Out - In),Вкупно Разлика во Вредност (Излез - Влез)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
 DocType: Stock Entry,Default Source Warehouse,Стандардно Извор Магацински
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,Акции средства
@@ -3361,19 +3455,19 @@
 DocType: Shopping Cart Settings,Checkout Settings,Плаќање Settings
 DocType: Attendance,Present,Моментов
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
-DocType: Notification Control,Sales Invoice Message,Порака Продај фактура
+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 +576,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна активност / задача.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генерирање на исплатните листи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Купување мора да се провери, ако е применливо за е избран како {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Повторете на Денот од месецот
@@ -3393,25 +3487,26 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Година датум за почеток или крај датум се преклопуваат со {0}. За да се избегне молам постави компанијата
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Нов Билтен
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### Доколку серија е поставено и сериски Не, не се споменува во трансакции ќе се создадат потоа автоматски сериски број врз основа на оваа серија. Ако вие секогаш сакате да споменува експлицитно Сериски броеви за оваа точка. оставите ова празно."
 DocType: Upload Attendance,Upload Attendance,Upload Публика
 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 +451,Amount,Износот
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Amount,Износ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
 DocType: Manufacturing Settings,Manufacturing Settings,Settings производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Поставување Е-пошта
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Ве молиме внесете го стандардно валута во компанијата мајстор
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Данок Правило Конфликтите со {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Нови име на сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Нови име на сметка
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
-DocType: Selling Settings,Settings for Selling Module,Поставки за продажба Модул
+DocType: Selling Settings,Settings for Selling Module,Нагодувања за модулот Продажби
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Услуги за Потрошувачи
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Точка Детали за корисници
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Понуда кандидат работа.
 DocType: Notification Control,Prompt for Email on Submission of,Прашај за е-мејл за доставување на
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Вкупно одобрени Листовите се повеќе од дена во периодот
+DocType: Pricing Rule,Percentage,процент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Точка {0} мора да биде акции Точка
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Стандардно работа во магацин за напредокот
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Точка {0} мора да биде Продажбата Точка
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Точка {0} мора да биде Продажбата Точка
 DocType: Naming Series,Update Series Number,Ажурирање Серија број
 DocType: Account,Equity,Капитал
 DocType: Sales Order,Printing Details,Детали за печатење
@@ -3431,11 +3527,12 @@
 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,Барај Под собранија
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,Против сметка сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; и се спомнуваат даночна стапка.
 DocType: Production Order,Production Order,Производството со цел
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
 DocType: Quotation Item,Against Docname,Против Docname
@@ -3454,31 +3551,32 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Успешно помири
 DocType: Production Order,Planned End Date,Планирани Крај Датум
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Каде што предмети се чуваат.
 DocType: Tax Rule,Validity,Валидноста
+DocType: Request for Quotation,Supplier Detail,добавувачот детали
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Фактурираниот износ
 DocType: Attendance,Attendance,Публика
 apps/erpnext/erpnext/config/projects.py +55,Reports,извештаи
 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 +508,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Данок дефиниција за купување трансакции.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Данок дефиниција за купување трансакции.
 ,Item Prices,Точка цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Затворање на ваучер
 apps/erpnext/erpnext/config/stock.py +77,Price List master.,Ценовник господар.
 DocType: Task,Review Date,Преглед Датум
 DocType: Purchase Invoice,Advance Payments,Аконтации
-DocType: Purchase Taxes and Charges,On Net Total,Он Нет Вкупно
+DocType: Purchase Taxes and Charges,On Net Total,На Нето Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Промени
@@ -3486,43 +3584,44 @@
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
+DocType: Asset Category,Asset Category Name,Средства Име на категоријата
 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,Против Продај фактура
+DocType: Delivery Note Item,Against Sales Invoice,Во однос на Продажна фактура
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,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 +559,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Категорија данок не може да биде &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot; како и сите предмети се без акции предмети
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Appraisal,Total Score (Out of 5),Вкупен Резултат (Од 5)
 DocType: Batch,Batch,Серија
 apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,Биланс
-DocType: Project,Total Expense Claim (via Expense Claims),Вкупно расходи барање (преку трошоците побарувања)
+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: Journal Entry,Total Debit,Вкупно Побарува
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Стандардно готови стоки Магацински
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продажбата на лице
 DocType: Sales Invoice,Cold Calling,Студената Повикувајќи
 DocType: SMS Parameter,SMS Parameter,SMS Параметар
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Буџетот и трошоците центар
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Буџетот и трошоците центар
 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: Purchase Invoice,Total Advance,Вкупно Аванс
 apps/erpnext/erpnext/config/hr.py +257,Processing Payroll,Обработка на платен список
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
@@ -3539,18 +3638,18 @@
 DocType: Company,Company Info,Инфо за компанијата
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +216,"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: Purchase Invoice,Frequency,фреквенција
+DocType: Purchase Invoice,Frequency,Фреквенција
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +452,Debit Account,Дебитни сметка
-DocType: Fiscal Year,Year Start Date,Година Почеток Датум
+DocType: Fiscal Year,Year Start Date,Година започнува на Датум
 DocType: Attendance,Employee Name,Име на вработениот
-DocType: Sales Invoice,Rounded Total (Company Currency),Заоблени Вкупно (Фирма валута)
+DocType: Sales Invoice,Rounded Total (Company Currency),Вкупно Заокружено (Валута на Фирма)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
 DocType: Purchase Common,Purchase Common,Купување Заеднички
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Сметки се зголеми на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,Родител профил
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
 DocType: Address,Office,Канцеларија
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Серија Инвентар
 DocType: Employee,Contract End Date,Договор Крај Датум
 DocType: Sales Order,Track this Sales Order against any Project,Следење на овој Продај Побарувања против било кој проект
+DocType: Sales Invoice Item,Discount and Margin,Попуст и Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Продажбата на налози се повлече (во очекување да се испорача) врз основа на горенаведените критериуми
 DocType: Deduction Type,Deduction Type,Одбивање Тип
 DocType: Attendance,Half Day,Половина ден
@@ -3596,10 +3696,10 @@
 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 +93,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 +175,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
-DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Фирма валута)
+DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Валута на Фирма)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
 DocType: Notification Control,Purchase Receipt Message,Купување Потврда порака
 DocType: Production Order,Actual Start Date,Старт на проектот Датум
@@ -3609,7 +3709,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Месечна плата Регистрирај се
 DocType: Warranty Claim,If different than customer address,Ако се разликува од клиент адреса
 DocType: BOM Operation,BOM Operation,Бум работа
@@ -3617,22 +3717,23 @@
 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 Профил
 DocType: Payment Gateway Account,Payment URL Message,Плаќање рачно порака
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ред {0}: Плаќањето сума не може да биде поголем од преостанатиот износ за наплата
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Вкупно ненаплатени
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Вкупно Ненаплатени
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Време најавите не е фактурираните
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
+DocType: Asset,Asset Category,средства Категорија
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Ве молиме внесете го Против Ваучери рачно
 DocType: SMS Settings,Static Parameters,Статични параметрите
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Материјал на Добавувачот
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Акцизни Фактура
 DocType: Expense Claim,Employees Email Id,Вработените-пошта Id
 DocType: Employee Attendance Tool,Marked Attendance,означени Публика
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Тековни обврски
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Тековни обврски
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Крај Количина е задолжително
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Нумерички вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Прикачи Logo
 DocType: Customer,Commission Rate,Комисијата стапка
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Апликации одмор блок од страна на одделот.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,анализатор
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошничка е празна
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Не стандардна адреса Шаблон најде. Ве молиме да се создаде нов една од поставување&gt; Печатење и Брендирање&gt; Адреса дефиниција.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
 DocType: Payment Gateway Account,Payment Gateway Account,Исплата Портал профил
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,По уплатата пренасочува корисникот да избраната страница.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
+DocType: Asset,Current Value (After Depreciation),Сегашната вредност (по амортизација)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Полудневен)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Пола ден)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Бил на материјали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Реф Датум
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,На сметка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,На сметка {0} не постои
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index 9d15c4b..1d6be82 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,ഡീലർ
 DocType: Employee,Rented,വാടകയ്ക്ക് എടുത്തത്
 DocType: POS Profile,Applicable for User,ഉപയോക്താവ് ബാധകമായ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,ശരിക്കും ഈ അസറ്റ് മുൻസർക്കാരിന്റെ ആഗ്രഹിക്കുന്നുണ്ടോ?
 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.,* ഇടപാടിലും കണക്കു കൂട്ടുക.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Purchase Order,Customer Contact,കസ്റ്റമർ കോൺടാക്റ്റ്
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ട്രീ
 DocType: Job Applicant,Job Applicant,ഇയ്യോബ് അപേക്ഷകന്
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
 DocType: Manufacturing Settings,Default 10 mins,10 മിനിറ്റ് സ്വതേ സ്വതേ
 DocType: Leave Type,Leave Type Name,ടൈപ്പ് പേര് വിടുക
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,തുറക്കുക കാണിക്കുക
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,ഷോ രൂപഭേദങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,ക്വാണ്ടിറ്റി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
 DocType: Employee Education,Year of Passing,പാസ് ആയ വര്ഷം
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,സ്റ്റോക്കുണ്ട്
 DocType: Designation,Designation,പദവിയും
@@ -64,7 +66,7 @@
 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 +642,Invoice,വികയപതം
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,പ്രതിരോധ
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},പുതിയ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},പുതിയ {0}: # {1}
 ,Sales Partners Commission,സെയിൽസ് പങ്കാളികൾ കമ്മീഷൻ
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ചുരുക്കെഴുത്ത് ലധികം 5 പ്രതീകങ്ങൾ കഴിയില്ല
 DocType: Payment Request,Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന
@@ -102,7 +104,7 @@
 DocType: Employee,Married,വിവാഹിത
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} അനുവദനീയമല്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,പലചരക്ക്
 DocType: Quality Inspection Reading,Reading 1,1 Reading
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ടാർഗറ്റിൽ
 DocType: BOM,Total Cost,മൊത്തം ചെലവ്
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,പ്രവർത്തന ലോഗ്:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ഫാർമസ്യൂട്ടിക്കൽസ്
+DocType: Item,Is Fixed Asset,ഫിക്സ്ഡ് സ്വത്ത്
 DocType: Expense Claim Detail,Claim Amount,ക്ലെയിം തുക
 DocType: Employee,Mr,മിസ്റ്റർ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,വിതരണക്കമ്പനിയായ ടൈപ്പ് / വിതരണക്കാരൻ
@@ -156,7 +159,8 @@
 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,സ്റ്റോക്ക് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} മരവിച്ചു
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
 DocType: Newsletter,Email Sent?,ഇമെയിൽ അയച്ചു:
 DocType: Journal Entry,Contra Entry,കോൺട്ര എൻട്രി
 DocType: Production Order Operation,Show Time Logs,കാണിക്കുക സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,ഇന്സ്റ്റലേഷന് അവസ്ഥ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,ഇനം {0} ഒരു വാങ്ങൽ ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: BOM Replace Tool,New BOM,പുതിയ BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},അക്കൗണ്ട് {0} കമ്പനി {1} സ്വന്തമല്ല
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,കമ്പനി നൽകുക
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
 DocType: Lead,Address & Contact,വിലാസം &amp; ബന്ധപ്പെടാനുള്ള
 DocType: Leave Allocation,Add unused leaves from previous allocations,മുൻ വിഹിതം നിന്ന് ഉപയോഗിക്കാത്ത ഇലകൾ ചേർക്കുക
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},അടുത്തത് ആവർത്തിക്കുന്നു {0} {1} സൃഷ്ടിക്കപ്പെടും
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},അടുത്തത് ആവർത്തിക്കുന്നു {0} {1} സൃഷ്ടിക്കപ്പെടും
 DocType: Newsletter List,Total Subscribers,ആകെ സബ്സ്ക്രൈബുചെയ്തവർ
 ,Contact Name,കോൺടാക്റ്റ് പേര്
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,മുകളിൽ സൂചിപ്പിച്ച മാനദണ്ഡങ്ങൾ ശമ്പളം സ്ലിപ്പ് തയ്യാറാക്കുന്നു.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 DocType: Payment Tool,Reference No,റഫറൻസ് ഇല്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,വിടുക തടയപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,ബാങ്ക് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
@@ -264,7 +268,7 @@
 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.,"ഈ പ്രദേശത്തിന്റെ മേൽ ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള ബജറ്റുകൾ സജ്ജമാക്കുക. ഇതിനു പുറമേ, വിതരണം ക്റമികരിക്കുക seasonality ഉൾപ്പെടുത്താൻ കഴിയും."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},പണ്ടകശാല {0} വേണ്ടി പാരന്റ് അക്കൗണ്ട് ഗ്രൂപ്പ് നൽകുക
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},പണ്ടകശാല {0} വേണ്ടി പാരന്റ് അക്കൗണ്ട് ഗ്രൂപ്പ് നൽകുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
 DocType: Supplier,Address HTML,വിലാസം എച്ച്ടിഎംഎൽ
 DocType: Lead,Mobile No.,മൊബൈൽ നമ്പർ
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,മാക്സ് 5 അക്ഷരങ്ങള്
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
 apps/erpnext/erpnext/config/desktop.py +83,Learn,അറിയുക
+DocType: Asset,Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ജീവനക്കാർ ശതമാനം പ്രവർത്തനം ചെലവ്
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},വിതരണക്കാരൻ ഇൻവോയ്സ് വാങ്ങൽ ഇൻവോയ്സ് {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,സെയിൽസ് പേഴ്സൺ ട്രീ നിയന്ത്രിക്കുക.
 DocType: Job Applicant,Cover Letter,കവർ ലെറ്റർ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,ക്ലിയർ നിലവിലുള്ള ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
 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.,നിങ്ങൾ ഡെലിവറി നോട്ട് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകൾ (എക്സ്പോർട്ട്) ൽ ദൃശ്യമാകും.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{2}] (# ഫോം / വെയർഹൗസ് / {2}) ൽ കണ്ടെത്തിയ [{1}] യൂണിറ്റുകൾ (# ഫോം / ഇനം / {1})
 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,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ഡെലിവറി നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ഡെലിവറി നോട്ട്
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,മാസം വർഷം തിരഞ്ഞെടുക്കുക
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ആകെ ഓർഡർ പരിഗണിക്കും
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,ഫീൽഡ് മൂല്യം &#39;ഡേ മാസം ആവർത്തിക്കുക&#39; നൽകുക
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},സീരിയൽ ഇല്ല {0} ഡെലിവറി നോട്ട് {1} സ്വന്തമല്ല
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ഇനം ക്വാളിറ്റി പരിശോധന പാരാമീറ്റർ
 DocType: Leave Application,Leave Approver Name,Approver പേര് വിടുക
-,Schedule Date,ഷെഡ്യൂൾ തീയതി
+DocType: Depreciation Schedule,Schedule Date,ഷെഡ്യൂൾ തീയതി
 DocType: Packed Item,Packed Item,ചിലരാകട്ടെ ഇനം
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,ഇടപാടുകൾ വാങ്ങുന്നത് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,ഇടപാടുകൾ വാങ്ങുന്നത് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},{1} - പ്രവർത്തന ചെലവ് പ്രവർത്തന ടൈപ്പ് നേരെ എംപ്ലോയിസ് {0} നിലവിലുണ്ട്
 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,നാണയ വിനിമയം
@@ -346,6 +353,7 @@
 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;സ്റ്റോക്കില്ല &#39;ആയ ആവശ്യപ്പെട്ട ഇനങ്ങൾ
+DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
 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.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,എല്ലാ നിർമാണ പ്രക്രിയകൾ വേണ്ടി ആഗോള ക്രമീകരണങ്ങൾ.
 DocType: Accounts Settings,Accounts Frozen Upto,ശീതീകരിച്ച വരെ അക്കൗണ്ടുകൾ
 DocType: SMS Log,Sent On,ദിവസം അയച്ചു
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
-DocType: Material Request Item,Required Date,ആവശ്യമായ തീയതി
+DocType: Request for Quotation Item,Required Date,ആവശ്യമായ തീയതി
 DocType: Delivery Note,Billing Address,ബില്ലിംഗ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,വിതരണക്കാരൻ വേണ്ടി സന്ദേശം
 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,ലഭിക്കാത്ത
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;ഉണ്ടോ ഇല്ല
 DocType: Pricing Rule,Valid Upto,സാധുതയുള്ള വരെ
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 ,Serial No Warranty Expiry,സീരിയൽ വാറണ്ടിയില്ല കാലഹരണ
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),വ്യത്യാസം (ഡോ - CR)
 DocType: Account,Profit and Loss,ലാഭവും നഷ്ടവും
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
+DocType: Project,Project will be accessible on the website to these users,പ്രോജക്ട് ഈ ഉപയോക്താക്കൾക്ക് വെബ്സൈറ്റിൽ ആക്സസ്സുചെയ്യാനാവൂ
 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 +53,Account {0} does not belong to company: {1},അക്കൗണ്ട് {0} കമ്പനി ഭാഗമല്ല: {1}
@@ -446,7 +456,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ഇനം {0} ഇനം വാങ്ങുക അല്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,ഇനം {0} ഇനം വാങ്ങുക അല്ല
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ എഡിറ്റ് നികുതികളും ചുമത്തിയിട്ടുള്ള ചേർക്കുക
 DocType: Purchase Invoice,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,സബ്-ചുരുങ്ങി വാങ്ങൽ റെസീപ്റ്റ് നിയമപരമായി വിതരണക്കാരൻ വെയർഹൗസ്
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,സബ്-ചുരുങ്ങി വാങ്ങൽ റെസീപ്റ്റ് നിയമപരമായി വിതരണക്കാരൻ വെയർഹൗസ്
 DocType: Pricing Rule,Valid From,വരെ സാധുതയുണ്ട്
 DocType: Sales Invoice,Total Commission,ആകെ കമ്മീഷൻ
 DocType: Pricing Rule,Sales Partner,സെയിൽസ് പങ്കാളി
@@ -467,13 +477,13 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** പ്രതിമാസ വിതരണം ** നിങ്ങളുടെ ബിസിനസ്സിൽ seasonality ഉണ്ടെങ്കിൽ മാസം ഉടനീളം നിങ്ങളുടെ ബജറ്റ് വിതരണം സഹായിക്കുന്നു. ഈ വിതരണ ഉപയോഗിച്ച് ഒരു ബജറ്റ് വിതരണം ** കോസ്റ്റ് സെന്ററിലെ ** ഈ ** പ്രതിമാസ വിതരണം സജ്ജമാക്കുന്നതിനായി **
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,കുമിഞ്ഞു മൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി വലുതായിരിക്കും പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി വലുതായിരിക്കും പാടില്ല
 DocType: Warranty Claim,Resolution,മിഴിവ്
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},കൈമാറി: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,അടയ്ക്കേണ്ട അക്കൗണ്ട്
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,പുനരാരംഭിക്കുക അറ്റാച്ച്മെന്റ്
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ആവർത്തിക്കുക ഇടപാടുകാർ
 DocType: Leave Control Panel,Allocate,നീക്കിവയ്ക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
 DocType: Item,Delivered by Supplier (Drop Ship),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,ശമ്പളം ഘടകങ്ങൾ.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,സാധ്യതയുള്ള ഉപഭോക്താക്കൾ ഡാറ്റാബേസിൽ.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,സ്റ്റോക്ക് എൻട്രികൾ നിർമ്മിക്കുന്ന നേരെ ഒരു ലോജിക്കൽ വെയർഹൗസ്.
@@ -500,7 +510,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposal എഴുത്ത്
 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/config/accounts.py +70,Masters,മാസ്റ്റേഴ്സ്
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,പുതുക്കിയ ബാങ്ക് ഇടപാട് തീയതി
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,പുതുക്കിയ ബാങ്ക് ഇടപാട് തീയതി
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} ൽ {2} {3} ന് സംഭരണശാല {1} ൽ ഇനം {0} നെഗറ്റീവ് ഓഹരി പിശക് ({6})
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,സമയം ട്രാക്കിംഗ്
 DocType: Fiscal Year Company,Fiscal Year Company,ധനകാര്യ വർഷം കമ്പനി
@@ -518,27 +528,27 @@
 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,സ്ഥിരസ്ഥിതി ആറെണ്ണവും റേറ്റ്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,മെയിൻറനൻസ് ഷെഡ്യൂൾ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,മെയിൻറനൻസ് ഷെഡ്യൂൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","അപ്പോൾ വിലനിർണ്ണയത്തിലേക്ക് കസ്റ്റമർ, കസ്റ്റമർ ഗ്രൂപ്പ്, ടെറിട്ടറി, വിതരണക്കാരൻ, വിതരണക്കാരൻ ടൈപ്പ്, കാമ്പയിൻ, തുടങ്ങിയവ സെയിൽസ് പങ്കാളി അടിസ്ഥാനമാക്കി ഔട്ട് ഫിൽറ്റർ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,മാനേജർ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി ചെയ്തിട്ടുണ്ട്.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
 DocType: Sales Person,Sales Person Targets,സെയിൽസ് വ്യാക്തി ടാർഗെറ്റ്
 DocType: Production Order Operation,In minutes,മിനിറ്റുകൾക്കുള്ളിൽ
 DocType: Issue,Resolution Date,റെസല്യൂഷൻ തീയതി
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,ജീവനക്കാരുടെ അല്ലെങ്കിൽ കമ്പനി ഒന്നുകിൽ ഒരു ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
+DocType: Depreciation Schedule,Depreciation Amount,മൂല്യത്തകർച്ച തുക
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,നിശ്ചിത ദിനങ്ങൾ
 DocType: Quotation Item,Item Balance,ഇനം ബാലൻസ്
 DocType: Sales Invoice,Packing List,പായ്ക്കിംഗ് ലിസ്റ്റ്
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,വിതരണക്കാരും ആജ്ഞ വാങ്ങുക.
+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,ക്ഷയിച്ചിരിക്കുന്നു
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,ഓപ്പറേഷൻ സമയം
 DocType: Pricing Rule,Sales Manager,സെയിൽസ് മാനേജർ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,എന്റെ പ്രോജക്ടുകൾ
 DocType: Journal Entry,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
 DocType: Journal Entry,Bill No,ബിൽ ഇല്ല
+DocType: Company,Gain/Loss Account on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 DocType: Purchase Invoice,Quarterly,പാദവാർഷികം
 DocType: Selling Settings,Delivery Note Required,ഡെലിവറി നോട്ട് ആവശ്യമാണ്
 DocType: Sales Order Item,Basic Rate (Company Currency),അടിസ്ഥാന നിരക്ക് (കമ്പനി കറൻസി)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,ആകെ ബില്ലിംഗ് ഈ വർഷം
 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 +529,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ട്രീ തരം
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Mode of Payment Account,Default Account,സ്ഥിര അക്കൗണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,പ്രതിവാര അവധി ദിവസം തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Planned End Time,പ്ലാൻ ചെയ്തു അവസാനിക്കുന്ന സമയം
 ,Sales Person Target Variance Item Group-Wise,സെയിൽസ് പേഴ്സൺ ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനുമാണ്
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
 DocType: Item Group,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},നിങ്ങളുടെ വിലാസ ഫലകം {0} ഒരു പിശക് ഉണ്ട്
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,പുതിയ അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,പുതിയ അക്കൗണ്ട്
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില നിയമങ്ങൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് വൈരുദ്ധ്യം പരിഹരിക്കുക. വില നിയമങ്ങൾ: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില നിയമങ്ങൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് വൈരുദ്ധ്യം പരിഹരിക്കുക. വില നിയമങ്ങൾ: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Opportunity,Maintenance,മെയിൻറനൻസ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ വാങ്ങൽ രസീത് എണ്ണം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ വാങ്ങൽ രസീത് എണ്ണം
 DocType: Item Attribute Value,Item Attribute Value,ഇനത്തിനും മൂല്യം
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +659,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ജേർണൽ എൻട്രി {0} ഓർഡർ {1} ബന്ധപ്പെടുത്തിയിരിക്കുന്നു ഈ ഇൻവോയ്സ് ലെ മുൻകൂറായി ആയി കടിച്ചുകീറി വേണം എങ്കിൽ പരിശോധിക്കുക.
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ഓഫീസ് മെയിൻറനൻസ് ചെലവുകൾ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,ആദ്യം ഇനം നൽകുക
 DocType: Account,Liability,ബാധ്യത
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.
 DocType: Company,Default Cost of Goods Sold Account,ഗുഡ്സ് സ്വതവേയുള്ള ചെലവ് അക്കൗണ്ട് വിറ്റു
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Process Payroll,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,എന്റെ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,എന്റെ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
 DocType: Supplier Quotation,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV വഴി സ്റ്റോക്ക് ബാലൻസ് അപ്ലോഡ് ചെയ്യുക.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ഇപ്പോൾ അയയ്ക്കുക
 ,Support Analytics,പിന്തുണ അനലിറ്റിക്സ്
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,ലോജിക്കൽ പിശക്: കവിഞ്ഞു കണ്ടെത്തേണ്ടിയിരിക്കുന്നു
 DocType: Item,Website Warehouse,വെബ്സൈറ്റ് വെയർഹൗസ്
 DocType: Payment Reconciliation,Minimum Invoice Amount,മിനിമം ഇൻവോയിസ് തുക
 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 +267,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,കസ്റ്റമർ വിതരണക്കാരൻ
 DocType: Email Digest,Email Digest Settings,ഇമെയിൽ ഡൈജസ്റ്റ് സജ്ജീകരണങ്ങൾ
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ഉപഭോക്താക്കൾക്ക് നിന്ന് അന്വേഷണങ്ങൾ പിന്തുണയ്ക്കുക.
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
 DocType: Newsletter,Newsletter Manager,വാർത്താക്കുറിപ്പ് മാനേജർ
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ചെലവുകൾ
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted മാത്രമാവില്ലല്ലോ
 DocType: Item Attribute,Item Attribute Values,ഇനം ഗുണ മൂല്യങ്ങൾ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,കാണുക സബ്സ്ക്രൈബുചെയ്തവർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,വാങ്ങൽ രസീത്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,വാങ്ങൽ രസീത്
 ,Received Items To Be Billed,ബില്ല് ലഭിച്ച ഇനങ്ങൾ
 DocType: Employee,Ms,മിസ്
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,നാണയ വിനിമയ നിരക്ക് മാസ്റ്റർ.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,നാണയ വിനിമയ നിരക്ക് മാസ്റ്റർ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
+DocType: Journal Entry,Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,ഗോടു കാർട്ട്
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
 DocType: Address,Shop,കട
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,സ്ഥിര വിലാസം തന്നെയല്ലേ
 DocType: Production Order Operation,Operation completed for how many finished goods?,ഓപ്പറേഷൻ എത്ര പൂർത്തിയായി ഗുഡ്സ് പൂർത്തിയായെന്നും?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ബ്രാൻഡ്
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} over- വേണ്ടി അലവൻസ് ഇനം {1} വേണ്ടി കടന്നു.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} over- വേണ്ടി അലവൻസ് ഇനം {1} വേണ്ടി കടന്നു.
 DocType: Employee,Exit Interview Details,നിന്ന് പുറത്തുകടക്കുക അഭിമുഖം വിശദാംശങ്ങൾ
 DocType: Item,Is Purchase Item,വാങ്ങൽ ഇനം തന്നെയല്ലേ
-DocType: Journal Entry Account,Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ്
+DocType: Asset,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,തീയതിയും അടയ്ക്കുന്ന തീയതി തുറക്കുന്നു ഒരേ സാമ്പത്തിക വർഷത്തിൽ ഉള്ളിൽ ആയിരിക്കണം
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;പാക്കിംഗ് പട്ടിക&#39; മേശയുടെ പകർത്തുന്നു."
 DocType: Job Opening,Publish on website,വെബ്സൈറ്റിൽ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ഉപഭോക്താക്കൾക്ക് കയറ്റുമതി.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതി തീയതി നോട്സ് ശ്രേഷ്ഠ പാടില്ല
 DocType: Purchase Invoice Item,Purchase Order Item,വാങ്ങൽ ഓർഡർ ഇനം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,പരോക്ഷ ആദായ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),ആകെ സന്ദേശം (ങ്ങൾ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Additional Discount Percentage,അധിക കിഴിവും ശതമാനം
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,എല്ലാ സഹായം വീഡിയോ ലിസ്റ്റ് കാണൂ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ഉപയോക്തൃ ഇടപാടുകൾ ൽ വില പട്ടിക റേറ്റ് എഡിറ്റ് ചെയ്യാൻ അനുവദിക്കുക
 DocType: Pricing Rule,Max Qty,മാക്സ് Qty
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","വരി {0}: ഇൻവോയ്സ് {1} അസാധുവാണ്, അത് റദ്ദാക്കി ആകേണ്ടതിന്നു / നിലവിലില്ല. \ സാധുവായ ഒരു ഇൻവോയിസ് നൽകുക"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലോയീസ് ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ അയയ്ക്കരുത്
 ,Employee Holiday Attendance,ജീവനക്കാരുടെ ഹോളിഡേ ഹാജർ
 DocType: Opportunity,Walk In,നടപ്പാൻ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ
 DocType: Item,Inspection Criteria,ഇൻസ്പെക്ഷൻ മാനദണ്ഡം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,എന്റെ വണ്ടി
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
 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 +180,Qty for {0},{0} വേണ്ടി Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0} വേണ്ടി Qty
 DocType: Leave Application,Leave Application,ആപ്ലിക്കേഷൻ വിടുക
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,വിഹിതം ടൂൾ വിടുക
 DocType: Leave Block List,Leave Block List Dates,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ഡിസ്കൗണ്ട്
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,തുക വിൽക്കുന്ന
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,നിങ്ങൾ ഈ റെക്കോർഡ് വേണ്ടി ചിലവിടൽ Approver ആകുന്നു. &#39;സ്റ്റാറ്റസ്&#39; സേവ് അപ്ഡേറ്റ് ദയവായി
 DocType: Serial No,Creation Document No,ക്രിയേഷൻ ഡോക്യുമെന്റ് ഇല്ല
 DocType: Issue,Issue,ഇഷ്യൂ
+DocType: Asset,Scrapped,തയ്യാർ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,അക്കൗണ്ട് കമ്പനി പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,റിക്രൂട്ട്മെന്റ്
 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,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,സെയിൽസ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,സെയിൽസ് ചെലവുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
+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,ശരാശരി പ്രായം
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,സ്ഥിരസ്ഥിതി കറന്സി
 DocType: Contact,Enter designation of this Contact,ഈ സമ്പർക്കത്തിന്റെ പദവിയും നൽകുക
 DocType: Expense Claim,From Employee,ജീവനക്കാരുടെ നിന്നും
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
 DocType: Journal Entry,Make Difference Entry,വ്യത്യാസം എൻട്രി നിർമ്മിക്കുക
 DocType: Upload Attendance,Attendance From Date,ഈ തീയതി മുതൽ ഹാജർ
 DocType: Appraisal Template Goal,Key Performance Area,കീ പ്രകടനം ഏരിയ
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},ഇനം വേണ്ടി BOM ലേക്ക് വയലിൽ {0} BOM തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},ഇനം വേണ്ടി BOM ലേക്ക് വയലിൽ {0} BOM തിരഞ്ഞെടുക്കുക
 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 +42,Contribution %,സംഭാവന%
@@ -909,22 +931,23 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,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,ആഗോള സ്ഥിരസ്ഥിതികൾ
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
 DocType: Salary Slip,Deductions,പൂർണമായും
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ഈ സമയം ലോഗ് ബാച്ച് ഈടാക്കൂ ചെയ്തു.
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
 ,Trial Balance for Party,പാർട്ടി ട്രയൽ ബാലൻസ്
 DocType: Lead,Consultant,ഉപദേഷ്ടാവ്
 DocType: Salary Slip,Earnings,വരുമാനം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
 DocType: Sales Invoice Advance,Sales Invoice Advance,സെയിൽസ് ഇൻവോയിസ് അഡ്വാൻസ്
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,മാനേജ്മെന്റ്
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,സമയം ഷീറ്റുകൾ വേണ്ടി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
@@ -935,18 +958,18 @@
 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; ടൈപ്പ് നോഡുകൾ പ്രകാരം സൃഷ്ടിക്കാൻ കഴിയും
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,UOM പരിവർത്തന ഫാക്ടർ
 DocType: Stock Settings,Default Item Group,സ്ഥിരസ്ഥിതി ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,നികുതി മറ്റ് ശമ്പളം ിയിളവുകള്ക്ക്.
 DocType: Lead,Lead,ഈയം
 DocType: Email Digest,Payables,Payables
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,ഹോളിഡേ
 DocType: Leave Control Panel,Leave blank if considered for all branches,എല്ലാ ശാഖകളും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 ,Daily Time Log Summary,ഡെയ്ലി സമയം ലോഗ് ചുരുക്കം
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},സി-ഫോം ഇൻവോയ്സ് വേണ്ടി ബാധകമല്ല: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled പേയ്മെന്റ് വിശദാംശങ്ങൾ
 DocType: Global Defaults,Current Fiscal Year,നടപ്പ് സാമ്പത്തിക വർഷം
 DocType: Global Defaults,Disable Rounded Total,വൃത്തത്തിലുള്ള ആകെ അപ്രാപ്തമാക്കുക
@@ -973,19 +997,20 @@
 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,വിശേഷണങ്ങൾ പട്ടികയിൽ കുറഞ്ഞത് ഒരു ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Contact,User ID,യൂസർ ഐഡി
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,കാണുക ലെഡ്ജർ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,കാണുക ലെഡ്ജർ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
 ,Budget Variance Report,ബജറ്റ് പൊരുത്തമില്ലായ്മ റിപ്പോർട്ട്
 DocType: Salary Slip,Gross Pay,മൊത്തം വേതനം
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,പണമടച്ചു ഡിവിഡന്റ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,നീക്കിയിരുപ്പ് സമ്പാദ്യം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,നീക്കിയിരുപ്പ് സമ്പാദ്യം
 DocType: BOM Item,Item Description,ഇനത്തെ കുറിച്ചുള്ള വിശദീകരണം
 DocType: Payment Tool,Payment Mode,പേയ്മെന്റ് മോഡ്
 DocType: Purchase Invoice,Is Recurring,ആവർത്തക ചെയ്യുന്നുണ്ടോ
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,താൽക്കാലിക തുറക്കുന്നു
 ,Employee Leave Balance,ജീവനക്കാരുടെ അവധി ബാലൻസ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},മൂലധനം നിരക്ക് വരി {0} ൽ ഇനം ആവശ്യമാണ്
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,അക്കൗണ്ടുകൾ അടയ്ക്കേണ്ട ചുരുക്കം
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 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 +165,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ചെറുകിട
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,അക്കൗണ്ട് തല {0} സൃഷ്ടിച്ചു
 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,മികച്ച വിജയം ആകെ
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,കൃഷി
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 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,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
@@ -1040,19 +1065,20 @@
 DocType: Serial No,Serial No Details,സീരിയൽ വിശദാംശങ്ങളൊന്നും
 DocType: Purchase Invoice Item,Item Tax Rate,ഇനം നിരക്ക്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
 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},പ്രൊഡക്ഷൻ ഓർഡർ നില {0} ആണ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി പ്ലാൻ ചെയ്തു ആരംഭ തീയതി അധികം കുറവാണ്.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി പ്ലാൻ ചെയ്തു ആരംഭ തീയതി അധികം കുറവാണ്.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,വിതരണക്കാരൻ വേണ്ടി
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,അക്കൗണ്ട് തരം സജ്ജീകരിക്കുന്നു ഇടപാടുകൾ ഈ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുന്നതിൽ സഹായിക്കുന്നു.
 DocType: Purchase Invoice,Grand Total (Company Currency),ആകെ മൊത്തം (കമ്പനി കറൻസി)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},{0} വിളിച്ചു ഏതെങ്കിലും ഇനം കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ആകെ അയയ്ക്കുന്ന
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",മാത്രം &quot;ചെയ്യുക മൂല്യം&quot; എന്ന 0 അല്ലെങ്കിൽ ശൂന്യം മൂല്യം കൂടെ ഒരു ഷിപ്പിങ് റൂൾ കണ്ടീഷൻ ഉണ്ട് ആകാം
 DocType: Authorization Rule,Transaction,ഇടപാട്
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പുകൾ
 DocType: Purchase Invoice,Total (Company Currency),ആകെ (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,സീരിയൽ നമ്പർ {0} ഒരിക്കൽ അധികം പ്രവേശിച്ചപ്പോൾ
-DocType: Journal Entry,Journal Entry,ജേർണൽ എൻട്രി
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Sales Partner,Target Distribution,ടാർജറ്റ് വിതരണം
 DocType: Salary Slip,Bank Account No.,ബാങ്ക് അക്കൗണ്ട് നമ്പർ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ഇത് ഈ കൂടിയ അവസാന സൃഷ്ടിച്ച ഇടപാട് എണ്ണം ആണ്
@@ -1072,6 +1098,7 @@
 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,വറ്ക്ക്സ്റ്റേഷൻ
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,ക്വട്ടേഷൻ വിതരണക്കാരൻ അഭ്യർത്ഥന
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ഹാര്ഡ്വെയര്
 DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,അപ്രൈസൽ ഫലകം ഗോൾ
 DocType: Salary Slip,Earning,സമ്പാദിക്കാനുള്ള
 DocType: Payment Tool,Party Account Currency,പാർട്ടി അക്കൗണ്ട് കറൻസി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},മൂല്യത്തകർച്ച ശേഷം നിലവിൽ മൂല്യം {0} തുല്യമോ കുറവായിരിക്കണം
 ,BOM Browser,BOM ബ്രൌസർ
 DocType: Purchase Taxes and Charges,Add or Deduct,ചേർക്കുകയോ കുറയ്ക്കാവുന്നതാണ്
 DocType: Company,If Yearly Budget Exceeded (for expense account),വാര്ഷികം ബജറ്റ് (ചിലവേറിയ വേണ്ടി) അധികരിച്ചു എങ്കിൽ
@@ -1096,21 +1124,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},സമാപന അക്കൗണ്ട് കറൻസി {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},എല്ലാ ഗോളുകൾ വേണ്ടി പോയിന്റിന്റെ സം 100 ആയിരിക്കണം അത് {0} ആണ്
 DocType: Project,Start and End Dates,"ആരംഭ, അവസാന തീയതി"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,ഓപ്പറേഷൻസ് ശൂന്യമാക്കിയിടാനാവില്ല ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,സവിശേഷതകൾ സെറ്റപ്പ്
+DocType: Asset,Depreciation Schedules,മൂല്യത്തകർച്ച സമയക്രമം
 DocType: Item,Is Service Item,സേവന ഇനം തന്നെയല്ലേ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
 DocType: Activity Cost,Projects,പ്രോജക്റ്റുകൾ
 DocType: Payment Request,Transaction Currency,ഇടപാട് കറൻസി
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} നിന്ന് | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},{0} നിന്ന് | {1} {2}
 DocType: BOM Operation,Operation Description,ഓപ്പറേഷൻ വിവരണം
 DocType: Item,Will also apply to variants,കൂടാതെ വകഭേദങ്ങളും ബാധകമാകും
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,സാമ്പത്തിക വർഷത്തെ സംരക്ഷിച്ചു ഒരിക്കൽ സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി മാറ്റാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,കാമ്പെയ്ൻ
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},പരമാവധി: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,കമ്പനിക്ക് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +17,Communication log.,കമ്മ്യൂണിക്കേഷൻ രേഖ.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
 DocType: Rename Tool,Type of document to rename.,പേരുമാറ്റാൻ പ്രമാണത്തിൽ തരം.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ഞങ്ങൾ ഈ ഇനം വാങ്ങാൻ
 DocType: Address,Billing,ബില്ലിംഗ്
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,വായന
 DocType: Stock Entry,Total Additional Costs,ആകെ അധിക ചെലവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,സബ് അസംബ്ലീസ്
+DocType: Asset,Asset Name,അസറ്റ് പേര്
 DocType: Shipping Rule Condition,To Value,മൂല്യത്തിലേക്ക്
 DocType: Supplier,Stock Manager,സ്റ്റോക്ക് മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ഓഫീസ് രെംട്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ഓഫീസ് രെംട്
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,ഉദ്ധരണി അഭ്യർത്ഥന താഴെ ലിങ്ക് ക്ലിക്ക് ചെയ്തുകൊണ്ട് ആക്സസ് ആകാം
+DocType: Asset,Number of Months in a Period,ഒരു കാലയളവിൽ മാസങ്ങളുടെ എണ്ണം
 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,വർക്ക്സ്റ്റേഷൻ ജോലി അന്ത്യസമയം
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,സർക്കാർ
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,ഇനം രൂപഭേദങ്ങൾ
 DocType: Company,Services,സേവനങ്ങള്
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),ആകെ ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),ആകെ ({0})
 DocType: Cost Center,Parent Cost Center,പാരന്റ് ചെലവ് കേന്ദ്രം
 DocType: Sales Invoice,Source,ഉറവിടം
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,അടച്ചു കാണിക്കുക
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,സാമ്പത്തിക വർഷം ആരംഭ തീയതി
 DocType: Employee External Work History,Total Experience,ആകെ അനുഭവം
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ചരക്കുഗതാഗതം കൈമാറലും ചുമത്തിയിട്ടുള്ള
 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 +86,Transfer Materials for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽസ് കൈമാറുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽസ് കൈമാറുക
 DocType: Pricing Rule,For Price List,വില ലിസ്റ്റിനായി
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,എക്സിക്യൂട്ടീവ് തിരച്ചിൽ
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} കണ്ടെത്തിയില്ല, എൻട്രി (ചെലവിൽ) കണക്കിൻറെ ബുക്ക് ആവശ്യമായ. ഒരു വാങ്ങൽ വില പട്ടികയുമായി ഇനത്തിന്റെ വില സൂചിപ്പിക്കുക."
@@ -1212,7 +1245,7 @@
 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.,അക്കൗണ്ട്സ് ചാർട്ട് നിന്ന് പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം
 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,ചെലവ് സഹായം റജിസ്റ്റർ
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,ബ്രാൻഡ് മാസ്റ്റർ.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
 DocType: Sales Invoice Item,Brand Name,ബ്രാൻഡ് പേര്
 DocType: Purchase Receipt,Transporter Details,ട്രാൻസ്പോർട്ടർ വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,ബോക്സ്
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +131,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,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,സ്റ്റോക്ക് ബാദ്ധ്യതകളും
 DocType: Purchase Receipt,Supplier Warehouse,വിതരണക്കാരൻ വെയർഹൗസ്
 DocType: Opportunity,Contact Mobile No,മൊബൈൽ ഇല്ല ബന്ധപ്പെടുക
 ,Material Requests for which Supplier Quotations are not created,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,മറ്റ് റിപ്പോർട്ടുകളിൽ
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} കാണുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Salary Structure Deduction,Salary Structure Deduction,ശമ്പളം ഘടന കിഴിച്ചുകൊണ്ടു
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ഇഷ്യൂ ഇനങ്ങൾ ചെലവ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,കഴിഞ്ഞ സാമ്പത്തിക വർഷം അടച്ചിട്ടില്ല
 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 +40,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 +38,Supplier Type master.,വിതരണക്കമ്പനിയായ തരം മാസ്റ്റർ.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,വിതരണക്കമ്പനിയായ തരം മാസ്റ്റർ.
 DocType: Purchase Order Item,Supplier Part Number,വിതരണക്കമ്പനിയായ ഭാഗം നമ്പർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,പരിവർത്തന നിരക്ക് 0 അല്ലെങ്കിൽ 1 കഴിയില്ല
 DocType: Purchase Invoice,Reference Document,റെഫറൻസ് പ്രമാണം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,പർച്ചേസ് റെസീപ്റ്റ് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,ഈടാക്കൂ {0}%
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","മുതലായ ഷിപ്പിംഗ് നിയമങ്ങൾ, വില ലിസ്റ്റ് പോലെ ഓൺലൈൻ ഷോപ്പിംഗ് കാർട്ട് ക്രമീകരണങ്ങൾ"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,അടയ്ക്കേണ്ട തുക ലെ നെറ്റ് മാറ്റുക
 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 കിഴിവും&#39; ആവശ്യമുള്ളതിൽ കസ്റ്റമർ
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,ഡയറിയിലെ ബാങ്ക് പേയ്മെന്റ് തീയതികൾ അപ്ഡേറ്റ്.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,ഡയറിയിലെ ബാങ്ക് പേയ്മെന്റ് തീയതികൾ അപ്ഡേറ്റ്.
 DocType: Quotation,Term Details,ടേം വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 വലുതായിരിക്കണം
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ദിവസം) ശേഷി ആസൂത്രണ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ഇനങ്ങളുടെ ഒന്നുമില്ല അളവിലും അല്ലെങ്കിൽ മൂല്യം എന്തെങ്കിലും മാറ്റം ഉണ്ടാകും.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,വാറന്റി ക്ലെയിം
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,സ്ഥിര വിലാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} ആകെ മൊത്തം {2} വലിയവനല്ല \ ആകാൻ പാടില്ല നേരെ പെയ്ഡ് മുൻകൂർ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ശമ്പള (LWP) ഇല്ലാതെ അവധിക്ക് കിഴിച്ചുകൊണ്ടു കുറയ്ക്കുക
 DocType: Territory,Territory Manager,ടെറിട്ടറി മാനേജർ
 DocType: Packed Item,To Warehouse (Optional),സംഭരണശാല (ഓപ്ഷണൽ)
@@ -1343,15 +1377,15 @@
 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,മാർക്കറ്റിംഗ് ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',സമയം ലോഗ് ബാച്ച് {0} &#39;സമർപ്പിച്ചു&#39; വേണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് വെയർഹൗസ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,"സാധുവായ സാമ്പത്തിക വർഷം ആരംഭ, അവസാന തീയതി നൽകുക"
 DocType: Employee,Date Of Retirement,വിരമിക്കൽ തീയതി
 DocType: Upload Attendance,Get Template,ഫലകം നേടുക
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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},അളവ് ഇനം {1} വേണ്ടി നിലവിലുണ്ട് പോലെ വെയർഹൗസ് {0} ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
+DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",ഉദാ: &quot;കഖഗ നാഷണൽ ബാങ്ക്&quot;
+DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
 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 +29,Shopping Cart is enabled,ഷോപ്പിംഗ് കാർട്ട് പ്രാപ്തമാക്കിയിരിക്കുമ്പോൾ
 DocType: Job Applicant,Applicant for a Job,ഒരു ജോലിക്കായി അപേക്ഷകന്
 DocType: Production Plan Material Request,Production Plan Material Request,പ്രൊഡക്ഷൻ പ്ലാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,സൃഷ്ടിച്ച ഇല്ല പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,സൃഷ്ടിച്ച ഇല്ല പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,പ്രധാന
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
 DocType: Employee,Leave Encashed?,കാശാക്കാം വിടണോ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,വയലിൽ നിന്ന് ഓപ്പർച്യൂനിറ്റി നിർബന്ധമാണ്
 DocType: Item,Variants,വകഭേദങ്ങളും
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ഒരു ജോലിക്കായി അപേക്ഷകന്.
 DocType: Purchase Order Item,Warehouse and Reference,വെയർഹൗസ് റഫറൻസ്
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമപ്രകാരമുള്ള വിവരങ്ങളും നിങ്ങളുടെ വിതരണക്കാരൻ കുറിച്ചുള്ള മറ്റ് ജനറൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,വിലാസങ്ങൾ
+apps/erpnext/erpnext/hooks.py +91,Addresses,വിലാസങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,വിലയിരുത്തലുകളും
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},സീരിയൽ ഇല്ല ഇനം {0} നൽകിയ തനിപ്പകർപ്പെടുക്കുക
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ഒരു ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,ഇനം പ്രൊഡക്ഷൻ ഓർഡർ ഉണ്ട് അനുവദിച്ചിട്ടില്ല.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,ഇനം പ്രൊഡക്ഷൻ ഓർഡർ ഉണ്ട് അനുവദിച്ചിട്ടില്ല.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,ഇനം അപാകതയുണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ഈ പാക്കേജിന്റെ മൊത്തം ഭാരം. (ഇനങ്ങളുടെ മൊത്തം ഭാരം തുകയുടെ ഒരു സ്വയം കണക്കുകൂട്ടുന്നത്)
 DocType: Sales Order,To Deliver and Bill,എത്തിക്കേണ്ടത് ബിൽ ചെയ്യുക
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,നിർമാണ സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,ഇതുപയോഗിക്കാം സമയം ലോഗ്.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ബ്രാൻഡ്
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,വില്പനയ്ക്ക് സമയത്ത് ഇനങ്ങളുടെ ചേർത്തുവെക്കുന്നു.
 DocType: Quotation Item,Actual Qty,യഥാർത്ഥ Qty
 DocType: Sales Invoice Item,References,അവലംബം
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,ഇനം {0} ഒരു സീരിയൽ ഇനം അല്ല
+DocType: Request for Quotation Supplier,Send Email to Supplier,വിതരണക്കാരൻ ഇമെയിലയയ്ക്കുകഇതിനെക്കുറിച്ച് അയയ്ക്കുക
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
 DocType: Packing Slip,To Package No.,നമ്പർ പാക്കേജ്
 DocType: Production Planning Tool,Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ഡെലിവറി വെയർഹൗസ്
 DocType: Stock Settings,Allowance Percent,അലവൻസ് ശതമാനം
 DocType: SMS Settings,Message Parameter,സന്ദേശ പാരാമീറ്റർ
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,സാമ്പത്തിക ചെലവ് സെന്റേഴ്സ് ട്രീ.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,സാമ്പത്തിക ചെലവ് സെന്റേഴ്സ് ട്രീ.
 DocType: Serial No,Delivery Document No,ഡെലിവറി ഡോക്യുമെന്റ് ഇല്ല
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Serial No,Creation Date,ക്രിയേഷൻ തീയതി
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,വിടുവിപ്പാൻ തുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ഒരു ഉല്പന്നം അല്ലെങ്കിൽ സേവനം
 DocType: Naming Series,Current Value,ഇപ്പോഴത്തെ മൂല്യം
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} സൃഷ്ടിച്ചു
 DocType: Delivery Note Item,Against Sales Order,സെയിൽസ് എതിരായ
 ,Serial No Status,സീരിയൽ നില ഇല്ല
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,ഇനം ടേബിൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","വരി {0}: തീയതി \ എന്നിവ തമ്മിലുള്ള വ്യത്യാസം വലിയവനോ അല്ലെങ്കിൽ {2} തുല്യമോ ആയിരിക്കണം, {1} കാലഘട്ടം സജ്ജമാക്കുന്നതിനായി"
 DocType: Pricing Rule,Selling,വിൽപ്പനയുള്ളത്
 DocType: Employee,Salary Information,ശമ്പളം വിവരങ്ങൾ
 DocType: Sales Person,Name and Employee ID,പേര് തൊഴിൽ ഐഡി
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,"കടമകൾ, നികുതി"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് കോൺഫിഗർ ചെയ്തിട്ടില്ല
 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: Production Order,Material Request Item,മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
+DocType: Request for Quotation Item,Material Request Item,മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
 apps/erpnext/erpnext/config/stock.py +85,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,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
+DocType: Asset,Sold,വിറ്റത്
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
 DocType: Account,Frozen,ശീതീകരിച്ച
 ,Open Production Orders,ഓപ്പൺ പ്രൊഡക്ഷൻ ഓർഡറുകൾ
 DocType: Installation Note,Installation Time,ഇന്സ്റ്റലേഷന് സമയം
 DocType: Sales Invoice,Accounting Details,അക്കൗണ്ടിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ഈ കമ്പനി വേണ്ടി എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,നിക്ഷേപങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,വിഹിതം
 DocType: Quality Inspection Reading,Acceptance Criteria,സ്വീകാര്യത മാനദണ്ഡം
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,മുകളിലുള്ള പട്ടികയിൽ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,മുകളിലുള്ള പട്ടികയിൽ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ നൽകുക
 DocType: Item Attribute,Attribute Name,പേര് ആട്രിബ്യൂട്ട്
 DocType: Item Group,Show In Website,വെബ്സൈറ്റ് കാണിക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,ഗ്രൂപ്പ്
@@ -1527,6 +1567,7 @@
 ,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 +25,Gantt chart of all tasks.,എല്ലാ ചുമതലകളും Gantt ചാർട്ട്.
+DocType: Pricing Rule,Margin Type,മാർജിൻ ഇനം
 DocType: Appraisal,For Employee Name,ജീവനക്കാരുടെ പേര് എന്ന
 DocType: Holiday List,Clear Table,മായ്ക്കുക ടേബിൾ
 DocType: Features Setup,Brands,ബ്രാൻഡുകൾ
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
 DocType: Activity Cost,Costing Rate,ആറെണ്ണവും റേറ്റ്
 ,Customer Addresses And Contacts,കസ്റ്റമർ വിലാസങ്ങളും ബന്ധങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,വരി # {0}: അസറ്റ് ഒരു നിശ്ചിത അസറ്റ് ഇനം നേരെ നിർബന്ധമായും
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,ജോഡി
+DocType: Asset,Depreciation Schedule,മൂല്യത്തകർച്ച ഷെഡ്യൂൾ
 DocType: Bank Reconciliation Detail,Against Account,അക്കൗണ്ടിനെതിരായ
 DocType: Maintenance Schedule Detail,Actual Date,യഥാർഥ
 DocType: Item,Has Batch No,ബാച്ച് ഇല്ല ഉണ്ട്
 DocType: Delivery Note,Excise Page Number,എക്സൈസ് പേജ് നമ്പർ
+DocType: Asset,Purchase Date,വാങ്ങിയ തിയതി
 DocType: Employee,Personal Details,പേഴ്സണൽ വിവരങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
 ,Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 ,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,പൊരുത്തപ്പെട്ട എൻട്രികൾ ഉൾപ്പെടുത്തുക
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,യഥാർത്ഥ ആകെ
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,യൂണിറ്റ്
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ചിലവേറിയ ക്ലെയിമുകൾ
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ചിലവേറിയ ക്ലെയിമുകൾ
 DocType: Issue,Support,പിന്തുണ
 ,BOM Search,BOM തിരച്ചിൽ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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} ആവശ്യമാണ്
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},ക്ലിയറൻസ് തീയതി വരി {0} ചെക്ക് തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Salary Slip,Deduction,കുറയ്ക്കല്
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
 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 +137,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,കണക്കുകൂട്ടിയത് ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ഉദ്ധരണി
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
 DocType: Quotation,Maintenance User,മെയിൻറനൻസ് ഉപയോക്താവ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
 DocType: Employee,Date of Birth,ജനിച്ച ദിവസം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
@@ -1620,8 +1666,8 @@
 ,SO Qty,ഷൂട്ട്ഔട്ട് Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
+DocType: Request for Quotation,Manufacturing Manager,ണം മാനേജർ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
 apps/erpnext/erpnext/hooks.py +71,Shipments,കയറ്റുമതി
 DocType: Purchase Order Item,To be delivered to customer,ഉപഭോക്താവിന് പ്രസവം
@@ -1629,12 +1675,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,സീരിയൽ ഇല്ല {0} ഏതെങ്കിലും വെയർഹൗസ് ഭാഗമല്ല
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,വരി #
 DocType: Purchase Invoice,In Words (Company Currency),വാക്കുകൾ (കമ്പനി കറൻസി) ൽ
-DocType: Pricing Rule,Supplier,സപൈ്ളയര്
+DocType: Asset,Supplier,സപൈ്ളയര്
 DocType: C-Form,Quarter,ക്വാര്ട്ടര്
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,പലവക ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,പലവക ചെലവുകൾ
 DocType: Global Defaults,Default Company,സ്ഥിരസ്ഥിതി കമ്പനി
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ചിലവേറിയ അല്ലെങ്കിൽ ഈ വ്യത്യാസം അത് കൂട്ടിയിടികൾ പോലെ ഇനം {0} മൊത്തത്തിലുള്ള ഓഹരി മൂല്യം നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} അധികം {0} നിരയിൽ {1} കൂടുതൽ ഇനം വേണ്ടി overbill ചെയ്യാൻ കഴിയില്ല. Overbilling അനുവദിക്കാൻ, സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ വെച്ചിരിക്കുന്നതും ദയവായി"
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} അധികം {0} നിരയിൽ {1} കൂടുതൽ ഇനം വേണ്ടി overbill ചെയ്യാൻ കഴിയില്ല. 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 +139,User {0} is disabled,ഉപയോക്താവ് {0} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Currency Exchange,From Currency,കറൻസി
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ സെയിൽസ് ഓർഡർ
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","വരി # {0}: പോലെ ഇനം ഒരു അസറ്റ് ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അളവ്, 1 ആയിരിക്കണം"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ശിശു ഇനം ഒരു ഉൽപ്പന്നം ബണ്ടിൽ പാടില്ല. ഇനം നീക്കംചെയ്യുക `{0}` സംരക്ഷിക്കാനുമാവും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ബാങ്കിംഗ്
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ഷെഡ്യൂൾ ലഭിക്കുന്നതിന് &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,പുതിയ ചെലവ് കേന്ദ്രം
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",തരം &quot;നികുതി&quot; എന്ന) ചൈൽഡ് ചേർക്കുക ക്ലിക്കുചെയ്ത് ഉചിതമായ ഗ്രൂപ്പ് (സാധാരണയായി ഫണ്ട്&gt; നിലവിലെ ബാധ്യതകൾ&gt; നികുതികളും കടമകൾ ഉറവിടം ലേക്ക് പോയി ഒരു പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക (നികുതി നിരക്ക് പരാമർശിക്കുക ചെയ്യാൻ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,പുതിയ ചെലവ് കേന്ദ്രം
 DocType: Bin,Ordered Quantity,ഉത്തരവിട്ടു ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",ഉദാ: &quot;നിർമ്മാതാക്കളുടേയും ഉപകരണങ്ങൾ നിർമ്മിക്കുക&quot;
 DocType: Quality Inspection,In Process,പ്രക്രിയയിൽ
@@ -1670,10 +1716,11 @@
 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,സ്വീകാ അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
 DocType: Quotation Item,Stock Balance,ഓഹരി ബാലൻസ്
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,സമയം ലോഗുകൾ സൃഷ്ടിച്ചത്:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,സമയം ലോഗുകൾ സൃഷ്ടിച്ചത്:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Item,Weight UOM,ഭാരോദ്വഹനം UOM
 DocType: Employee,Blood Group,രക്ത ഗ്രൂപ്പ്
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 DocType: Offer Letter Term,Offer Term,ആഫര് ടേം
 DocType: Quality Inspection,Quality Manager,ക്വാളിറ്റി മാനേജർ
 DocType: Job Applicant,Job Opening,ഇയ്യോബ് തുറക്കുന്നു
 DocType: Payment Reconciliation,Payment Reconciliation,പേയ്മെന്റ് അനുരഞ്ജനം
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Incharge വ്യക്തിയുടെ പേര് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Incharge വ്യക്തിയുടെ പേര് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ടെക്നോളജി
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ഓഫർ ലെറ്ററിന്റെ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ (എംആർപി) നിർമ്മാണവും ഉത്തരവുകൾ ജനറേറ്റുചെയ്യുക.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
 DocType: Production Order Operation,Completed Qty,പൂർത്തിയാക്കി Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.,ഇനം {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 +123,Create Payment Entries against Orders or Invoices.,ഉത്തരവുകൾ അല്ലെങ്കിൽ ഇൻവോയിസുകൾ നേരെ പേയ്മെന്റ് എൻട്രികൾ സൃഷ്ടിക്കുക.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ഉത്തരവുകൾ അല്ലെങ്കിൽ ഇൻവോയിസുകൾ നേരെ പേയ്മെന്റ് എൻട്രികൾ സൃഷ്ടിക്കുക.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,പുതിയ വിലാസം
 DocType: Quality Inspection,Sample Size,സാമ്പിളിന്റെവലിപ്പം
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,ഉപയോക്താക്കൾ അനുമതികളും
@@ -1729,10 +1776,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
 DocType: Leave Block List Date,Block Date,ബ്ലോക്ക് തീയതി
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
 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."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,തൊഴിൽ വിശദാംശങ്ങൾ
 DocType: Employee,New Workplace,പുതിയ ജോലിസ്ഥലം
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,അടഞ്ഞ സജ്ജമാക്കുക
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},ബാർകോഡ് {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},ബാർകോഡ് {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
 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,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},ഇനം {0} {1} ഒരു സെയിൽസ് ഇനം ആയിരിക്കണം
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,ശമ്പളം ജി സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ഫണ്ട് സ്രോതസ്സ് (ബാധ്യതകളും)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,ജീവനക്കാരുടെ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,നിന്നും ഇറക്കുമതി ഇമെയിൽ
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,ഉപയോക്താവ് ആയി ക്ഷണിക്കുക
 DocType: Features Setup,After Sale Installations,വില്പനയ്ക്ക് ഇൻസ്റ്റലേഷനുകൾ ശേഷം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},ദയവായി {0} സെറ്റ് കമ്പനി {1} ൽ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
 DocType: Workstation Working Hour,End Time,അവസാനിക്കുന്ന സമയം
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,സെയിൽസ് വാങ്ങാനും സ്റ്റാൻഡേർഡ് കരാർ നിബന്ധനകൾ.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ Purchse ഓർഡർ നമ്പർ
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ Purchse ഓർഡർ നമ്പർ
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ഫാർമസ്യൂട്ടിക്കൽ
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,തീയതി ആരംഭിക്കുന്ന ഹാജർ
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Gateway Account,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},അസാധുവായ റഫറൻസ് {0} {1}
 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}) വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) പ്രൊഡക്ഷൻ ഓർഡർ {3} ആസൂത്രണം quanitity ({2}) വലുതായിരിക്കും കഴിയില്ല
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Newsletter,Test,ടെസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ഇനങ്ങളുടെ വേണ്ടി അപേക്ഷ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ഓരോ നല്ല ഇനത്തിനും തീർന്നശേഷം പ്രത്യേക ഉത്പാദനം ഓർഡർ സൃഷ്ടിക്കപ്പെടും.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,വാർത്താക്കുറിപ്പ് മെയിലിംഗ് ലിസ്റ്റ്
 DocType: Delivery Note,Transporter Name,ട്രാൻസ്പോർട്ടർ പേര്
 DocType: Authorization Rule,Authorized Value,അംഗീകൃത മൂല്യം
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} അടച്ചു
 DocType: Email Digest,How frequently?,എത്ര ഇടവേളകളിലാണ്?
 DocType: Purchase Receipt,Get Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക് നേടുക
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",കുട്ടികളുടെ ചേർക്കുക ക്ലിക്കുചെയ്ത്) തരം ഉചിതമായ ഗ്രൂപ്പ് (ഫണ്ട് സാധാരണയായി അപ്ലിക്കേഷൻ&gt; നിലവിലെ ആസ്തി&gt; ബാങ്ക് അക്കൗണ്ടുകൾ ലേക്ക് പോയി ഒരു പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കാൻ ( &quot;ബാങ്ക്&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,വസ്തുക്കളുടെ ബിൽ ട്രീ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,മർക്കോസ് നിലവിലുള്ളജാലകങ്ങള്
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},മെയിൻറനൻസ് ആരംഭ തീയതി സീരിയൽ ഇല്ല {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,ഉദ്ദേശ്യം
+DocType: Company,Fixed Asset Depreciation Settings,ഫിക്സ്ഡ് അസറ്റ് മൂല്യത്തകർച്ച ക്രമീകരണങ്ങൾ
 DocType: Item,Will also apply for variants unless overrridden,കൂടാതെ overrridden അവയൊഴിച്ച് മോഡലുകൾക്കാണ് ബാധകമാകും
 DocType: Purchase Invoice,Advances,അഡ്വാൻസുകളും
 DocType: Production Order,Manufacture against Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നേരെ ഉല്പാദനം
@@ -1884,6 +1933,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,ചൈൽഡ് നോഡ് ഉണ്ട്
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
+DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
 DocType: Tax Rule,Billing City,ബില്ലിംഗ് സിറ്റി
 DocType: Global Defaults,Hide Currency Symbol,കറൻസി ചിഹ്നം മറയ്ക്കുക
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ഉദാ ബാങ്ക്, ക്യാഷ്, ക്രെഡിറ്റ് കാർഡ്"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ഉദാ ബാങ്ക്, ക്യാഷ്, ക്രെഡിറ്റ് കാർഡ്"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",കുട്ടികളുടെ ചേർക്കുക ക്ലിക്കുചെയ്ത്) തരം ഉചിതമായ ഗ്രൂപ്പ് (ഫണ്ട് സാധാരണയായി അപ്ലിക്കേഷൻ&gt; നിലവിലെ ആസ്തി&gt; ബാങ്ക് അക്കൗണ്ടുകൾ ലേക്ക് പോയി ഒരു പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കാൻ ( &quot;ബാങ്ക്&quot;
 DocType: Journal Entry,Credit Note,ക്രെഡിറ്റ് കുറിപ്പ്
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},പൂർത്തിയാക്കി Qty {1} ഓപ്പറേഷൻ വേണ്ടി {0} കൂടുതലായി കഴിയില്ല
 DocType: Features Setup,Quality,ക്വാളിറ്റി
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,എന്റെ വിലാസങ്ങൾ
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,അഥവാ
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,സ്ഥിരസ്ഥിതി വാങ്ങൽ വില പട്ടിക
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡങ്ങൾ OR ശമ്പളം സ്ലിപ്പ് വേണ്ടി ഒരു ജീവനക്കാരനും ഇതിനകം സൃഷ്ടിച്ചു
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 ,To Produce,ഉത്പാദിപ്പിക്കാൻ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ശന്വളപ്പട്ടിക
 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} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,രസീത് ഇനങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,യഥേഷ്ടമാക്കുക ഫോമുകൾ
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"സഹജമായ വിലാസം ഫലകം കണ്ടെത്തി. സജ്ജീകരണം&gt; അച്ചടി, ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക."
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,കീ ഉത്തരവാദിത്വം ഏരിയ
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,കസ്റ്റമർ ഗ്രൂപ്പ് ട്രീ നിയന്ത്രിക്കുക.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
 DocType: Leave Control Panel,Leave Control Panel,നിയന്ത്രണ പാനൽ വിടുക
 DocType: Appraisal,HR User,എച്ച് ഉപയോക്താവ്
 DocType: Purchase Invoice,Taxes and Charges Deducted,നികുതി ചാർജുകളും വെട്ടിക്കുറയ്ക്കും
-apps/erpnext/erpnext/config/support.py +7,Issues,പ്രശ്നങ്ങൾ
+apps/erpnext/erpnext/hooks.py +90,Issues,പ്രശ്നങ്ങൾ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},നില {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Sales Invoice,Debit To,ഡെബിറ്റ് ചെയ്യുക
 DocType: Delivery Note,Required only for sample item.,മാത്രം സാമ്പിൾ ഇനത്തിന്റെ ആവശ്യമാണ്.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
 ,Pending SO Items For Purchase Request,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,അതിബൃഹത്തായ
 ,Profit and Loss Statement,അറ്റാദായം നഷ്ടവും സ്റ്റേറ്റ്മെന്റ്
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
 DocType: Stock Settings,Default Valuation Method,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
 DocType: Production Order Operation,Planned Start Time,ആസൂത്രണം ചെയ്ത ആരംഭിക്കുക സമയം
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,ബാലൻസ് ഷീറ്റും പുസ്തകം പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം അടയ്ക്കുക.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,ബാലൻസ് ഷീറ്റും പുസ്തകം പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം അടയ്ക്കുക.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,മറ്റൊരു ഒരേ കറൻസി പരിവർത്തനം ചെയ്യാൻ വിനിമയ നിരക്ക് വ്യക്തമാക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,ക്വട്ടേഷൻ {0} റദ്ദാക്കി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,മൊത്തം തുക
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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} ഏതെങ്കിലും ലഭ്യമായ പ്രവ്യത്തി അധികം, ഒന്നിലധികം ഓപ്പറേഷൻസ് കടന്നു ഓപ്പറേഷൻ ഇടിച്ചു"
 ,Requested,അഭ്യർത്ഥിച്ചു
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,ഇല്ല അഭിപ്രായപ്രകടനം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,സെയിൽസ് ആൻഡ് വാങ്ങൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Supplier Quotation Item,Material Request No,മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ഉപഭോക്താവിന്റെ കറൻസി കമ്പനിയുടെ അടിത്തറ കറൻസി മാറ്റുമ്പോൾ തോത്
@@ -2119,7 +2174,7 @@
 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,സെയിൽസ് ടീം 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
 DocType: Payment Request,Recipient and Message,സ്വീകർത്താവ് ആൻഡ് സന്ദേശം
 DocType: Purchase Invoice,Apply Additional Discount On,പ്രയോഗിക്കുക അധിക ഡിസ്കൌണ്ട്
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 DocType: Payment Request,Mute Email,നിശബ്ദമാക്കുക ഇമെയിൽ
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,ഉദ്ധരണി അഭ്യർത്ഥന.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;ഓഹരി ഇനം ആകുന്നു &#39;എവിടെ ഇനം തിരഞ്ഞെടുക്കുക&quot; ഇല്ല &quot;ആണ്&quot; സെയിൽസ് ഇനം തന്നെയല്ലേ &quot;&quot; അതെ &quot;ആണ് മറ്റൊരു പ്രൊഡക്ട് ബണ്ടിൽ ഇല്ല ദയവായി
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,സമമായി മാസം ഉടനീളമുള്ള ലക്ഷ്യങ്ങളിലൊന്നാണ് വിതരണം ചെയ്യാൻ പ്രതിമാസ വിതരണം തിരഞ്ഞെടുക്കുക.
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,പ്രോജക്ട് ആരംഭ തീയതി
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,ഡോക്യുമെന്റ് പോസ്റ്റ് എഗെൻസ്റ്റ്
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,സെയിൽസ് പങ്കാളികൾ നിയന്ത്രിക്കുക.
 DocType: Quality Inspection,Inspection Type,ഇൻസ്പെക്ഷൻ തരം
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},{0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0} തിരഞ്ഞെടുക്കുക
 DocType: C-Form,C-Form No,സി-ഫോം ഇല്ല
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,അടയാളപ്പെടുത്താത്ത ഹാജർ
@@ -2183,6 +2239,7 @@
 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,പരസ്യം
+DocType: Asset Category Account,Depreciation Expense Account,മൂല്യത്തകർച്ച ചിലവേറിയ
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,സ്ഥിരീകരിച്ച
 DocType: Payment Gateway,Gateway,ഗേറ്റ്വേ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,ശാരീരിക
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,ശാരീരിക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,സമർപ്പിച്ച കഴിയും &#39;അംഗീകരിച്ചു&#39; നില ആപ്ലിക്കേഷൻസ് മാത്രം വിടുക
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,വിലാസം ശീർഷകം നിർബന്ധമാണ്.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,അന്വേഷണത്തിന് സ്രോതസ് പ്രചാരണം എങ്കിൽ പ്രചാരണത്തിന്റെ പേര് നൽകുക
@@ -2210,18 +2267,19 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,അംഗീകരിച്ച വെയർഹൗസ്
 DocType: Bank Reconciliation Detail,Posting Date,പോസ്റ്റിംഗ് തീയതി
 DocType: Item,Valuation Method,മൂലധനം രീതിയുടെ
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} {1} വേണ്ടി വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} {1} വേണ്ടി വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,മാർക് ഹാഫ് ഡേ
 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 +410,[Error],[പിശക്]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),(ദിവസങ്ങളിൽ) അനുവദിച്ചതായും പുതിയ ഇലകൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,സീരിയൽ ഇല്ല {0} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
 DocType: Sales Invoice Item,Customer Warehouse (Optional),കസ്റ്റമർ വെയർഹൗസ് (ഓപ്ഷണൽ)
 DocType: Pricing Rule,Discount Percentage,കിഴിവും ശതമാനം
 DocType: Payment Reconciliation Invoice,Invoice Number,ഇൻവോയിസ് നമ്പർ
@@ -2247,14 +2305,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,നിബന്ധനകളോ കരാറിലെ ഫലകം.
 DocType: Purchase Invoice,Address and Contact,വിശദാംശവും ബന്ധപ്പെടാനുള്ള
 DocType: Supplier,Last Day of the Next Month,അടുത്തത് മാസത്തിലെ അവസാന ദിവസം
 DocType: Employee,Feedback,പ്രതികരണം
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് വിഹിതം കഴിയില്ല"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
+DocType: Asset,Expected Value After Useful Life,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം
 DocType: Item,Reorder level based on Warehouse,വെയർഹൗസ് അടിസ്ഥാനമാക്കിയുള്ള പുനഃക്രമീകരിക്കുക തലത്തിൽ
 DocType: Activity Cost,Billing Rate,ബില്ലിംഗ് റേറ്റ്
 ,Qty to Deliver,വിടുവിപ്പാൻ Qty
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} റദ്ദാക്കി അല്ലെങ്കിൽ അടച്ച
 DocType: Delivery Note,Track this Delivery Note against any Project,ഏതെങ്കിലും പ്രോജക്ട് നേരെ ഈ ഡെലിവറി നോട്ട് ട്രാക്ക്
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,മുടക്കുന്ന നിന്നും നെറ്റ് ക്യാഷ്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,റൂട്ട് അക്കൌണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
 ,Is Primary Address,പ്രാഥമിക വിലാസം
 DocType: Production Order,Work-in-Progress Warehouse,പ്രവർത്തിക്കുക-ഇൻ-പ്രോഗ്രസ് വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,അസറ്റ് {0} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,വിലാസങ്ങൾ നിയന്ത്രിക്കുക
-DocType: Pricing Rule,Item Code,ഇനം കോഡ്
+DocType: Asset,Item Code,ഇനം കോഡ്
 DocType: Production Planning Tool,Create Production Orders,പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിവരങ്ങൾ
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ സൃഷ്ടിക്കുക
 DocType: Employee Education,School/University,സ്കൂൾ / യൂണിവേഴ്സിറ്റി
 DocType: Payment Request,Reference Details,റഫറൻസ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
 DocType: Sales Invoice Item,Available Qty at Warehouse,സംഭരണശാല ലഭ്യമാണ് Qty
 ,Billed Amount,ഈടാക്കൂ തുക
+DocType: Asset,Double Declining Balance,ഇരട്ട കുറയുന്ന
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,അടച്ച ഓർഡർ റദ്ദാക്കാൻ സാധിക്കില്ല. റദ്ദാക്കാൻ Unclose.
 DocType: Bank Reconciliation,Bank Reconciliation,ബാങ്ക് അനുരഞ്ജനം
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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; ശേഷം ആയിരിക്കണം
+DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച്
 DocType: Warranty Claim,From Company,കമ്പനി നിന്നും
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,മൂല്യം അഥവാ Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,മിനിറ്റ്
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
 ,Qty to Receive,സ്വീകരിക്കാൻ Qty
 DocType: Leave Block List,Leave Block List Allowed,ബ്ലോക്ക് പട്ടിക അനുവദനീയം വിടുക
 DocType: Sales Partner,Retailer,ഫേയ്സ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
 DocType: Global Defaults,Disable In Words,വാക്കുകളിൽ പ്രവർത്തനരഹിതമാക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,ബാങ്ക് ഓവർഡ്രാഫ്റ്റിലായില്ല അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,അടച്ച് വായ്പകൾ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},അസറ്റ് വർഗ്ഗം {0} അല്ലെങ്കിൽ കമ്പനി {1} ൽ മൂല്യത്തകർച്ച ബന്ധപ്പെട്ട അക്കൗണ്ടുകൾ സജ്ജമാക്കുക
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},വിതരണക്കമ്പനിയായ {0} അയച്ച ഇമെയിൽ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,അധികാരങ്ങളും നല്കുകയും
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
@@ -2344,7 +2410,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,സന്ദേശം അയച്ചു
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,ആകെ മാർജിൻ
 DocType: Supplier,Supplier Details,വിതരണക്കാരൻ വിശദാംശങ്ങൾ
 DocType: Expense Claim,Approval Status,അംഗീകാരം അവസ്ഥ
 DocType: Hub Settings,Publish Items to Hub,ഹബ് വരെ ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,കസ്റ്റമർ ഗ്രൂപ്പ് / കസ്റ്റമർ
 DocType: Payment Gateway Account,Default Payment Request Message,കാശടയ്ക്കല് അഭ്യർത്ഥന സന്ദേശം
 DocType: Item Group,Check this if you want to show in website,നിങ്ങൾ വെബ്സൈറ്റിൽ കാണണമെങ്കിൽ ഈ പരിശോധിക്കുക
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,ബാങ്കിംഗ് പേയ്മെന്റുകൾ
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,ബാങ്കിംഗ് പേയ്മെന്റുകൾ
 ,Welcome to ERPNext,ERPNext സ്വാഗതം
 DocType: Payment Reconciliation Payment,Voucher Detail Number,സാക്ഷപ്പെടുത്തല് വിശദാംശം നമ്പർ
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,ക്വട്ടേഷൻ ഇടയാക്കും
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,ഇലകളും ഹോളിഡേ
 DocType: Sales Order,Not Billed,ഈടാക്കൂ ഒരിക്കലും പാടില്ല
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,രണ്ടും വെയർഹൗസ് ഒരേ കമ്പനി സ്വന്തമായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,ബില്ലിംഗ് വേണ്ടി ബാച്ചുചെയ്ത
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,ജേണൽ എൻട്രി അക്കൗണ്ട്
 DocType: Shopping Cart Settings,Quotation Series,ക്വട്ടേഷൻ സീരീസ്
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
+DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,അസറ്റ് {0} എന്ന വാങ്ങിയ തിയതി വാങ്ങൽ ഇൻവോയ്സ് തീയതി കൂടെ പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,വെയർഹൗസ് {0}: കമ്പനി നിർബന്ധമാണ്
 ,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} വേണ്ടി കറൻസി എക്സ്ചേഞ്ച് നിരക്കുകൾ കാണാതായ
 DocType: Journal Entry,Stock Entry,ഓഹരി എൻട്രി
 DocType: Account,Payable,അടയ്ക്കേണ്ട
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),കടക്കാർ ({0})
-DocType: Project,Margin,മാർജിൻ
+DocType: Pricing Rule,Margin,മാർജിൻ
 DocType: Salary Slip,Arrear Amount,കുടിശിക തുക
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,പുതിയ ഉപഭോക്താക്കളെ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,മൊത്തം ലാഭം %
@@ -2435,20 +2504,23 @@
 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,നിങ്ങൾ ശമ്പളം സ്ലിപ്പ് സമർപ്പിക്കുമ്പോൾ ഓരോ ജീവനക്കാർക്ക് മെയിലിൽ ശമ്പള സ്ലിപ്പ് അയയ്ക്കാൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ പരിശോധിക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
 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 +57,Where manufacturing operations are carried.,എവിടെ നിർമാണ ഓപ്പറേഷനുകൾ നടപ്പിലാക്കുന്നത്.
 DocType: Stock Entry Detail,Source Warehouse,ഉറവിട വെയർഹൗസ്
 DocType: Installation Note,Installation Date,ഇന്സ്റ്റലേഷന് തീയതി
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
 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,കുറഞ്ഞത് Qty മാക്സ് Qty വലുതായിരിക്കും കഴിയില്ല
+DocType: Account,Accumulated Depreciation,മൊത്ത വിലയിടിവ്
 DocType: Stock Entry,Customer or Supplier Details,കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ വിവരങ്ങൾ
 DocType: Payment Request,Email To,ഇമെയിൽ ചെയ്യുക
 DocType: Lead,Lead Owner,ലീഡ് ഉടമ
 DocType: Bin,Requested Quantity,അഭ്യർത്ഥിച്ചു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,വെയർഹൗസ് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,വെയർഹൗസ് ആവശ്യമാണ്
 DocType: Employee,Marital Status,വൈവാഹിക നില
 DocType: Stock Settings,Auto Material Request,ഓട്ടോ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Time Log,Will be updated when billed.,ഈടാക്കും വരുമ്പോൾ അപ്ഡേറ്റ് ചെയ്യും.
@@ -2456,11 +2528,12 @@
 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 +115,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 +84,{0}% Delivered,കൈമാറി {0}%
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,ഒരേ വിതരണക്കമ്പനിയായ ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,വാങ്ങൽ ഓർഡർ ഇനം നൽകിയത്
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,കമ്പനിയുടെ പേര് കമ്പനി ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി കത്ത് മേധാവികൾ.
@@ -2470,13 +2543,14 @@
 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: Payment Request,Payment Details,പേയ്മെന്റ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM റേറ്റ്
+DocType: Asset,Journal Entry for Scrap,സ്ക്രാപ്പ് ജേണൽ എൻട്രി
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ഡെലിവറി നോട്ട് നിന്നുള്ള ഇനങ്ങൾ pull ദയവായി
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,എൻട്രികൾ {0} അൺ-ലിങ്ക്ഡ് ചെയ്യുന്നു
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","തരം ഇമെയിൽ എല്ലാ ആശയവിനിമയ റെക്കോർഡ്, ഫോൺ, ചാറ്റ്, സന്ദർശനം തുടങ്ങിയവ"
 DocType: Manufacturer,Manufacturers used in Items,ഇനങ്ങൾ ഉപയോഗിക്കുന്ന മാനുഫാക്ചറേഴ്സ്
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,കമ്പനിയിൽ റൌണ്ട് ഓഫാക്കുക സൂചിപ്പിക്കുക കോസ്റ്റ് കേന്ദ്രം
 DocType: Purchase Invoice,Terms,നിബന്ധനകൾ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,പുതിയ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,പുതിയ സൃഷ്ടിക്കുക
 DocType: Buying Settings,Purchase Order Required,ഓർഡർ ആവശ്യമുണ്ട് വാങ്ങുക
 ,Item-wise Sales History,ഇനം തിരിച്ചുള്ള സെയിൽസ് ചരിത്രം
 DocType: Expense Claim,Total Sanctioned Amount,ആകെ അനുവദിക്കപ്പെട്ട തുക
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,ഓഹരി ലെഡ്ജർ
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},നിരക്ക്: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ശമ്പളം ജി കിഴിച്ചുകൊണ്ടു
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,ആദ്യം ഒരു ഗ്രൂപ്പ് നോഡ് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,ആദ്യം ഒരു ഗ്രൂപ്പ് നോഡ് തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ജീവനക്കാർ എന്നാല് ബി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},ഉദ്ദേശ്യം {0} ഒന്നാണ് ആയിരിക്കണം
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","അതു നിങ്ങളുടെ കമ്പനി വിലാസം പോലെ, ഉപഭോക്താവ്, വിതരണക്കാരൻ, വിൽപ്പന പങ്കാളി കാരീയം പരിഗണനാവിഷയങ്ങൾ നീക്കംചെയ്യുക"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} നിന്ന്
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,പുതിയ അക്കൗണ്ട് പേര്. കുറിപ്പ്: ഉപയോക്താക്കൾക്ക് വിതരണക്കാർക്കും അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാൻ ദയവായി
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,പുതിയ അക്കൗണ്ട് പേര്. കുറിപ്പ്: ഉപയോക്താക്കൾക്ക് വിതരണക്കാർക്കും അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാൻ ദയവായി
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ടൂൾ മാറ്റിസ്ഥാപിക്കുക
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,രാജ്യം ജ്ഞാനികൾ സഹജമായ വിലാസം ഫലകങ്ങൾ
 DocType: Sales Order Item,Supplier delivers to Customer,വിതരണക്കമ്പനിയായ ഉപയോക്താക്കൾക്കായി വിടുവിക്കുന്നു
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,അടുത്ത തീയതി തീയതി നോട്സ് വലുതായിരിക്കണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ഫോം / ഇനം / {0}) സ്റ്റോക്കില്ല
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,അടുത്ത തീയതി തീയതി നോട്സ് വലുതായിരിക്കണം
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/accounts/party.py +289,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; പ്രാപ്തമാക്കുന്നു
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ഇൻവോയിസ് പ്രസിദ്ധീകരിക്കൽ തീയതി
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി&#39; നൽകുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,തുക + തുക ആകെ മൊത്തം വലുതായിരിക്കും കഴിയില്ല ഓഫാക്കുക എഴുതുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} ഇനം {1} ഒരു സാധുവായ ബാച്ച് നമ്പർ അല്ല
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","കുറിപ്പ്: പേയ്മെന്റ് ഏതെങ്കിലും റഫറൻസ് നേരെ ഉണ്ടാക്കിയ എങ്കിൽ, മാനുവലായി ജേർണൽ എൻട്രി ഉണ്ടാക്കുക."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,ലഭ്യത പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,ജനന തീയതി ഇന്ന് വലുതായിരിക്കും കഴിയില്ല.
 ,Stock Ageing,സ്റ്റോക്ക് എയ്ജിങ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,കസ്റ്റമർ കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,ഫലകം
 DocType: Sales Person,Sales Person Name,സെയിൽസ് വ്യക്തി നാമം
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
+DocType: Asset Category Account,Fixed Asset Account,ഫിക്സ്ഡ് അസറ്റ് അക്കൗണ്ട്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് പേയ്മെന്റ് എൻട്രി നടത്തുന്നതിനുള്ള നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,തടവുകാരി
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,BOM നിന്നും
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,അടിസ്ഥാന
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} ഫ്രീസുചെയ്തിരിക്കുമ്പോൾ സ്റ്റോക്ക് ഇടപാടുകൾ മുമ്പ്
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,തീയതി പകുതി ഡേ അനുവാദം തീയതി മുതൽ അതേ വേണം
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","ഉദാ കിലോ, യൂണിറ്റ്, ഒഴിവ്, മീറ്റർ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,ശമ്പളം ഘടന
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
 DocType: Employee,Offer Date,ആഫര് തീയതി
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ഉദ്ധരണികളും
 DocType: Hub Settings,Access Token,അക്സസ് ടോക്കൺ
 DocType: Sales Invoice Item,Serial No,സീരിയൽ ഇല്ല
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
-DocType: Item,Is Fixed Asset Item,സ്ഥിര അസറ്റ് ഇനമാണെന്ന്
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
 DocType: Purchase Invoice,Print Language,പ്രിന്റ് ഭാഷ
 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","നീണ്ട പ്രിന്റ് ഫോർമാറ്റുകൾ ഉണ്ടെങ്കിൽ, ഈ സവിശേഷത ഓരോ പേജിലെ എല്ലാ തലക്കെട്ടുകൾ പാദലേഖങ്ങളും ഒന്നിലധികം പേജുകളിൽ മുദ്രണത്തിനായി പേജ് പിളരുകയും ഉപയോഗിയ്ക്കാം"
+DocType: Asset,Number of Depreciations,Depreciations എണ്ണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,എല്ലാ പ്രദേശങ്ങളും
 DocType: Purchase Invoice,Items,ഇനങ്ങൾ
 DocType: Fiscal Year,Year Name,വർഷം പേര്
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
 DocType: Product Bundle Item,Product Bundle Item,ഉൽപ്പന്ന ബണ്ടിൽ ഇനം
 DocType: Sales Partner,Sales Partner Name,സെയിൽസ് പങ്കാളി പേര്
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
 DocType: Payment Reconciliation,Maximum Invoice Amount,പരമാവധി ഇൻവോയിസ് തുക
 DocType: Purchase Invoice Item,Image View,ചിത്രം കാണുക
 apps/erpnext/erpnext/config/selling.py +23,Customers,ഇടപാടുകാർ
+DocType: Asset,Partially Depreciated,ഭാഗികമായി മൂല്യത്തകർച്ചയുണ്ടായ
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,നിന്ന് ആവശ്യമായ തീയതികൾ ചെയ്യുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
 DocType: Purchase Taxes and Charges,Valuation and Total,"മൂലധനം, മൊത്ത"
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,മെയിൻറനൻസ് മാനേജർ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,ആകെ പൂജ്യമാകരുത്
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"വലിയവനോ പൂജ്യത്തിന് സമാനമോ ആയിരിക്കണം &#39;കഴിഞ്ഞ ഓർഡർ മുതൽ, ഡെയ്സ്&#39;"
-DocType: C-Form,Amended From,നിന്ന് ഭേദഗതി
+DocType: Asset,Amended From,നിന്ന് ഭേദഗതി
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,ശിശു അക്കൌണ്ട് ഈ അക്കൗണ്ടിന് നിലവിലുണ്ട്. നിങ്ങൾ ഈ അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,മുന്നോട്ട് കൊണ്ടുപോകും
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,&#39;അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്&#39; സൂചിപ്പിക്കുക കമ്പനിയിൽ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},സീരിയൽ ഇനം {0} വേണ്ടി സീരിയൽ ഒഴിവ് ആവശ്യമുണ്ട്
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,ഇൻവോയിസുകൾ കളിയിൽ പേയ്മെന്റുകൾ
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,ഇൻവോയിസുകൾ കളിയിൽ പേയ്മെന്റുകൾ
 DocType: Journal Entry,Bank Entry,ബാങ്ക് എൻട്രി
 DocType: Authorization Rule,Applicable To (Designation),(തസ്തിക) ബാധകമായ
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,കാർട്ടിലേക്ക് ചേർക്കുക
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ഗ്രൂപ്പ്
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,പ്രാപ്തമാക്കുക / കറൻസിയുടെ അപ്രാപ്തമാക്കാൻ.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,പ്രാപ്തമാക്കുക / കറൻസിയുടെ അപ്രാപ്തമാക്കാൻ.
 DocType: Production Planning Tool,Get Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നേടുക
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,തപാൽ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,തപാൽ ചെലവുകൾ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ആകെ (ശാരീരിക)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,വിനോദം &amp; ഒഴിവുസമയ
 DocType: Quality Inspection,Item Serial No,ഇനം സീരിയൽ പോസ്റ്റ്
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} കുറച്ചു വേണം അല്ലെങ്കിൽ നിങ്ങൾ ഓവർഫ്ലോ ടോളറൻസ് വർദ്ധിപ്പിക്കാൻ വേണം
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,അന്ത്യസമയം
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജന ഉപയോഗിച്ച് \ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
@@ -2687,15 +2766,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ആരംഭ പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് (POS)
 apps/erpnext/erpnext/config/support.py +32,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 യൂണിറ്റ് ഉത്തരവിട്ടു ഉണ്ടെങ്കിൽ. ഒപ്പം നിങ്ങളുടെ അലവൻസ് നിങ്ങളെ 110 യൂണിറ്റുകൾ സ്വീകരിക്കാൻ അനുവദിച്ചിരിക്കുന്ന പിന്നീട് 10% ആണ്.
 DocType: Pricing Rule,Customer Group,കസ്റ്റമർ ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: Item,Website Description,വെബ്സൈറ്റ് വിവരണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
@@ -2703,12 +2783,13 @@
 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,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
 DocType: GL Entry,Against Voucher Type,വൗച്ചർ തരം എഗെൻസ്റ്റ്
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},പിശക്: {0}&gt; {1}
 DocType: Item,Attributes,വിശേഷണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
 DocType: C-Form,C-Form,സി-ഫോം
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,മൊബൈൽ ഇല്ല
 DocType: Payment Tool,Make Journal Entry,ജേർണൽ എൻട്രി നിർമ്മിക്കുക
 DocType: Leave Allocation,New Leaves Allocated,അലോക്കേറ്റഡ് പുതിയ ഇലകൾ
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,ആവശ്യത്തിന്
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},പിശക്: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,പാരന്റ് ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം പാടില്ല
 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 +52,All Products or Services.,എല്ലാ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ.
 DocType: Supplier Quotation,Supplier Address,വിതരണക്കാരൻ വിലാസം
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty ഔട്ട്
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,ഒരു വില്പനയ്ക്ക് ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ നിയമങ്ങൾ
+apps/erpnext/erpnext/config/accounts.py +259,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,സാമ്പത്തിക സേവനങ്ങൾ
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ആട്രിബ്യൂട്ടിനായുള്ള മൂല്യം {0} {1} {3} ഇൻക്രിമെന്റുകളിൽ {2} വരെ വരെയാണ് ഉള്ളിൽ ആയിരിക്കണം
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,കോടിയുടെ
 DocType: Customer,Default Receivable Accounts,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ടുകൾ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
 DocType: Journal Entry,Pay To / Recd From,നിന്നും / Recd നൽകാൻ
 DocType: Naming Series,Setup Series,സെറ്റപ്പ് സീരീസ്
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,അഭിപ്രായപ്രകടനം
 DocType: Purchase Order Item Supplied,Raw Material Item Code,അസംസ്കൃത വസ്തുക്കളുടെ ഇനം കോഡ്
 DocType: Journal Entry,Write Off Based On,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
 DocType: Features Setup,POS View,POS കാണുക
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,ഒരു സീരിയൽ നമ്പർ ഇന്സ്റ്റലേഷന് റെക്കോർഡ്
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,മാസം അടുത്ത ദിവസം തിയതി ദിവസം ആവർത്തിക്കുക തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,മാസം അടുത്ത ദിവസം തിയതി ദിവസം ആവർത്തിക്കുക തുല്യമായിരിക്കണം
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ഒരു വ്യക്തമാക്കുക
 DocType: Offer Letter,Awaiting Response,കാത്തിരിക്കുന്നു പ്രതികരണത്തിന്റെ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,മുകളിൽ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,സമയം ലോഗ് ഈടാക്കൂ ചെയ്തു
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 DocType: Salary Slip,Earning & Deduction,സമ്പാദിക്കാനുള്ള &amp; കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,അക്കൗണ്ട് {0} ഒരു ഗ്രൂപ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ഓപ്ഷണൽ. ഈ ക്രമീകരണം വിവിധ വ്യവഹാരങ്ങളിൽ ഫിൽട്ടർ ഉപയോഗിക്കും.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),താൽക്കാലികഫാ ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},{1} കമ്പനി {0} സ്വതവേയുള്ള മൂല്യം സജ്ജീകരിക്കുക
@@ -2788,12 +2871,13 @@
 ,Monthly Attendance Sheet,പ്രതിമാസ ഹാജർ ഷീറ്റ്
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,റെക്കോർഡ് കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+DocType: Asset,Straight Line,വര
+DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,നൽകുക അതെ അല്ലെങ്കിൽ അല്ല ആയി &#39;Subcontracted മാത്രമാവില്ലല്ലോ&#39;
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,എൻട്രി തുറക്കുന്നു അനുവദനീയമല്ല &#39;പ്രോഫിറ്റ് നഷ്ടം ടൈപ്പ് അക്കൗണ്ട് {0}
 DocType: Features Setup,Sales Discounts,സെയിൽസ് ഡിസ്കൗണ്ട്
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ഓർഡർ എണ്ണം
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ഉൽപ്പന്ന പട്ടികയിൽ മുകളിൽ കാണിച്ചുതരുന്ന HTML / ബാനർ.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ വ്യവസ്ഥകൾ വ്യക്തമാക്കുക
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,ശിശു ചേർക്കുക
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,തുറക്കുന്നു മൂല്യം
 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,വിൽപ്പന കമ്മീഷൻ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
 DocType: Offer Letter Term,Value / Description,മൂല്യം / വിവരണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 ,Customers Not Buying Since Long Time,ഇടപാടുകാർ ലോംഗ് സമയം മുതൽ വാങ്ങുന്നതിൽ
 DocType: Production Order,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,വിനോദം ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,വിനോദം ചെലവുകൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,ലീവ് അപേക്ഷകൾ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,നിയമ ചെലവുകൾ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,നിയമ ചെലവുകൾ
 DocType: Sales Invoice,Posting Time,പോസ്റ്റിംഗ് സമയം
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,ടെലിഫോൺ ചെലവുകൾ
 DocType: Sales Partner,Logo,ലോഗോ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,സംരക്ഷിക്കാതെ മുമ്പ് ഒരു പരമ്പര തിരഞ്ഞെടുക്കുന്നതിന് ഉപയോക്താവിനെ നിർബ്ബന്ധമായും ചെയ്യണമെങ്കിൽ ഇത് പരിശോധിക്കുക. നിങ്ങൾ ഈ പരിശോധിക്കുക ആരും സ്വതവേ അവിടെ ആയിരിക്കും.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},സീരിയൽ ഇല്ല {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},സീരിയൽ ഇല്ല {0} ഉപയോഗിച്ച് ഇല്ല ഇനം
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ഓപ്പൺ അറിയിപ്പുകൾ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,നേരിട്ടുള്ള ചെലവുകൾ
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,നേരിട്ടുള്ള ചെലവുകൾ
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;അറിയിപ്പ് \ ഇമെയിൽ വിലാസം&#39; അസാധുവായ ഇമെയിൽ വിലാസമാണ്
 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,യാത്രാ ചെലവ്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,യാത്രാ ചെലവ്
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ബില്ലിംഗ് തുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,ഞങ്ങൾ ഈ ഇനം വിൽക്കാൻ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,വിതരണക്കമ്പനിയായ ഐഡി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
 DocType: Journal Entry,Cash Entry,ക്യാഷ് എൻട്രി
 DocType: Sales Partner,Contact Desc,കോൺടാക്റ്റ് DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","കാഷ്വൽ, രോഗികളെ മുതലായ ഇല തരം"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,ആകെ ഓപ്പറേറ്റിംഗ് ചെലവ്
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,കുറിപ്പ്: ഇനം {0} ഒന്നിലധികം തവണ നൽകി
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,എല്ലാ ബന്ധങ്ങൾ.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,അസറ്റ് {0} എന്ന വിതരണക്കാരൻ വാങ്ങൽ ഇൻവോയ്സ് ലെ വിതരണക്കാരൻ കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 DocType: Newsletter,Test Email Id,ടെസ്റ്റ് ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,അസംസ്കൃത വസ്തുക്കളുടെ പ്രധാന ഇനം അതേ ആകും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,ശമ്പളം ടെംപ്ലേറ്റ് മാസ്റ്റർ.
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
 ,Territory Target Variance Item Group-Wise,ടെറിട്ടറി ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനും
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,തിരഞ്ഞെടുത്ത ബില്ലിംഗ് വിലാസം
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,ബില്ലിംഗ് കറൻസി സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി payble അക്കൗണ്ട് കറൻസി ഒന്നുകിൽ തുല്യമായിരിക്കണം
 DocType: Monthly Distribution Percentage,Percentage Allocation,ശതമാന അലോക്കേഷൻ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,സെക്രട്ടറി
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, വയലിൽ &#39;വാക്കുകളിൽ&#39; ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
@@ -2902,13 +2989,13 @@
 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,കടക്കാരിൽ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,കടക്കാരിൽ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,വരി # {0}: സീരിയൽ ഇല്ല നിർബന്ധമാണ്
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം യുക്തിമാനും നികുതി വിശദാംശം
 ,Item-wise Price List Rate,ഇനം തിരിച്ചുള്ള വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
 DocType: Lead,Add to calendar on this date,ഈ തീയതി കലണ്ടർ ചേർക്കുക
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,വരാനിരിക്കുന്ന
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,അളവു സ്വതവേയുള്ള യൂണിറ്റ് നൽകുക
-DocType: Project,Project Name,പ്രോജക്ട് പേര്
+DocType: Request for Quotation 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,ഇനം ബാച്ച് ഒഴിവ്
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,അവസാന ദിവസം
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,ഓഹരി ഇടപാടുകൾ
 DocType: Employee,Internal Work History,ആന്തരിക വർക്ക് ചരിത്രം
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,സ്വകാര്യ ഓഹരി
 DocType: Maintenance Visit,Customer Feedback,കസ്റ്റമർ ഫീഡ്ബാക്ക്
 DocType: Account,Expense,ചിലവേറിയ
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","അതു നിങ്ങളുടെ കമ്പനി വിലാസം പോലെ കമ്പനി, നിർബന്ധമായും"
 DocType: Item Attribute,From Range,ശ്രേണിയിൽ നിന്നും
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,അത് ഒരു സ്റ്റോക്ക് ഇനവും സ്ഥിതിക്ക് ഇനം {0} അവഗണിച്ച
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,കൂടുതൽ സംസ്കരണം ഈ ഉല്പാദനം ഓർഡർ സമർപ്പിക്കുക.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,കൂടുതൽ സംസ്കരണം ഈ ഉല്പാദനം ഓർഡർ സമർപ്പിക്കുക.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ഒരു പ്രത്യേക ഇടപാടിലും പ്രൈസിങ് .കൂടുതൽ ചെയ്യുന്നതിനായി, ബാധകമായ എല്ലാ വിലനിർണ്ണയത്തിലേക്ക് പ്രവർത്തനരഹിതമാകും വേണം."
 DocType: Company,Domain,ഡൊമൈൻ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ജോലി
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
 DocType: BOM,Materials Required (Exploded),ആവശ്യമായ മെറ്റീരിയൽസ് (പൊട്ടിത്തെറിക്കുന്ന)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ശമ്പള (LWP) ഇല്ലാതെ അവധിക്ക് സമ്പാദിക്കുന്നത് കുറയ്ക്കുക
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,ഡെലിവറി തീയതി
 DocType: Opportunity,Opportunity Date,ഓപ്പർച്യൂനിറ്റി തീയതി
 DocType: Purchase Receipt,Return Against Purchase Receipt,പർച്ചേസ് രസീത് എഗെൻസ്റ്റ് മടങ്ങുക
+DocType: Request for Quotation Item,Request for Quotation Item,ക്വട്ടേഷൻ ഇനം അഭ്യർത്ഥന
 DocType: Purchase Order,To Bill,ബില്ലിന്
 DocType: Material Request,% Ordered,% ക്രമപ്പെടുത്തിയ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. കോളം ശ്യൂന്യമായിടണം
 DocType: Accounts Settings,Accounts Settings,ക്രമീകരണങ്ങൾ അക്കൗണ്ടുകൾ
 DocType: Customer,Sales Partner and Commission,"സെയിൽസ് പങ്കാളി, കമ്മീഷൻ"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},ദയവായി &#39;അസറ്റ് തീർപ്പ് അക്കൗണ്ട്&#39; സജ്ജമാക്കാൻ കമ്പനി {0} ൽ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,താൽക്കാലിക അക്കൗണ്ടുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ബ്ലാക്ക്
 DocType: BOM Explosion Item,BOM Explosion Item,BOM പൊട്ടിത്തെറി ഇനം
 DocType: Account,Auditor,ഓഡിറ്റർ
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,അപ്രാപ്തമാക്കുക
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,അടയ്ക്കാൻ ഇവിടെ ക്ലിക്ക്
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","അത് ഇതിനകം {1} പോലെ അസറ്റ്, {0} ബോംബെടുക്കുന്നവനും കഴിയില്ല"
 DocType: Task,Total Expense Claim (via Expense Claim),(ചിലവിടൽ ക്ലെയിം വഴി) ആകെ ചിലവേറിയ ക്ലെയിം
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ഉപഭോക്തൃ ഐഡി
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,മാർക് േചാദി
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,സമയാസമയങ്ങളിൽ വലുതായിരിക്കണം
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},വെയർഹൗസ് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി {2} ലേക്ക് bolong ഇല്ല
 DocType: BOM,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
 DocType: Account,Asset,അസറ്റ്
 DocType: Project Task,Task ID,ടാസ്ക് ഐഡി
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",ഉദാ: &quot;എം സി&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,വകഭേദങ്ങളും ഇല്ലല്ലോ ഓഹരി ഇനം {0} വേണ്ടി നിലവിലില്ല കഴിയില്ല
 ,Sales Person-wise Transaction Summary,സെയിൽസ് പേഴ്സൺ തിരിച്ചുള്ള ഇടപാട് ചുരുക്കം
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,വെയർഹൗസ് {0} നിലവിലില്ല
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,ക്വാളിറ്റി മാനേജ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
 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,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
@@ -3068,7 +3160,7 @@
 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,അടുത്തത് കോൺടാക്റ്റ്
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,സെറ്റപ്പ് ഗേറ്റ്വേ അക്കൗണ്ടുകൾ.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,സെറ്റപ്പ് ഗേറ്റ്വേ അക്കൗണ്ടുകൾ.
 DocType: Employee,Employment Type,തൊഴിൽ തരം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,നിശ്ചിത ആസ്തികൾ
 ,Cash Flow,ധനപ്രവാഹം
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},{0} # {1} ചേർക്കപ്പട്ടവ ദയവായി
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},{0} # {1} ചേർക്കപ്പട്ടവ ദയവായി
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,ജനറൽ ലെഡ്ജർ പ്രകാരം ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Job Applicant,Applicant Name,അപേക്ഷകന് പേര്
 DocType: Authorization Rule,Customer / Item Name,കസ്റ്റമർ / ഇനം പേര്
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,പരിധി വരെ / നിന്നും വ്യക്തമാക്കുക
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,ഇടപാടുകൾ വിൽക്കുന്ന സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 DocType: BOM Replace Tool,Current BOM,ഇപ്പോഴത്തെ BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,സീരിയൽ ഇല്ല ചേർക്കുക
 apps/erpnext/erpnext/config/support.py +43,Warranty,ഉറപ്പ്
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,പ്രിന്റ് ആൻഡ് സ്റ്റേഷനറി
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ഗ്രൂപ്പ് നോഡ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,പൂർത്തിയായ സാധനങ്ങളുടെ അപ്ഡേറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,പൂർത്തിയായ സാധനങ്ങളുടെ അപ്ഡേറ്റ്
 DocType: Workstation,per hour,മണിക്കൂറിൽ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,പർച്ചേസിംഗ്
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,പണ്ടകശാല (നിരന്തരമുള്ള ഇൻവെന്ററി) വേണ്ടി അക്കൗണ്ട് ഈ അക്കൗണ്ട് കീഴിൽ സൃഷ്ടിക്കപ്പെടും.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 DocType: Company,Distribution,വിതരണം
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,തുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,പ്രോജക്റ്റ് മാനേജർ
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},തീയതി സാമ്പത്തിക വർഷത്തിൽ ആയിരിക്കണം. തീയതി = {0} ചെയ്യുക കരുതുന്നു
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ഇവിടെ നിങ്ങൾ ഉയരം, ഭാരം, അലർജി, മെഡിക്കൽ ആശങ്കകൾ മുതലായവ നിലനിർത്താൻ കഴിയും"
 DocType: Leave Block List,Applies to Company,കമ്പനി പ്രയോഗിക്കുന്നു
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Purchase Invoice,In Words,വാക്കുകളിൽ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
 DocType: Production Planning Tool,Material Request For Warehouse,വെയർഹൗസ് വേണ്ടി മെറ്റീരിയൽ അഭ്യർത്ഥന
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ഇടപാട് നിർത്തിവച്ചു പ്രൊഡക്ഷൻ ഓർഡർ {0} നേരെ അനുവദിച്ചിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","സഹജമായിസജ്ജീകരിയ്ക്കുക സാമ്പത്തിക വർഷം സജ്ജമാക്കാൻ, &#39;സഹജമായിസജ്ജീകരിയ്ക്കുക&#39; ക്ലിക്ക് ചെയ്യുക"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,ചേരുക
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Salary Slip,Salary Slip,ശമ്പളം ജി
+DocType: Pricing Rule,Margin Rate or Amount,മാർജിൻ നിരക്ക് അല്ലെങ്കിൽ തുക
 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,സെയിൽസ് ഓർഡർ ഇനം
@@ -3165,7 +3258,7 @@
 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.","ചെക്ക് ചെയ്ത ഇടപാടുകൾ ഏതെങ്കിലും &#39;സമർപ്പിച്ചു &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 +782,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ഇതിനകം ലഭിച്ചു ചെയ്തു
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,സെയിൽസ് ടീം വിശദാംശങ്ങൾ
 DocType: Expense Claim,Total Claimed Amount,ആകെ ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,വില്ക്കുകയും വരാവുന്ന അവസരങ്ങൾ.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},അസാധുവായ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ഡിപ്പാർട്ട്മെന്റ് സ്റ്റോറുകൾ
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,ആദ്യം പ്രമാണം സംരക്ഷിക്കുക.
 DocType: Account,Chargeable,ഈടാക്കുന്നതല്ല
 DocType: Company,Change Abbreviation,മാറ്റുക സംഗ്രഹ
 DocType: Expense Claim Detail,Expense Date,ചിലവേറിയ തീയതി
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,ജനറൽ ലെഡ്ജർ
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,കാണുക നയിക്കുന്നു
 DocType: Item Attribute Value,Attribute Value,ന്റെതിരച്ചറിവിനു്തെറ്റായധാര്മ്മികമൂല്യം
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ഇമെയിൽ ഐഡി അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ഇമെയിൽ ഐഡി അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
 DocType: Features Setup,To get Item Group in details table,വിശദാംശങ്ങൾ പട്ടികയിൽ ഇനം ഗ്രൂപ്പ് ലഭിക്കാൻ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {0}
 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>
@@ -3226,23 +3319,23 @@
 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,പ്രോജക്ട് ജ്ഞാനികൾ സ്റ്റോക്ക് ട്രാക്കിംഗ്
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} {0} നേരെ നിലവിലുണ്ട്
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} {0} നേരെ നിലവിലുണ്ട്
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ഉറവിടം / ലക്ഷ്യം ന്) യഥാർത്ഥ Qty
 DocType: Item Customer Detail,Ref Code,റഫറൻസ് കോഡ്
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
 DocType: Payment Gateway,Payment Gateway,പേയ്മെന്റ് ഗേറ്റ്വേ
 DocType: HR Settings,Payroll Settings,ശമ്പളപ്പട്ടിക ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,സ്ഥല ഓർഡർ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,റൂട്ട് ഒരു പാരന്റ് ചെലവ് കേന്ദ്രം പാടില്ല
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ബ്രാൻഡ് തിരഞ്ഞെടുക്കുക ...
 DocType: Sales Invoice,C-Form Applicable,ബാധകമായ സി-ഫോം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,വെയർഹൗസ് നിർബന്ധമാണ്
 DocType: Supplier,Address and Contacts,വിശദാംശവും ബന്ധങ്ങൾ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM പരിവർത്തന വിശദാംശം
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px (എച്ച്) വെബ് സൗഹൃദ 900px (W) നിലനിർത്തുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,തന്നെയാണ പരിഹരിക്കപ്പെട്ട
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,ഇടപാട് കറൻസി പേയ്മെന്റ് ഗേറ്റ്വേ കറൻസി അതേ ആയിരിക്കണം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,സ്വീകരിക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,സ്വീകരിക്കുക
 DocType: Maintenance Visit,Fully Completed,പൂർണ്ണമായി പൂർത്തിയാക്കി
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,സമ്പൂർണ്ണ {0}%
 DocType: Employee,Educational Qualification,വിദ്യാഭ്യാസ യോഗ്യത
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,വാങ്ങൽ മാസ്റ്റർ മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,എന്റെ ഉത്തരവുകൾ
@@ -3296,10 +3389,10 @@
 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,അയക്കുന്നതിന് മുമ്പ് സന്ദേശം നൽകുക
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് പ്രൊഫൈൽ
+apps/erpnext/erpnext/config/accounts.py +258,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} ഇതിനകം ഈടാക്കൂ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,മുൻവാതിൽ വായ്പകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,മുൻവാതിൽ വായ്പകൾ
 DocType: Cost Center,Cost Center Name,കോസ്റ്റ് സെന്റർ പേര്
 DocType: Maintenance Schedule Detail,Scheduled Date,ഷെഡ്യൂൾഡ് തീയതി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,ആകെ പണമടച്ചു ശാരീരിക
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} over- വേണ്ടി അലവൻസ് ഇനം {1} സാധിതപ്രായമായി
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; മുന്നോട്ടുപോകാൻ ദയവായി.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
 DocType: Purchase Invoice,Contact,കോൺടാക്റ്റ്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,നിന്നു ലഭിച്ച
 DocType: Features Setup,Exports,കയറ്റുമതി
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
 DocType: Issue,Content Type,ഉള്ളടക്ക തരം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,കമ്പ്യൂട്ടർ
 DocType: Item,List this Item in multiple groups on the website.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,മറ്റ് കറൻസി കൊണ്ട് അക്കൗണ്ടുകൾ അനുവദിക്കുന്നതിന് മൾട്ടി നാണയ ഓപ്ഷൻ പരിശോധിക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,ഇനം: {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,ഇനം: {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,അക്കൗണ്ട് ഹെഡ്
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,സ്റ്റോക്ക് അസറ്റുകൾ
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ശമ്പളം സ്ലിപ്പിൽ ജനറേറ്റുചെയ്യൂ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","ബാധകമായ വേണ്ടി {0} തിരഞ്ഞെടുക്കപ്പെട്ടു എങ്കിൽ വാങ്ങൽ, ചെക്ക് ചെയ്തിരിക്കണം"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ഡിസ്കൗണ്ട് 100 താഴെ ആയിരിക്കണം
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,മാസം നാളിൽ ആവർത്തിക്കുക
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,വർഷം ആരംഭിക്കുന്ന തീയതി അല്ലെങ്കിൽ അവസാന തീയതി {0} ഓവർലാപ്പുചെയ്യുന്നു ആണ്. ഒഴിവാക്കാൻ കമ്പനി സജ്ജമാക്കാൻ ദയവായി
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ന്യൂ വാർത്താക്കുറിപ്പ്
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},തീയതി ഇനം {0} വേണ്ടി അവസാനം തീയതി കുറവായിരിക്കണം ആരംഭിക്കുക
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},തീയതി ഇനം {0} വേണ്ടി അവസാനം തീയതി കുറവായിരിക്കണം ആരംഭിക്കുക
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ഉദാഹരണം:. എബിസിഡി ##### പരമ്പര സജ്ജമാക്കുമ്പോൾ സീരിയൽ ഇടപാടുകൾ ഒന്നുമില്ല പരാമർശിച്ച അല്ല, പിന്നെ ഓട്ടോമാറ്റിക് സീരിയൽ നമ്പർ ഈ പരമ്പര അടിസ്ഥാനമാക്കി സൃഷ്ടിച്ച ചെയ്യുന്നതെങ്കിൽ. നിങ്ങൾക്ക് എല്ലായ്പ്പോഴും കീഴ്വഴക്കമായി ഈ ഇനത്തിന്റെ വേണ്ടി സീരിയൽ ഒഴിവ് മറന്ന ആഗ്രഹിക്കുന്നുവെങ്കിൽ. ശ്യൂന്യമായിടുകയാണെങ്കിൽ."
 DocType: Upload Attendance,Upload Attendance,ഹാജർ അപ്ലോഡുചെയ്യുക
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,കമ്പനി മാസ്റ്റർ സ്വതവേയുള്ള കറൻസി നൽകുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},{0} ഉപയോഗിച്ച് നികുതി നിയമം പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,പുതിയ അക്കൗണ്ട് പേര്
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,കസ്റ്റമർ സർവീസ്
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,സ്ഥാനാർഥി ഒരു ജോലി ഓഫര്.
 DocType: Notification Control,Prompt for Email on Submission of,സമർപ്പിക്കുന്നതിന് ന് ഇമെയിൽ പ്രേരിപ്പിക്കരുത്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ആകെ അലോക്കേറ്റഡ് ഇല കാലയളവിൽ ദിവസം അധികം ആകുന്നു
+DocType: Pricing Rule,Percentage,ശതമാനം
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,പ്രോഗ്രസ് വെയർഹൗസ് സ്വതവെയുള്ള വർക്ക്
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,അക്കൗണ്ടിങ് ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,അക്കൗണ്ടിങ് ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,പ്രതീക്ഷിച്ച തീയതി മെറ്റീരിയൽ അഭ്യർത്ഥന തീയതി മുമ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,ഇനം {0} ഒരു സെയിൽസ് ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,ഇനം {0} ഒരു സെയിൽസ് ഇനം ആയിരിക്കണം
 DocType: Naming Series,Update Series Number,അപ്ഡേറ്റ് സീരീസ് നമ്പർ
 DocType: Account,Equity,ഇക്വിറ്റി
 DocType: Sales Order,Printing Details,അച്ചടി വിശദാംശങ്ങൾ
@@ -3431,11 +3527,12 @@
 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,തിരച്ചിൽ സബ് അസംബ്ലീസ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,ചിലവേറിയ എഗെൻസ്റ്റ്
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",തരം &quot;നികുതി&quot; എന്ന) ചൈൽഡ് ചേർക്കുക ക്ലിക്കുചെയ്ത് ഉചിതമായ ഗ്രൂപ്പ് (സാധാരണയായി ഫണ്ട്&gt; നിലവിലെ ബാധ്യതകൾ&gt; നികുതികളും കടമകൾ ഉറവിടം ലേക്ക് പോയി ഒരു പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക (നികുതി നിരക്ക് പരാമർശിക്കുക ചെയ്യാൻ.
 DocType: Production Order,Production Order,പ്രൊഡക്ഷൻ ഓർഡർ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,ഇന്സ്റ്റലേഷന് കുറിപ്പ് {0} ഇതിനകം സമർപ്പിച്ചു
 DocType: Quotation Item,Against Docname,Docname എഗെൻസ്റ്റ്
@@ -3454,18 +3551,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,"ലാഭേച്ചയില്ലാത്തതും, ചാരിറ്റിയും"
 DocType: Issue,First Responded On,ആദ്യം പ്രതികരിച്ചു
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ഒന്നിലധികം സംഘങ്ങളായി ഇനത്തിന്റെ ലിസ്റ്റിങ്
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,വിജയകരമായി പൊരുത്തപ്പെട്ട
 DocType: Production Order,Planned End Date,ആസൂത്രണം ചെയ്ത അവസാന തീയതി
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,എവിടെ ഇനങ്ങളുടെ സൂക്ഷിച്ചിരിക്കുന്നു.
 DocType: Tax Rule,Validity,സാധുത
+DocType: Request for Quotation,Supplier Detail,വിതരണക്കാരൻ വിശദാംശം
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced തുക
 DocType: Attendance,Attendance,ഹാജർ
 apps/erpnext/erpnext/config/projects.py +55,Reports,റിപ്പോർട്ടുകൾ
 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 +508,Posting date and posting time is mandatory,തീയതിയും പോസ്റ്റിംഗ് സമയം ചേർക്കൽ നിർബന്ധമായും
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,ഇടപാടുകൾ വാങ്ങിയതിന് നികുതി ടെംപ്ലേറ്റ്.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,ഇടപാടുകൾ വാങ്ങിയതിന് നികുതി ടെംപ്ലേറ്റ്.
 ,Item Prices,ഇനം വിലകൾ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,നിങ്ങൾ വാങ്ങൽ ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 DocType: Period Closing Voucher,Period Closing Voucher,കാലയളവ് സമാപന വൗച്ചർ
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,നെറ്റ് ആകെ ന്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,നിരയിൽ ടാർഗെറ്റ് വെയർഹൗസ് {0} പ്രൊഡക്ഷൻ ഓർഡർ അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,പേയ്മെന്റ് ടൂൾ ഉപയോഗിക്കാൻ അനുമതിയില്ല
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% S ആവർത്തന പേരിൽ വ്യക്തമാക്കാത്ത &#39;അറിയിപ്പ് ഇമെയിൽ വിലാസങ്ങൾ&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% S ആവർത്തന പേരിൽ വ്യക്തമാക്കാത്ത &#39;അറിയിപ്പ് ഇമെയിൽ വിലാസങ്ങൾ&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,മാറ്റുക
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,സ്കോർ നേടി
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",ഉദാ: &quot;എന്റെ കമ്പനി LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,നോട്ടീസ് പിരീഡ്
+DocType: Asset Category,Asset Category Name,അസറ്റ് വിഭാഗത്തിന്റെ പേര്
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"നികുതി വർഗ്ഗം എല്ലാ വസ്തുക്കളുടെ &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; ആകാൻ പാടില്ല-ഇതര ഓഹരി വസ്തുക്കളും"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,ബാച്ച്
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,സെയിൽസ് വ്യാക്തി
 DocType: Sales Invoice,Cold Calling,കോൾഡ് കാളിംഗ്
 DocType: SMS Parameter,SMS Parameter,എസ്എംഎസ് പാരാമീറ്റർ
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
 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.,മൂല്യങ്ങൾ അടിസ്ഥാനമാക്കിയുള്ള ഇടപാടുകൾ പരിമിതപ്പെടുത്താൻ നിയമങ്ങൾ സൃഷ്ടിക്കുക.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,സാധാരണ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 DocType: Sales Invoice,Is POS,POS തന്നെയല്ലേ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Production Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,പ്രോജക്ട് ഐഡി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,പാരന്റ് അക്കൗണ്ട്
@@ -3574,7 +3673,7 @@
 DocType: Employee,Education,വിദ്യാഭ്യാസം
 DocType: Selling Settings,Campaign Naming By,ആയപ്പോഴേക്കും നാമകരണം കാമ്പെയ്ൻ
 DocType: Employee,Current Address Is,ഇപ്പോഴത്തെ വിലാസമാണിത്
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","ഓപ്ഷണൽ. വ്യക്തമാക്കിയിട്ടില്ല എങ്കിൽ കമ്പനിയുടെ സ്വതവേ കറൻസി, സജ്ജമാക്കുന്നു."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","ഓപ്ഷണൽ. വ്യക്തമാക്കിയിട്ടില്ല എങ്കിൽ കമ്പനിയുടെ സ്വതവേ കറൻസി, സജ്ജമാക്കുന്നു."
 DocType: Address,Office,ഓഫീസ്
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,ബാച്ച് ഇൻവെന്ററി
 DocType: Employee,Contract End Date,കരാര് അവസാനിക്കുന്ന തീയതി
 DocType: Sales Order,Track this Sales Order against any Project,ഏതെങ്കിലും പ്രോജക്ട് നേരെ ഈ സെയിൽസ് ഓർഡർ ട്രാക്ക്
+DocType: Sales Invoice Item,Discount and Margin,ഡിസ്ക്കൗണ്ട് മാര്ജിന്
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,മുകളിൽ മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി വിൽപ്പന ഉത്തരവുകൾ (വിടുവിപ്പാൻ തീരുമാനിക്കപ്പെടാത്ത) വലിക്കുക
 DocType: Deduction Type,Deduction Type,കിഴിച്ചുകൊണ്ടു തരം
 DocType: Attendance,Half Day,അര ദിവസം
@@ -3609,7 +3709,7 @@
 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} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/party.py +234,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,പ്രതിമാസ ശമ്പളം രജിസ്റ്റർ
 DocType: Warranty Claim,If different than customer address,ഉപഭോക്തൃ വിലാസം അധികം വ്യത്യസ്ത എങ്കിൽ
 DocType: BOM Operation,BOM Operation,BOM ഓപ്പറേഷൻ
@@ -3617,22 +3717,23 @@
 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 പ്രൊഫൈൽ
 DocType: Payment Gateway Account,Payment URL Message,പേയ്മെന്റ് യുആർഎൽ സന്ദേശം
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","ബജറ്റുകൾ സ്ഥാപിക്കുന്നതിനുള്ള Seasonality, ടാർഗറ്റുകൾ തുടങ്ങിയവ"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","ബജറ്റുകൾ സ്ഥാപിക്കുന്നതിനുള്ള Seasonality, ടാർഗറ്റുകൾ തുടങ്ങിയവ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,വരി {0}: പേയ്മെന്റ് തുക നിലവിലുള്ള തുക വലുതായിരിക്കും കഴിയില്ല
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,ആകെ ലഭിക്കാത്ത
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,സമയം ലോഗ് ബില്ലുചെയ്യാനാകുന്ന അല്ല
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
+DocType: Asset,Asset Category,അസറ്റ് വർഗ്ഗം
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,എഗെൻസ്റ്റ് വൗച്ചറുകൾ മാനുവലായി നൽകുക
 DocType: SMS Settings,Static Parameters,സ്റ്റാറ്റിക് പാരാമീറ്ററുകൾ
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
 DocType: Expense Claim,Employees Email Id,എംപ്ലോയീസ് ഇമെയിൽ ഐഡി
 DocType: Employee Attendance Tool,Marked Attendance,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,നിലവിലുള്ള ബാധ്യതകൾ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,നിലവിലുള്ള ബാധ്യതകൾ
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,യഥാർത്ഥ Qty നിർബന്ധമായും
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,സാംഖിക മൂല്യങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,ലോഗോ അറ്റാച്ച്
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,അനലിറ്റിക്സ്
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Production Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"സഹജമായ വിലാസം ഫലകം കണ്ടെത്തി. സജ്ജീകരണം&gt; അച്ചടി, ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,റൂട്ട് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,പദ്ധതി തുക unadusted തുക വലിയവനോ can
 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,ക്യാപിറ്റൽ സ്റ്റോക്ക്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം വിശദാംശങ്ങൾ
 DocType: Payment Gateway Account,Payment Gateway Account,പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട്
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,പേയ്മെന്റ് പൂർത്തിയായ ശേഷം തിരഞ്ഞെടുത്ത പേജിലേക്ക് ഉപയോക്താവിനെ തിരിച്ചുവിടൽ.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ഡിസൈനർ
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,നിബന്ധനകളും വ്യവസ്ഥകളും ഫലകം
 DocType: Serial No,Delivery Details,ഡെലിവറി വിശദാംശങ്ങൾ
+DocType: Asset,Current Value (After Depreciation),ഇപ്പോഴത്തെ മൂല്യം (മൂല്യത്തകർച്ച ശേഷം)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
 ,Item-wise Purchase Register,ഇനം തിരിച്ചുള്ള വാങ്ങൽ രജിസ്റ്റർ
 DocType: Batch,Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","പുനഃക്രമീകരിക്കുക നില സജ്ജീകരിക്കാൻ, ഇനം ഒരു പർച്ചേസ് ഇനം അല്ലെങ്കിൽ ണം ഇനം ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(അര ദിവസം)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,വസ്തുക്കൾ ബിൽ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},വരി {0}: പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് {1} ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,റഫറൻസ് തീയതി
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക
 DocType: GL Entry,Is Opening,തുറക്കുകയാണ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,അക്കൗണ്ട് {0} നിലവിലില്ല
 DocType: Account,Cash,ക്യാഷ്
 DocType: Employee,Short biography for website and other publications.,വെബ്സൈറ്റ് മറ്റ് പ്രസിദ്ധീകരണങ്ങളിൽ ഷോർട്ട് ജീവചരിത്രം.
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index b7f575e..c6285e4 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -4,105 +4,107 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,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/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,साहित्य भेट रद्द करा {0} हा हमी दावा रद्द होण्यापुर्वी रद्द करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,प्रथम पक्ष प्रकार निवडा
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,कृपया प्रथम पक्ष प्रकार निवडा
 DocType: Item,Customer Items,ग्राहक आयटम
 DocType: Project,Costing and Billing,भांडवलाच्या आणि बिलिंग
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक खातेवही असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +48,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,माप डीफॉल्ट युनिट
 DocType: SMS Center,All Sales Partner Contact,सर्व विक्री भागीदार संपर्क
-DocType: Employee,Leave Approvers,Approvers सोडा
+DocType: Employee,Leave Approvers,रजा साक्षीदार
 DocType: Sales Partner,Dealer,विक्रेता
 DocType: Employee,Rented,भाड्याने
-DocType: POS Profile,Applicable for User,वापरकर्ता लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविले उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती बूच"
+DocType: POS Profile,Applicable for User,वापरकर्त्यांसाठी  लागू
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,आपण खरोखर या मालमत्ता स्क्रॅप इच्छित आहे का?
 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.,* व्यवहार हिशोब केला जाईल.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहारामधे  हिशोब केला जाईल.
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
 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/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}
+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: Purchase Receipt Item,Required By,ने  आवश्यक
 DocType: Delivery Note,Return Against Delivery Note,डिलिव्हरी टीप विरुद्ध परत
 DocType: Department,Department,विभाग
 DocType: Purchase Order,% Billed,% बिल
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर समान असणे आवश्यक आहे {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +100,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
-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: 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 , कोटेशन , विक्री चलन, विक्री ऑर्डर इ उपलब्ध आहेत"
 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 +176,Outstanding for {0} cannot be less than zero ({1}),बाकी {0} असू शकत नाही कमी शून्य ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,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/templates/pages/projects.js +81,Show open,खुल्या दर्शवा
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,नवी रजेचा अर्ज
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
-DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
-apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,दर्शवा रूपे
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,प्रमाण
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),कर्ज (दायित्व)
+DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
+apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,रूपे दर्शवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
 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/hr/doctype/employee/employee.py +146,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी नियुक्त केले आहे {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +146,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/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 +642,Invoice,चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
 apps/erpnext/erpnext/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 +198,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},सलग  {0}: {1} {2}  हे  {3}सह जुळत नाही
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,रो # {0}:
-DocType: Delivery Note,Vehicle No,वाहन नाही
-apps/erpnext/erpnext/public/js/pos/pos.js +557,Please select Price List,किंमत सूची निवडा कृपया
-DocType: Production Order Operation,Work In Progress,प्रगती मध्ये कार्य
+DocType: Delivery Note,Vehicle No,वाहन क्रमांक
+apps/erpnext/erpnext/public/js/pos/pos.js +557,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 +180,Accountant,फडणवीस
+apps/erpnext/erpnext/public/js/setup_wizard.js +180,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 +131,New {0}: #{1},नवी {0}: # {1}
+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 +132,New {0}: #{1},नवी {0}: # {1}
 ,Sales Partners Commission,विक्री भागीदार आयोग
-apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,5 पेक्षा जास्त वर्ण असू शकत नाही संक्षेप
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,संक्षेपला 5 पेक्षा जास्त वर्ण असू शकत नाही
 DocType: Payment Request,Payment Request,भरणा विनंती
 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} आयटम म्हणून रूपे \ काढले जाऊ शकत नाही विशेषता या विशेषता सह अस्तित्वात.
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,या रूट खाते आहे आणि संपादित केला जाऊ शकत नाही.
+						exist with this Attribute.",विशेषता मूल्य {0} {1} बाबींचा म्हणून रूपे \ काढले जाऊ शकत नाही कारण या विशेषता सह अस्तित्वात आहे .
+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}
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},सवलत साठी आधारावर अधिकृतता सेट करू शकत नाही {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दोन स्तंभ, जुना नाव आणि एक नवीन नाव एक .csv फाइल संलग्न"
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,जॉब साठी उघडत आहे.
 DocType: Item Attribute,Increment,बढती
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +39,PayPal Settings missing,गहाळ पोपल सेटिंग्ज
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +39,PayPal Settings missing,PayPal सेटिंग्ज गहाळ
 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,त्याच कंपनी एकदा पेक्षा अधिक प्रवेश केला आहे
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनीने  एका  पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},परवानगी नाही {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ला परवानगी नाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 DocType: Payment Reconciliation,Reconcile,समेट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
@@ -113,66 +115,69 @@
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
 DocType: Account,Credit,क्रेडिट
-DocType: POS Profile,Write Off Cost Center,खर्च केंद्र बंद लिहा
+DocType: POS Profile,Write Off Cost Center,Write Off खर्च केंद्र
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,शेअर अहवाल
 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 +140,You are not authorized to add or update entries before {0},आपण आधी नोंदी जमा करा किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
-DocType: Item,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नाही तर)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +140,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: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} वर सुट्टी तारखेपासून आणि तारिक करण्यासाठी दरम्यान नाही
-DocType: Quality Inspection,Get Specification Details,तपशील तपशील मिळवा
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} वरील  सुट्टी तारखेपासून आणि तारखेपर्यंत  च्या दरम्यान नाही
+DocType: Quality Inspection,Get Specification Details,तपशील मिळवा
 DocType: Lead,Interested,इच्छुक
 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}
+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,उघडणे प्रवेश
 DocType: Stock Entry,Additional Costs,अतिरिक्त खर्च
-apps/erpnext/erpnext/accounts/doctype/account/account.py +137,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +137,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 +324,Please select Company first,पहिल्या कंपनी निवडा कृपया
+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 +324,Please select Company first,कृपया पहिले कंपनी निवडा
 DocType: Employee Education,Under Graduate,पदवीधर अंतर्गत
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,लक्ष्य रोजी
 DocType: BOM,Total Cost,एकूण खर्च
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,क्रियाकलाप लॉग:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} आयटम प्रणाली अस्तित्वात नाही किंवा कालबाह्य झाले आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
+DocType: Item,Is Fixed Asset,मुदत मालमत्ता आहे
 DocType: Expense Claim Detail,Claim Amount,दाव्याची रक्कम
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
 DocType: Naming Series,Prefix,पूर्वपद
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Consumable,Consumable
 DocType: Upload Attendance,Import Log,आयात लॉग
-DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,प्रकार उत्पादन साहित्य विनंती वरील निकष आधारित खेचणे
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,प्रकार उत्पादन साहित्य विनंती वरील निकषावर आधारित खेचणे
 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/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,शेअर खर्च
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} गोठविले
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,शेअर खर्च
 DocType: Newsletter,Email Sent?,ई-मेल पाठविले?
 DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
-DocType: Production Order Operation,Show Time Logs,दर्शवा वेळ नोंदी
+DocType: Production Order Operation,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 +108,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,आयटम {0} खरेदी आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/get_item_details.py +139,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} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
+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 +507,"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 +533,"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 +170,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
-DocType: BOM Replace Tool,New BOM,नवी BOM
+DocType: BOM Replace Tool,New BOM,नवीन BOM
 apps/erpnext/erpnext/config/projects.py +40,Batch Time Logs for billing.,बॅच बिलिंग वेळ नोंदी.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,वृत्तपत्र यापूर्वीच पाठविला गेला आहे
 DocType: Lead,Request Type,विनंती प्रकार
@@ -182,37 +187,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,कार्यवाही
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Serial No,Maintenance Status,देखभाल स्थिती
-apps/erpnext/erpnext/config/stock.py +62,Items and Pricing,आयटम आणि ती
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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 +93,Cost Center {0} does not belong to Company {1},केंद्र {0} कंपनी संबंधित नाही किंमत {1}
+apps/erpnext/erpnext/config/stock.py +62,Items and Pricing,आयटम आणि किंमत
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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 +93,Cost Center {0} does not belong to Company {1},खर्च केंद्र {0} कंपनी  {1} ला संबंधित नाही
 DocType: Customer,Individual,वैयक्तिक
 apps/erpnext/erpnext/config/support.py +27,Plan for maintenance visits.,देखभाल भेटींसाठी योजना.
 DocType: SMS Settings,Enter url parameter for message,संदेश साठी मापदंड प्रविष्ट करा
 apps/erpnext/erpnext/config/stock.py +102,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 +79,Installation date cannot be before delivery date for Item {0},प्रतिष्ठापन तारीख आयटम वितरणाची तारीख आधी असू शकत नाही {0}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},{1} {2} साठी ही वेळ लॉग {0}  सोबत  conflict होते
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्रीसाठी  लागू असणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},आयटम {0} साठी प्रतिष्ठापन तारीख  वितरणाच्या  तारीखेनंतर  असू शकत नाही
 DocType: Pricing Rule,Discount on Price List Rate (%),दर सूची रेट सूट (%)
-DocType: Offer Letter,Select Terms and Conditions,निवडा अटी आणि नियम
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,मूल्य
+DocType: Offer Letter,Select Terms and Conditions,अटी आणि नियम निवडा
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,मूल्य Qty
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
 ,Purchase Order Trends,ऑर्डर ट्रेन्ड खरेदी
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,वर्ष पाने वाटप करा.
 DocType: Earning Type,Earning Type,कमाई प्रकार
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,अक्षम करा क्षमता नियोजन आणि वेळ ट्रॅकिंग
+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',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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,कोठार सादर करा करण्यापूर्वी आवश्यक आहे
+DocType: Customer Group,Mention if non-standard receivable account applicable,गैर-मानक प्राप्त खाते लागू असल्यास उल्लेख करावा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,कंपनी प्रविष्ट करा
@@ -221,38 +226,38 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,आर्थिक निव्वळ रोख
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},पुढील आवर्ती {1} {0} वर तयार केले जाईल
 DocType: Newsletter List,Total Subscribers,एकूण सदस्य
 ,Contact Name,संपर्क नाव
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
-apps/erpnext/erpnext/templates/generators/item.html +30,No description given,दिलेली नाही वर्णन
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगारपत्रक निर्माण करते.
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,वर्णन दिलेले नाही
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरेदीसाठी विनंती.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,तारीख relieving प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा साक्षीदार या रजेचा अर्ज सादर करू शकतात
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+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 +103,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 +178,Warehouse {0} does not belong to company {1},{0} कोठार कंपनी संबंधित नाही {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: कृपया  ' आगाऊ आहे' खाते {1} विरुद्ध  ही  एक आगाऊ नोंद असेल  तर तपासा.
+apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},कोठार{0}  कंपनी {1} ला  संबंधित नाही
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 DocType: Payment Tool,Reference No,संदर्भ नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,रजा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,बँक नोंदी
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
-DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
+DocType: Stock Entry,Sales Invoice No,विक्री चलन क्रमांक
 DocType: Material Request Item,Min Order Qty,किमान ऑर्डर Qty
 DocType: Lead,Do Not Contact,संपर्क करू नका
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेअर डेव्हलपर
-DocType: Item,Minimum Order Qty,किमान Qty
+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 +592,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},आयटम {0} खरेदी ऑर्डर {1} मध्ये ' कच्चा माल पुरवठा ' टेबल मध्ये आढळला  नाही
 DocType: Employee,Relation,नाते
 DocType: Shipping Rule,Worldwide Shipping,जगभरातील शिपिंग
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
@@ -264,98 +269,102 @@
 DocType: Notification Control,Notification Control,सूचना नियंत्रण
 DocType: Lead,Suggestions,सूचना
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,या प्रदेश सेट आयटम गट निहाय खर्चाचे अंदाजपत्रक. आपण वितरण सेट करून हंगामी समाविष्ट करू शकता.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},कोठार मूळ खाते गट प्रविष्ट करा {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} शिल्लक रक्कम पेक्षा जास्त असू शकत नाही {2}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},कोठार{0} साठी  मूळ खाते गट प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} च्या  विरुद्ध भरणा  थकबाकी रक्कम{2} पेक्षा जास्त  असू शकत नाही
 DocType: Supplier,Address HTML,पत्ता HTML
-DocType: Lead,Mobile No.,मोबाइल क्रमांक
-DocType: Maintenance Schedule,Generate Schedule,वेळापत्रक व्युत्पन्न
+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/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 +20,Max 5 characters,कमाल 5 वर्ण
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 apps/erpnext/erpnext/config/desktop.py +83,Learn,जाणून घ्या
+DocType: Asset,Next Depreciation Date,पुढील घसारा दिनांक
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,कर्मचारी दर क्रियाकलाप खर्च
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},पुरवठादार चलन कोणतेही चलन खरेदी अस्तित्वात {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,विक्री व्यक्ती वृक्ष व्यवस्थापित करा.
 DocType: Job Applicant,Cover Letter,कव्हर पत्र
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,थकबाकी चेक आणि स्पष्ट ठेवी
-DocType: Item,Synced With Hub,हब समक्रमित
+DocType: Item,Synced With Hub,हबला  समक्रमित
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',पेक्षा &#39;Qty निर्मिती करणे&#39; पूर्ण Qty जास्त असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दा मध्ये   ( निर्यात करा) डिलिव्हरी टीप एकदा save केल्यावर दृश्यमान होईल
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] युनिट (# फॉर्म / आयटम / {1}) [{2}] आढळले (# फॉर्म / वखार / {2})
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,कामाचे
 DocType: 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,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,डिलिव्हरी टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,डिलिव्हरी टीप
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{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,या आठवड्यात आणि प्रलंबित उपक्रम सारांश
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,महिना आणि वर्ष निवडा कृपया
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,कृपया महिना आणि वर्ष निवडा
 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 +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहार वापरले जाऊ शकत नाही. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानले एकूण ऑर्डर
+apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानलेली  एकूण ऑर्डर
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 उपलब्ध"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचारी तरतूद {1} काळात {2} साठी {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,आयटम निवडा
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच कोणत्याही समान असणे आवश्यक आहे {1} {2}
+					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल व्यवस्थापित,   शेअर सलोखा/ वापरूनसमेट केला जाऊ शकत नाही , त्याऐवजी शेअर प्रविष्टी वापरा"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +254,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,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 +118,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/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 +213,Please see attachment,संलग्नक पहा कृपया
-DocType: Purchase Order,% Received,% प्राप्त
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +213,Please see attachment,कृपया संलग्नक पहा
+DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
 DocType: Maintenance Visit,Maintenance Type,देखभाल प्रकार
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},सिरियल नाही {0} वितरण टीप संबंधित नाही {1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},सिरियल क्रमांक {0} वितरण टीप {1} शी  संबंधित नाही
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,आयटम गुणवत्ता तपासणी मापदंड
-DocType: Leave Application,Leave Approver Name,माफीचा साक्षीदार नाव सोडा
-,Schedule Date,वेळापत्रक तारीख
-DocType: Packed Item,Packed Item,पॅक आयटम
-apps/erpnext/erpnext/config/buying.py +60,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: Leave Application,Leave Approver Name,रजा साक्षीदारा चे   नाव
+DocType: Depreciation Schedule,Schedule Date,वेळापत्रक तारीख
+DocType: Packed Item,Packed Item,पॅक केलेला  आयटम
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,खरेदी व्यवहारासाठी  मुलभूत सेटिंग्ज.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},क्रियाकलाप खर्च कर्मचारी {0} साठी  गतिविधी प्रकार - {1} विरुद्ध अस्तित्वात असतो
+apps/erpnext/erpnext/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; आहेत विनंती करणे
+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 अंदाज प्रमाण आणि किमान ऑर्डर प्रमाण आधारित सर्व गोदामांचा  विचार करून  ज्याचा  ""स्टॉक संपला"" आहे"
+DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
 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.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्ते संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
+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,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा  मंजूर' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,तोट्याचा कारण
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,तोट्याचे  कारण
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,संधी
 DocType: Employee,Single,सिंगल
@@ -365,79 +374,81 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
 DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,सरासरी. विक्री दर
-apps/erpnext/erpnext/utilities/transaction_base.py +131,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,पहिल्या कंपनीचे नाव प्रविष्ट करा
 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,स्वयंचलितपणे FIFO आधारित संख्या सिरिअल सेट
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक पुरवठादार चलन क्रमांक वेगळेपण
+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/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/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: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,प्रास्ताविक मजकूर सानुकूलित करा जो ईमेलचा  एक भाग म्हणून जातो.   प्रत्येक व्यवहाराला स्वतंत्र प्रास्ताविक मजकूर आहे.
 DocType: Stock Reconciliation Item,Do not include symbols (ex. $),प्रतीक समावेश करू नका (उदा. $)
 DocType: Sales Taxes and Charges Template,Sales Master Manager,विक्री मास्टर व्यवस्थापक
-apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया ग्लोबल सेटिंग्ज.
-DocType: Accounts Settings,Accounts Frozen Upto,फ्रोजन पर्यंत खाती
+apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया साठीचे ग्लोबल सेटिंग्ज.
+DocType: Accounts Settings,Accounts Frozen Upto,खाती फ्रोजन पर्यंत
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
-DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडले फील्ड वापरून तयार आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
-DocType: Material Request Item,Required Date,आवश्यक तारीख
+DocType: Request for Quotation Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,पुरवठादार संदेश
 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,न चुकता
+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,वाटप एकूण पाने अनिवार्य आहे
+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 +24,Attendance record.,उपस्थित रेकॉर्ड.
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिती रेकॉर्ड
 DocType: Bank Reconciliation,Journal Entries,जर्नल नोंदी
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
-DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिया दरम्यान वेळ
+DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिये च्या  दरम्यानची  वेळ
 DocType: Customer,Buyer of Goods and Services.,वस्तू आणि सेवा खरेदीदार.
 DocType: Journal Entry,Accounts Payable,देय खाती
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,निवडलेले BOMs सारख्या आयटम नाहीत
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,निवडलेले BOMs सारख्या आयटमसाठी  नाहीत
 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/public/js/setup_wizard.js +212,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/public/js/setup_wizard.js +212,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 +146,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 +308,Please select Company,कंपनी निवडा कृपया
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +378,Please enter Warehouse for which Material Request will be raised,साहित्य विनंती उठविला जाईल जे भांडार प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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 Warranty Expiry,सिरियल क्रमांक हमी कालावधी समाप्ती
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
-DocType: Journal Entry,Difference (Dr - Cr),फरक (डॉ - कोटी)
+DocType: Journal Entry,Difference (Dr - Cr),फरक  (Dr - Cr)
 DocType: Account,Profit and Loss,नफा व तोटा
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,व्यवस्थापकीय Subcontracting
+DocType: Project,Project will be accessible on the website to these users,"प्रकल्प या वापरकर्त्यांना वेबसाइटवर उपलब्ध राहील,"
 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 +53,Account {0} does not belong to company: {1},{0} खाते कंपनी संबंधित नाही: {1}
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,दर ज्यामध्ये किंमत यादी चलन कंपनी बेस चलनमधे  रूपांतरित आहे
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},खाते {0} ला  कंपनी {1} संबंधित नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,संक्षेप कंपनीसाठी आधीच वापरला
 DocType: Selling Settings,Default Customer Group,मुलभूत ग्राहक गट
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","अक्षम केल्यास, &#39;गोळाबेरीज एकूण&#39; क्षेत्रात काही व्यवहार दृश्यमान होणार नाही"
@@ -446,42 +457,42 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,आयटम {0} खरेदी नाही आयटम
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ संपादित करा कर आणि शुल्क जोडा
-DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,आयटम {0} खरेदी आयटम नाही
+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/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",सिरियल  क्रमांक {0} हटवू शकत नाही कारण  तो स्टॉक व्यवहार मध्ये  वापरला जातो
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +232,Closing (Cr),बंद (कोटी)
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
+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 +127,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 +126,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 +230,Financial / accounting year.,आर्थिक / लेखा वर्षी.
+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 +126,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 +238,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,जमा मूल्ये
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,आर्थिक वर्ष प्रारंभ तारीख आर्थिक वर्षाच्या शेवटी तारीख पेक्षा जास्त असू नये
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,आर्थिक वर्ष प्रारंभ तारीख आर्थिक वर्षाच्या शेवटी तारीख पेक्षा जास्त असू नये
 DocType: Warranty Claim,Resolution,ठराव
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},वितरित: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,देय खाते
 DocType: Sales Order,Billing and Delivery Status,बिलिंग आणि वितरण स्थिती
 DocType: Job Applicant,Resume Attachment,सारांश संलग्नक
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,पुन्हा करा ग्राहक
+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 +640,Sales Return,विक्री परत
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,विक्री परत
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,पगार घटक.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभाव्य ग्राहकांच्या डेटाबेस.
@@ -489,56 +500,56 @@
 apps/erpnext/erpnext/config/crm.py +22,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/stock/doctype/item/item.py +698,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/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उघडणे (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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 +91,Reference No & Reference Date is required for {0},संदर्भ नाही आणि संदर्भ तारीख आवश्यक आहे {0}
-DocType: Sales Invoice,Customer's Vendor,ग्राहक च्या विक्रेता
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,तार्किक वखार च्या विरोधात स्टॉक नोंदी केल्या जातात
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
+DocType: Sales Invoice,Customer's Vendor,ग्राहकाचा  विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,उत्पादन ऑर्डर अनिवार्य आहे
 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/config/accounts.py +70,Masters,मास्टर्स
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,सुधारणा बँक व्यवहार तारखा
-apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम साठी {0} कोठार मध्ये {1} वर {2} {3} मधील {4} {5}
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,सुधारणा बँक व्यवहार तारखा
+apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम {0} साठी  कोठार {1} मध्ये  {2} {3}वर  {4} {5} मधील
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,वेळ ट्रॅकिंग
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
-DocType: Packing Slip Item,DN Detail,DN देखील तपशील
+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: Delivery Note,Time at which items were delivered from warehouse,ज्या वेळेला आयटम कोठार पासून सुटका झाली
 DocType: Sales Invoice,Sales Taxes and Charges,विक्री कर आणि शुल्क
 DocType: Employee,Organization Profile,संघटना प्रोफाइल
-DocType: Employee,Reason for Resignation,राजीनामा कारण
+DocType: Employee,Reason for Resignation,राजीनाम्याचे  कारण
 apps/erpnext/erpnext/config/hr.py +151,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}
 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,करून पुरवठादार नामांकन
+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,डीफॉल्ट कोटीच्या दर
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,देखभाल वेळापत्रक
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","मग किंमत ठरविणे नियम इ ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार आधारित बाहेर फिल्टर आहेत"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,देखभाल वेळापत्रक
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","त्यानंतर किंमत नियम ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार   इ  वर आधारित बाहेर फिल्टर आहेत"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,यादी निव्वळ बदला
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,विक्री व्यक्ती लक्ष्य
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,कर्मचारी किंवा कंपनी एकतर एक सुट्टी यादी सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
+DocType: Depreciation Schedule,Depreciation Amount,घसारा रक्कम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,मुदत दिवस
 DocType: Quotation Item,Item Balance,आयटम शिल्लक
 DocType: Sales Invoice,Packing List,पॅकिंग यादी
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,खरेदी ऑर्डर पुरवठादार देण्यात.
+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,नाश
@@ -547,14 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,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}
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरले खर्च कर आणि शुल्क
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग शिक्का  {0} नंतर असणे आवश्यक आहे
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,स्थावर खर्च कर आणि शुल्क
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
 DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,गट गट
-DocType: Journal Entry,Write Off Amount,रक्कम बंद लिहा
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,गट  पासून  गट पर्यंत
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,माझे प्रकल्प
+DocType: Journal Entry,Write Off Amount,Write Off रक्कम
 DocType: Journal Entry,Bill No,बिल नाही
+DocType: Company,Gain/Loss Account on Asset Disposal,लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर
 DocType: Purchase Invoice,Quarterly,तिमाही
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
 DocType: Sales Order Item,Basic Rate (Company Currency),बेसिक रेट (कंपनी चलन)
@@ -564,22 +577,23 @@
 DocType: Account,Accounts,खाते
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
-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: 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,या वर्षी एकूण बिलिंग
 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 +529,Item has variants.,आयटम रूपे आहेत.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,आयटम {0} आढळले नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,आयटम {0} आढळला नाही
 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 (%),आयोगाने दर (%)
+DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +176,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","व्हाउचर विरुद्ध प्रकार विक्री आदेश एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Project,Estimated Cost,अंदाजे खर्च
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एरोस्पेस
@@ -594,29 +608,30 @@
 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 +91,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
 DocType: Mode of Payment Account,Default Account,मुलभूत खाते
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"संधी लीड केले आहे, तर लीड सेट करणे आवश्यक आहे"
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,साप्ताहिक बंद दिवस निवडा कृपया
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,कृपया साप्ताहिक बंद दिवस निवडा
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
-,Sales Person Target Variance Item Group-Wise,विक्री व्यक्ती लक्ष्य फरक आयटम गट निहाय
+,Sales Person Target Variance Item Group-Wise,आयटम गट निहाय विक्री व्यक्ती लक्ष्य फरक
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
-DocType: Delivery Note,Customer's Purchase Order No,ग्राहक च्या पर्चेस नाही
+DocType: Delivery Note,Customer's Purchase Order No,ग्राहकाच्या पर्चेस order क्रमांक
 DocType: Employee,Cell Number,सेल क्रमांक
-apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ऑटो साहित्य विनंत्या व्युत्पन्न
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ऑटो साहित्य विनंत्या तयार होतो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक पगार विधान.
 DocType: Item Group,Website Specifications,वेबसाइट वैशिष्ट्य
-apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},आपले पत्ता साचा त्रुटी आहे {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,नवीन खाते
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: पासून {0} प्रकारच्या {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","अनेक किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून संघर्षाचे निराकरण करा. किंमत नियम: {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.,लेखा नोंदी पानांचे नोडस् विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},तुमच्या पत्ता साचा {0} मधे  त्रुटी आहे
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,नवीन खाते
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: {0} पासून {1} प्रकारच्या
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","अनेक किंमतीचे  नियम समान निकषा सह  अस्तित्वात नाहीत , प्राधान्य सोपवून संघर्षाचे निराकरण करा. किंमत नियम: {0}"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,लेखा नोंदी leaf nodes विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -638,79 +653,81 @@
 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.","सर्व विक्री व्यवहार लागू केले जाऊ शकते मानक कर टेम्प्लेट. हा साचा इ #### आपण सर्व मानक कर दर असतील येथे परिभाषित कर दर टीप ""हाताळणी"", कर डोक्यावर आणि ""शिपिंग"", ""इन्शुरन्स"" सारखे इतर खर्च / उत्पन्न डोक्यावर यादी असू शकतात ** आयटम **. विविध दर आहेत ** की ** आयटम नाहीत, तर ते ** आयटम  मास्टर** मधे ** आयटम करात** समाविष्ट करणे आवश्यक आहे **  . #### स्तंभ वर्णन 1. गणना प्रकार: - हे (मूलभूत रक्कम बेरीज आहे) ** नेट एकूण ** वर असू शकते. - ** मागील पंक्ती एकूण / रक्कम ** रोजी (संचयी कर किंवा शुल्क साठी). तुम्ही हा पर्याय निवडत असाल, तर कर रक्कम एकूण (कर सारणी मध्ये) मागील सलग टक्केवारी म्हणून लागू केले जाईल. - ** ** वास्तविक (नमूद). 2. खाते प्रमुख: हा कर खर्च केंद्र ज्या अंतर्गत हा  tax बुक केला  जाईल  3. खातेवही: कर / शुल्क (शिपिंग सारखे) एक उत्पन्न आहे किंवा खर्च तर ती खर्च केंद्र विरुद्ध गुन्हा दाखल करण्यात येणे  आवश्यक आहे. 4. वर्णन: कर वर्णन  (जे  पावत्या / कोट मधे छापले जाईल). 5. दर: कर दर. 6 रक्कम: कर रक्कम. 7. एकूण: या बिंदू संचयी एकूण. 8.रो प्रविष्ट करा: , तर ""मागील पंक्ती एकूण"" वर आधारित असेल तर  तुम्ही सलग क्रमांक निवडू शकता जो या गणनेसाठी  बेस म्हणून घेतला  जाईल(मुलभूत मागील ओळीत आहे) . 9. बेसिक रेट मध्ये समाविष्ट हा कर आहे ?: आपण या तपासा असेल, तर ते हा कर आयटम table  मधे  दाखवला  जाणार नाही, परंतु आपल्या मुख्य आयटम टेबल मध्ये बेसिक रेट मध्ये समाविष्ट केला  जाईल. अर्थ असा की, तुम्ही ग्राहकांना फ्लॅट (सर्व कर समाविष्ट) किंमत, ग्राहकांना किंमत करू इच्छिता तिथे हा उपयुक्त आहे."
 DocType: Employee,Bank A/C No.,बँक / सी क्रमांक
 DocType: Purchase Invoice Item,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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रवेश {0} हे चलन आगाऊ म्हणून कुलशेखरा धावचीत पाहिजे तर {1}, तपासा ऑर्डर विरूद्ध जोडली आहे."
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,हे खरेदी सूचीत टाका साठी मुलभूत सेटिंग्ज
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,पहिल्या आयटम प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,कार्यालय देखभाल खर्च
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
 DocType: Account,Liability,दायित्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो मागणी रक्कम पेक्षा जास्त असू शकत नाही {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा  जास्त असू शकत नाही.
 DocType: Company,Default Cost of Goods Sold Account,वस्तू विकल्या खाते डीफॉल्ट खर्च
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,किंमत सूची निवडलेले नाही
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Process Payroll,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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/public/js/setup_wizard.js +272,Nos,क्र
+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/public/js/setup_wizard.js +272,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 +666,My Invoices,माझे चलने
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नाही कर्मचारी आढळले
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,माझी  चलने
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,कर्मचारी आढळले  नाहीत
 DocType: Supplier Quotation,Stopped,थांबवले
-DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted तर
+DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
 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 +149,Upload stock balance via csv.,सी द्वारे स्टॉक शिल्लक अपलोड करा.
+apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,आता पाठवा
 ,Support Analytics,समर्थन Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,लॉजिकल त्रुटी: होणारे शोधण्यासाठी आवश्यक
 DocType: Item,Website Warehouse,वेबसाइट कोठार
 DocType: Payment Reconciliation,Minimum Invoice Amount,किमान चलन रक्कम
 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 +267,C-Form records,सी-फॉर्म रेकॉर्ड
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,सी-फॉर्म रेकॉर्ड
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ग्राहक आणि पुरवठादार
 DocType: Email Digest,Email Digest Settings,ईमेल डायजेस्ट सेटिंग्ज
 apps/erpnext/erpnext/config/support.py +12,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,हलवित/Moving सरासरी  दर
 DocType: Production Planning Tool,Select Items,निवडा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: Production Order,Target Warehouse,लक्ष्य कोठार
-DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
+DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत डिलिव्हरी किंवा पावती अनुमती द्या
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,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 +34,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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} चा स्थिती {2} आहे
 DocType: Shopping Cart Settings,Enable Checkout,चेकआऊट सक्षम
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 DocType: Quotation Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,तुम्ही ध्येय प्राप्त करू इच्छित असलेल्या टेम्प्लेट निवडा
+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,नोंदणी तपशील
 DocType: Item Reorder,Re-Order Qty,पुन्हा-क्रम 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,प्रोत्साहन
@@ -718,37 +735,38 @@
 apps/erpnext/erpnext/config/hr.py +146,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 +311,Point-of-Sale,पॉइंट-ऑफ-विक्री
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/config/selling.py +311,Point-of-Sale,पॉइंट-ऑफ-सेल
+apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट मध्ये खाते शिल्लक आहे , आपल्याला ' डेबिट ' म्हणून ' शिल्लक असणे आवश्यक ' सेट करण्याची परवानगी नाही"
 DocType: Account,Balance must be,शिल्लक असणे आवश्यक आहे
 DocType: Hub Settings,Publish Pricing,किंमत प्रकाशित
 DocType: Notification Control,Expense Claim Rejected Message,खर्च हक्क नाकारला संदेश
 ,Available Qty,उपलब्ध Qty
-DocType: Purchase Taxes and Charges,On Previous Row Total,मागील पंक्ती एकूण रोजी
+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 +44,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणाली सेट आहेत."
-DocType: HR Settings,Include holidays in Total no. of Working Days,नाही एकूण मध्ये सुटी यांचा समावेश आहे. कार्यरत दिवस
+apps/erpnext/erpnext/public/js/setup_wizard.js +44,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,Subcontracted आहे
 DocType: Item Attribute,Item Attribute Values,आयटम विशेषता मूल्ये
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,पहा सदस्य
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,खरेदी पावती
-,Received Items To Be Billed,प्राप्त आयटम बिल करायचे
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,सदस्य पहा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,खरेदी पावती
+,Received Items To Be Billed,बिल करायचे प्राप्त आयटम
 DocType: Employee,Ms,श्रीमती
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,चलन विनिमय दर मास्टर.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन पुढील {0} दिवसांत वेळ शोधू शकला नाही {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,चलन विनिमय दर मास्टर.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहिल्या दस्तऐवज प्रकार निवडा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
+DocType: Journal Entry,Depreciation Entry,घसारा प्रवेश
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहले दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,कडे जा टाका
-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}
+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/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
@@ -757,49 +775,52 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आयटम समक्रमित करण्यासाठी प्रकाशित
 DocType: Bank Reconciliation,Account Currency,खाते चलन
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,कंपनी मध्ये गोल बंद खाते उल्लेख करा
+apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,कंपनी मध्ये Round Off खाते उल्लेख करा
 DocType: Purchase Receipt,Range,श्रेणी
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} कर्मचारी सक्रिय नाही आहे किंवा अस्तित्वात नाही
+apps/erpnext/erpnext/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 +524,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,आयटम रूपे {0} सुधारित
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
-DocType: Hub Settings,Sync Now,समक्रमण आता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश दुवा साधला जाऊ शकत नाही {1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,या मोडमध्ये निवडलेले असताना मुलभूत बँक / रोख खाते आपोआप पीओएस चलन अद्यतनित केले जाईल.
+DocType: Hub Settings,Sync Now,आता समक्रमण
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
+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?,ऑपरेशन किती तयार वस्तू पूर्ण?
+DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन किती तयार वस्तूंसाठी  पूर्ण आहे ?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,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,बाहेर पडा मुलाखत तपशील
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
+DocType: Employee,Exit Interview Details,मुलाखत तपशीलाच्या बाहेर पडा
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
-DocType: Journal Entry Account,Purchase Invoice,खरेदी चलन
+DocType: Asset,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,तारीख आणि अखेरची दिनांक उघडत त्याच आर्थिक वर्ष आत असावे
+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 Request,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/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम नाही सिरियल निर्दिष्ट करा {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; यादी पॅकिंग &#39;कॉपी होईल."
+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 +110,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम {1} साठी   सिरियल क्रमांक निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
 DocType: Job Opening,Publish on website,वेबसाइट वर प्रकाशित
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ग्राहकांना निर्यात.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,पुरवठादार चलन तारीख पोस्ट दिनांक पेक्षा जास्त असू शकत नाही
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष उत्पन्न
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),एकूण संदेश (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+DocType: SMS Center,Total Message(s),एकूण संदेशा  (चे)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
 DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त सवलत टक्केवारी
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,चेक जमा होते जेथे बँक खाते निवडा प्रमुख.
+DocType: 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","सलग {0}: बीजक {1}, ती रद्द केली जाऊ शकते / अस्तित्वात नाही अवैध आहे. \ वैध चलन प्रविष्ट करा"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
@@ -808,37 +829,38 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
 ,Employee Holiday Attendance,कर्मचारी सुट्टी उपस्थिती
 DocType: Opportunity,Walk In,मध्ये चाला
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,शेअर नोंदी
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,शेअर नोंदी
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,हस्तांतरण
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,करा
+DocType: Purchase Invoice,Get Advances Paid,सुधारण अदा करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी होती . एक संभाव्य कारण तुम्ही  फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com येथे संपर्क साधा.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,माझे टाका
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ऑर्डर प्रकार एक असणे आवश्यक आहे {0}
+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 उघडत
+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/setup_wizard/install_fixtures.py +168,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},साठी Qty {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0} साठी Qty
 DocType: Leave Application,Leave Application,रजेचा अर्ज
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,वाटप साधन सोडा
-DocType: Leave Block List,Leave Block List Dates,ब्लॉक यादी तारखा सोडा
+apps/erpnext/erpnext/config/hr.py +80,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: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,स्थावर खर्च खरेदी पावती
 DocType: Company,Default Terms,मुलभूत अटी
 DocType: Features Setup,"If checked, only Description, Quantity, Rate and Amount are shown in print of Item table. Any extra field is shown under 'Description' column.","चेक केलेले असल्यास, फक्त वर्णन, प्रमाण, दर आणि रक्कम बाबींचा टेबल प्रिंट दिसत आहेत. कोणत्याही अतिरिक्त क्षेत्र &#39;वर्णन&#39; स्तंभ अंतर्गत दर्शविले आहे."
 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.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
+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 +547,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,सवलत
@@ -847,52 +869,53 @@
 DocType: Time Log,Will be updated only if Time Log is 'Billable',वेळ लॉग &#39;बिल&#39; असेल तर फक्त अद्ययावत केले जाईल
 DocType: Project,Internal,अंतर्गत
 DocType: Task,Urgent,त्वरित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},टेबल मध्ये सलग {0} एक वैध रो ID निर्दिष्ट करा {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,डेस्कटॉप वर जा आणि ERPNext वापर सुरू
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},कृपया टेबल {1} मध्ये सलग {0}साठी  एक वैध रो ID निर्दिष्ट करा
+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 +69,Selling Amount,विक्री रक्कम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,वेळ नोंदी
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. &#39;स्थिती&#39; आणि जतन करा अद्यतनित करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,वेळ नोंदी
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' अद्यतनित करा आणि जतन करा
 DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
 DocType: Issue,Issue,अंक
+DocType: Asset,Scrapped,रद्द
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,खाते कंपनी जुळत नाही
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},सिरियल नाही {0} पर्यंत देखभाल करार अंतर्गत आहे {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},सिरियल क्रमांक  {0} हा  {1} पर्यंत देखभाल करार अंतर्गत आहे
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,भरती
 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,आयटम &#39;बटण खरेदी पावत्या आयटम मिळवा&#39; वापर करून समाविष्ट करणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,विक्री खर्च
+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 +129,Sales Expenses,विक्री खर्च
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,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 +300,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,मुलभूत पुरवठादार
-DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता टक्केवारी चेंडू
+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.,प्रथम निवडा कंपनीचे नाव.
+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 +18,Quotations received from Suppliers.,अवतरणे पुरवठादार प्राप्त झाली.
+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,सरासरी वय
-DocType: Opportunity,Your sales person who will contact the customer in future,भविष्यात ग्राहक संपर्क साधू असलेले आपले विक्री व्यक्ती
-apps/erpnext/erpnext/public/js/setup_wizard.js +235,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 +235,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,Enter designation of this Contact,या संपर्कचे पद प्रविष्ट करा
 DocType: Expense Claim,From Employee,कर्मचारी पासून
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,की कामगिरी क्षेत्र
@@ -900,100 +923,103 @@
 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 +130,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},कृपया आयटम {0} साठी BOM क्षेत्रात BOM निवडा
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी-फॉर्म चलन तपशील
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भरणा मेळ चलन
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भरणा सलोखा बीजक
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,योगदान%
 DocType: 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,हे खरेदी सूचीत टाका शिपिंग नियम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',सेट &#39;वर अतिरिक्त सवलत लागू करा&#39; करा
-,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/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डरआधी  रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
+,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,ग्लोबल डीफॉल्ट
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
 DocType: Salary Slip,Deductions,वजावट
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,या वेळ लॉग बॅच बिल आले आहे.
-DocType: Salary Slip,Leave Without Pay,पे न करता सोडू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,क्षमता नियोजन त्रुटी
+DocType: Salary Slip,Leave Without Pay,पे न करता रजा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,क्षमता नियोजन त्रुटी
 ,Trial Balance for Party,पार्टी चाचणी शिल्लक
 DocType: Lead,Consultant,सल्लागार
 DocType: Salary Slip,Earnings,कमाई
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,उघडत लेखा शिल्लक
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,काहीही विनंती करण्यासाठी
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,काहीही विनंती करण्यासाठी
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,व्यवस्थापन
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,वेळ पत्रके क्रियाकलाप प्रकार
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,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.,तुम्ही पगाराच्या स्लिप्स जतन एकदा (शब्दात) निव्वळ वेतन दृश्यमान होईल.
+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 आयटम कोड आहे त्यासाठी जोडला  जाईल. उदाहरणार्थ जर आपला  संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
+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;ग्रुप प्रकार नोडस् अंतर्गत तयार केले जाऊ शकते
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ईमेल आयडी सेट करा
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ईमेल आयडी सेट करा
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +171,{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},पीओएस प्रोफाइल {0} आधीपासूनच प्रयोक्ता तयार: {1} आणि कंपनी {2}
+apps/erpnext/erpnext/stock/utils.py +171,{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},पीओएस प्रोफाइल {0} आधीपासूनच वापरकर्त्यासाठी  तयार: {1} आणि कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,पुरवठादार डेटाबेस.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,पुरवठादार डेटाबेस.
 DocType: Account,Balance Sheet,ताळेबंद
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',&#39;आयटम कोड आयटम केंद्र किंमत
-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 +209,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट सुरू केले"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
 apps/erpnext/erpnext/config/hr.py +120,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 +83,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +83,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: Leave Control Panel,Leave blank if considered for all branches,सर्व शाखा वाटल्यास रिक्त सोडा
+DocType: Leave Control Panel,Leave blank if considered for all branches,सर्व शाखांमध्ये विचारल्यास रिक्त सोडा
 ,Daily Time Log Summary,दैनिक वेळ लॉग सारांश
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},सी-फॉर्म बीजक लागू नाही: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled देय तपशील
-DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्षात वर्ष
-DocType: Global Defaults,Disable Rounded Total,गोळाबेरीज एकूण अक्षम करा
+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 +410,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},सह डुप्लिकेट सलग {0} त्याच {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
 ,Trial Balance,चाचणी शिल्लक
 apps/erpnext/erpnext/config/hr.py +242,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/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,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
 DocType: Contact,User ID,वापरकर्ता आयडी
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,पहा लेजर
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,लेजर पहा
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,लाभांश पेड
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,कायम ठेवण्यात कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,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: 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,तात्पुरती उघडणे
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},मूल्यांकन दर सलग आयटम आवश्यक {0}
@@ -1001,23 +1027,23 @@
 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/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/selling/doctype/quotation/quotation.py +33,Item {0} must be Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ते
-DocType: Item,Lead Time in days,दिवस आघाडी वेळ
+DocType: Item,Lead Time in days,दिवस आघाडीची  वेळ
 ,Accounts Payable Summary,खाती देय सारांश
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},गोठविलेल्या खाते संपादित करण्यासाठी आपण अधिकृत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
 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 +165,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
-							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / वर्ग प्रमाणात साहित्य विनंती मध्ये {0} {1} \ विनंती {2} आयटम प्रमाण जास्त असू शकत नाही {3}
+							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
 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},प्रकरण क्रमांक (s) आधीपासून वापरात आहेत .  प्रकरण {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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,खाते प्रमुख {0} तयार
 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,एकूण गाठले
@@ -1025,164 +1051,171 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 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,वखार संपर्क माहिती
 DocType: Address,City/Town,शहर / नगर
-DocType: Address,Is Your Company Address,आपले कंपनी पत्ता आहे
+DocType: Address,Is Your Company Address,आपल्या  कंपनीचा  पत्ता आहे का ?
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
-DocType: Serial No,Serial No Details,सिरियल तपशील
+DocType: Serial No,Serial No Details,सिरियल क्रमांक तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/stock/get_item_details.py +142,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;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
 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},उत्पादन आदेश स्थिती {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारीख पेक्षा कमी आहे.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,पुरवठादार साठी
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट व्यवहार हे खाते निवडून मदत करते.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारखेच्या पेक्षा कमी आहे.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,पुरवठादार साठी
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट करणे हे व्यवहारामधील account निवडण्यास मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},म्हणतात कोणत्याही आयटम शोधण्यासाठी नाही {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,एकूण जाणारे
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",फक्त &quot;मूल्य&quot; 0 किंवा रिक्त मूल्य एक शिपिंग नियम अट असू शकते
+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 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.,टीप: हा खर्च केंद्र एक गट आहे. गट विरुद्ध लेखा नोंदी करू शकत नाही.
 DocType: Item,Website Item Groups,वेबसाइट आयटम गट
 DocType: Purchase Invoice,Total (Company Currency),एकूण (कंपनी चलन)
-apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} अनुक्रमांक एकापेक्षा अधिक प्रवेश केला
-DocType: Journal Entry,Journal Entry,जर्नल प्रवेश
+apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,अनुक्रमांक {0}  एकापेक्षा अधिक वेळा  enter केला आहे
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Salary Slip,Bank Account No.,बँक खाते क्रमांक
-DocType: Naming Series,This is the number of the last created transaction with this prefix,या हा प्रत्यय गेल्या निर्माण व्यवहार संख्या आहे
+DocType: Naming Series,This is the number of the last created transaction with this prefix,हा क्रमांक या प्रत्ययसह  गेल्या निर्माण केलेला  व्यवहार  आहे
 DocType: Quality Inspection Reading,Reading 8,8 वाचन
 DocType: Sales Partner,Agent,एजंट
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम आपण &#39;वर आधारीत शुल्क वितरण&#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'","एकूण {0} सर्व आयटमसाठी  शून्य आहे,  आपण 'वर आधारीत शुल्क वितरण' बदलले  पाहीजे"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर आणि शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,अवतरण पुरवठादार विनंती
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेअर
 DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कंपनी निवडा
+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,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक
+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,पार्टी खाते चलन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},वर्तमान मूल्य घसारा केल्यावर समान पेक्षा कमी असणे आवश्यक {0}
 ,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/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,दरम्यान आढळलेल्या  आच्छादित अटी:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +167,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,एकूण ऑर्डर मूल्य
 apps/erpnext/erpnext/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 +136,You can make a time log only against a submitted production order,आपण फक्त एक सादर उत्पादन आदेशा एक वेळ लॉग करू शकता
-DocType: Maintenance Schedule Item,No of Visits,भेटी नाही
-apps/erpnext/erpnext/config/crm.py +68,"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/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,आपण फक्त एक सादर उत्पादन आदेशाविरुद्ध  एक वेळ लॉग करू शकता
+DocType: Maintenance Schedule Item,No of Visits,भेटी क्रमांक
+apps/erpnext/erpnext/config/crm.py +68,"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},सर्व goalsसाठी  गुणांची  सम 100 असावी.  हे  {0} आहे
 DocType: Project,Start and End Dates,सुरू आणि तारखा समाप्त
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
-,Delivered Items To Be Billed,वितरित केले आयटम बिल करायचे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,वैशिष्ट्ये सेटअप
+DocType: Asset,Depreciation Schedules,घसारा वेळापत्रक
 DocType: Item,Is Service Item,सेवा आयटम आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,अर्ज काळात बाहेर रजा वाटप कालावधी असू शकत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
 DocType: Payment Request,Transaction Currency,व्यवहार चलन
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},पासून {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},पासून {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ऑपरेशन वर्णन
 DocType: Item,Will also apply to variants,तसेच रूपे लागू होईल
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,आर्थिक वर्ष जतन केले आहे एकदा आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख बदलू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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 +28,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 +210,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
-DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},कमाल: {0}
+DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदांसाठी  विचारल्यास रिक्त सोडा
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,कंपनी साठी
-apps/erpnext/erpnext/config/support.py +17,Communication log.,कम्युनिकेशन लॉग.
+apps/erpnext/erpnext/config/support.py +17,Communication log.,संवाद लॉग.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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 +472,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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,पे न करता सोडू अवलंबून
+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,जी.एल. प्रवेश
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
-,Batch-Wise Balance History,बॅच-शहाणे शिल्लक इतिहास
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची करावे
+,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,नकारात्मक प्रमाण परवानगी नाही
+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/hr/doctype/employee/employee.py +156,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 +447,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 +44,No active Salary Structure found for employee {0} and the month,कर्मचारी {0} आणि महिना आढळले नाही सक्रिय तत्वे
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,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 +167,Tax Rule for transactions.,व्यवहार कर नियम.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,व्यवहार कर नियम.
 DocType: Rename Tool,Type of document to rename.,दस्तऐवज प्रकार पुनर्नामित करण्यात.
-apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,आम्ही या आयटम खरेदी
+apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,आम्ही ही  आयटम खरेदी
 DocType: Address,Billing,बिलिंग
 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} प्राप्तकर्ता पाठविण्यासाठी अनुसूचित
+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/public/js/setup_wizard.js +269,Sub Assemblies,उप विधानसभा
+DocType: Asset,Asset Name,मालमत्ता नाव
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Supplier,Stock Manager,शेअर व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},स्रोत कोठार सलग अनिवार्य आहे {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,पॅकिंग स्लिप्स
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,कार्यालय भाडे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,अवतरण विनंती खालील दुव्यावर क्लिक करुन प्रवेश असू शकते
+DocType: Asset,Number of Months in a Period,एक कालावधी मध्ये महिने संख्या
 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.,नाही पत्ता अद्याप जोडले.
+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,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,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 +415,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +415,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 मध्ये
@@ -1191,31 +1224,32 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),एकूण ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),एकूण ({0})
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
 DocType: Sales Invoice,Source,स्रोत
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,बंद शो
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,भरणा टेबल मधे रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
 DocType: Employee External Work History,Total Experience,एकूण अनुभव
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,रद्द केलेल्या  पॅकिंग स्लिप (चे)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,गुंतवणूक रोख प्रवाह
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 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 +86,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
 DocType: Pricing Rule,For Price List,किंमत सूची
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
-apps/erpnext/erpnext/stock/stock_ledger.py +406,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आयटम खरेदी दर: {0} आढळले नाही, एकट्या नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमत उल्लेख करा."
+apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} आढळले नाही, accounting नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमतीचा  उल्लेख करा."
 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.,लेखा चार्ट नवीन खाते तयार करा.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,देखभाल भेट द्या
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,कोठार वर उपलब्ध आहे बॅच Qty
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,लेखा चार्टपासून  नवीन खाते तयार करा.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,देखभाल भेट द्या
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,वखार मधे उपलब्ध बॅच प्रमाण
 DocType: Time Log Batch Detail,Time Log Batch Detail,वेळ लॉग बॅच तपशील
-DocType: Landed Cost Voucher,Landed Cost Help,उतरले खर्च मदत
+DocType: Landed Cost Voucher,Landed Cost Help,स्थावर खर्च मदत
 DocType: Purchase Invoice,Select Shipping Address,पाठविण्याचा पत्ता निवडा
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
 ,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
@@ -1223,85 +1257,85 @@
 DocType: UOM,UOM Name,UOM नाव
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,योगदान रक्कम
 DocType: Purchase Invoice,Shipping Address,शिपिंग पत्ता
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,हे साधन आपल्याला सुधारीत किंवा प्रणाली मध्ये स्टॉक प्रमाण आणि मूल्यांकन निराकरण करण्यासाठी मदत करते. सामान्यत: प्रणाली मूल्ये आणि काय प्रत्यक्षात आपल्या गोदामे अस्तित्वात समक्रमित करण्यासाठी वापरले जाते.
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,आपण डिलिव्हरी टीप जतन एकदा शब्द मध्ये दृश्यमान होईल.
+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 +196,Brand master.,ब्रँड मास्टर.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,बॉक्स
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,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,स्वीकारणारा सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
+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 +106,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 DocType: Shopping Cart Settings,Payment Success URL,भरणा यशस्वी URL मध्ये
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत आयटम {1} नाही विद्यमान नाही {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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 +295,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,आयटम नाहीत पॅक करण्यासाठी
+apps/erpnext/erpnext/config/stock.py +295,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} विरुद्ध  {0} पेक्षा  {1} अधिक  transfer करण्याची परवानगी नाही
+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 +540,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +131,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,शेअर दायित्व
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,शेअर दायित्व
 DocType: Purchase Receipt,Supplier Warehouse,पुरवठादार कोठार
 DocType: Opportunity,Contact Mobile No,संपर्क मोबाइल नाही
-,Material Requests for which Supplier Quotations are not created,पुरवठादार अवतरणे तयार नाहीत जे साहित्य विनंत्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण रजा अर्ज करत आहेत ज्या दिवशी (चे) सुटी आहेत. आपण रजा अर्ज गरज नाही.
+,Material Requests for which Supplier Quotations are not created,साहित्य विनंत्या  ज्यांच्यासाठी पुरवठादार अवतरणे तयार नाहीत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,इतर अहवाल
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +180,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,स्वीकारणारा यादी
+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,नाश रक्कम
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} पहा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,रोख निव्वळ बदला
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,मागील आर्थिक वर्ष बंद नाही
 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 +40,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 +38,Supplier Type master.,पुरवठादार प्रकार मास्टर.
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +43,Supplier Type master.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
 DocType: Purchase Invoice,Reference Document,संदर्भ दस्तऐवज
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1} रद्द किंवा बंद आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/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,माझे मुद्दे
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,माझी  मुद्दे
 DocType: BOM Item,BOM Item,BOM आयटम
 DocType: Appraisal,For Employee,कर्मचारी साठी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,रो {0}: पुरवठादार विरुद्ध आगाऊ डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +240,Row {0}: Payment amount can not be negative,रो {0}: भरणा रक्कम नकारात्मक असू शकत नाही
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
@@ -1311,132 +1345,137 @@
 DocType: Budget Detail,Budget Allocated,अर्थसंकल्प वाटप
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,देय खाती निव्वळ बदल
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,देय खात्यांमध्ये  निव्वळ बदल
 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 सवलत&#39; आवश्यक ग्राहक
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,नियतकालिके बँकेच्या भरणा तारखा अद्यतनित करा.
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Customerwise सवलत' साठी आवश्यक ग्राहक
+apps/erpnext/erpnext/config/accounts.py +137,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.,आयटम कोणतेही प्रमाणात किंवा मूल्य कोणत्याही बदल आहेत.
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 पेक्षा जास्त असणे आवश्यक आहे
+DocType: Manufacturing Settings,Capacity Planning For (Days),( दिवस) क्षमता नियोजन
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,कोणत्याही आयटमधे   प्रमाण किंवा मूल्यांमध्ये  बदल नाहीत .
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,हमी दावा
 ,Lead Details,लीड तपशील
 DocType: Pricing Rule,Applicable For,लागू
-DocType: Bank Reconciliation,From Date,तारीख पासून
+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,पॅक आयटम
-apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,सिरियल क्रमांक विरुद्ध हमी दावा
-DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM",ते वापरले जाते त्या इतर सर्व BOMs विशिष्ट BOM बदला. हे जुन्या BOM दुवा पुनर्स्थित खर्च अद्ययावत आणि नवीन BOM नुसार &quot;BOM स्फोट आयटम &#39;टेबल निर्माण होईल
+DocType: Leave Type,Include holidays within leaves as leaves,leaves म्हणून leaves मध्ये सुट्ट्यांचा सामावेश करा
+DocType: Sales Invoice,Packed Items,पॅक केलेला आयटम
+apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,सिरियल क्रमांका  विरुद्ध हमी दावा
+DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","ज्या  इतर सर्व BOMs  मध्ये हे वापरले जाते तो  विशिष्ट BOM बदला. यामुळे  जुन्या BOM दुवा पुनर्स्थित खर्च अद्ययावत आणि नवीन BOM नुसार ""BOM स्फोट आयटम 'टेबल निर्माण होईल"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',&#39;एकूण&#39;
-DocType: Shopping Cart Settings,Enable Shopping Cart,हे खरेदी सूचीत टाका सक्षम
+DocType: Shopping Cart Settings,Enable Shopping Cart,खरेदी सूचीत टाका आणि सक्षम करा
 DocType: Employee,Permanent Address,स्थायी पत्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",एकूण पेक्षा \ {0} {1} जास्त असू शकत नाही विरुद्ध दिले आगाऊ {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,आयटम कोड निवडा
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),पे न करता सोडू साठी कपात कमी (LWP)
+						than Grand Total {2}",आगाऊ \ एकूण पेक्षा {2} विरुद्ध {0} {1} जास्त असू शकत नाही
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,कृपया आयटम कोड निवडा
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),पे न करता  रजेसाठी कपात कमी (LWP)
 DocType: Territory,Territory Manager,प्रदेश व्यवस्थापक
 DocType: Packed 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/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,विपणन खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +53,Single unit of an Item.,एक आयटम एकच एकक.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,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 +392,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि शेवट तारखा प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,एका  आयटम एकच एकक.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,प्रत्येक स्टॉक चळवळीसाठी  Accounting प्रवेश करा
+DocType: Leave Allocation,Total Leaves Allocated,एकूण रजा  वाटप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},रो क्रमांक  {0} साठी  आवश्यक कोठार
+apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि समाप्त  तारखा प्रविष्ट करा
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Address,Postal,पोस्टल
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +171,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
 DocType: Item,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,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
-apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{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 +155,Please select {0} first.,कृपया प्रथम {0}  निवडा.
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,नवीन संपर्क
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
 DocType: Stock Entry,Material Receipt,साहित्य पावती
 apps/erpnext/erpnext/public/js/setup_wizard.js +268,Products,उत्पादने
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},पार्टी प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {0}
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटम रूपे आहेत, तर तो विक्री आदेश इ निवडले जाऊ शकत नाही"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},सलग  {1}  मधे आयटम {0}   साठी आवश्यक त्या प्रमाणात
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,आयटम निहाय विक्री नोंदणी
+DocType: Payment Tool,Find Invoices to Match,मॅच करण्यासाठी चलने शोधा
+,Item-wise Sales Register,आयटमनूसार विक्री नोंदणी
+DocType: Asset,Gross Purchase Amount,एकूण खरेदी रक्कम
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",उदा &quot;xyz नॅशनल बँक&quot;
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,बेसिक रेट मध्ये समाविष्ट या कर काय आहे?
+DocType: Asset,Depreciation Method,घसारा पद्धत
+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 +29,Shopping Cart is enabled,हे खरेदी सूचीत टाका सक्षम आहे
-DocType: Job Applicant,Applicant for a Job,जॉब साठी अर्जदाराची
+DocType: Job Applicant,Applicant for a Job,नोकरी साठी अर्जदार
 DocType: Production Plan Material Request,Production Plan Material Request,उत्पादन योजना साहित्य विनंती
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,तयार केला नाही उत्पादन आदेश
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,उत्पादन आदेश तयार केला नाही
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,मुख्य
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,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/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+DocType: Employee,Leave Encashed?,रजा  मिळविता?
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,field पासून संधी अनिवार्य आहे
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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,शेअर मेळ
 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 +40,Applicant for a Job.,जॉब साठी अर्जदाराचे.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,नोकरी साठी अर्जदार
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,पत्ते
+apps/erpnext/erpnext/hooks.py +91,Addresses,पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,त्यावेळच्या
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},सिरियल नाही आयटम प्रविष्ट डुप्लिकेट {0}
+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 +337,Item is not allowed to have Production Order.,आयटम उत्पादन ऑर्डर आहेत करण्याची परवानगी नाही.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,आयटमला  उत्पादन ऑर्डर करण्याची परवानगी नाही.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,आयटम किंवा वखार आधारित फिल्टर सेट करा
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),या संकुल निव्वळ वजन. (आयटम निव्वळ वजन रक्कम म्हणून स्वयंचलितपणे गणना)
-DocType: Sales Order,To Deliver and Bill,वाचव आणि बिल
-DocType: GL Entry,Credit Amount in Account Currency,खाते चलन क्रेडिट रक्कम
-apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,उत्पादन वेळ नोंदी.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+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,वितरीत आणि बिल
+DocType: GL Entry,Credit Amount in Account Currency,खाते चलनातील  क्रेडिट रक्कम
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,उत्पादन वेळेसाठी   नोंदी.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: वखार नाकारलेले नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,कार्ये वेळ लॉग इन करा.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,भरणा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,हा सलाम लिहीत आहे
+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: Pricing Rule,Brand,ब्रँड
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Quotation Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 वाचन
-apps/erpnext/erpnext/public/js/setup_wizard.js +258,"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 +258,"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,हब नोड
-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 +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,मूल्य {0} विशेषता साठी {1} वैध आयटम यादीत अस्तित्वात नाही मूल्ये विशेषता
+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 +66,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 +44,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
+DocType: Request for Quotation Supplier,Send Email to Supplier,पुरवठादार ईमेल पाठवा
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 DocType: Packing Slip,To Package No.,क्रमांक पॅकेज करण्यासाठी
 DocType: Production Planning Tool,Material Requests,साहित्य विनंत्या
@@ -1446,301 +1485,311 @@
 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 +126,Quantity for Item {0} must be less than {1},आयटम संख्या {0} पेक्षा कमी असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
 ,Sales Invoice Trends,विक्री चलन ट्रेन्ड
-DocType: Leave Application,Apply / Approve Leaves,पाने मंजूर / लागू करा
+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; शुल्क प्रकार असेल तर सलग पहा शकता
+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,भत्ता टक्के
 DocType: SMS Settings,Message Parameter,संदेश मापदंड
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,आर्थिक खर्च केंद्रे झाड.
-DocType: Serial No,Delivery Document No,डिलिव्हरी दस्तऐवज नाही
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,खरेदी पावत्या आयटम मिळवा
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,आर्थिक खर्च केंद्रे Tree.
+DocType: Serial No,Delivery Document No,डिलिव्हरी दस्तऐवज क्रमांक
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,खरेदी पावत्यांचे आयटम मिळवा
 DocType: Serial No,Creation Date,तयार केल्याची तारीख
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} आयटम किंमत यादी मध्ये अनेक वेळा आढळते {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर विक्री, चेक करणे आवश्यक आहे {0}"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},आयटम {0}  किंमत यादी  {1} मध्ये अनेक वेळा आढळतो
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","पाञ {0} म्हणून निवडले असेल , तर विक्री, चेक करणे आवश्यक आहे"
 DocType: Production Plan Material Request,Material Request Date,साहित्य विनंती तारीख
 DocType: Purchase Order Item,Supplier Quotation Item,पुरवठादार कोटेशन आयटम
-DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन आदेश विरुद्ध वेळ नोंदी निर्माण अकार्यान्वित करतो. ऑपरेशन उत्पादन ऑर्डर विरुद्ध माग काढला जाऊ नये;
+DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन आदेश विरुद्ध वेळ नोंदी तयार करणे अक्षम करते .ऑपरेशन उत्पादन ऑर्डर विरुद्ध मागे काढला जाऊ नये
 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; बटणावर क्लिक करा.
 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,कंपनी मास्टर आणि ग्लोबल मुलभूत पूर्वनिर्धारीत चलन निर्दिष्ट करा
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,कृपया कंपनी मास्टर आणि जागतिक मुलभूत मधे पूर्वनिर्धारीत चलन निर्दिष्ट करा
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
 apps/erpnext/erpnext/config/projects.py +78,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/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/public/js/setup_wizard.js +201,e.g. 5,उदा 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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.,तुम्ही विक्री चलन जतन एकदा शब्द मध्ये दृश्यमान होईल.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,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} आयटम सिरियल क्र सेटअप नाही. आयटम मास्टर तपासा
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आयटम {0} सिरियल क्रमांकासाठी  सेटअप नाही. आयटम मास्टर तपासा
 DocType: Maintenance Visit,Maintenance Time,देखभाल वेळ
 ,Amount to Deliver,रक्कम वितरीत करण्यासाठी
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,एखाद्या उत्पादन किंवा सेवा
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,एखादी उत्पादन किंवा सेवा
 DocType: Naming Series,Current Value,वर्तमान मूल्य
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} तयार
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} तयार
 DocType: Delivery Note Item,Against Sales Order,विक्री आदेशा
-,Serial No Status,सिरियल नाही स्थिती
+,Serial No Status,सिरियल क्रमांक स्थिती
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,आयटम टेबल रिक्त ठेवता येणार नाही
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
-						must be greater than or equal to {2}","रो {0}: सेट करण्यासाठी {1} ठराविक मुदतीने पुन: पुन्हा उगवणे, आणि तारीख \ दरम्यान फरक पेक्षा मोठे किंवा समान असणे आवश्यक आहे {2}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","रो {0}: {1} periodicity सेट करण्यासाठी , पासून आणि पर्यंत  तारीख \ दरम्यानचा  फरक {2} पेक्षा मोठे किंवा समान असणे आवश्यक आहे"
 DocType: Pricing Rule,Selling,विक्री
 DocType: Employee,Salary Information,पगार माहिती
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,मुळे तारीख तारीख पोस्ट करण्यापूर्वी असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,कर आणि कर्तव्ये
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,पेमेंट गेटवे खाते कॉन्फिगर नाही
-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: Production Order,Material Request Item,साहित्य विनंती आयटम
-apps/erpnext/erpnext/config/stock.py +85,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/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,पेमेंट गेटवे खाते संरचीत केलेले नाही
+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: Request for Quotation Item,Material Request Item,साहित्य विनंती आयटम
+apps/erpnext/erpnext/config/stock.py +85,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,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
+DocType: Asset,Sold,विक्री
+,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सिरियल नाही आयटम जोडले प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},कृपया   आयटम {0} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
 DocType: Account,Frozen,फ्रोजन
-,Open Production Orders,ओपन उत्पादन ऑर्डर
+,Open Production Orders,उत्पादन ऑर्डर ओपन करा
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
 DocType: Sales Invoice,Accounting Details,लेखा माहिती
-apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ही कंपनी सर्व व्यवहार हटवा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,गुंतवणूक
+apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ह्या कंपनीसाठी सर्व व्यवहार हटवा
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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 +60,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,वाटप
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृती निकष
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,वरील टेबल साहित्य विनंत्या प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,वरील टेबलमधे  साहित्य विनंत्या प्रविष्ट करा
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 DocType: Item Group,Show In Website,वेबसाइट मध्ये दर्शवा
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,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","खालील कागदपत्रे वितरण टीप, संधी, साहित्य विनंती, आयटम, पर्चेस, खरेदी व्हाउचर, ग्राहक पावती, कोटेशन, विक्री चलन, उत्पादन बंडल, विक्री आदेश, माणे मध्ये ब्रांड नाव ट्रॅक करण्यासाठी"
+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 +25,Gantt chart of all tasks.,सर्व कार्ये Gantt चार्ट.
+DocType: Pricing Rule,Margin Type,मार्जिन प्रकार
 DocType: Appraisal,For Employee Name,कर्मचारी नावासाठी
-DocType: Holiday List,Clear Table,साफ करा टेबल
+DocType: Holiday List,Clear Table,टेबल साफ करा
 DocType: Features Setup,Brands,ब्रांड
-DocType: C-Form Invoice Detail,Invoice No,चलन नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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: C-Form Invoice Detail,Invoice No,चलन क्रमांक
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजा शिल्लक आधीच   रजा वाटप रेकॉर्ड{1} मधे भविष्यात carry-forward केले आहे म्हणून, रजा  {0} च्या आधी रद्द / लागू केल्या  जाऊ शकत नाहीत"
 DocType: Activity Cost,Costing Rate,भांडवलाच्या दर
 ,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,सलग # {0}: मालमत्ता मुदत मालमत्ता आयटम विरुद्ध अनिवार्य आहे
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे विधान परिषदेच्या मालिका संख्या करा&gt; क्रमांकन मालिका
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'एक्सपेन्स मंजुरी' भूमिका असणे आवश्यक आहे
+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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'खर्च मंजूर' भूमिका असणे आवश्यक आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,जोडी
+DocType: Asset,Depreciation Schedule,घसारा वेळापत्रक
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बॅच नाही आहे
 DocType: Delivery Note,Excise Page Number,अबकारी पृष्ठ क्रमांक
+DocType: Asset,Purchase Date,खरेदी दिनांक
 DocType: Employee,Personal Details,वैयक्तिक माहिती
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी मध्ये &#39;मालमत्ता घसारा खर्च केंद्र&#39; सेट करा {0}
 ,Maintenance Schedules,देखभाल वेळापत्रक
 ,Quotation Trends,कोटेशन ट्रेन्ड
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},आयटम गट आयटम आयटम मास्टर उल्लेख केला नाही {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,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,वितरित केले
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
-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} जास्त
+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,पुरवठादार-शहाणे विक्री विश्लेषण
+,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,समेट नोंदी समाविष्ट
-DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी प्रकार विचार तर रिक्त सोडा
+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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,नॉन-गट गट
+DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,गट  पासून नॉन-गट पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक एकूण
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,युनिट
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,Your financial year ends on,आपले आर्थिक वर्षात रोजी संपत आहे
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारलेले  आयटम राखण्यासाठी आहेत ते  कोठार
+apps/erpnext/erpnext/public/js/setup_wizard.js +42,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,खर्च दावे
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,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,कंपनी चलन निर्दिष्ट करा
+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 +49,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,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/controllers/accounts_controller.py +262,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} मधे आवश्यक आहे
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},निपटारा तारीख सलग चेक तारखेच्या आधी असू शकत नाही {0}
 DocType: Salary Slip,Deduction,कपात
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},आयटम किंमत जोडले {0} किंमत यादी मध्ये {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
 DocType: Address Template,Address Template,पत्ता साचा
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,या विक्री व्यक्ती कर्मचारी आयडी प्रविष्ट करा
+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 +137,Please enter Production Item first,पहिल्या उत्पादन आयटम प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,पहिले  उत्पादन आयटम प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,गणिती बँक स्टेटमेंट शिल्लक
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,अक्षम वापरकर्ता
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,कोटेशन
 DocType: Salary Slip,Total Deduction,एकूण कपात
 DocType: Quotation,Maintenance User,देखभाल सदस्य
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,खर्च अद्यतनित
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,खर्च अद्यतनित
 DocType: Employee,Date of Birth,जन्म तारीख
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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**.,** आर्थिक वर्ष ** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार ** ** आर्थिक वर्ष विरुद्ध नियंत्रीत केले जाते.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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: 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,त्यामुळे Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
+,SO Qty,SO Qty
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},सिरियल नाही {0} पर्यंत हमी अंतर्गत आहे {1}
-apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,संकुल स्प्लिट वितरण टीप.
+DocType: Request for Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},सिरियल क्रमांक {0} हा  {1} पर्यंत हमी अंतर्गत आहे
+apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,वितरण टीप  मधे संकुल मधे  Split करा .
 apps/erpnext/erpnext/hooks.py +71,Shipments,निर्यात
 DocType: Purchase Order Item,To be delivered to customer,ग्राहकाला वितरित करणे
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,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/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल क्रमांक  {0} कोणत्याही वखारशी  संबंधित नाही
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,रो #
 DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन)
-DocType: Pricing Rule,Supplier,पुरवठादार
+DocType: Asset,Supplier,पुरवठादार
 DocType: C-Form,Quarter,तिमाहीत
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,मिश्र खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,मिश्र खर्च
 DocType: Global Defaults,Default Company,मुलभूत कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,सदस्य {0} अक्षम आहे
 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,सर्व विभागांसाठी वाटल्यास रिक्त सोडा
+DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +175,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} आयटम अनिवार्य आहे {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
 DocType: Currency Exchange,From Currency,चलन पासून
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},आयटम  {0} साठी  आवश्यक विक्री ऑर्डर
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,इतर
-apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,एक जुळणारे आयटम शोधू शकत नाही. साठी {0} काही इतर मूल्य निवडा.
+apps/erpnext/erpnext/templates/includes/product_page.js +65,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/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,बाल आयटम उत्पादन बंडल असू नये. आयटम काढा &#39;{0}&#39; आणि जतन
+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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","सलग # {0}: प्रमाण 1, आयटम मालमत्ता निगडीत आहे असणे आवश्यक आहे"
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child आयटम उत्पादन बंडल मधे असू नये. आयटम  '{0}' काढा आणि जतन करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बँकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,नवी खर्च केंद्र
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; प्रकार बाल जोडा वर क्लिक) आणि करू कर दर उल्लेख.
-DocType: Bin,Ordered Quantity,आदेश दिले प्रमाण
-apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",उदा &quot;बांधणाऱ्यांनी साधने बिल्ड&quot;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,नवी खर्च केंद्र
+DocType: Bin,Ordered Quantity,आदेश दिलेले प्रमाण
+apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","उदा ""बांधकाम व्यावसायिकांसाठी  बिल्ड साधने """
 DocType: Quality Inspection,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
-apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,आर्थिक खाती झाड.
+apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,आर्थिक खाती Tree.
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तऐवज प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} विक्री आदेशा {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} विक्री आदेशा विरुद्ध {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
 apps/erpnext/erpnext/config/stock.py +305,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,प्राप्त खाते
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
 DocType: Quotation Item,Stock Balance,शेअर शिल्लक
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,वेळ नोंदी तयार:
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,योग्य खाते निवडा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,वेळ नोंदी तयार:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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,विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता जे वापरकर्ते
+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/setup_wizard/industry_type.py +24,Electronics,इलेक्ट्रॉनिक्स
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,स्टॉक पुन्हा आदेश स्तरावर पोहोचते तेव्हा साहित्य विनंती वाढवण्याची
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,स्टॉक पुन्हा आदेश स्तरावर पोहोचते तेव्हा साहित्य विनंती वाढवा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,पूर्ण-वेळ
 DocType: Employee,Contact Details,संपर्क माहिती
 DocType: C-Form,Received Date,प्राप्त तारीख
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","तुम्ही विक्री कर आणि शुल्क साचा मध्ये एक मानक टेम्प्लेट तयार केले असेल तर, एक निवडा आणि खालील बटणावर क्लिक करा."
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,या शिपिंग नियम देश निर्दिष्ट करा किंवा जगभरातील शिपिंग तपासा
-DocType: Stock Entry,Total Incoming Value,एकूण येणार्या मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,डेबिट करणे आवश्यक आहे
+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/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,डेबिट करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
 DocType: Offer Letter Term,Offer Term,ऑफर मुदत
 DocType: Quality Inspection,Quality Manager,गुणवत्ता व्यवस्थापक
 DocType: Job Applicant,Job Opening,जॉब ओपनिंग
 DocType: Payment Reconciliation,Payment Reconciliation,भरणा मेळ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,प्रभारी व्यक्तीचे नाव निवडा कृपया
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,कृपया  पहिले प्रभारी व्यक्तीचे नाव निवडा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,पत्र ऑफर
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ऑफर पत्र
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,साहित्य विनंत्या (एमआरपी) आणि उत्पादन आदेश व्युत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,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 +103,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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/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.","child नोडस् जोडण्यासाठी, वृक्ष अन्वेषण करा  आणि आपण अधिक नोडस् जोडू इच्छित असल्यास त्या अंतर्गत नोड वर क्लिक करा."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,क्रेडिट खाते देय खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
+apps/erpnext/erpnext/stock/get_item_details.py +272,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 +123,Create Payment Entries against Orders or Invoices.,ऑर्डर किंवा चलने विरुद्ध भरणा नोंदी तयार करा.
+DocType: Opportunity,Lost Reason,कारण गमावले
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ऑर्डर किंवा चलने विरुद्ध भरणा नोंदी तयार करा.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,आयटम सिरियल क्र
+DocType: Features Setup,Item Serial 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:,महिन्यात आढळले नाही पगारपत्रक:
+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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,आढळले नाही सिरियल नाही {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,आपले ग्राहक
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,आता लागू
-DocType: Sales Order,Not Delivered,वितरण नाही
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,आता लागू
+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/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
 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/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}  साठी Maxiumm सवलत  {1}% आहे
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,मोठ्या प्रमाणात आयात
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
@@ -1751,12 +1800,12 @@
 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/batch_wise_balance_history/batch_wise_balance_history.py +43,'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,नवीन कामाची जागा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,बंद म्हणून सेट करा
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},बारकोड असलेले कोणतेही आयटम नाहीत {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},बारकोड असलेले कोणतेही आयटम {0} नाहीत
 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,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
@@ -1774,10 +1823,10 @@
 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 +608,Transfer Material,ट्रान्सफर साहित्य
-apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},आयटम {0} मध्ये विक्री आयटम असणे आवश्यक आहे {1}
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च निर्देशीत आणि आपल्या ऑपरेशन नाही एक अद्वितीय ऑपरेशन द्या."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},आयटम {0} मध्ये विक्री आयटम {1} असणे आवश्यक आहे
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च  आणि आपल्या ऑपरेशनसाठी    एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -1789,26 +1838,27 @@
 DocType: Address,Subsidiary,उपकंपनी
 apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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,बयाणा रक्कम
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,इसा-याची रक्कम
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),निधी स्रोत (दायित्व)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,कर्मचारी
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,पासून आयात ईमेल
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,ईमेल पासून  आयात
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,वापरकर्ता म्हणून आमंत्रित करा
 DocType: Features Setup,After Sale Installations,विक्री स्थापना केल्यानंतर
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},कंपनी मध्ये {0} सेट करा {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 DocType: Workstation Working Hour,End Time,समाप्त वेळ
 apps/erpnext/erpnext/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/config/crm.py +6,Sales Pipeline,विक्री पाईपलाईन
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक रोजी
+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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},कृपया सलग आयटम BOM निवडा {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
-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 +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+DocType: Rename Tool,File to Rename,फाइल पुनर्नामित करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},आयटम  {1} साठी निर्दिष्ट BOM {0} अस्तित्वात नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,खरेदी आयटम खर्च
@@ -1821,76 +1871,77 @@
 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,"तारीख करण्यासाठी, विधान परिषदेच्या"
+DocType: Upload Attendance,Attendance To Date,उपस्थिती पासून तारीख
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Gateway Account,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनी सर्व व्यवहार हटवू इच्छिता याची खात्री करा. ती आहे म्हणून आपला मालक डेटा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
+apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनीतील  सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master  data  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादन ऑर्डर {3} मधे {0} ({1}) नियोजित प्रमाण पेक्षा जास्त असू शकत नाही ({2})
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, बीजक ड्रॉप शिपिंग आयटम आहे."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},सलग येथे आयटम {0} साठी नियोजनबद्ध Qty प्रविष्ट करा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,"{0} {1} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},सलग  आयटम {0} सलग{1} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,"{0} {1} हे सबमिट केलेली नाही,"
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,आयटम विनंती.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगल्या आयटम तयार केले जाईल.
+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.","या अद्ययावत गोठविली लेखा नोंद, कोणीही / करू खाली निर्दिष्ट भूमिका वगळता नोंद संपादीत करू शकता."
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting प्रवेश गोठविली लेखा नोंद, कोणीही करून  / सुधारुन खालील  निर्दिष्ट भूमिका वगळता नोंद संपादीत करताू शकतात ."
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
+DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्रमांकासाठी)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,वृत्तपत्र मेलिंग सूची
 DocType: Delivery Note,Transporter Name,वाहतुक नाव
 DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
-DocType: Contact,Enter department to which this Contact belongs,या संपर्क मालकीचे जे विभाग प्रविष्ट करा
+DocType: Contact,Enter department to which this Contact belongs,या संपर्क मालकीचे जे विभाग आहेत ते प्रविष्ट करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,एकूण अनुपिस्थत
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,आयटम किंवा कोठार सलग {0} साठी  सामग्री विनंती  जुळत नाही
 apps/erpnext/erpnext/config/stock.py +185,Unit of Measure,माप युनिट
-DocType: Fiscal Year,Year End Date,वर्ष अंतिम तारीख
+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,पूर्ण उत्पादन ऑर्डर
+,Completed Production Orders,उत्पादन ऑर्डर पूर्ण झाला
 DocType: Operation,Default Workstation,मुलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,खर्च क्लेम मंजूर संदेश
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} बंद आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} हे बंद आहे
 DocType: Email Digest,How frequently?,किती वारंवार?
 DocType: Purchase Receipt,Get Current Stock,वर्तमान शेअर मिळवा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",योग्य गट (सहसा निधी अर्ज&gt; वर्तमान मालमत्ता&gt; बँक खाते जा आणि (नवीन खाते तयार प्रकार बाल जोडा) क्लिक करून &quot;बँक&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,साहित्य बिल झाडाकडे
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,मार्क सध्याची
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},देखभाल प्रारंभ तारीख माणे वितरणाची तारीख आधी असू शकत नाही {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,उद्देश
-DocType: Item,Will also apply for variants unless overrridden,Overrridden तोपर्यंत देखील रूपे लागू राहील
-DocType: Purchase Invoice,Advances,अग्रिम
+DocType: Company,Fixed Asset Depreciation Settings,मुदत मालमत्ता घसारा सेटिंग्ज
+DocType: Item,Will also apply for variants unless overrridden,Overrridden आहेत तोपर्यंत देखील रूपे लागू राहील
+DocType: Purchase Invoice,Advances,प्रगती
 DocType: Production Order,Manufacture against Material Request,साहित्य विनंती विरुद्ध उत्पादन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,सदस्य मंजूर नियम लागू आहे वापरकर्ता म्हणून समान असू शकत नाही
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),बेसिक रेट (शेअर UOM नुसार)
-DocType: SMS Log,No of Requested SMS,मागणी एसएमएस नाही
+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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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: 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,Child नोड आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{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/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,Ageing श्रेणी 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.
 
@@ -1912,21 +1963,23 @@
 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. जोडा किंवा वजा: आपण जोडू किंवा कर वजा करायचे."
+10. Add or Deduct: Whether you want to add or deduct the tax.","सर्व खरेदी व्यवहार लागू केले जाऊ शकते मानक कर टेम्प्लेट. हा साचा इ #### आपण सर्व ** आयटम मानक कर दर असतील येथे परिभाषित कर दर टीप ""हाताळणी"", कर heads आणि ""शिपिंग"", ""इन्शुरन्स"" सारखे इतर खर्च heads यादी असू शकतात * *. विविध दर आहेत ** की ** आयटम नाहीत, तर ते ** आयटम  मास्टर** मधे  ** आयटम करात समाविष्ट करणे आवश्यक आहे **. #### स्तंभ वर्णन 1. गणना प्रकार: - हे (मूलभूत रक्कम बेरीज आहे) ** नेट एकूण ** वर असू शकते. - ** मागील पंक्ती एकूण / रक्कम ** रोजी (संचयी कर किंवा शुल्क साठी). तुम्ही हा पर्याय निवडत असाल, तर कर रक्कम एकूण (कर सारणी मध्ये) मागील सलग टक्केवारी म्हणून लागू केले जाईल. - ** ** वास्तविक (नमूद). 2. खाते प्रमुख: हा कर 3. खर्च केंद्र बुक केले जाईल ज्या अंतर्गत खाते खातेवही: कर / शुल्क (शिपिंग सारखे) एक उत्पन्न आहे किंवा खर्च तर ती खर्च केंद्र विरुद्ध गुन्हा दाखल करण्यात यावा करणे आवश्यक आहे. 4. वर्णन: कर वर्णन (की पावत्या / कोट छापले जाईल). 5. दर: कर दर. 6 रक्कम: कर रक्कम. 7. एकूण: या बिंदू संचयी एकूण. 8. रो प्रविष्ट करा: आधारित असेल, तर ""मागील पंक्ती एकूण"" जर तुम्ही या गणित एक बेस (मुलभूत मागील ओळीत आहे) म्हणून घेतले जाईल जे ओळीवर निवडू शकता. 9. कर किंवा शुल्क विचार करा: कर / शुल्क मूल्यांकन केवळ आहे (एकूण नाही एक भाग) किंवा (फक्त आयटम मूल्यवान नाही) एकूण किंवा दोन्ही असल्यावरच हा विभाग तुम्ही देखिल निर्देशीत करू शकता. 10. जोडा किंवा वजा: आपण जोडू किंवा कर वजा करायचे."
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
-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 +497,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
+DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","उदा बँक, रोख, क्रेडिट कार्ड"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",योग्य गट (सहसा निधी अर्ज&gt; वर्तमान मालमत्ता&gt; बँक खाते जा आणि (नवीन खाते तयार प्रकार बाल जोडा) क्लिक करून &quot;बँक&quot;
 DocType: Journal Entry,Credit Note,क्रेडिट टीप
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},पूर्ण Qty पेक्षा अधिक असू शकत नाही {0} ऑपरेशन {1}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},ऑपरेशन {1} साठी  पूर्ण Qty {0} पेक्षा अधिक असू शकत नाही
 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 पंक्ती.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,शेअर सलोखासाठी  कमाल 100 पंक्ती .
 DocType: Material Request,Manufacture,उत्पादन
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,कृपया वितरण टीप पहिल्या
+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 +69,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
@@ -1939,53 +1992,54 @@
 DocType: Lead,Fax,फॅक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,एकूण कमाई
-DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ज्या वेळ"
+DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ती  वेळ"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,माझे पत्ते
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,संघटना शाखा मास्टर.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,मुलभूत खरेदी दर सूची
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,उपरोक्त निवडलेले निकष किंवा पगारपत्रक नाही कर्मचारी आधीच तयार
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,वर निवडलेल्या निकषानुसार कर्मचारी नाही  किंवा पगारपत्रक आधीच तयार केले आहे
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","इ कंपनी, चलन, वर्तमान आर्थिक वर्षात, जसे सेट मुलभूत मुल्य"
+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: Opportunity,Potential Sales Deal,संभाव्य विक्री करार
 DocType: Purchase Invoice,Total Taxes and Charges,एकूण कर आणि शुल्क
 DocType: Employee,Emergency Contact,तात्काळ संपर्क
-DocType: Item,Quality Parameters,दर्जा
+DocType: Item,Quality Parameters,गुणवत्ता घटके
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,लेजर
 DocType: Target Detail,Target  Amount,लक्ष्य रक्कम
 DocType: Shopping Cart Settings,Shopping Cart Settings,हे खरेदी सूचीत टाका सेटिंग्ज
 DocType: Journal Entry,Accounting Entries,लेखा नोंदी
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},प्रवेश डुप्लिकेट. कृपया तपासा प्राधिकृत नियम {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},आधीच कंपनी निर्माण ग्लोबल पीओएस प्रोफाइल {0} {1}
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},प्रवेश डुप्लिकेट. कृपया प्राधिकृत नियम {0} तपासा
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},ग्लोबल पीओएस प्रोफाइल {0}  कंपनी {1} साठी आधीच निर्माण केली आहे
 DocType: Purchase Order,Ref SQ,संदर्भ SQ
-apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सर्व BOMs आयटम / BOM बदला
+apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सर्व BOMs मधले  आयटम / BOM बदला
 DocType: Purchase Order Item,Received Qty,प्राप्त Qty
-DocType: Stock Entry Detail,Serial No / Batch,सिरियल / नाही बॅच
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +295,Not Paid and Not Delivered,नाही अदा आणि वितरित नाही
+DocType: Stock Entry Detail,Serial No / Batch,सिरियल क्रमांक/  बॅच
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +295,Not Paid and Not Delivered,अदा केलेला नाही  आणि वितरित नाही
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,रजा प्रकार {0} carry-forward केला  जाऊ शकत नाही
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/config/hr.py +93,Payroll,उपयोग पे रोल
-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} समाविष्ट करणे आवश्यक आहे"
+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: Purchase Invoice,Recurring Ends On,आवर्ती टोकांना
 DocType: Landed Cost Voucher,Purchase Receipt Items,खरेदी पावती आयटम
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,पसंतीचे अर्ज
 DocType: Account,Income Account,उत्पन्न खाते
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा पासून एक नवीन तयार करा.
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",पहा कोटीच्या विभाग &quot;सामुग्री आधारित रोजी दर&quot;
+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 +83,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
@@ -1994,32 +2048,33 @@
 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: Upload Attendance,Upload HTML,HTML अपलोड करा
 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,कोठार फक्त शेअर प्रवेश द्वारे बदलले जाऊ शकते / डिलिव्हरी टीप / खरेदी पावती
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारीने  परिभाषित केले आहे."
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश / डिलिव्हरी टीप / खरेदी पावती द्वारे बदलले जाऊ शकते
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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/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 +168,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to एक मूल्य निवडा {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,नवी खर्च केंद्र नाव
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
 DocType: Appraisal,HR User,एचआर सदस्य
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर आणि शुल्क वजा
-apps/erpnext/erpnext/config/support.py +7,Issues,मुद्दे
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},स्थिती एक असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/hooks.py +90,Issues,मुद्दे
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},{0} पैकी स्थिती एक असणे आवश्यक आहे
 DocType: Sales Invoice,Debit To,करण्यासाठी डेबिट
-DocType: Delivery Note,Required only for sample item.,फक्त नमुना आयटम आवश्यक.
-DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष Qty
+DocType: Delivery Note,Required only for sample item.,फक्त नमुन्यासाठी  आवश्यक आयटम .
+DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष प्रमाण
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,अधिक मोठे
 ,Profit and Loss Statement,नफा व तोटा स्टेटमेंट
@@ -2027,36 +2082,36 @@
 DocType: Payment Tool Detail,Payment Tool Detail,भरणा साधन तपशील
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश  {2} विरुद्ध अस्तित्वात
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +362,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 +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/setup_wizard/install_fixtures.py +147,Large,मोठे
 DocType: C-Form Invoice Detail,Territory,प्रदेश
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,आवश्यक भेटी नाही उल्लेख करा
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,आवश्यक भेटी क्रमांकाचा उल्लेख करा
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा पुस्तक किंवा तोटा.
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर आणखी मध्ये एक चलन रूपांतरित करण्यात निर्देशीत
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा किंवा तोटा नोंद  करा .
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,एक चलन दुसर्यात रूपांतरित करण्यासाठी  विनिमय दर निर्देशीत  करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,कोटेशन {0} रद्द
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,एकूण थकबाकी रक्कम
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} कर्मचारी वर सुट्टी घेतली होती {1}. हजेरी चिन्हांकित करू शकत नाही.
+apps/erpnext/erpnext/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,किंमत सूची मास्टर
-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: 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/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},लीड ग्राहक तयार करा {0}
-DocType: Price List,Applicable for Countries,देश साठी लागू
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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/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,खाती आपल्या चार्ट सेटअप तुम्ही लेखा नोंदी सुरू करा आधी
+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/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,तत्वे दिनांक पासून कर्मचारी सामील होत तारीख पेक्षा कमी असू शकत नाही.
+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/selling/doctype/sales_order/sales_order.py +63,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावणी: विक्री ऑर्डर {0} आधीच ग्राहक च्या पर्चेस विरुद्ध अस्तित्वात {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +63,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},चेतावणी: विक्री  {0} आधीच ग्राहक च्या पर्चेस ऑर्डर {1} विरुद्ध अस्तित्वात
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2069,78 +2124,79 @@
 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. पत्ता आणि आपल्या कंपनीच्या संपर्क."
+1. Address and Contact of your Company.","ज्या  विक्री आणि खरेदीला  जोडल्या  जाऊ शकतील अशा मानक  अटी. उदाहरणे: ऑफर 1. वैधता. 1. भरणा अटी (क्रेडिट रोजी आगाऊ, भाग आगाऊ इत्यादी). 1. अतिरिक्त (किंवा ग्राहक देय) काय आहे. 1. सुरक्षितता / वापर चेतावणी. 1. हमी जर असेल तर. 1. धोरण परतावा. 1.शिपिंग अटी लागू असल्यास 1. अटी, लागू असल्यास. वाद पत्ता, नुकसानभरपाई, दायित्व इ पत्याचे  मार्ग. पत्ता आणि आपल्या कंपनीच्या संपर्क."
 DocType: Attendance,Leave Type,रजा प्रकार
 apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,खर्च / फरक खाते ({0}) एक &#39;नफा किंवा तोटा&#39; खाते असणे आवश्यक आहे
 DocType: Account,Accounts User,वापरकर्ता खाती
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} उपस्थिती आधीच खूण आहे
+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),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
-DocType: C-Form Invoice Detail,Net Total,नेट एकूण
+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,बाकी रक्कम
 DocType: Project Task,Working,कार्यरत आहे
 DocType: Stock Ledger Entry,Stock Queue (FIFO),शेअर रांग (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +24,Please select Time Logs.,वेळ नोंदी निवडा.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} कंपनी संबंधित नाही {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} हा कंपनी {1} ला संबंधित नाही
 DocType: Account,Round Off,बंद फेरीत
 ,Requested Qty,विनंती Qty
-DocType: Tax Rule,Use for Shopping Cart,हे खरेदी सूचीत टाका वापर
+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 किंवा रक्कम आधारित वाटप केले जाणार आहे"
+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",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे
 DocType: Maintenance Visit,Purposes,हेतू
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
-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/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन{1} मधे   कोणत्याही उपलब्ध काम तासांपेक्षा जास्त आहे , ऑपरेशन अनेक ऑपरेशन मध्ये  तोडा"
 ,Requested,विनंती
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,नाही शेरा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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/item/item.py +574,Fixed Asset Item must be a non-stock item,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे
+DocType: Supplier Quotation Item,Material Request No,साहित्य विनंती क्रमांक
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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/erpnext/erpnext/config/crm.py +101,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 +442,Please select Apply Discount On,सवलत लागू निवडा कृपया
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,कृपया सवलत लागू निवडा
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,पगाराच्या स्लिप्स तयार
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,उपरोक्त निवडलेले निकष अदा एकूण पगार बँक प्रवेश तयार करा
+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.,सवलत टक्केवारी किंमत यादी विरुद्ध किंवा सर्व दर सूची एकतर लागू केले जाऊ शकते.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
 DocType: Purchase Invoice,Half-yearly,सहामाही
 apps/erpnext/erpnext/accounts/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,शेअर एकट्या प्रवेश
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 DocType: Payment Request,Recipient and Message,प्राप्तकर्ता आणि संदेश
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
 DocType: Account,Root Type,रूट प्रकार
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}: पेक्षा अधिक परत करू शकत नाही {1} आयटम साठी {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
 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),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग अनिवार्य आहे {0}
-DocType: Purchase Invoice,Select Supplier Address,पुरवठादार पत्ता निवडा
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग {0} साठी अनिवार्य आहे
+DocType: Purchase Invoice,Select Supplier Address,पुरवठादाराचा  पत्ता निवडा
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,खाते {0} गोठविले
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संघटना राहण्याचे लेखा स्वतंत्र चार्ट सह कायदेशीर अस्तित्व / उपकंपनी.
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पु किंवा बी.एस.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +557,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/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पी. ल.  किंवा बी.एस.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +557,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
 apps/erpnext/erpnext/public/js/utils/party.js +124,Please enter {0} first,प्रथम {0} प्रविष्ट करा
@@ -2149,18 +2205,19 @@
 DocType: Item,Manufacturer Part Number,निर्माता भाग क्रमांक
 DocType: Production Order Operation,Estimated Time and Cost,अंदाजे वेळ आणि खर्च
 DocType: Bin,Bin,बिन
-DocType: SMS Log,No of Sent SMS,पाठविलेला एसएमएस नाही
+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; आहे आयटम निवडा आणि इतर उत्पादन बंडल आहे कृपया
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण पेक्षा जास्त असू शकत नाही ({2})
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,अवतरण विनंती.
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","कृपया असा आयटम निवडा जेथे ""शेअर आयटम आहे?""  ""नाही"" आहे  आणि ""विक्री आयटम आहे?"" ""होय "" आहे आणि  तेथे इतर उत्पादन बंडल नाही"
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
-apps/erpnext/erpnext/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/stock/get_item_details.py +293,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 +158,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,पर्यंत
@@ -2168,22 +2225,23 @@
 DocType: Installation Note Item,Against Document No,दस्तऐवज नाही विरुद्ध
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,विक्री भागीदार व्यवस्थापित करा.
 DocType: Quality Inspection,Inspection Type,तपासणी प्रकार
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},कृपया निवडा {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},कृपया  {0} निवडा
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
-DocType: Employee Attendance Tool,Unmarked Attendance,खुणा न केलेल्या विधान परिषदेच्या
+DocType: Employee Attendance Tool,Unmarked Attendance,खुणा न केलेली  उपस्थिती
 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 +25,Name or Email is mandatory,नाव किंवा ईमेल अनिवार्य आहे
 apps/erpnext/erpnext/config/stock.py +159,Incoming quality inspection.,येणार्या गुणवत्ता तपासणी.
-DocType: Purchase Order Item,Returned Qty,परत Qty
+DocType: Purchase Order Item,Returned Qty,परत केलेली Qty
 DocType: Employee,Exit,बाहेर पडा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} तयार माणे
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,सिरियल क्रमांक{0} तयार केला
 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: Asset Category Account,Depreciation Expense Account,इतर किरकोळ खर्च खाते
+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,खर्च माफीचा साक्षीदार
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
@@ -2195,48 +2253,49 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,प्रलंबित उपक्रम
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टी
 DocType: Payment Gateway,Gateway,गेटवे
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,तारीख relieving प्रविष्ट करा.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,रक्कम
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती 'मंजूर'असलेला रजा अर्ज  सादर केला जाऊ शकतो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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,वृत्तपत्र प्रकाशक
+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,विधान परिषदेच्या तारीख
+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 +127,Account with child nodes cannot be converted to ledger,मुलाला नोडस् खाते लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Account with child nodes cannot be converted to ledger,child नोडस् सह खाते लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 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 +91,Unable to find exchange rate for {0} to {1},{0} करण्यासाठी विनिमय दर शोधण्यात अक्षम {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} पासून  {1}  पर्यंत  विनिमय दर शोधण्यात अक्षम
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,मार्क अर्धा दिवस
 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 +410,[Error],[त्रुटी]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर जतन एकदा शब्द मध्ये दृश्यमान होईल.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),(दिवस मध्ये) वाटप नवी पाने
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,सिरियल नाही {0} अस्तित्वात नाही
+DocType: Leave Control Panel,New Leaves Allocated (In Days),नवी पाने वाटप (दिवस मध्ये)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,सिरियल क्रमांक {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ग्राहक भांडार (पर्यायी)
 DocType: Pricing Rule,Discount Percentage,सवलत टक्केवारी
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
 DocType: Shopping Cart Settings,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
-DocType: Features Setup,To maintain the customer wise item code and to make them searchable based on their code use this option,"ग्राहक शहाणा आयटम कोड ठेवणे, त्यांचा कोड वापर हा पर्याय आधारित ते शोध करण्यासाठी"
+DocType: Features Setup,To maintain the customer wise item code and to make them searchable based on their code use this option,"ग्राहका नुसार  आयटम कोड ठेवण्यासाठी , ते शोध करण्यासाठी त्यांच्या  कोड वर आधारित  हा पर्याय वापरा आधारित"
 DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
 DocType: Manufacturing Settings,Material Transferred for Manufacture,साहित्य उत्पादन साठी हस्तांतरित
-DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;खर्चाचे माफीचा साक्षीदार&quot; भूमिका एक वापरकर्ता
+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,लक्ष्य तपशील
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,सर्व नोकरी
-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,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
 DocType: Account,Depreciation,घसारा
@@ -2247,15 +2306,17 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,तयार साहित्य विनंत्या {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,साहित्य विनंत्या {0} तयार
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,अटी किंवा करार साचा.
 DocType: Purchase Invoice,Address and Contact,पत्ता आणि संपर्क
 DocType: Supplier,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Employee,Feedback,अभिप्राय
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","आधी वाटप केले जाऊ शकत नाही सोडा {0}, रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे म्हणून {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+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 +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
-DocType: Item,Reorder level based on Warehouse,वखार आधारित पुन्हा क्रमवारी लावा पातळी
+DocType: Asset,Expected Value After Useful Life,अपेक्षित मूल्य उपयुक्त जीवन नंतर
+DocType: Item,Reorder level based on Warehouse,वखारवर  आधारित पुन्हा क्रमवारी लावा पातळी
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,वितरीत करण्यासाठी Qty
 DocType: Monthly Distribution Percentage,Month,महिना
@@ -2264,15 +2325,15 @@
 DocType: Quality Inspection,Outgoing,जाणारे
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
-apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} रद्द किंवा बंद
+apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} हे रद्द किंवा बंद
 DocType: Delivery Note,Track this Delivery Note against any Project,कोणत्याही प्रकल्पाच्या विरोधात या वितरण टीप मागोवा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,गुंतवणूक निव्वळ रोख
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
 ,Is Primary Address,प्राथमिक पत्ता आहे
-DocType: Production Order,Work-in-Progress Warehouse,कार्य-इन-प्रगती कोठार
+DocType: Production Order,Work-in-Progress Warehouse,कार्य प्रगती मध्ये असलेले  कोठार
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,मालमत्ता {0} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,पत्ते व्यवस्थापित करा
-DocType: Pricing Rule,Item Code,आयटम कोड
+DocType: Asset,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
 DocType: Journal Entry,User Remark,सदस्य शेरा
@@ -2280,10 +2341,10 @@
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,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/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,सिरियल क्रमांक {0} स्टॉक मध्ये नाही
 apps/erpnext/erpnext/config/selling.py +163,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: Sales Invoice,Write Off Outstanding Amount,Write Off बाकी रक्कम
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","आपण स्वयंचलित आवर्ती पावत्या आवश्यकता असल्यास तपासा. कोणतेही विक्री चलन सबमिट केल्यानंतर, विभाग आवर्ती दृश्यमान होईल."
 DocType: Account,Accounts Manager,खाते व्यवस्थापक
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',वेळ लॉग {0} &#39;सादर&#39; करणे आवश्यक आहे
 DocType: Stock Settings,Default Stock UOM,डिफॉल्ट स्टॉक UOM
@@ -2291,194 +2352,208 @@
 DocType: Production Planning Tool,Create Material Requests,साहित्य विनंत्या तयार करा
 DocType: Employee Education,School/University,शाळा / विद्यापीठ
 DocType: Payment Request,Reference Details,संदर्भ तपशील
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
 DocType: Sales Invoice Item,Available Qty at Warehouse,कोठार वर उपलब्ध आहे Qty
 ,Billed Amount,बिल केलेली रक्कम
+DocType: Asset,Double Declining Balance,दुहेरी नाकारून शिल्लक
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,बंद मागणी रद्द जाऊ शकत नाही. रद्द करण्यासाठी उघडकीस आणणे.
 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 +135,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,काही नमुना रेकॉर्ड जोडा
-apps/erpnext/erpnext/config/hr.py +247,Leave Management,व्यवस्थापन सोडा
+apps/erpnext/erpnext/config/hr.py +247,Leave Management,रजा व्यवस्थापन
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
-DocType: Sales Order,Fully Delivered,पूर्णतः वितरण
+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: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","दायित्व अंतर्गत  account head  , ज्यामध्ये  नफा / तोटा गुन्हा दाखल होणार"
 DocType: Payment Tool,Against Vouchers,कूपन विरुद्ध
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,त्वरित मदत
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +167,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार रांगेत समान असू शकत नाही {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +167,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार  {0} रांगेत समान असू शकत नाही
 DocType: Features Setup,Sales Extras,विक्री अवांतर
-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 +242,"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 +131,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},{0} बजेट खाते {1} साठी खर्च केंद्र  {2} विरुद्ध  {3} पेक्षा जास्त होईल
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
+DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
 DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
-apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,सिरियल नाही आणि बॅच
+apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,सिरियल क्रमांक आणि बॅच
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य किंवा Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,मिनिट
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
-DocType: Leave Block List,Leave Block List Allowed,ब्लॉक यादी परवानगी द्या
+DocType: Leave Block List,Leave Block List Allowed,रजा ब्लॉक यादी परवानगी दिली
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
 DocType: Global Defaults,Disable In Words,शब्द मध्ये अक्षम
-apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,आयटम कोड बंधनकारक आहे कारण आयटम स्वयंचलितपणे गणती केलेला  नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,सुरक्षित कर्ज
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},मालमत्ता वर्ग {0} किंवा कंपनी मध्ये घसारा संबंधित खाती सेट करा {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,शिल्लक इक्विटी उघडणे
 DocType: Appraisal,Appraisal,मूल्यमापन
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},पुरवठादार वर ईमेल पाठविले {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तारीख पुनरावृत्ती आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},माफीचा साक्षीदार  {0} पैकी एक असणे आवश्यक आहे
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
-DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी करा चलन द्वारे)
+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 +199,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.py +66,Unsubscribe from this Email Digest,या ईमेल डायजेस्ट पासून सदस्यता रद्द करा
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,संदेश पाठवला
-apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,मुलाला नोडस् खाते खातेवही म्हणून सेट केली जाऊ शकत नाही
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर प्राईस यादी चलन ग्राहक बेस चलनात रुपांतरीत आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,child नोडस् सह खाते लेजर म्हणून सेट केली जाऊ शकत  नाही
+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/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,ऑर्डर आयटम नाही खरेदी
+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: 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 +50,Cost of various activities,विविध उपक्रम खर्च
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,Not allowed to update stock transactions older than {0},नाही जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: Item,Inspection Required,तपासणी आवश्यक
-DocType: Purchase Invoice Item,PR Detail,जनसंपर्क तपशील
+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 +120,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: 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 +328,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:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम आहेत जरी, तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
+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: Sales Invoice Item,Total Margin,एकूण मार्जिन
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
 DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 DocType: Hub Settings,Publish Items to Hub,हब करण्यासाठी आयटम प्रकाशित
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य रांगेत मूल्य पेक्षा कमी असणे आवश्यक पासून {0}
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},सलग {0} मधे  मूल्य पासून मूल्य पर्यंत कमी असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,कृपया बँक खाते निवडा
+DocType: Newsletter,Create and Send Newsletters,वृत्तपत्रे तयार करा आणि पाठवा
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,सर्व चेक करा
 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: Payment Gateway Account,Default Payment Request Message,मुलभूत भरणा विनंती संदेश
-DocType: Item Group,Check this if you want to show in website,आपण वेबसाइटवर मध्ये दाखवायची असेल तर या तपासा
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,बँकिंग आणि देयके
-,Welcome to ERPNext,ERPNext आपले स्वागत आहे
+DocType: Item Group,Check this if you want to show in website,आपल्याला वेबसाइटवर दाखवायची असेल तर हे  तपासा
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,बँकिंग आणि देयके
+,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/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: 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 +199,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,खरेदी ऑर्डर {0} सबमिट केलेली नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल क्रमांक {0} कोठार  {1} शी संबंधित नाही
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
-DocType: Issue,Opening Date,उघडण्याच्या तारीख
+DocType: Issue,Opening Date,उघडण्याची  तारीख
 DocType: Journal Entry,Remark,शेरा
 DocType: Purchase Receipt Item,Rate and Amount,दर आणि रक्कम
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,पाने आणि सुट्टी
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,रजा आणि सुट्टी
 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,उतरले खर्च व्हाउचर रक्कम
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,बिलिंग साठी बॅच
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
-DocType: POS Profile,Write Off Account,खाते बंद लिहा
+DocType: POS Profile,Write Off Account,Write Off खाते
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,ऑपरेशन्स निव्वळ रोख
 apps/erpnext/erpnext/public/js/setup_wizard.js +199,e.g. VAT,उदा व्हॅट
-apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,मोठ्या प्रमाणात मध्ये मार्क कर्मचारी उपस्थिती
+apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,मोठ्या प्रमाणात मध्ये मार्क कर्मचारी उपस्थिती करा
 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 +53,"An item exists with same name ({0}), please change the item group name or rename the item","एक आयटम त्याच नावाने अस्तित्वात ({0}), आयटम समूहाचे नाव बदलू किंवा आयटम पुनर्नामित करा"
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
+DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
 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}: कंपनी अनिवार्य आहे
+DocType: Sales Invoice Item,Delivered Qty,वितरित केलेली  Qty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,{0} मालमत्ता खरेदी तारीख चलन खरेदी तारीख जुळत नाही
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,कोठार {0}: कंपनी अनिवार्य आहे
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},साठी गहाळ चलन विनिमय दर {0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},चलन विनिमय दर {0} साठी  गहाळ
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),कर्जदार ({0})
-DocType: Project,Margin,मार्जिन
+DocType: Pricing Rule,Margin,मार्जिन
 DocType: Salary Slip,Arrear Amount,थकबाकी रक्कम
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नवीन ग्राहक
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,निव्वळ नफा%
 DocType: Appraisal Goal,Weightage (%),वजन (%)
-DocType: Bank Reconciliation Detail,Clearance Date,निपटारा तारीख
+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,तुम्ही पगारपत्रक सादर करताना प्रत्येक कर्मचारी मेल मध्ये पगारपत्रक पाठवू इच्छित असल्यास तपासा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
 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 +57,Where manufacturing operations are carried.,उत्पादन ऑपरेशन कोठे नेले जातात.
 DocType: Stock Entry Detail,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
 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,किमान Qty कमाल Qty पेक्षा जास्त असू शकत नाही
+DocType: Account,Accumulated Depreciation,जमा घसारा
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
 DocType: Payment Request,Email To,ई-मेल
 DocType: Lead,Lead Owner,लीड मालक
 DocType: Bin,Requested Quantity,विनंती प्रमाण
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,वखार आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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
+DocType: Time Log,Will be updated when billed.,जेव्हा बिल केले जाईल तेव्हा  अपडेट केले जातील.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,वखार पासून उपलब्ध बॅच प्रमाण
 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 +115,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 +84,{0}% Delivered,{0}% वितरण
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित 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/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,त्याच पुरवठादार अनेक वेळा प्रविष्ट केले गेले आहे
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरेदी ऑर्डर बाबींचा पुरवठा
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट साठी letter.
+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 आहे याची खात्री करा.
 DocType: Payment Request,Payment Details,भरणा माहिती
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिव्हरी टीप आयटम पुल करा
-apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,जर्नल नोंदी {0}-रद्द जोडलेले आहेत
-apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ई-मेल, फोन, चॅट भेट, इ सर्व संचार नोंद"
-DocType: Manufacturer,Manufacturers used in Items,आयटम वापरले उत्पादक
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,कंपनी मध्ये गोल बंद खर्च केंद्र उल्लेख करा
+DocType: Asset,Journal Entry for Scrap,स्क्रॅप साठी जर्नल प्रवेश
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिव्हरी Note मधून  आयटम पुल करा/ओढा
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,जर्नल नोंदी {0} रद्द लिंक नाहीत
+apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","ई-मेल, फोन, चॅट भेट, इ सर्व प्रकारच्या संचाराची   नोंद"
+DocType: Manufacturer,Manufacturers used in Items,आयटम मधे  वापरलेले  उत्पादक
+apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,कंपनी मध्ये Round Off खर्च केंद्र खात्याचा   उल्लेख करा
 DocType: Purchase Invoice,Terms,अटी
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,नवीन तयार करा
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,नवीन तयार करा
 DocType: Buying Settings,Purchase Order Required,ऑर्डर आवश्यक खरेदी
-,Item-wise Sales History,आयटम निहाय विक्री इतिहास
+,Item-wise Sales History,आयटमनूसार विक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,एकूण मंजूर रक्कम
 ,Purchase Analytics,खरेदी Analytics
 DocType: Sales Invoice Item,Delivery Note Item,डिलिव्हरी टीप आयटम
@@ -2489,73 +2564,74 @@
 ,Stock Ledger,शेअर लेजर
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,पगाराच्या स्लिप्स कपात
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,प्रथम एक गट नोड निवडा.
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी आणि विधान परिषदेच्या
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,प्रथम एक गट नोड निवडा.
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी आणि उपस्थिती
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",", ग्राहक, पुरवठादार, विक्री भागीदार आणि आघाडी संदर्भ काढून टाका आपली कंपनी पत्ता आहे"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ग्राहक, पुरवठादार, विक्री भागीदार आणि आघाडीयांचे  संदर्भ काढून टाका कारण हा  आपला  कंपनी पत्ता आहे"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,फॉर्म भरा आणि तो जतन
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,त्यांच्या नवीनतम यादी स्थिती सर्व कच्चा माल असलेली एक अहवाल डाउनलोड करा
+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: Purchase Order,Get Items from Open Material Requests,ओपन साहित्य विनंत्या आयटम मिळवा
+DocType: Purchase Order,Get Items from Open Material Requests,ओपन साहित्य विनंत्यांचे आयटम मिळवा
 DocType: Time Log,Billable,बिल
-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: Account,Rate at which this tax is applied,कर लागू आहे जेथे  हा  दर
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Qty पुनर्क्रमित करा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,वर्तमान नोकरी संबंधी
 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: Employee,"System User (login) ID. If set, it will become default for all HR forms.","प्रणाली वापरकर्ता (लॉग-इन) आयडी. सेट केल्यास, हे सर्व एचआर फॉर्मसाठी  मुलभूत होईल."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: पासून {1}
-DocType: Task,depends_on,depends_on
-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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
+DocType: Task,depends_on,च्या वर अवलंबून असणे
+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 +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
 DocType: BOM Replace Tool,BOM Replace Tool,BOM साधन बदला
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देशनिहाय मुलभूत पत्ता टेम्पलेट
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,पुढील तारीख पोस्ट दिनांक पेक्षा जास्त असणे आवश्यक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,शो कर ब्रेक अप
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख नंतर असू शकत नाही {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# फॉर्म / आयटम / {0}) स्टॉक बाहेर आहे
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,पुढील तारीख पोस्ट दिनांक पेक्षा जास्त असणे आवश्यक
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,ब्रेक अप कर शो
+apps/erpnext/erpnext/accounts/party.py +289,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;
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,अशी यादी तयार करणे पोस्ट तारीख
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',तुम्ही जर मॅन्युफॅक्चरिंग क्रियाकलाप मधे सहभागी असाल तर सक्षम आयटम 'उत्पादित आहे'
+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.,पॅकेज तयार यादी आयटम.
+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,एएमसी पैकी
 DocType: Purchase Order Item,Material Request Detail No,साहित्य विनंती तपशील नाही
-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} भूमिका ज्या वापरकर्ता करण्यासाठी येथे संपर्क साधा
+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 +45,Company (not Customer or Supplier) master.,कंपनी (नाही ग्राहक किंवा पुरवठादार) मास्टर.
+apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,कंपनी ( ग्राहक किंवा पुरवठादार नाही) मास्टर.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम रक्कम एकूण पेक्षा जास्त असू शकत नाही बंद लिहा +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम + एकूण रक्कमेपेक्षा   पेक्षा जास्त असू शकत नाही बंद लिहा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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 +57,Cost Center is required for 'Profit and Loss' account {0},खर्च केंद्र &#39;नफा व तोटा&#39; आवश्यक आहे खात्यात {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},खर्च केंद्र 'नफा व तोटा'  {0} खात्यात आवश्यक आहे
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,व्यवहार फक्त कंपनी निर्माता हटवल्या जाऊ शकतात
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,जनरल लेजर नोंदी चुकीची संख्या आढळले. आपण व्यवहार चुकीचे खाते निवडले आहे शकते.
+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 +109,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{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/controllers/accounts_controller.py +219,{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 +229,"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: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
@@ -2566,186 +2642,192 @@
 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 +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
-DocType: Sales Order,Partly Billed,पाऊस बिल
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,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/doctype/company/company.js +44,Please re-type company name to confirm,पुन्हा-टाइप करा कंपनीचे नाव पुष्टी करा
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,कंपनीचे नाव  पुष्टी करण्यासाठी पुन्हा-टाइप करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Time Log Batch,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक  {0}आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
+DocType: Asset Category Account,Fixed Asset Account,मुदत मालमत्ता खाते
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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: Newsletter,A Lead with this email id should exist,या ई-मेल id असलेले लीड अस्तित्वात पाहिजे
 DocType: Stock Entry,From BOM,BOM पासून
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} गोठविली आहेत करण्यापूर्वी शेअर व्यवहार
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} पूर्वीचे  शेअर व्यवहार गोठविली आहेत
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,तारीख करण्यासाठी अर्धा दिवस रजा दिनांक पासून एकच असले पाहिजे
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केला असल्यास संदर्भ नाही बंधनकारक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,वेतन रचना
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,बोली
 DocType: Hub Settings,Access Token,प्रवेश टोकन
 DocType: Sales Invoice Item,Serial No,सिरियल नाही
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,पहिल्या Maintaince तपशील प्रविष्ट करा
-DocType: Item,Is Fixed Asset Item,मुदत मालमत्ता आयटम आहे
-DocType: Purchase Invoice,Print Language,प्रिंट भाषा
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,पहिले  Maintaince तपशील प्रविष्ट करा
+DocType: Purchase Invoice,Print Language,मुद्रण भाषा
 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","आपण लांब प्रिंट स्वरूप असल्यास, हे वैशिष्ट्य प्रत्येक पानावर सर्व शीर्षलेख आणि तळटीप सह एकाधिक पृष्ठांवर मुद्रित केले पृष्ठ विभाजन करण्यासाठी वापरले जाऊ शकते"
+DocType: Asset,Number of Depreciations,Depreciations संख्या
 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 +77,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,कामाच्या  दिवसापेक्षा अधिक सुट्ट्या  या महिन्यात आहेत.
 DocType: Product Bundle Item,Product Bundle Item,उत्पादन बंडल आयटम
 DocType: Sales Partner,Sales Partner Name,विक्री भागीदार नाव
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,अवतरणे विनंती
 DocType: Payment Reconciliation,Maximum Invoice Amount,कमाल चलन रक्कम
 DocType: Purchase Invoice Item,Image View,प्रतिमा पहा
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहक
-DocType: Issue,Opening Time,उघडणे वेळ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,आणि आवश्यक तारखा
+DocType: Asset,Partially Depreciated,अंशतः अवमूल्यन
+DocType: Issue,Opening Time,उघडण्याची  वेळ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,पासून आणि  पर्यंत तारखा आवश्यक आहेत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"प्रकार करीता माप मुलभूत युनिट &#39;{0}&#39; साचा म्हणून समान असणे आवश्यक आहे, &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
 DocType: Tax Rule,Shipping City,शिपिंग शहर
-apps/erpnext/erpnext/stock/doctype/item/item.js +59,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0} (साचा) एक प्रकार आहे. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
+apps/erpnext/erpnext/stock/doctype/item/item.js +59,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,सूचना सानुकूलित
+DocType: Notification Control,Customize the Notification,सूचना सानुकूलित करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविला  जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
-DocType: Manufacturer,Limited to 12 characters,12 वर्ण मर्यादित
-DocType: Journal Entry,Print Heading,प्रिंट शीर्षक
+DocType: Manufacturer,Limited to 12 characters,12 वर्णांपर्यंत  मर्यादित
+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/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;गेल्या ऑर्डर असल्याने दिवस&#39; शून्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे
-DocType: C-Form,Amended From,पासून दुरुस्ती
+DocType: Asset,Amended From,पासून दुरुस्ती
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Posting Date first,पहिल्या पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर रूपांतरीत केले जाऊ शकत नाही
+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: 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 +143,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 +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","आपल्या कर डोक्यावर यादी (उदा व्हॅट सीमाशुल्क इत्यादी, ते वेगळी नावे असावा) आणि त्यांचे प्रमाण दरात. हे आपण संपादित आणि नंतर अधिक जोडू शकता, जे मानक टेम्पलेट, तयार करेल."
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम साठी सिरियल क्र आवश्यक {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,पावत्या सह देयके सामना
+apps/erpnext/erpnext/public/js/setup_wizard.js +191,"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.","आपल्या  tax headsची आणि त्यांच्या  प्रमाण दरांची यादी करा  (उदा, व्हॅट , जकात वगैरे त्यांना  वेगळी नावे असणे आवश्यक आहे ) . हे मानक टेम्पलेट, तयार करेल, जे आपण संपादित करू शकता आणि नंतर अधिक जोडू शकता."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,कंपनी मध्ये &#39;लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर&#39; उल्लेख करा
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम  {0}साठी सिरियल क्रमांक आवश्यक
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,पावत्या सह देयके सामना
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,सूचीत टाका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,गट
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ अक्षम चलने सक्षम करा.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,चलने अक्षम  /सक्षम करा.
 DocType: Production Planning Tool,Get Material Request,साहित्य विनंती मिळवा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,पोस्टल खर्च
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक्कम)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
-DocType: Quality Inspection,Item Serial No,आयटम सिरियल नाही
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
+DocType: Quality Inspection,Item Serial No,आयटम सिरियल क्रमांक
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,एकूण उपस्थित
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,लेखा स्टेटमेन्ट
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,लेखा स्टेटमेन्ट
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल नाही कोठार आहे शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,आपण ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,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,विक्री पॉइंट
 DocType: Account,Tax,कर
-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/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},सलग  {0}: {1} हा  एक वैध  {2} नाही
 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 +346,Quantity to Manufacture must be greater than 0.,कारखानदार प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),प्रारंभ पॉइंट-ऑफ-विक्री (पीओएस)
+DocType: Features Setup,Item Groups in Details,आयटम गटाचा तपशील
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 युनिट्स आदेश दिले असेल, तर. आणि आपल्या भत्ता नंतर आपण 110 युनिट प्राप्त करण्याची अनुमती आहे 10% आहे."
+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 units  प्राप्त करण्याची अनुमती आहे."
 DocType: Pricing Rule,Customer Group,ग्राहक गट
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},खर्च अकांऊंट बाब अनिवार्य आहे {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: Item,Website Description,वेबसाइट वर्णन
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,इक्विटी निव्वळ बदला
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
 ,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,या महिन्यात आणि प्रलंबित उपक्रम सारांश
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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,आपण देखील मागील आर्थिक वर्षात शिल्लक या आर्थिक वर्षात पाने समाविष्ट करू इच्छित असल्यास कॅरी फॉरवर्ड निवडा कृपया
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
 DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},त्रुटी: {0}&gt; {1}
 DocType: Item,Attributes,विशेषता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Write Off खाते प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,गेल्या ऑर्डर तारीख
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाते {0} नाही कंपनी मालकीचे नाही {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +143,Operation ID not set,ऑपरेशन आयडी सेट नाही
 DocType: Payment Request,Initiated,सुरू
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
-DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज प्रकार
+DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज क्रमांक
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
-DocType: Purchase Invoice,Mobile No,मोबाइल नाही
+DocType: Purchase Invoice,Mobile No,मोबाइल क्रमांक
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रवेश करा
 DocType: Leave Allocation,New Leaves Allocated,नवी पाने वाटप
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,व्यावसायिक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},त्रुटी: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 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 +52,All Products or Services.,सर्व उत्पादने किंवा सेवा.
 DocType: Supplier Quotation,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 +251,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,आउट Qty
+apps/erpnext/erpnext/config/accounts.py +259,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,वित्तीय सेवा
-apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता मूल्य श्रेणीत असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3}
+apps/erpnext/erpnext/controllers/item_variant.py +62,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 +165,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
-DocType: Leave Allocation,Unused leaves,न वापरलेले पाने
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
+DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,कोटी
-DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
+DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य मुलभूत खाते
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,ट्रान्सफर
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,मुळे तारीख अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
@@ -2754,7 +2836,7 @@
 ,Inactive Customers,निष्क्रिय ग्राहक
 DocType: Landed Cost Voucher,Purchase Receipts,खरेदी पावती
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
-DocType: Quality Inspection,Delivery Note No,डिलिव्हरी टीप नाही
+DocType: Quality Inspection,Delivery Note No,डिलिव्हरी टीप क्रमांक
 DocType: Company,Retail,किरकोळ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
@@ -2764,36 +2846,39 @@
 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: Journal Entry,Write Off Based On,आधारित Write Off
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
 DocType: Features Setup,POS View,पीओएस पहा
-apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,एक सिरियल क्रमांक प्रतिष्ठापन रेकॉर्ड
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,पुढील तारीख दिवस आणि समान असणे आवश्यक आहे महिना दिवशी पुन्हा
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,एक निर्दिष्ट करा
+apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,एक सिरियल क्रमांकासाठी  प्रतिष्ठापन रेकॉर्ड
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,पुढील तारीख दिवस आणि पुन्हा महिन्याच्या दिवशी समान असणे आवश्यक आहे
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,कृपया a निर्दिष्ट करा
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,वर
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,वेळ लॉग बिल आकारले गेले आहे
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),अस्थायी नफा / तोटा (क्रेडिट)
-DocType: Sales Invoice,Return Against Sales Invoice,विरुद्ध विक्री चलन परत
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,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},कंपनी {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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: खर्च केंद्र आयटम अनिवार्य आहे {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे विधान परिषदेच्या मालिका संख्या करा&gt; क्रमांकन मालिका
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,उत्पादन बंडल आयटम मिळवा
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,रेकॉर्ड आढळले नाही
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आयटम {2} ला खर्च केंद्र अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
+DocType: Asset,Straight Line,सरळ रेष
+DocType: Project User,Project User,प्रकल्प वापरकर्ता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून &#39;Subcontracted आहे&#39; प्रविष्ट करा
+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 +123,Please enter 'Is Subcontracted' as Yes or No,'Subcontracted आहे' होय किंवा नाही म्हणून प्रविष्ट करा
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
 DocType: Features Setup,Sales Discounts,विक्री सवलत
@@ -2805,48 +2890,49 @@
 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/inactive_customers/inactive_customers.py +67,Number of Order,ऑर्डर संख्या
-DocType: Item Group,HTML / Banner that will show on the top of product list.,उत्पादन सूचीच्या वर दर्शवेल की HTML / बॅनर.
+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 +117,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/report/stock_balance/stock_balance.py +47,Opening Value,उघडत मूल्य
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,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,त्याला child nodes आहेत म्हणून खातेवही खर्च केंद्र रूपांतरित करू शकत नाही
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,उघडण्याचे  मूल्य
 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,विक्री आयोगाने
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,विक्री आयोगाने
 DocType: Offer Letter Term,Value / Description,मूल्य / वर्णन
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
-,Customers Not Buying Since Long Time,ग्राहक वेळ असल्याने खरेदी
+,Customers Not Buying Since Long Time,ग्राहक खूप वेळापासून खरेदी करत नाही
 DocType: Production Order,Expected Delivery Date,अपेक्षित वितरण तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
-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 +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,मनोरंजन खर्च
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,आयटम {0} साठी  निर्दिष्ट अवैध प्रमाण  . प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,निरोप साठी अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,कायदेशीर खर्च
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,कायदेशीर खर्च
 DocType: Sales Invoice,Posting Time,पोस्टिंग वेळ
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,टेलिफोन खर्च
 DocType: Sales Partner,Logo,लोगो
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास या तपासा. आपण या चेक केले, तर नाही मुलभूत असेल."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},सिरियल नाही असलेले कोणतेही आयटम नाहीत {0}
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास हे  तपासा. आपण या चेक केले, तर मुलभूत नसेल."
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},सिरियल क्रमांक  असलेले कोणतेही आयटम  {0} नाहीत
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ओपन सूचना
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,थेट खर्च
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,थेट खर्च
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;सूचना \ ई-मेल पत्ता&#39; एक अवैध ईमेल पत्ता आहे
 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,प्रवास खर्च
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी संबंधित नाही: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,यशस्वीरित्या ही कंपनी संबंधित सर्व व्यवहार हटवला!
+apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी {2} ला संबंधित नाही:
+apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,यशस्वीरित्या या  कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/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/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/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,नॅव्हिगेट
@@ -2854,9 +2940,9 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +20,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 +275,We sell this Item,आम्ही या आयटम विक्री
+apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,आम्ही ही  आयटम विक्री
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,पुरवठादार आयडी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
 DocType: Journal Entry,Cash Entry,रोख प्रवेश
 DocType: Sales Partner,Contact Desc,संपर्क desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","प्रासंगिक जसे पाने प्रकार, आजारी इ"
@@ -2867,54 +2953,56 @@
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सर्व संपर्क.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,{0} खरेदी चलन पुरवठादार जुळणारे मालमत्ता पुरवठा नाही
 DocType: Newsletter,Test Email Id,कसोटी ई मेल आयडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Company Abbreviation,कंपनी Abbreviation
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,आपण गुणवत्ता तपासणी अनुसरण केल्यास. खरेदी पावती नाही आयटम गुणवत्ता आवश्यक आणि QA वर सक्षम
+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 +71,Raw material cannot be same as main Item,कच्चा माल मुख्य आयटम म्हणून समान असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ने मर्यादा ओलांडल्यापासून authroized नाही
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,वेतन टेम्प्लेट मास्टर.
 DocType: Leave Type,Max Days Leave Allowed,कमाल दिवस रजा परवानगी
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,हे खरेदी सूचीत टाका सेट कर नियम
-DocType: Payment Tool,Set Matching Amounts,सेट जुळणारे राशी
+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 +41,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 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 +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
-DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेल्या स्टॉक संपादित करण्याची परवानगी
+DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,पसंतीचे बिलिंग पत्ता
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्षाच्या payble खाते चलन समान असणे आवश्यक आहे
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","अक्षम केला तर, क्षेत्र &#39;शब्द मध्ये&#39; काही व्यवहार दृश्यमान होणार नाही"
 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.,या वेळ लॉग बॅच रद्द करण्यात आली आहे.
+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,कर्ज
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल नाही बंधनकारक आहे
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटम शहाणे कर तपशील
-,Item-wise Price List Rate,आयटम कुशल दर सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,पुरवठादार कोटेशन
-DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,कर्ज
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल क्रमांक  बंधनकारक आहे
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटमनूसार  कर तपशील
+,Item-wise Price List Rate,आयटमनूसार  किंमत सूची दर
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,पुरवठादार कोटेशन
+DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण एकदा जतन केल्यावर  शब्दा मध्ये दृश्यमान होईल.
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/stock.py +97,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,जलद प्रवेश
-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/public/js/setup_wizard.js +172,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,उत्पन्न / खर्च
@@ -2926,37 +3014,36 @@
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादन प्रकाशीत.
+apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
 DocType: Hub Settings,Name Token,नाव टोकन
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
-DocType: Project,Project Name,प्रकल्प नाव
+DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
 DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
-DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च तर
+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 +239,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,BOM नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
-DocType: Item,Moving Average,हलवित सरासरी
-DocType: BOM Replace Tool,The BOM which will be replaced,पुनर्स्थित केले जाईल BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} इतर व्हाउचर विरुद्ध {1} किंवा आधीच जुळणारे खाते नाही
+DocType: Item,Moving Average,हलवित/Moving सरासरी
+DocType: BOM Replace Tool,The BOM which will be replaced,BOM पुनर्स्थित केले जाईल
 DocType: Account,Debit,डेबिट
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
+apps/erpnext/erpnext/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 +29,Upload attendance from a .csv file,एक .csv फाइल पासून उपस्थिती अपलोड करा
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बाकी रक्कम
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,सेट लक्ष्य आयटम गट निहाय या विक्री व्यक्ती आहे.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक जुने पेक्षा [दिवस]
-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: Sales Person,Set targets Item Group-wise for this Sales Person.,या विक्री व्यक्ती साठी item गट निहाय लक्ष्य सेट करा .
+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 दरम्यान एक नंबर आहे. उच्च संख्येचा  अर्थ जर तेथे समान परिस्थितीमधे  एकाधिक किंमत नियम असतील तर त्याला प्राधान्य मिळेल"
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,आर्थिक वर्ष: {0} अस्तित्वात नाही
 DocType: Currency Exchange,To Currency,चलन
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,खालील वापरकर्त्यांना ब्लॉक दिवस रजा अर्ज मंजूर करण्याची परवानगी द्या.
 apps/erpnext/erpnext/config/hr.py +136,Types of Expense Claim.,खर्चाचे हक्काचा प्रकार.
@@ -2966,15 +3053,16 @@
 DocType: Sales Invoice,End Date,शेवटची तारीख
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,शेअर व्यवहार
 DocType: Employee,Internal Work History,अंतर्गत कार्य इतिहास
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,जमा घसारा रक्कम
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
 DocType: Sales Invoice,Exhibition,प्रदर्शन
-apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","तो आपल्या कंपनी पत्ता आहे म्हणून कंपनी, अनिवार्य आहे"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","तो आपल्या कंपनीचा पत्ता आहे म्हणून कंपनी, अनिवार्य आहे"
 DocType: Item Attribute,From Range,श्रेणी पासून
-apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,तो पासून दुर्लक्ष आयटम {0} एक स्टॉक आयटम नाही
-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.","एका विशिष्ट व्यवहार किंमत नियम लागू करण्यासाठी, सर्व लागू किंमत नियम अक्षम करणे आवश्यक आहे."
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,आयटम {0} एक स्टॉक आयटम नसल्यामुळे  दुर्लक्षित केला आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,पुढील प्रक्रियेसाठी  ही उत्पादन मागणी सबमिट करा.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एका विशिष्ट व्यवहारात  किंमत नियम लागू न करण्यासाठी, सर्व लागू किंमत नियम अक्षम करणे आवश्यक आहे."
 DocType: Company,Domain,डोमेन
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,नोकरी
 ,Sales Order Trends,विक्री ऑर्डर ट्रेन्ड
@@ -2985,24 +3073,26 @@
 DocType: Time Log,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
-DocType: BOM,Materials Required (Exploded),साहित्य (स्फोट झाला) आवश्यक
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),पे न करता सोडू साठी मिळवून कमी (LWP)
+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 +162,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल नाही {1} जुळत नाही {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल क्रमांक  {1} हा {2} {3}सोबत  जुळत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,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/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: Opportunity,Opportunity Date,संधी तारीख
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरेदी पावती विरुद्ध परत
+DocType: Request for Quotation Item,Request for Quotation Item,अवतरण आयटम विनंती
 DocType: Purchase Order,To Bill,बिल
-DocType: Material Request,% Ordered,% आदेश
+DocType: Material Request,% Ordered,% आदेश दिले
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
@@ -3010,16 +3100,17 @@
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,वृत्तपत्रे
 DocType: Address,Shipping,शिपिंग
 DocType: Stock Ledger Entry,Stock Ledger Entry,शेअर खतावणीत नोंद
-DocType: Department,Leave Block List,ब्लॉक यादी सोडा
+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,सेटिंग्ज खाती
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} आयटम सिरियल क्रमांकासाठी  सेटअप केलेला नाही. स्तंभ रिक्त असणे आवश्यक आहे
+DocType: Accounts Settings,Accounts Settings,खाती सेटिंग्ज
 DocType: Customer,Sales Partner and Commission,विक्री भागीदार व आयोगाच्या
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},कंपनी मध्ये &#39;मालमत्ता विल्हेवाट खाते&#39; सेट करा {0}
 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: 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,तात्पुरती खाती
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ब्लॅक
 DocType: BOM Explosion Item,BOM Explosion Item,BOM स्फोट आयटम
 DocType: Account,Auditor,लेखापरीक्षक
@@ -3028,25 +3119,26 @@
 DocType: Pricing Rule,Disable,अक्षम करा
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,अदा करण्यासाठी येथे क्लिक करा
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","मालमत्ता {0} तो आधीपासूनच आहे म्हणून, रद्द जाऊ शकत नाही {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आयडी
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,मार्क अनुपिस्थत
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,वेळ वेळ पासून पेक्षा जास्त असणे आवश्यक करण्यासाठी
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,वेळ  पासून पेक्षा वेळ पर्यंत  जास्त असणे आवश्यक आहे
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,आयटम जोडा
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,आयटम जोडा
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},कोठार {0}: पालक खाते {1} कंपनी{2} ला संबंधित नाही
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
 DocType: Project Task,Task ID,कार्य आयडी
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",उदा &quot;MC&quot;
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,आयटम साठी अस्तित्वात शकत नाही स्टॉक {0} पासून रूपे आहेत
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,आयटम {0} साठी Stock अस्तित्वात असू शकत नाही कारण त्याला  variants आहेत
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
-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 हब नोंदणी
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
+DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्याचे % या पोच पावती विरोधात वितरित केले आहे
 DocType: Features Setup,Compact Item Print,संक्षिप्त आयटम मुद्रित
 DocType: Project,Customer Details,ग्राहक तपशील
 DocType: Employee,Reports to,अहवाल
@@ -3054,21 +3146,22 @@
 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 +16,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,हा पत्ता साचा मुलभूतरित्या सेट केला कारण तेथे इतर पूर्वनिर्धारीत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,गुणवत्ता व्यवस्थापन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
 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}
+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/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/setup/doctype/company/company.js +20,Cost Centers,खर्च केंद्रे
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,जे पुरवठादार चलनात दर कंपनीच्या बेस चलनात रुपांतरीत आहे
+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,पुढील संपर्क
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,सेटअप गेटवे खाती.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,सेटअप गेटवे खाती.
 DocType: Employee,Employment Type,रोजगार प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थिर मालमत्ता
 ,Cash Flow,वित्त प्रवाह
@@ -3079,10 +3172,10 @@
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +183,"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}
+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 +132,Please find attached {0} #{1},शोधू करा संलग्न {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},संलग्न {0} # {1} शोधा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,सामान्य लेजर नुसार बँक स्टेटमेंट शिल्लक
 DocType: Job Applicant,Applicant Name,अर्जदाराचे नाव
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / आयटम नाव
@@ -3092,33 +3185,32 @@
 
 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 असाल तर हे संकुल मध्ये ** उपयुक्त आहे आणि आपण पॅक ** आयटम स्टॉक ** नाही ** एकूण आयटम ठेवा. पॅकेज ** आयटम ** लागेल &quot;नाही&quot; आणि &quot;होय&quot; म्हणून &quot;विक्री आयटम आहे&quot; म्हणून &quot;स्टॉक आयटम आहे&quot;. उदाहरणार्थ: ग्राहक दोन्ही खरेदीस तर तुम्ही स्वतंत्रपणे लॅपटॉप आणि बॅकपॅक विक्री व असाल तर एक विशेष किंमत आहे, नंतर लॅपटॉप + ओलिस एक नवीन उत्पादन बंडल आयटम असेल. टीप: ट्रॅक BOM = बिल"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},सिरियल नाही आयटम अनिवार्य आहे {0}
+Note: BOM = Bill of Materials","आणखी एक ** आयटम मध्ये ** आयटम ** एकंदर गट ** . या संकुल मध्ये ** आपण एक विशिष्ट ** आयटम बंडल असाल तर उपयुक्त आहे आणि आपण पॅक ** आयटम स्टॉक ** नाही एकूण ** आयटम राखण्यासाठी ** देखरेख करता. पॅकेज ** आयटम ** ला ""विक्री आयटम आहे""  ""होय"" आणि ""स्टॉक आयटम आहे"" ""नाही "" "" विक्री आयटम आहे  "" म्हणून "" शेअर बाबींचा आहे"". उदाहरणार्थ: ग्राहक दोन्ही विकत घेतो तर आपण स्वतंत्रपणे लॅपटॉप आणि बॅकपॅक विक्री असाल तर एक विशेष किंमत आहे, नंतर लॅपटॉप + ओलिस एक नवीन उत्पादन बंडल बाबींचा असेल. टीप: सामग्रीचा BOM = Bill of Material"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},सिरियल क्रमांक आयटम  {0} साठी अनिवार्य आहे
 DocType: Item Variant Attribute,Attribute,विशेषता
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,श्रेणी / पासून ते निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,कृपया  पासून / पर्यंत श्रेणी निर्दिष्ट करा
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
-apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,व्यवहार विक्री डीफॉल्ट सेटिंग्ज.
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,आयटम मूल्यांकन दर उतरले खर्च व्हाउचर रक्कमचा  विचार करून  recalculate केले  आहे
+apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,विक्री व्यवहारासाठी  मुलभूत सेटिंग्ज.
 DocType: BOM Replace Tool,Current BOM,वर्तमान BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,सिरियल नाही जोडा
 apps/erpnext/erpnext/config/support.py +43,Warranty,हमी
-DocType: Production Order,Warehouses,गोदामांची
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,प्रिंट आणि स्टेशनरी
+DocType: Production Order,Warehouses,गोदामे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,मुद्रण आणि स्टेशनरी
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,गट नोड
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,अद्यतन पूर्ण वस्तू
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,अद्यतन पूर्ण वस्तू
 DocType: Workstation,per hour,प्रती तास
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,खरेदी
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,कोठार (शा्वत सूची) खाते या खाते अंतर्गत तयार करण्यात येणार आहे.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,खाते कोठार ( शा्वत यादी ) ह्या खाते अंतर्गत निर्माण केले जाईल.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.js +435,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,पाठवणे
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम परवानगी कमाल सवलतीच्या: {0} {1}% आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम: {0} साठी कमाल {1} % सवलतिची परवानगी आहे
 DocType: Account,Receivable,प्राप्त
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,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: 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,साहित्य अंक
@@ -3135,52 +3227,53 @@
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,सर्व अनचेक करा
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी गोदामांची मधिल आढळणारी {0}
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी वख्रार मध्ये गहाळ आहे {0}
 DocType: POS Profile,Terms and Conditions,अटी आणि शर्ती
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीख करण्यासाठी आर्थिक वर्ष आत असावे. = तारीख करण्यासाठी गृहीत धरून {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत"
-DocType: Leave Block List,Applies to Company,कंपनी लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीखे पर्यंत आर्थिक वर्षाच्या   आत असावे. तारीख पर्यंत= {0}गृहीत धरून
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत करू  शकता"
+DocType: Leave Block List,Applies to Company,कंपनीसाठी  लागू
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
 DocType: Purchase Invoice,In Words,शब्द मध्ये
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
 DocType: Production Planning Tool,Material Request For Warehouse,कोठार साहित्य विनंती
 DocType: Sales Order Item,For Production,उत्पादन
 DocType: Payment Request,payment_url,payment_url
-DocType: Project Task,View Task,पहा कार्य
-apps/erpnext/erpnext/public/js/setup_wizard.js +40,Your financial year begins on,आपले आर्थिक वर्षात सुरू
+DocType: Project Task,View Task,कार्य पहा
+apps/erpnext/erpnext/public/js/setup_wizard.js +40,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,घेवप्यांची जोडा / काढा
+DocType: Sales Invoice,Get Advances Received,सुधारण प्राप्त करा
+DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ते  जोडा / काढा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी &#39;डीफॉल्ट म्हणून सेट करा&#39; वर क्लिक करा"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी, 'डीफॉल्ट म्हणून सेट करा' वर क्लिक करा"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,सामील व्हा
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'तारीख' आवश्यक आहे
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
+DocType: Pricing Rule,Margin Rate or Amount,मार्जिन दर किंवा रक्कम
+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,आयटम प्रगत
-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; एक ईमेल पाठवू उघडले. वापरकर्ता मे किंवा ई-मेल पाठवू शकत नाही."
+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 +782,It is needed to fetch Item Details.,हे आयटम तपशील प्राप्त करणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
 DocType: Salary Slip,Net Pay,नेट पे
 DocType: Account,Account,खाते
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,सिरियल नाही {0} आधीच प्राप्त झाले आहे
-,Requested Items To Be Transferred,मागणी आयटम हस्तांतरीत करण्याची
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,सिरियल क्रमांक {0} आधीच प्राप्त झाला  आहे
+,Requested Items To Be Transferred,विनंती आयटम हस्तांतरित करणे
 DocType: Customer,Sales Team Details,विक्री कार्यसंघ तपशील
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,विक्री संभाव्य संधी.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},अवैध {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग स्टोअर्स
-apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,खालील गोदामांची नाही लेखा नोंदी
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहिल्या दस्तऐवज जतन करा.
+apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,पहिला  दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
 DocType: Company,Change Abbreviation,बदला Abbreviation
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
@@ -3192,20 +3285,21 @@
 DocType: Purchase Order,Raw Materials Supplied,कच्चा माल प्रदान
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
 DocType: C-Form,Series,मालिका
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारीख आधी असू शकत नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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/stock/doctype/warehouse/warehouse.js +12,General Ledger,सामान्य खातेवही
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,पहा निष्पन्न
 DocType: Item Attribute Value,Attribute Value,मूल्य विशेषता
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ईमेल आयडी आधीच अस्तित्वात नाही, अद्वितीय असणे आवश्यक आहे {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ईमेल आयडी अद्वितीय असणे आवश्यक आहे ,आधीच अस्तित्वात आहे ,  {0} साठी"
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,प्रथम {0} निवडा कृपया
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,कृपया प्रथम {0} निवडा
 DocType: Features Setup,To get Item Group in details table,तपशील तक्ता मध्ये आयटम गट प्राप्त करण्यासाठी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {0}
 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>
@@ -3221,74 +3315,74 @@
 </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 +96,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,हा महिना च्या सारांश
+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,प्रकल्प शहाणा शेअर ट्रॅकिंग
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),(स्रोत / लक्ष्याच्या) प्रत्यक्ष Qty
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {0} आहे
+DocType: Stock Entry Detail,Actual Qty (at source/target),प्रत्यक्ष प्रमाण (स्त्रोत / लक्ष्य येथे)
 DocType: Item Customer Detail,Ref Code,संदर्भ कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रेकॉर्ड.
 DocType: Payment Gateway,Payment Gateway,पेमेंट गेटवे
-DocType: HR Settings,Payroll Settings,वेतनपट सेटिंग्ज
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
+DocType: HR Settings,Payroll Settings,पे रोल सेटिंग्ज
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,मागणी नोंद करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,रूट एक पालक खर्च केंद्र असू शकत नाही
-apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,निवडा ब्रँड ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ब्रँड निवडा
 DocType: Sales Invoice,C-Form Applicable,सी-फॉर्म लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन साठी 0 पेक्षा असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,वखार अनिवार्य आहे
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
-apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px करून (प) वेब अनुकूल 900px ठेवा (ह)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,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,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती अद्ययावत आहेत
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),ते 100px करून  (h) वेब अनुकूल 900px (w ) ठेवा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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: Warranty Claim,Resolved By,ने  निराकरण
 DocType: Appraisal,Start Date,प्रारंभ तारीख
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचा साफ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचे  साफ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करण्यासाठी येथे क्लिक करा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,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; दर्शवा.
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""स्टॉक मध्ये"" किंवा या कोठारमधे  उपलब्ध स्टॉक आधारित "" स्टॉक मध्ये नाही"" दर्शवा."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),साहित्य बिल (DEL)
 DocType: Item,Average time taken by the supplier to deliver,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
 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,शुल्क की आयटम लागू नाही तर आयटम काढा
+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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,व्यवहार चलन पेमेंट गेटवे चलन म्हणून समान असणे आवश्यक आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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: Purchase Invoice,Submit on creation,निर्माण सबमिट
+DocType: Purchase Invoice,Submit on creation,निर्माण केल्यावर सबमिट
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ऑर्डर {0} सादर करणे आवश्यक आहे उत्पादन
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},आयटम प्रारंभ तारीख आणि अंतिम तारीख निवडा कृपया {0}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीख करण्यासाठी तारखेपासून आधी असू शकत नाही
+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 +141,Please select Start Date and End Date for Item {0},कृपया आयटम   {0} साठी   प्रारंभ तारीख आणि अंतिम तारीख निवडा
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,माझे ऑर्डर
+,Requested Items To Be Ordered,विनंती आयटमची  मागणी करणे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,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,आदेश दिले आयटम वितरित करणे
+,Ordered Items To Be Delivered,आदेश दिलेले  आयटम वितरित करणे
 DocType: Account,Income,उत्पन्न
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,काहीतरी चूक झाली!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,विक्री चलन {0} आधीच सादर केला गेला आहे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,आर्थिक वर्ष {0} अस्तित्वात नाही
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूर्ण तारीख
 DocType: Purchase Invoice Item,Amount (Company Currency),रक्कम (कंपनी चलन)
@@ -3296,66 +3390,67 @@
 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,पाठविण्यापूर्वी कृपया संदेश प्रविष्ट करा
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,पॉइंट-ऑफ-विक्री प्रोफाइल
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,बिनव्याजी कर्ज
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,बिनव्याजी कर्ज
 DocType: Cost Center,Cost Center Name,खर्च केंद्र नाव
 DocType: Maintenance Schedule Detail,Scheduled Date,अनुसूचित तारीख
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,एकूण सशुल्क रक्कम
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 वर्ण या पेक्षा मोठे संदेश एकाधिक संदेश विभागली जातील
-DocType: Purchase Receipt Item,Received and Accepted,प्राप्त झालेले आहे आणि स्वीकारले
-,Serial No Service Contract Expiry,सिरियल नाही सेवा करार कालावधी समाप्ती
+DocType: 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 +272,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,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/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,आपले पुरवठादार
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,विक्री आदेश केले आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; पुढे जाण्यासाठी करा.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,पुरवठादार भाग नाही
 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: Item,Has Serial No,सिरियल क्रमांक  आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: पासून {0} साठी {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,आयटम {1} संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} पासून {1} साठी
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
-DocType: Item,List this Item in multiple groups on the website.,वेबसाइट अनेक गट या आयटम यादी.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,आयटम: {0} प्रणाली अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
+DocType: Item,List this Item in multiple groups on the website.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,इतर चलनबरोबरचे account परवानगी देण्यासाठी कृपया  मल्टी चलन पर्याय तपासा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,आयटम: {0} प्रणालीत  अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,आपल्याला गोठविलेले  मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
 DocType: Cost Center,Budgets,खर्चाचे अंदाजपत्रक
 apps/erpnext/erpnext/public/js/setup_wizard.js +21,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},खाते {0} आर्थिक वर्ष {1} त एकापेक्षा अधिक प्रविष्ट केले गेले आहे
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,विधान परिषदेच्या भविष्यात तारखा करीता चिन्हाकृत केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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 +164,Update additional costs to calculate landed cost of items,आयटम उतरले किंमत काढण्यासाठी अतिरिक्त खर्च अद्यतनित करा
+apps/erpnext/erpnext/config/stock.py +164,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/accounts/doctype/journal_entry/journal_entry.py +318,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/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी  {0}साठी सेट नाही
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
-DocType: Leave Block List,Leave Block List Name,ब्लॉक यादी नाव सोडा
+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/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/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,लक्ष्य Qty
 DocType: Shopping Cart Settings,Checkout Settings,चेकआऊट सेटिंग्ज
@@ -3364,40 +3459,41 @@
 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 +576,Item {0} is disabled,आयटम {0} अक्षम आहे
+DocType: Sales Order Item,Ordered Qty,आदेश दिलेली  Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},कालावधी पासून आणि कालावधी   पर्यंत  तारखा  कालावधी  आवर्ती {0} साठी बंधनकारक
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
-apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,पगार डाव सावरला व्युत्पन्न
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,पगार Slips तयार  करा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर खरेदी, चेक करणे आवश्यक आहे {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
-DocType: Purchase Invoice,Write Off Amount (Company Currency),रक्कम बंद लिहा (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,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,महिना दिवशी पुन्हा करा
+DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off रक्कम (कंपनी चलन)
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,महिन्याच्या  दिवशी पुन्हा करा
 DocType: Employee,Health Details,आरोग्य तपशील
 DocType: Offer Letter,Offer Letter Terms,पत्र अटी ऑफर
 DocType: Features Setup,To track any installation or commissioning related work after sales,कोणतेही प्रतिष्ठापन ट्रॅक किंवा विक्री केल्यानंतर संबंधित काम अंमलबजावणी करण्यासाठी
-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,उपरोक्त निवडलेले निकष सर्व पगार स्लिप सादर करा
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,उपरोक्त  निकषा साठी  निवडलेल्या  सर्व पगार स्लिप सादर करा
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} आयटम समक्रमित
-DocType: Sales Order,Partly Delivered,पाऊस वितरण
+DocType: Sales Order,Partly Delivered,अंशतः वितरण आकारले
 DocType: Sales Invoice,Existing Customer,विद्यमान ग्राहक
 DocType: Email Digest,Receivables,Receivables
 DocType: Customer,Additional information regarding the customer.,ग्राहक संबंधित अतिरिक्त माहिती.
 DocType: Quality Inspection Reading,Reading 5,5 वाचन
 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,नाकारल्याचे सिरियल नाही
+DocType: Purchase Receipt Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,वर्ष प्रारंभ तारीख किंवा समाप्ती तारीख {0} आच्छादित आहे. टाळण्यासाठी कृपया कंपनी
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नवी वृत्तपत्र
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},आयटम साठी अंतिम तारीख कमी असणे आवश्यक आहे प्रारंभ तारीख {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},आयटम  {0} साठी प्रारंभ तारीखेपेक्षा अंतिम तारीख कमी असणे आवश्यक आहे
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","उदाहरण:. मालिका सेट केले असल्यास आणि सिरियल नाही व्यवहार उल्लेख केला नाही, तर एबीसीडी #####, नंतर स्वयंचलित सिरीयल क्रमांक या मालिकेत आधारित तयार केले जाईल. आपण नेहमी सुस्पष्टपणे या आयटम सिरियल क्र उल्लेख करायचे असेल तर. हे रिक्त सोडा."
-DocType: Upload Attendance,Upload Attendance,अपलोड करा हजेरी
+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.","उदाहरण: . एबीसीडी ##### मालिका सेट केले जाते आणि सिरियल कोणतेही व्यवहार उल्लेख , तर स्वयंचलित सिरीयल क्रमांक या मालिकेवर आधारित तयार होईल. आपण नेहमी स्पष्टपणे या आयटम साठी सिरिअल क्रमांक उल्लेख करू इच्छित असल्यास हे रिक्त सोडा."
+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 +451,Amount,रक्कम
@@ -3405,11 +3501,11 @@
 ,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 +91,Please enter default currency in Company Master,कंपनी मास्टर मध्ये डीफॉल्ट चलन प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},कर नियम वाद {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,नवीन खाते नाव
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,ग्राहक सेवा
@@ -3417,13 +3513,14 @@
 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 +50,Offer candidate a Job.,ऑफर उमेदवार जॉब.
-DocType: Notification Control,Prompt for Email on Submission of,सादरीकरण ईमेल विनंती
+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: Pricing Rule,Percentage,टक्केवारी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,आयटम {0} एक स्टॉक आयटम असणे आवश्यक आहे
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगती वखार मध्ये डीफॉल्ट कार्य
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,लेखा व्यवहार डीफॉल्ट सेटिंग्ज.
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारीख आधी असू शकत नाही
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,लेखा व्यवहारासाठी  मुलभूत सेटिंग्ज.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारखेच्या आधी असू शकत नाही
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
 DocType: Naming Series,Update Series Number,अद्यतन मालिका क्रमांक
 DocType: Account,Equity,इक्विटी
 DocType: Sales Order,Printing Details,मुद्रण तपशील
@@ -3431,11 +3528,12 @@
 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,शोध उप विधानसभा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},आयटम कोड रो नाही आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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,खर्चाचे खाते विरुद्ध
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; प्रकार बाल जोडा वर क्लिक) आणि करू कर दर उल्लेख.
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
 DocType: Quotation Item,Against Docname,Docname विरुद्ध
@@ -3443,7 +3541,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
 DocType: Item Reorder,Re-Order Level,पुन्हा-क्रम स्तर
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करायचे आहे आयटम आणि नियोजित qty प्रविष्ट करा.
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करू इच्छित असलेल्या आयटम आणि नियोजित प्रमाण प्रविष्ट करा.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
@@ -3453,32 +3551,33 @@
 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/setup_wizard/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
-DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गट आयटम च्या क्रॉस यादी
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
+DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गटामध्ये आयटम च्या क्रॉस यादी
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,यशस्वीरित्या समेट
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,आयटम कोठे साठवले जातात.
 DocType: Tax Rule,Validity,वैधता
+DocType: Request for Quotation,Supplier Detail,पुरवठादार तपशील
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced रक्कम
 DocType: Attendance,Attendance,विधान परिषदेच्या
 apps/erpnext/erpnext/config/projects.py +55,Reports,अहवाल
 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 +508,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,व्यवहार खरेदी कर टेम्प्लेट.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,पोस्ट करण्याची तारीख आणि  पोस्ट करण्याची वेळ आवश्यक आहे
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,व्यवहार खरेदी कर टेम्प्लेट.
 ,Item Prices,आयटम किंमती
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,तुम्ही पर्चेस जतन एकदा शब्द मध्ये दृश्यमान होईल.
+DocType: 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 +77,Price List master.,किंमत सूची मास्टर.
 DocType: Task,Review Date,पुनरावलोकन तारीख
 DocType: Purchase Invoice,Advance Payments,आगाऊ पेमेंट
-DocType: Purchase Taxes and Charges,On Net Total,नेट एकूण रोजी
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0} सलग लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +123,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
+DocType: Purchase Taxes and Charges,On Net Total,निव्वळ एकूण वर
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,सलग {0} मधील  लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,भरणा साधन वापरण्यास कोणतीही परवानगी नाही
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,बदला
@@ -3486,24 +3585,25 @@
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
+DocType: Asset Category,Asset Category Name,मालमत्ता वर्गवारी नाव
 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/accounts/doctype/journal_entry/journal_entry.js +458,Credit Account,क्रेडिट खाते
-DocType: Landed Cost Item,Landed Cost Item,उतरले खर्च आयटम
+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 +559,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
+DocType: Delivery Note,Print Without Amount,रक्कम न करता छापा
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,बॅच
@@ -3517,11 +3617,11 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,विक्री व्यक्ती
 DocType: Sales Invoice,Cold Calling,थंड कॉलिंग
 DocType: SMS Parameter,SMS Parameter,एसएमएस मापदंड
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,बजेट आणि खर्च केंद्र
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,बजेट आणि खर्च केंद्र
 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,एकूण आगाऊ
 apps/erpnext/erpnext/config/hr.py +257,Processing Payroll,प्रक्रिया वेतनपट
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
@@ -3530,7 +3630,7 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भरणा पावती टीप
 DocType: Supplier,Credit Days Based On,क्रेडिट दिवस आधारित
 DocType: Tax Rule,Tax Rule,कर नियम
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,विक्री सायकल संपूर्ण समान दर ठेवणे
+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,आयटम विनंती करण्यासाठी
@@ -3544,52 +3644,53 @@
 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 +95,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण ग्रुपला गुप्त करू शकत नाही.
-DocType: Purchase Common,Purchase Common,खरेदी सामान्य
+apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण खाते प्रकार निवडले आहे.
+DocType: Purchase Common,Purchase Common,सामान्य खरेदी
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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 +12,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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 +492,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 +42,{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: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","हा खर्च केंद्र अर्थसंकल्पात परिभाषित. बजेट क्रिया सेट करण्यासाठी, ""कंपनी यादी"" पहा"
 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 +99,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
+apps/erpnext/erpnext/public/js/pos/pos.js +99,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,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/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
+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 +219,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरवतो."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरावा ."
 DocType: Address,Office,कार्यालय
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: पक्ष / खात्याशी जुळत नाही {1} / {2} मधील {3} {4}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: {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 +239,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: 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 +310,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: Sales Invoice Item,Discount and Margin,सवलत आणि मार्जिन
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,वरील निकषावर  आधारित (वितरीत करण्यासाठी प्रलंबित) विक्री आदेश खेचा
 DocType: Deduction Type,Deduction Type,कपात प्रकार
 DocType: Attendance,Half Day,अर्धा दिवस
 DocType: Pricing Rule,Min Qty,किमान Qty
@@ -3600,16 +3701,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +175,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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे फक्त प्राप्तीयोग्य / देय खातेविरुद्ध   लागू आहे
 DocType: Notification Control,Purchase Receipt Message,खरेदी पावती संदेश
 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 +12,Record item movement.,नोंद आयटम चळवळ.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,वृत्तपत्र यादी ग्राहक
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,मासिक पगार नोंदणी
 DocType: Warranty Claim,If different than customer address,ग्राहक पत्ता पेक्षा भिन्न असेल तर
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
@@ -3617,82 +3718,83 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,किमान एक सलग भरणा रक्कम प्रविष्ट करा
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 DocType: Payment Gateway Account,Payment URL Message,भरणा URL मध्ये संदेश
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,रो {0}: भरणा रक्कम शिल्लक रक्कम पेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,न चुकता केल्यामुळे एकूण
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,एकूण बाकी
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,वेळ लॉग बिल देण्यायोग्य नाही
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} आयटम एक टेम्प्लेट आहे, त्याच्या रूपे कृपया एक निवडा"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
+DocType: Asset,Asset Category,मालमत्ता वर्ग
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,स्वतः विरुद्ध कूपन प्रविष्ट करा
 DocType: SMS Settings,Static Parameters,स्थिर बाबी
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,पुरवठादार साहित्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,उत्पादन शुल्क चलन
 DocType: Expense Claim,Employees Email Id,कर्मचारी ई मेल आयडी
 DocType: Employee Attendance Tool,Marked Attendance,चिन्हांकित उपस्थिती
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,वर्तमान दायित्व
-apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,वस्तुमान एसएमएस आपले संपर्क पाठवा
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,वर्तमान दायित्व
+apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,वास्तविक Qty अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +59,Actual Qty is mandatory,वास्तविक प्रमाण अनिवार्य आहे
 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 +175,Default settings for stock transactions.,स्टॉक व्यवहार डीफॉल्ट सेटिंग्ज.
+apps/erpnext/erpnext/config/stock.py +175,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: 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,चलन आणि चलन समान असू शकत नाही
+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/public/js/setup_wizard.js +149,Attach Logo,लोगो संलग्न
 DocType: Customer,Commission Rate,आयोगाने दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,विश्लेषण
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट रिक्त आहे
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा पासून एक नवीन तयार करा.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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: Sales Order,Customer's Purchase Order Date,ग्राहकाच्या पर्चेस तारीख
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,कॅपिटल शेअर
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
-DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,पैसे पूर्ण केल्यानंतर निवडलेले पृष्ठ वापरकर्ता पुनर्निर्देशित.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,एक सी फाइल निवडा
+DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,पैसे पूर्ण भरल्यानंतर  वापरकर्ता निवडलेल्या पृष्ठला  पुनर्निर्देशित झाला पाहिजे
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,कृपया एक सी फाइल निवडा
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
-,Item-wise Purchase Register,आयटम निहाय खरेदी नोंदणी
+DocType: Asset,Current Value (After Depreciation),वर्तमान मूल्य (घसारा केल्यानंतर)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
+,Item-wise Purchase Register,आयटमनूसार खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,कृपया   पहिले  वर्ग निवडा
 apps/erpnext/erpnext/config/projects.py +13,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 +409, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,वरील टेबल विक्री आदेश प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,साहित्य बिल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते {1} साठी   आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,संदर्भ तारीख
-DocType: Employee,Reason for Leaving,सोडत आहे कारण
+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 +169,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,खाते {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद  {1} सोबत लिंक केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 DocType: Account,Cash,रोख
-DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशने लहान चरित्र.
+DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशनासठी  लहान चरित्र.
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 027f6c7..ee31383 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -18,10 +18,10 @@
 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 +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
 DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Pokok {0}
 DocType: Job Applicant,Job Applicant,Kerja Pemohon
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,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/templates/pages/projects.js +81,Show open,Tunjukkan terbuka
 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/projects/doctype/project/project.py +44,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 +229,New Leave Application,Cuti Permohonan Baru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draf
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show Kelainan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Kuantiti
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Pinjaman (Liabiliti)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Jadual account tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
@@ -64,7 +66,7 @@
 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 +642,Invoice,Invois
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Pasangan Jualan Suruhanjaya
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
 DocType: Payment Request,Payment Request,Permintaan Bayaran
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Berkahwin
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak dibenarkan untuk {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Mendapatkan barangan dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,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 +197,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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: Item,Is Fixed Asset,Adakah Aset Tetap
 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
@@ -156,7 +159,8 @@
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Perbelanjaan saham
 DocType: Newsletter,Email Sent?,E-mel Dihantar?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Logs
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Pemasangan Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Perkara {0} mestilah Pembelian Item
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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/controllers/accounts_controller.py +533,"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 +170,Settings for HR Module,Tetapan untuk HR Modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Sila masukkan Syarikat
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Tunai bersih daripada Pembiayaan
 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 +217,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,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 +427,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Penyertaan
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 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/stock/doctype/warehouse/warehouse.py +80,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 +249,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
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Belajar
+DocType: Asset,Next Depreciation Date,Selepas Tarikh Susutnilai
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Kos aktiviti setiap Pekerja
 DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Pembekal Invois No wujud dalam Invois Belian {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Cek cemerlang dan Deposit untuk membersihkan
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Salah Kata Laluan
 DocType: Item,Variant Of,Varian Daripada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unit [{1}] (# Borang / Item / {1}) yang terdapat di [{2}] (# Borang / Gudang / {2})
 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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Penghantaran Nota
 apps/erpnext/erpnext/config/learn.py +87,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 +381,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Sila pilih bulan dan tahun
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Jumlah Pesanan Dianggap
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Pilih Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,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: Depreciation Schedule,Schedule Date,Jadual Tarikh
 DocType: Packed Item,Packed Item,Makan Perkara
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Tetapan lalai untuk membeli transaksi.
+apps/erpnext/erpnext/config/buying.py +65,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
@@ -346,6 +353,7 @@
 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: Request for Quotation,Request for Quotation,Permintaan untuk sebut harga
 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."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
-DocType: Material Request Item,Required Date,Tarikh Diperlukan
+DocType: Request for Quotation Item,Required Date,Tarikh Diperlukan
 DocType: Delivery Note,Billing Address,Alamat Bil
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Sila masukkan Kod Item.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Mesej untuk Pembekal
 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
@@ -416,17 +425,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
 DocType: Account,Profit and Loss,Untung dan Rugi
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Urusan subkontrak
+DocType: Project,Project will be accessible on the website to these users,Projek akan boleh diakses di laman web untuk pengguna ini
 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 +53,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
@@ -446,7 +456,7 @@
 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 +86,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Menunggu Kuantiti
 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
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Tahun kewangan / perakaunan.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Nilai terkumpul
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
 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 +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Dihantar: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Akaun Belum Bayar
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,resume Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
 DocType: Leave Control Panel,Allocate,Memperuntukkan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Jualan Pulangan
 DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Komponen gaji.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Pangkalan data pelanggan yang berpotensi.
@@ -490,7 +500,7 @@
 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 +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Sarjana
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update Bank Tarikh Transaksi
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update Bank Tarikh Transaksi
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Tracking masa
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
@@ -518,27 +528,27 @@
 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
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Jadual Penyelenggaraan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Perubahan Bersih dalam Inventori
 DocType: Employee,Passport Number,Nombor Pasport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Pengurus
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Sila menetapkan Senarai Holiday untuk sama ada pekerja atau Syarikat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Jumlah susut nilai
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Hari Tetap
 DocType: Quotation Item,Item Balance,Perkara Baki
 DocType: Sales Invoice,Packing List,Senarai Pembungkusan
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Pesanan pembelian diberikan kepada Pembekal.
+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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Masa Operasi
 DocType: Pricing Rule,Sales Manager,Pengurus Jualan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Kumpulan kepada Kumpulan
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Projek saya
 DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
 DocType: Journal Entry,Bill No,Rang Undang-Undang No
+DocType: Company,Gain/Loss Account on Asset Disposal,Akaun Keuntungan / Kerugian daripada Pelupusan Aset
 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)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Kemasukan bayaran telah membuat
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Jumlah bil tahun ini
 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 +529,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Perkara mempunyai varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Sila pilih hari cuti mingguan
 DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
 ,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kenyataan gaji bulanan.
 DocType: Item Group,Website Specifications,Laman Web Spesifikasi
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Terdapat ralat dalam Template Alamat anda {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Akaun Baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Akaun Baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {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.,Catatan perakaunan boleh dibuat terhadap nod daun. Catatan terhadap Kumpulan adalah tidak dibenarkan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,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 +188,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Sila masukkan Perkara pertama
 DocType: Account,Liability,Liabiliti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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 +275,Price List not selected,Senarai Harga tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Invois saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Invois saya
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tiada pekerja didapati
 DocType: Supplier Quotation,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,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
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,ralat logik: Mesti mencari bertindih
 DocType: Item,Website Warehouse,Laman Web Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
 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 +267,C-Form records,C-Borang rekod
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Borang rekod
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Pelanggan dan Pembekal
 DocType: Email Digest,Email Digest Settings,E-mel Tetapan Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Pertanyaan sokongan daripada pelanggan.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +752,15 @@
 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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Resit Pembelian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Resit Pembelian
 ,Received Items To Be Billed,Barangan yang diterima dikenakan caj
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} mesti aktif
+DocType: Journal Entry,Depreciation Entry,Kemasukan susutnilai
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Sila pilih jenis dokumen pertama
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Troli
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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 +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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: Asset,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
@@ -785,21 +802,24 @@
 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 +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Menerbitkan di laman web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Penghantaran kepada pelanggan.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Pilih Item Pemindahan
 DocType: Purchase Invoice,Additional Discount Percentage,Peratus Diskaun tambahan
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Invois {1} adalah tidak sah, ia mungkin dibatalkan / tidak wujud. \ Sila masukkan Invois yang sah"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
 ,Employee Holiday Attendance,Pekerja Holiday Kehadiran
 DocType: Opportunity,Walk In,Berjalan Dalam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Penyertaan Saham
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Penyertaan Saham
 DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Dipindahkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Buat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,Keranjang saya
@@ -825,7 +845,8 @@
 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 +180,Qty for {0},Qty untuk {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Adakah anda benar-benar mahu memulihkan aset dilupuskan ini?
+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 +80,Leave Allocation Tool,Tinggalkan Alat Peruntukan
 DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
@@ -838,7 +859,7 @@
 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 +547,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Diskaun
@@ -853,20 +874,21 @@
 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 +69,Selling Amount,Jumlah Jualan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Time Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Time Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,dibatalkan
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recruitment
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Perbelanjaan jualan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Membeli Standard
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
+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
@@ -892,7 +914,7 @@
 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 +334,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
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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
@@ -900,7 +922,7 @@
 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}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Sumbangan%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projek Kerjasama Jemputan
 DocType: Salary Slip,Deductions,Potongan
 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.
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapasiti Ralat Perancangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,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 +92,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 +473,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 +45,Types of activities for Time Sheets,Jenis-jenis aktiviti untuk Lembaran Masa
@@ -935,18 +958,18 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Sila menetapkan ID E-mel
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Sila menetapkan ID E-mel
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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 +33,Supplier database.,Pangkalan data pembekal.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Pangkalan data pembekal.
 DocType: Account,Balance Sheet,Kunci Kira-kira
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Cukai dan potongan gaji lain.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pemiutang
@@ -960,6 +983,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-bentuk tidak boleh digunakan untuk invois: {0}
 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
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
 DocType: Contact,User ID,ID Pengguna
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Lihat Lejar
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,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
@@ -993,7 +1018,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Pembukaan sementara
 ,Employee Leave Balance,Pekerja Cuti Baki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,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 +165,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,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
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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 +257,Your Products or Services,Produk atau Perkhidmatan anda
 DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/stock/get_item_details.py +142,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,Jangkaan Tarikh penghantaran adalah lebih rendah daripada yang dirancang Tarikh Mula.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Untuk Pembekal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Tidak jumpa apa-apa perkara yang dipanggil {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Kumpulan Website Perkara
 DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
-DocType: Journal Entry,Journal Entry,Jurnal Entry
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sebut Harga Pembekal
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perkakasan
 DocType: Sales Order,Recurring Upto,berulang Hamper
 DocType: Attendance,HR Manager,HR Manager
@@ -1082,6 +1109,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Nilai Semasa Selepas Susutnilai mesti kurang dari sama dengan {0}
 ,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)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Tarikh mula dan tamat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operasi tidak boleh dibiarkan kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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
+DocType: Asset,Depreciation Schedules,Jadual susutnilai
 DocType: Item,Is Service Item,Adalah Perkhidmatan Perkara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
 DocType: Activity Cost,Projects,Projek
 DocType: Payment Request,Transaction Currency,transaksi mata Wang
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,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 +31,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.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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 +17,Communication log.,Log komunikasi.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
+apps/erpnext/erpnext/config/accounts.py +175,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 +276,We buy this Item,Kami membeli Perkara ini
 DocType: Address,Billing,Bil
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Jumlah Kos Tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Dewan Sub
+DocType: Asset,Asset Name,Nama aset
 DocType: Shipping Rule Condition,To Value,Untuk Nilai
 DocType: Supplier,Stock Manager,Pengurus saham
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,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 +600,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/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Minta sebut harga boleh diakses dengan klik link berikut
+DocType: Asset,Number of Months in a Period,Bilangan bulan dalam tempoh yang
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kerajaan
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Kelainan Perkara
 DocType: Company,Services,Perkhidmatan
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Jumlah ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
 DocType: Sales Invoice,Source,Sumber
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Show ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,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 +261,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Aliran tunai daripada Pelaburan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding dan Caj
 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 +86,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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 +406,"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."
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Sila buat akaun baru dari carta akaun.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Penyelenggaraan Lawatan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Penyelenggaraan Lawatan
 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
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Master Jenama.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 DocType: Sales Invoice Item,Brand Name,Nama jenama
 DocType: Purchase Receipt,Transporter Details,Butiran Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Box
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +131,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Liabiliti saham
 DocType: Purchase Receipt,Supplier Warehouse,Gudang Pembekal
 DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
 ,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Hantar semula Pembayaran E-mel
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Laporan lain
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Lihat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Potongan Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Sebelum Tahun Kewangan tidak ditutup
 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 +40,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 +38,Supplier Type master.,Jenis pembekal induk.
+apps/erpnext/erpnext/config/buying.py +43,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 +93,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
 DocType: Purchase Invoice,Reference Document,Dokumen rujukan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/config/website.py +12,"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 +80,{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
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Perubahan Bersih dalam Akaun Belum Bayar
 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 +129,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
 DocType: Quotation,Term Details,Butiran jangka
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mesti lebih besar daripada 0
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Jaminan Tuntutan
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"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 +135,Please select item code,Sila pilih kod item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,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: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Unit tunggal Item satu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",contohnya &quot;XYZ Bank Negara&quot;
+DocType: Asset,Depreciation Method,Kaedah susut nilai
 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 +29,Shopping Cart is enabled,Troli Membeli-belah diaktifkan
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk pekerjaan yang
 DocType: Production Plan Material Request,Production Plan Material Request,Pengeluaran Pelan Bahan Permintaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Tiada Perintah Pengeluaran dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Tiada Perintah Pengeluaran dicipta
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1402,31 +1438,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
 apps/erpnext/erpnext/config/hr.py +40,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 +37,Addresses,Alamat
+apps/erpnext/erpnext/hooks.py +91,Addresses,Alamat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,penilaian
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Perkara yang tidak dibenarkan mempunyai Perintah Pengeluaran.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Perkara yang tidak dibenarkan mempunyai Perintah Pengeluaran.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
 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 +27,Time Logs for manufacturing.,Masa balak untuk pengeluaran.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Masa Log untuk tugas-tugas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Barangan bundle pada masa jualan.
 DocType: Quotation Item,Actual Qty,Kuantiti Sebenar
 DocType: Sales Invoice Item,References,Rujukan
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
+DocType: Request for Quotation Supplier,Send Email to Supplier,Hantar Email kepada Pembekal
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
 DocType: Packing Slip,To Package No.,Untuk Pakej No.
 DocType: Production Planning Tool,Material Requests,Permintaan bahan
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
 DocType: Stock Settings,Allowance Percent,Peruntukan Peratus
 DocType: SMS Settings,Message Parameter,Mesej Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree of Centers Kos kewangan.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree of Centers Kos kewangan.
 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
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Jumlah untuk Menyampaikan
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} dihasilkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{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 +448,Item table can not be blank,Meja Item tidak boleh kosong
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"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 +271,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Tugas dan Cukai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Sila masukkan tarikh Rujukan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Akaun Gateway bayaran tidak dikonfigurasikan
 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: Production Order,Material Request Item,Bahan Permintaan Item
+DocType: Request for Quotation Item,Material Request Item,Bahan Permintaan Item
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,dijual
 ,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 +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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 +66,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,peruntukan
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
 DocType: Item Attribute,Attribute Name,Atribut Nama
 DocType: Item Group,Show In Website,Show Dalam Laman Web
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Kumpulan
@@ -1527,6 +1567,7 @@
 ,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 +25,Gantt chart of all tasks.,Carta Gantt semua tugas.
+DocType: Pricing Rule,Margin Type,Jenis margin
 DocType: Appraisal,For Employee Name,Nama Pekerja
 DocType: Holiday List,Clear Table,Jadual jelas
 DocType: Features Setup,Brands,Jenama
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Aset adalah wajib terhadap Aset Perkara Tetap
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 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 +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pasangan
+DocType: Asset,Depreciation Schedule,Jadual susutnilai
 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: Asset,Purchase Date,Tarikh pembelian
 DocType: Employee,Personal Details,Maklumat Peribadi
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Sila set &#39;Asset Susutnilai Kos Center&#39; dalam Syarikat {0}
 ,Maintenance Schedules,Jadual Penyelenggaraan
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,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
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Penyertaan berdamai
 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 +318,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 +127,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 +234,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 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 +272,Unit,Unit
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Sila nyatakan Syarikat
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,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 +)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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 +249,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
 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 +137,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Dikira-kira Penyata Bank
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna orang kurang upaya
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Sebut Harga
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
 DocType: Quotation,Maintenance User,Penyelenggaraan pengguna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kos Dikemaskini
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kos Dikemaskini
 DocType: Employee,Date of Birth,Tarikh Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
+DocType: Request for Quotation,Manufacturing Manager,Pembuatan Pengurus
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Penghantaran
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
@@ -1629,12 +1675,12 @@
 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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Perbelanjaan Pelbagai
 DocType: Global Defaults,Default Company,Syarikat Default
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"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 +139,User {0} is disabled,Pengguna {0} adalah orang kurang upaya
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{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 +154,"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 +94,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
@@ -1653,11 +1699,11 @@
 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/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Qty mesti menjadi 1, sebagai item dikaitkan dengan aset"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kanak-kanak Item tidak seharusnya menjadi Fail Produk. Sila keluarkan item `{0}` dan menyelamatkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Kos Pusat Baru
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Duti dan buat Akaun baru (dengan mengklik pada Tambah Kanak-kanak) jenis &quot;Cukai&quot; dan melakukan menyebut Kadar Cukai.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Kos Pusat Baru
 DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
 DocType: Quality Inspection,In Process,Dalam Proses
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Baki saham
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Masa Log dicipta:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Masa Log dicipta:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Sila pilih akaun yang betul
 DocType: Item,Weight UOM,Berat UOM
 DocType: Employee,Blood Group,Kumpulan Darah
@@ -1691,13 +1738,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debit Untuk diperlukan
 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 +141,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Menawarkan Surat
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menjana Permintaan Bahan (MRP) dan Perintah Pengeluaran.
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
+apps/erpnext/erpnext/stock/get_item_details.py +272,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 +123,Create Payment Entries against Orders or Invoices.,Buat Penyertaan Bayaran terhadap Pesanan atau Invois.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Buat Penyertaan Bayaran terhadap Pesanan atau Invois.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +303,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
@@ -1729,10 +1776,11 @@
 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 +175,Serial No {0} not found,No siri {0} tidak dijumpai
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,No siri {0} tidak dijumpai
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Pelanggan anda
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
 DocType: Leave Block List Date,Block Date,Sekat Tarikh
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Mohon sekarang
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Mohon sekarang
 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."
@@ -1756,7 +1804,7 @@
 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 +114,No Item with Barcode {0},No Perkara dengan Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,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
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Pemindahan Bahan
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Perkara {0} perlu menjadi Item Sales dalam {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
 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
@@ -1791,12 +1839,13 @@
 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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 +70,Invite as User,Jemput sebagai pengguna
 DocType: Features Setup,After Sale Installations,Selepas Pemasangan Sale
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Sila menetapkan {0} dalam Syarikat {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{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.
@@ -1805,9 +1854,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
 DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
 DocType: Payment Gateway Account,Payment Account,Akaun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Newsletter,Test,Ujian
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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 +206,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} tidak diserahkan
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Senarai Mel
 DocType: Delivery Note,Transporter Name,Nama Transporter
 DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} adalah ditutup
 DocType: Email Digest,How frequently?,Berapa kerap?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Saham Semasa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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 buat Akaun baru (dengan mengklik pada Tambah Kanak-kanak) jenis &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Rang Undang-Undang Bahan
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Hadir
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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: Company,Fixed Asset Depreciation Settings,Aset Tetap Tetapan Susutnilai
 DocType: Item,Will also apply for variants unless overrridden,Juga akan memohon varian kecuali overrridden
 DocType: Purchase Invoice,Advances,Pendahuluan
 DocType: Production Order,Manufacture against Material Request,Mengeluarkan terhadap Permintaan Bahan
@@ -1884,6 +1933,7 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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}
+DocType: Asset Category Account,Asset Category Account,Akaun Kategori Asset
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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 +262,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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 buat Akaun baru (dengan mengklik pada Tambah Kanak-kanak) jenis &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Nota Kredit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Master cawangan organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Tiada pekerja bagi kriteria ATAU penyata gaji dipilih di atas telah membuat
@@ -1972,7 +2024,7 @@
 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 +200,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;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Payroll
 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"
@@ -1982,8 +2034,9 @@
 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/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No Templat lalai Alamat dijumpai. Sila buat yang baru dari Persediaan&gt; Percetakan dan Branding&gt; Alamat Template.
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,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 +326,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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/accounts/doctype/account/account.py +215,"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 +92,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,New Nama PTJ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,New Nama PTJ
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
 DocType: Appraisal,HR User,HR pengguna
 DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
-apps/erpnext/erpnext/config/support.py +7,Issues,Isu-isu
+apps/erpnext/erpnext/hooks.py +90,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
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} dilumpuhkan
 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
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
 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 +214,Close Balance Sheet and book Profit or Loss.,Kunci Kira-kira rapat dan buku Untung atau Rugi.
+apps/erpnext/erpnext/config/accounts.py +222,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 +142,Quotation {0} is cancelled,Sebut Harga {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Cemerlang
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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 +67,No Remarks,Tidak Catatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Asset Item tetap perlu menjadi item tanpa saham yang
 DocType: Supplier Quotation Item,Material Request No,Permintaan bahan Tidak
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2119,7 +2174,7 @@
 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 +449,Item {0} does not exist,Perkara {0} tidak wujud
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
 DocType: Payment Request,Recipient and Message,Penerima dan Mesej
 DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Senyapkan E-mel
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Permintaan untuk sebut harga.
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
 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 +294,Price List Currency not selected,Senarai harga mata wang tidak dipilih
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Terhadap Dokumen No
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Mengurus Jualan Partners.
 DocType: Quality Inspection,Inspection Type,Jenis Pemeriksaan
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Sila pilih {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Sila pilih {0}
 DocType: C-Form,C-Form No,C-Borang No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran yang dinyahtandakan
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Akaun Susut Perbelanjaan
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Disahkan
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Sila masukkan tarikh melegakan.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Tidak dapat mencari kadar pertukaran untuk {0} kepada {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Tidak dapat mencari kadar pertukaran untuk {0} kepada {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Day Half
 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 +410,[Error],[Ralat]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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 +49,Serial No {0} does not exist,No siri {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Warehouse pelanggan (Pilihan)
 DocType: Pricing Rule,Discount Percentage,Peratus diskaun
 DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
@@ -2247,14 +2305,16 @@
 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 +471,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Permintaan bahan {0} dicipta
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Templat istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Perhubungan
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
+DocType: Asset,Expected Value After Useful Life,Nilai dijangka After Life Berguna
 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
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} batal atau ditutup
 DocType: Delivery Note,Track this Delivery Note against any Project,Jejaki Penghantaran Nota ini terhadap mana-mana Projek
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Tunai bersih daripada Pelaburan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Akaun akar tidak boleh dihapuskan
 ,Is Primary Address,Adakah Alamat Utama
 DocType: Production Order,Work-in-Progress Warehouse,Kerja dalam Kemajuan Gudang
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} hendaklah dikemukakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Mengurus Alamat
-DocType: Pricing Rule,Item Code,Kod Item
+DocType: Asset,Item Code,Kod Item
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
 DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
 DocType: Journal Entry,User Remark,Catatan pengguna
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
 DocType: Employee Education,School/University,Sekolah / Universiti
 DocType: Payment Request,Reference Details,Rujukan Butiran
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
 ,Billed Amount,Jumlah dibilkan
+DocType: Asset,Double Declining Balance,Baki Penurunan Double
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,perintah tertutup tidak boleh dibatalkan. Unclose untuk membatalkan.
 DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Maklumat Terbaru
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
 ,Stock Projected Qty,Saham Unjuran Qty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serial No dan Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Peruncit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Matikan Dalam Perkataan
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Akaun Overdraf bank
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Item Group&gt; Jenama
 apps/erpnext/erpnext/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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Pinjaman Bercagar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Sila menetapkan Akaun berkaitan Susutnilai dalam Kategori Asset {0} atau Syarikat {1}
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Pembukaan Ekuiti Baki
 DocType: Appraisal,Appraisal,Penilaian
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mel dihantar kepada pembekal {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,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 +187,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
@@ -2344,7 +2410,7 @@
 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 +199,Select Quantity,Pilih Kuantiti
+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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesej dihantar
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Jumlah Margin
 DocType: Supplier,Supplier Details,Butiran Pembekal
 DocType: Expense Claim,Approval Status,Kelulusan Status
 DocType: Hub Settings,Publish Items to Hub,Menerbitkan item untuk Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
 DocType: Payment Gateway Account,Default Payment Request Message,Lalai Permintaan Bayaran Mesej
 DocType: Item Group,Check this if you want to show in website,Semak ini jika anda mahu untuk menunjukkan di laman web
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Perbankan dan Pembayaran
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Perbankan dan Pembayaran
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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/config/hr.py +55,Leaves and Holiday,Daun dan Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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
@@ -2419,15 +2486,17 @@
 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 +53,"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: Company,Asset Depreciation Cost Center,Aset Pusat Susutnilai Kos
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Tarikh Pembelian aset {0} tidak sepadan dengan tarikh Invois Belian
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Gudang {0}: Syarikat adalah wajib
 ,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
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Penghutang ({0})
-DocType: Project,Margin,margin
+DocType: Pricing Rule,Margin,margin
 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 +72,Gross Profit %,Keuntungan kasar%
@@ -2435,20 +2504,23 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
 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 +57,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
 DocType: Stock Entry Detail,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Tarikh pemasangan
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
 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: Account,Accumulated Depreciation,Susut nilai terkumpul
 DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
 DocType: Payment Request,Email To,E-mel Untuk
 DocType: Lead,Lead Owner,Lead Pemilik
 DocType: Bin,Requested Quantity,diminta Kuantiti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Gudang diperlukan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2456,11 +2528,12 @@
 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 +115,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/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Dihantar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,pembekal yang sama telah dibuat beberapa kali
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pesanan Pembelian Item Dibekalkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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.
 DocType: Payment Request,Payment Details,Butiran Pembayaran
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
+DocType: Asset,Journal Entry for Scrap,Kemasukan Jurnal untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Rekod semua komunikasi e-mel jenis, telefon, chat, keindahan, dan lain-lain"
 DocType: Manufacturer,Manufacturers used in Items,Pengeluar yang digunakan dalam Perkara
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Buat Baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Saham Lejar
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Kadar: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Gaji Slip Potongan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Pilih nod kumpulan pertama.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Pilih nod kumpulan pertama.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pekerja dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Buang rujukan pelanggan, pembekal, rakan kongsi jualan dan plumbum, kerana ia adalah alamat syarikat anda"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Tarikh akan datang mesti lebih besar daripada Pos Tarikh
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Show cukai Perpecahan
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Borang / Item / {0}) kehabisan stok
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Tarikh akan datang mesti lebih besar daripada Pos Tarikh
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +289,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
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
 DocType: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
 DocType: Sales Team,Contribution (%),Sumbangan (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Template
 DocType: Sales Person,Sales Person Name,Orang Jualan Nama
@@ -2566,7 +2641,7 @@
 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 +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,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 +44,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Tetapan Percetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Akaun Aset Tetap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
@@ -2587,7 +2663,7 @@
 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 +96,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","contohnya Kg, Unit, No, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Struktur gaji
 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 +612,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Isu Bahan
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Tawaran Tarikh
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sebut Harga
 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 +131,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
-DocType: Item,Is Fixed Asset Item,Adalah tetap Aset Perkara
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
 DocType: Purchase Invoice,Print Language,Cetak Bahasa
 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"
+DocType: Asset,Number of Depreciations,Jumlah penurunan nilai
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Tawaran Sebut Harga
 DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
 DocType: Purchase Invoice Item,Image View,Lihat imej
 apps/erpnext/erpnext/config/selling.py +23,Customers,pelanggan
+DocType: Asset,Partially Depreciated,sebahagiannya telah disusutnilai
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
@@ -2635,13 +2713,13 @@
 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/inactive_customers/inactive_customers.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
+DocType: Asset,Amended From,Pindaan Dari
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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 +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Sila sebutkan &#39;Akaun / Kerugian Keuntungan Pelupusan Aset&#39; dalam Syarikat
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Pembayaran perlawanan dengan Invois
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Pembayaran perlawanan dengan Invois
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dalam Troli
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
 DocType: Production Planning Tool,Get Material Request,Dapatkan Permintaan Bahan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Perbelanjaan pos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,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: Quality Inspection,Item Serial No,Item No Serial
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Jumlah Hadir
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Penyata perakaunan
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Penyata perakaunan
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Invois
 DocType: Job Opening,Job Title,Tajuk Kerja
 DocType: Features Setup,Item Groups in Details,Kumpulan item dalam Butiran
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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 +169,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: Item,Website Description,Laman Web Penerangan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Perubahan Bersih dalam Ekuiti
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
 ,Sales Register,Jualan Daftar
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
@@ -2703,12 +2783,13 @@
 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 +416,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Ralat: {0}&gt; {1}
 DocType: Item,Attributes,Sifat-sifat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Dapatkan Item
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Lepas Tarikh Perintah
 apps/erpnext/erpnext/accounts/doctype/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
@@ -2720,18 +2801,18 @@
 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 +261,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Perdagangan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Ralat: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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 +52,All Products or Services.,Semua Produk atau Perkhidmatan.
 DocType: Supplier Quotation,Supplier Address,Alamat Pembekal
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Keluar Qty
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
+apps/erpnext/erpnext/config/accounts.py +259,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 +62,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}
@@ -2742,10 +2823,10 @@
 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Pemindahan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Pemindahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +52,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
@@ -2765,20 +2846,22 @@
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Hantar Email Pembekal
 DocType: Features Setup,POS View,POS Lihat
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
 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
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Masa Log telah Diiktiraf
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Akaun {0} tidak boleh menjadi Kumpulan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+DocType: Asset,Straight Line,Garis lurus
+DocType: Project User,Project User,projek Pengguna
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Tambah Anak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,Nilai pembukaan
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Suruhanjaya Jualan
 DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
 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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Perbelanjaan hiburan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Permohonan untuk kebenaran.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Perbelanjaan Undang-undang
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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 +118,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,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/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Perbelanjaan langsung
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{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/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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Perbelanjaan Perjalanan
 DocType: Maintenance Visit,Breakdown,Pecahan
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Kami menjual Perkara ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Pembekal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
 DocType: Journal Entry,Cash Entry,Entry Tunai
 DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kenalan.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Pembekal aset {0} tidak sepadan dengan pembekal dalam Invois Belian
 DocType: Newsletter,Test Email Id,Id Ujian E-mel
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Bahan mentah tidak boleh sama dengan Perkara utama
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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 +110,Salary template master.,Master template gaji.
@@ -2887,12 +2973,13 @@
 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 +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,mata wang bil mesti sama dengan mata wang sama ada lalai comapany atau mata wang akaun kena bayar parti
 DocType: Monthly Distribution Percentage,Percentage Allocation,Peratus Peruntukan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Setiausaha
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika melumpuhkan, &#39;Dalam Perkataan&#39; bidang tidak akan dapat dilihat dalam mana-mana transaksi"
@@ -2902,13 +2989,13 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Pemiutang
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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 +106,Standard Selling,Jualan Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Sila masukkan Unit keingkaran Langkah
-DocType: Project,Project Name,Nama Projek
+DocType: Request for Quotation Item,Project Name,Nama Projek
 DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
 DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
 DocType: Features Setup,Item Batch Nos,Perkara Batch No.
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Tarikh akhir
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Urusniaga saham
 DocType: Employee,Internal Work History,Sejarah Kerja Dalaman
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Terkumpul Jumlah Susutnilai
 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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Syarikat adalah wajib, kerana ia adalah alamat syarikat anda"
 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/manufacturing/doctype/production_order/production_order.js +30,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
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Pekerjaan
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Kos tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 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: Request for Quotation Item,Request for Quotation Item,Sebut Harga Item
 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
@@ -3015,11 +3104,12 @@
 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/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Sila menetapkan &#39;Akaun Pelupusan Aset&#39; dalam Syarikat {0}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Melumpuhkan
 DocType: Project Task,Pending Review,Sementara menunggu Review
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klik di sini untuk membayar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} tidak boleh dimansuhkan, kerana ia sudah {1}"
 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/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Tidak Hadir
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Tambah item dari
-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}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Tambah item dari
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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 +20,"e.g. ""MC""",contohnya &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Persediaan akaun Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Persediaan akaun Gateway.
 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
 ,Cash Flow,Aliran tunai
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Dilampirkan {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Dilampirkan {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
 DocType: Job Applicant,Applicant Name,Nama pemohon
 DocType: Authorization Rule,Customer / Item Name,Pelanggan / Nama Item
@@ -3098,19 +3190,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/config/selling.py +147,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 +39,Add Serial No,Tambah No Serial
 apps/erpnext/erpnext/config/support.py +43,Warranty,jaminan
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Cetak dan pegun
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kumpulan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Update Mendapat tempat Barangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Update Mendapat tempat Barangan
 DocType: Workstation,per hour,sejam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Membeli
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Amaun Dibayar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Pengurus Projek
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +177,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,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 +220,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
@@ -3153,9 +3244,11 @@
 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/projects/doctype/project/project.py +133,Join,Sertai
 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 +564,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
+DocType: Pricing Rule,Margin Rate or Amount,Kadar margin atau Amaun
 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
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
 DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Tidak sah {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kedai Jabatan
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,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
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,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}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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 +114,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {0}
 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>
@@ -3226,23 +3319,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Kuantiti sebenar (pada sumber / sasaran)
 DocType: Item Customer Detail,Ref Code,Ref Kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekod pekerja.
 DocType: Payment Gateway,Payment Gateway,Gateway Pembayaran
 DocType: HR Settings,Payroll Settings,Tetapan Gaji
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +22,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 +351,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse adalah wajib
 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 +144,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 +340,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Mata wang urus niaga mesti sama dengan mata wang Pembayaran Gateway
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Mengemukakan kepada penciptaan
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +65,"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 +137,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Pesanan
@@ -3296,10 +3389,10 @@
 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 +250,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +258,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,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 +63,Total Paid Amt,Jumlah dibayar AMT
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Peruntukan berlebihan {0} terlintas untuk Perkara {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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 +234,Your Suppliers,Pembekal anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Pembekal bahagian No
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Tarikh Keluaran
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
 DocType: Payment Reconciliation,From Invoice Date,Dari Invois Tarikh
@@ -3338,7 +3432,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,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 +18,Project activity / task.,Aktiviti projek / tugasan.
 apps/erpnext/erpnext/config/hr.py +104,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 +412,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tarikh mula atau tarikh akhir adalah bertindih dengan {0}. Untuk mengelakkan sila menetapkan syarikat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","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
@@ -3405,11 +3500,11 @@
 ,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 +91,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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 +206,New Account Name,Nama Akaun Baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,peratus
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Tetapan lalai untuk transaksi perakaunan.
+apps/erpnext/erpnext/config/accounts.py +233,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 +132,Item {0} must be a Sales Item,Perkara {0} mestilah Item Jualan
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 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 +385,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Duti dan buat Akaun baru (dengan mengklik pada Tambah Kanak-kanak) jenis &quot;Cukai&quot; dan melakukan menyebut Kadar Cukai.
 DocType: Production Order,Production Order,Perintah Pengeluaran
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
 DocType: Quotation Item,Against Docname,Terhadap Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Berjaya didamaikan
 DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Di mana item disimpan.
 DocType: Tax Rule,Validity,Kesahan
+DocType: Request for Quotation,Supplier Detail,Detail pembekal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invois
 DocType: Attendance,Attendance,Kehadiran
 apps/erpnext/erpnext/config/projects.py +55,Reports,laporan
 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 +508,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
+apps/erpnext/erpnext/config/buying.py +76,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Tiada kebenaran untuk menggunakan Alat Pembayaran
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Alamat-alamat E-mel Makluman' tidak dinyatakan untuk %s yang berulang
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Perubahan
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Skor Diperoleh
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Kategori Nama
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Orang Jualan
 DocType: Sales Invoice,Cold Calling,Panggilan Dingin
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Belanjawan dan PTJ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Belanjawan dan PTJ
 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.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Pembelian Bersama
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Pekerja
 DocType: Sales Invoice,Is POS,Adalah POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Item Group&gt; Jenama
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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
@@ -3574,7 +3673,7 @@
 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 +219,"Optional. Sets company's default currency, if not specified.","Pilihan. Set mata wang lalai syarikat, jika tidak dinyatakan."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"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 +50,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Diskaun dan Margin
 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
 DocType: Deduction Type,Deduction Type,Potongan Jenis
 DocType: Attendance,Half Day,Hari separuh
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Tetapan Hub
 DocType: Project,Gross Margin %,Margin kasar%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,URL Pembayaran Mesej
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Jumlah yang tidak dibayar
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Masa Log tidak dapat ditaksir
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
+DocType: Asset,Asset Category,Kategori Asset
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Bahan kepada Pembekal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Cukai Invois
 DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
 DocType: Employee Attendance Tool,Marked Attendance,Kehadiran ketara
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Liabiliti Semasa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Liabiliti Semasa
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Lampirkan Logo
 DocType: Customer,Commission Rate,Kadar komisen
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Troli kosong
 DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No Templat lalai Alamat dijumpai. Sila buat yang baru dari Persediaan&gt; Percetakan dan Branding&gt; Alamat Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Modal Saham
 DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
 DocType: Payment Gateway Account,Payment Gateway Account,Akaun Gateway Pembayaran
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Terma dan Syarat Template
 DocType: Serial No,Delivery Details,Penghantaran Details
+DocType: Asset,Current Value (After Depreciation),Nilai semasa (Selepas Susutnilai)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
 ,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
 DocType: Batch,Expiry Date,Tarikh Luput
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Separuh Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Rang Undang-Undang Bahan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
 DocType: GL Entry,Is Opening,Adalah Membuka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Akaun {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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 415c804..804947e 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,အရောင်းကိုယ်စားလှယ်
 DocType: Employee,Rented,ငှားရမ်းထားသော
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
 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.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,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/templates/pages/projects.js +81,Show open,ပွင့်လင်းပြရန်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 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 +229,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Show ကို Variant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ချေးငွေများ (စိစစ်)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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,သတ်မှတ်ပေးထားခြင်း
@@ -64,7 +66,7 @@
 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 +642,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},နယူး {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},နယူး {0}: # {1}
 ,Sales Partners Commission,အရောင်း Partners ကော်မရှင်
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,အတိုကောက်ကျော်ကို 5 ဇာတ်ကောင်ရှိသည်မဟုတ်နိုင်
 DocType: Payment Request,Payment Request,ငွေပေးချေမှုရမည့်တောင်းခံခြင်း
@@ -102,7 +104,7 @@
 DocType: Employee,Married,အိမ်ထောင်သည်
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ဘို့ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,အထဲကပစ္စည်းတွေကို Get
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
+DocType: Item,Is Fixed Asset,Fixed Asset Is
 DocType: Expense Claim Detail,Claim Amount,ပြောဆိုချက်ကိုငွေပမာဏ
 DocType: Employee,Mr,ဦး
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
@@ -156,7 +159,8 @@
 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,စတော့အိတ်အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 DocType: Newsletter,Email Sent?,အီးမေးလ် Sent?
 DocType: Journal Entry,Contra Entry,Contra Entry &#39;
 DocType: Production Order Operation,Show Time Logs,Show ကိုအချိန် Logs
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,item {0} တစ်ဦးဝယ်ယူ Item ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: BOM Replace Tool,New BOM,နယူး BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,ကုမ္ပဏီရိုက်ထည့်ပေးပါ
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
 DocType: Newsletter List,Total Subscribers,စုစုပေါင်း Subscribers
 ,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,ဘဏ်မှ Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
@@ -248,8 +252,8 @@
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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 ထဲမှာမတှေ့
@@ -264,7 +268,7 @@
 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.,ဒီနယ်မြေတွေကိုအပေါ် Item Group မှပညာဘတ်ဂျက် Set လုပ်ပါ။ ကိုလည်းသင်ဖြန့်ဖြူး setting ကြောင့်ရာသီပါဝင်နိုင်ပါသည်။
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},ဂိုဒေါင် {0} သည်မိဘအကောင့်ကိုရိုက်ထည့်ပါအုပ်စုတစ်စု ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},ဂိုဒေါင် {0} သည်မိဘအကောင့်ကိုရိုက်ထည့်ပါအုပ်စုတစ်စု ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
 DocType: Supplier,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,max 5 ဇာတ်ကောင်
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Learn
+DocType: Asset,Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,ထမ်းနှုန်းဖြင့်လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},ပေးသွင်းငွေတောင်းခံလွှာဘယ်သူမျှမကအရစ်ကျငွေတောင်းခံလွှာ {0} အတွက်တည်ရှိ
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,အရောင်းပုဂ္ဂိုလ် Tree Manage ။
 DocType: Job Applicant,Cover Letter,ပေးပို့သည့်အကြောင်းရင်းအားရှင်းပြသည့်စာ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,ရှင်းရှင်းလင်းလင်းမှထူးချွန်ထက်မြက် Cheques နှင့်စာရင်း
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,မှားယွင်းနေ Password ကို
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 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.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),[{2}] (# Form ကို / ဂိုဒေါင် / {2}) ၌တွေ့ [{1}] ၏ {0} ယူနစ် (# Form ကို / ပစ္စည်း / {1})
 DocType: Lead,Industry,စက်မှုလုပ်ငန်း
 DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Newsletter,Newsletter,သတင်းလွှာ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Delivery မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Delivery မှတ်ချက်
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 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 +381,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},serial No {0} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,item အရည်အသွေးစစ်ဆေးရေး Parameter
 DocType: Leave Application,Leave Approver Name,ခွင့်ပြုချက်အမည် Leave
-,Schedule Date,ဇယားနေ့စွဲ
+DocType: Depreciation Schedule,Schedule Date,ဇယားနေ့စွဲ
 DocType: Packed Item,Packed Item,ထုပ်ပိုး Item
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,အရောင်းအဝယ်သည် default setting များ။
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,အရောင်းအဝယ်သည် default setting များ။
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},{1} - လုပ်ဆောင်ချက်ကုန်ကျစရိတ်လုပ်ဆောင်ချက် Type ဆန့်ကျင်န်ထမ်း {0} သည်တည်ရှိ
 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,ငွေကြေးလဲလှယ်မှု
@@ -346,6 +353,7 @@
 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
+DocType: Request for Quotation,Request for Quotation,စျေးနှုန်းအဘို့တောင်းဆိုခြင်း
 DocType: Workstation,Working Hours,အလုပ်လုပ်နာရီ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
-DocType: Material Request Item,Required Date,လိုအပ်သောနေ့စွဲ
+DocType: Request for Quotation Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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 / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
+DocType: Request for Quotation,Message for Supplier,ပေးသွင်းဘို့ကို Message
 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,Unpaid
@@ -416,17 +425,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;တည်ရှိပါဘူး
 DocType: Pricing Rule,Valid Upto,သက်တမ်းရှိအထိ
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 ,Serial No Warranty Expiry,serial မရှိပါအာမခံသက်တမ်းကုန်ဆုံး
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
+DocType: Project,Project will be accessible on the website to these users,စီမံကိန်းကဤသည်အသုံးပြုသူများမှ website တွင်ဝင်ရောက်ဖြစ်လိမ့်မည်
 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 +53,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,item {0} Item ဝယ်ယူမဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,item {0} Item ဝယ်ယူမဟုတ်
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,စုဆောင်းတန်ဖိုးများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},ကယ်နှုတ်တော်မူ၏: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,ပေးဆောင်ရမည့်အကောင့်
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,ကိုယ်ရေးမှတ်တမ်းတွယ်တာ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,အရောင်းသို့ပြန်သွားသည်
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,လစာအစိတ်အပိုင်းများ။
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,အလားအလာရှိသောဖောက်သည်၏ဒေတာဘေ့စ။
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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 တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,မာစတာ
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update ကိုဘဏ်မှငွေသွင်းငွေထုတ်နေ့စွဲများ
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update ကိုဘဏ်မှငွေသွင်းငွေထုတ်နေ့စွဲများ
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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})
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,အချိန်ခြေရာကောက်
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,ဝယ်ယူခြင်းပြေစာပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Buying Settings,Supplier Naming By,အားဖြင့်ပေးသွင်း Name
 DocType: Activity Type,Default Costing Rate,Default အနေနဲ့ကုန်ကျနှုန်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,ပြုပြင်ထိန်းသိမ်းမှုဇယား
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager က
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,အထမ်းသို့မဟုတ်ကုမ္ပဏီတစ်ခုခုကိုများအတွက်အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
+DocType: Depreciation Schedule,Depreciation Amount,တန်ဖိုးပမာဏ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Fixed Days
 DocType: Quotation Item,Item Balance,item Balance
 DocType: Sales Invoice,Packing List,ကုန်ပစ္စည်းစာရင်း
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ပေးသွင်းမှပေးထားသောအမိန့်ဝယ်ယူအသုံးပြုပါ။
+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,ကျွမ်းလောင်
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
 DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Group ကိုမှ Group က
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,အကြှနျုပျ၏စီမံကိန်းများ
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
+DocType: Company,Gain/Loss Account on Asset Disposal,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်းအကောင့်
 DocType: Purchase Invoice,Quarterly,သုံးလတစ်ကြိမ်
 DocType: Selling Settings,Delivery Note Required,Delivery မှတ်ချက်လိုအပ်သော
 DocType: Sales Order Item,Basic Rate (Company Currency),အခြေခံပညာ Rate (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Total ကုမ္ပဏီငွေတောင်းခံသည်ယခုနှစ်
 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 +529,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Mode of Payment Account,Default Account,default အကောင့်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
 ,Sales Person Target Variance Item Group-Wise,အရောင်းပုဂ္ဂိုလ် Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
 DocType: Item Group,Website Specifications,website သတ်မှတ်ချက်များ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},သင့်ရဲ့လိပ်စာ Template {0} မှာအမှားရှိပါတယ်
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,နယူးအကောင့်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,နယူးအကောင့်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးစည်းကမ်းများတူညီတဲ့စံနှင့်အတူတည်ရှိ, ဦးစားပေးတာဝန်ပေးဖို့ခြင်းဖြင့်ပဋိပက္ခဖြေရှင်းရန်ပါ။ စျေးစည်းကမ်းများ: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးစည်းကမ်းများတူညီတဲ့စံနှင့်အတူတည်ရှိ, ဦးစားပေးတာဝန်ပေးဖို့ခြင်းဖြင့်ပဋိပက္ခဖြေရှင်းရန်ပါ။ စျေးစည်းကမ်းများ: {0}"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,စာရင်းကိုင် Entries အရွက်ဆုံမှတ်များဆန့်ကျင်စေနိုင်ပါတယ်။ အဖွဲ့တွေဆန့်ကျင် entries ခွင့်ပြုမထားပေ။
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Liability,တာဝန်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 DocType: Company,Default Cost of Goods Sold Account,ကုန်စည်၏ default ကုန်ကျစရိတ်အကောင့်ရောင်းချ
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Process Payroll,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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 ကိုရွေးပါ
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,ငါ့အငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,ငါ့အငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Supplier Quotation,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,အခုတော့ Send
 ,Support Analytics,ပံ့ပိုးမှု Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,logical အမှား: ထပ်ရှာတွေ့ရမည်
 DocType: Item,Website Warehouse,website ဂိုဒေါင်
 DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
 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 +267,C-Form records,C-Form တွင်မှတ်တမ်းများ
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form တွင်မှတ်တမ်းများ
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ဖောက်သည်များနှင့်ပေးသွင်း
 DocType: Email Digest,Email Digest Settings,အီးမေးလ် Digest မဂ္ဂဇင်း Settings ကို
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ဖောက်သည်များအနေဖြင့်မေးမြန်းချက်ထောက်ခံပါတယ်။
@@ -699,7 +715,7 @@
 DocType: Quotation Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ကုန်ကျစရိတ်
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted ဖြစ်ပါတယ်
 DocType: Item Attribute,Item Attribute Values,item Attribute တန်ဖိုးများ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,view Subscribers
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ဝယ်ယူခြင်း Receipt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
 DocType: Employee,Ms,ဒေါ်
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+DocType: Journal Entry,Depreciation Entry,တန်ဖိုး Entry &#39;
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,goto လှည်း
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ကုန်ဆိုင်
@@ -772,10 +789,10 @@
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,အဆိုပါအမှတ်တံဆိပ်
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
-DocType: Journal Entry Account,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
+DocType: Asset,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
 DocType: Stock Ledger Entry,Voucher Detail No,ဘောက်ချာ Detail မရှိပါ
 DocType: Stock Entry,Total Outgoing Value,စုစုပေါင်းအထွက် Value တစ်ခု
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
@@ -785,21 +802,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ &#39;&#39; List ကိုထုပ်ပိုး &#39;&#39; စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို &#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို &#39;&#39; Pack များစာရင်း &#39;&#39; စားပွဲကိုမှကူးယူလိမ့်မည်။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; ပစ္စည်းများကို, ဂိုဒေါင်, Serial No နှင့် Batch for မရှိ &#39;&#39; List ကိုထုပ်ပိုး &#39;&#39; စားပွဲကနေစဉ်းစားကြလိမ့်မည်။ ဂိုဒေါင်နှင့် Batch မရှိဆို &#39;&#39; ကုန်ပစ္စည်း Bundle ကို &#39;&#39; တဲ့ item ပေါင်းသည်တလုံးထုပ်ပိုးပစ္စည်းများသည်အတူတူပင်ဖြစ်ကြောင်း အကယ်. အဲဒီတန်ဖိုးတွေကိုအဓိက Item table ထဲမှာသို့ဝင်နိုင်ပါတယ်, တန်ဖိုးများကို &#39;&#39; Pack များစာရင်း &#39;&#39; စားပွဲကိုမှကူးယူလိမ့်မည်။"
 DocType: Job Opening,Publish on website,website တွင် Publish
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ဖောက်သည်တင်ပို့ရောင်းချမှု။
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 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,သွယ်ဝိုက်ဝင်ငွေခွန်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ set = ထူးချွန်ပမာဏ
 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 +672,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
 DocType: Purchase Invoice,Additional Discount Percentage,အပိုဆောင်းလျှော့ရာခိုင်နှုန်း
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","အတန်း {0}: ငွေတောင်းခံလွှာ {1} မမှန်ကန်, ကမတည်ရှိပါဘူး / ဖျက်သိမ်းစေခြင်းငှါ။ \ တစ်တရားဝင်ပြေစာရိုက်ထည့်ပေးပါ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
 ,Employee Holiday Attendance,ဝန်ထမ်းအားလပ်ရက်တက်ရောက်
 DocType: Opportunity,Walk In,ခုနှစ်တွင် Walk
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,စတော့အိတ် Entries
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,စတော့အိတ် Entries
 DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferable
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,အကြှနျုပျ၏လှည်း
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 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 +180,Qty for {0},{0} သည် Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
+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 +80,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
 DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
@@ -838,7 +859,7 @@
 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,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,လြှော့ခွငျး
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,ဝယ်ယူခြင်းပြေစာ Item
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ငွေပမာဏရောင်းချနေ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,အချိန် Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,အချိန် Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,ထုတ်ပြန်သည်
+DocType: Asset,Scrapped,ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,အကောင့်ကိုကုမ္ပဏီနှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,်ထမ်းခေါ်ယူမှု
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,အရောင်းအသုံးစရိတ်များ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 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 +18,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{1} {2} | {0} မှ
 DocType: Time Log Batch,updated via Time Logs,အချိန် Logs ကနေတဆင့် updated
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ပျမ်းမျှအားဖြင့်ခေတ်
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,default ငွေကြေးစနစ်
 DocType: Contact,Enter designation of this Contact,ဒီဆက်သွယ်ရန်၏သတ်မှတ်ရေး Enter
 DocType: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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 ကိုစွမ်းဆောင်ရည်ဧရိယာ
@@ -900,7 +922,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,contribution%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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 ။
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
 DocType: Salary Slip,Deductions,ဖြတ်ငွေများ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ဒါဟာအချိန်အထဲ Batch ကြေညာခဲ့တာဖြစ်ပါတယ်။
 DocType: Salary Slip,Leave Without Pay,Pay ကိုမရှိရင် Leave
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
 ,Trial Balance for Party,ပါတီများအတွက် trial Balance ကို
 DocType: Lead,Consultant,အကြံပေး
 DocType: Salary Slip,Earnings,င်ငွေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,စီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,အချိန် Sheet များသည်လှုပ်ရှားမှုများအမျိုးအစားများ
@@ -935,18 +958,18 @@
 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 ကိုဆုံမှတ်များအောက်မှာနေသူများကဖန်တီးနိုင်ပါသည်
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,အီးမေးလ် ID ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,အီးမေးလ် ID ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,item Code ကို Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 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/config/buying.py +33,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
 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 +209,"Further accounts 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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,အခွန်နှင့်အခြားလစာဖြတ်တောက်။
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,အားလပ်ရက်များ
 DocType: Leave Control Panel,Leave blank if considered for all branches,အားလုံးအကိုင်းအခက်စဉ်းစားလျှင်အလွတ် Leave
 ,Daily Time Log Summary,Daily သတင်းစာအချိန်အထဲအကျဉ်းချုပ်
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-form ကိုပြေစာများအတွက်သက်ဆိုင်သည်မဟုတ်: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ငွေပေးချေမှုရမည့်အသေးစိတ်
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
@@ -973,19 +997,20 @@
 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 ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
 DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,view လယ်ဂျာ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,view လယ်ဂျာ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,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,Paid အမြတ်ဝေစု
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,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,ထိန်းသိမ်းထားသောဝင်ငွေများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,ထိန်းသိမ်းထားသောဝင်ငွေများ
 DocType: BOM Item,Item Description,item ဖော်ပြချက်များ
 DocType: Payment Tool,Payment Mode,ငွေပေးချေမှုရမည့် Mode ကို
 DocType: Purchase Invoice,Is Recurring,ထပ်တလဲလဲဖြစ်ပါတယ်
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,ယာယီဖွင့်ပွဲ
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 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 +165,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,အရောင်းအမိန့် {0} တရားဝင်မဟုတ်
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,အကောင့်ဖွင့်ဦးခေါင်း {0} နေသူများကဖန်တီး
 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,အကောင်အထည်ဖော်ခဲ့သောစုစုပေါင်း
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
 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} သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},{0} ဟုခေါ်တွင်မည်သည့်ပစ္စည်းကိုမတှေ့
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,စုစုပေါင်းအထွက်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",သာ &quot;To Value တစ်ခု&quot; ကို 0 င်သို့မဟုတ်ကွက်လပ်တန်ဖိုးကိုနှင့်တသားတ Shipping Rule အခြေအနေမရှိနိုငျ
 DocType: Authorization Rule,Transaction,ကိစ္စ
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,website Item အဖွဲ့များ
 DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
-DocType: Journal Entry,Journal Entry,ဂျာနယ် Entry &#39;
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
@@ -1072,6 +1098,7 @@
 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 နှင့်
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,စျေးနှုန်းပေးသွင်းဘို့တောင်းဆိုခြင်း
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Sales Order,Recurring Upto,နူန်းကျော်ကျော်ထပ်တလဲလဲ
 DocType: Attendance,HR Manager,HR Manager
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,စိစစ်ရေး Template: Goal
 DocType: Salary Slip,Earning,ဝင်ငွေ
 DocType: Payment Tool,Party Account Currency,ပါတီ၏အကောင့်ကိုငွေကြေးစနစ်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},တန်ဖိုးပြီးနောက်လက်ရှိ Value တစ်ခု {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
 ,BOM Browser,BOM Browser ကို
 DocType: Purchase Taxes and Charges,Add or Deduct,Add သို့မဟုတ်ထုတ်ယူ
 DocType: Company,If Yearly Budget Exceeded (for expense account),နှစ်အလိုက်ဘတ်ဂျက် (စရိတ်အကောင့်) ကိုကျော်လွန်လိုလျှင်
@@ -1096,21 +1124,22 @@
 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} သည်
 DocType: Project,Start and End Dates,Start နဲ့ရပ်တန့်နေ့စွဲများ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
 DocType: Address,Utilities,အသုံးအဆောင်များ
 DocType: Purchase Invoice Item,Accounting,စာရင်းကိုင်
 DocType: Features Setup,Features Setup,အင်္ဂါရပ်များကို Setup
+DocType: Asset,Depreciation Schedules,တန်ဖိုးအချိန်ဇယား
 DocType: Item,Is Service Item,ဝန်ဆောင်မှု Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 DocType: Payment Request,Transaction Currency,ငွေသွင်းငွေထုတ်ငွေကြေးစနစ်
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} ကနေ | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},{0} ကနေ | {1} {2}
 DocType: BOM Operation,Operation Description,စစ်ဆင်ရေးဖော်ပြချက်များ
 DocType: Item,Will also apply to variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ဘဏ္ဍာရေးနှစ်အတွင်းကယ်တင်ခြင်းသို့ရောက်ကြသည်တစ်ချိန်ကဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုမပြောင်းနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ဘဏ္ဍာရေးနှစ်အတွင်းကယ်တင်ခြင်းသို့ရောက်ကြသည်တစ်ချိန်ကဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုမပြောင်းနိုင်ပါ။
 DocType: Quotation,Shopping Cart,စျေးဝယ်တွန်းလှည်း
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,AVG Daily သတင်းစာအထွက်
 DocType: Pricing Rule,Campaign,ကင်ပိန်း
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,ကုမ္ပဏီ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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 ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
 DocType: Rename Tool,Type of document to rename.,အမည်ပြောင်းရန်စာရွက်စာတမ်းအမျိုးအစား။
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
 DocType: Address,Billing,ငွေတောင်းခံ
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,sub စညျးဝေး
+DocType: Asset,Asset Name,ပိုင်ဆိုင်မှုအမည်
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Supplier,Stock Manager,စတော့အိတ် Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Office ကိုငှား
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,quotation အဘို့တောင်းဆိုခြင်းအောက်ပါ link ကိုနှိပ်ခြင်းအားဖြင့်ဝင်ရောက်ခွင့်ရှိနိုင်ပါသည်
+DocType: Asset,Number of Months in a Period,တစ်ဦးကာလအတွက်လအရေအတွက်
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),စုစုပေါင်း ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),စုစုပေါင်း ({0})
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,show ကိုပိတ်ထား
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Item Group,Item Group Name,item Group မှအမည်
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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 စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
@@ -1212,7 +1245,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 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.,ငွေစာရင်း၏ Chart ဟာကနေအကောင့်သစ်ဖန်တီးပေးပါ။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Batch Qty
 DocType: Time Log Batch Detail,Time Log Batch Detail,အချိန်အထဲ Batch Detail
 DocType: Landed Cost Voucher,Landed Cost Help,ကုန်ကျစရိတ်အကူအညီဆင်းသက်
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,ကုန်အမှတ်တံဆိပ်မာစတာ။
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,သေတ္တာ
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,စတော့အိတ်မှုစိစစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,စတော့အိတ်မှုစိစစ်
 DocType: Purchase Receipt,Supplier Warehouse,ပေးသွင်းဂိုဒေါင်
 DocType: Opportunity,Contact Mobile No,မိုဘိုင်းလ်မရှိဆက်သွယ်ရန်
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,အခြားအစီရင်ခံစာများ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,မွေးနေသတိပေးချက်များကိုရပ်တန့်
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} ကြည့်ရန်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,ယခင်ဘဏ္ဍာရေးတစ်နှစ်တာပိတ်လိုက်သည်မဟုတ်
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,ပေးသွင်း Type မာစတာ။
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
 DocType: Purchase Invoice,Reference Document,ကိုးကားစရာစာရွက်စာတမ်း
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,ကြေညာတဲ့ {0}%
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,ပေးဆောင်ရမည့်ငွေစာရင်းထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,သင့်ရဲ့အီးမေးလ်က id အတည်ပြုရန် ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;&#39; Customerwise လျှော့ &#39;&#39; လိုအပ် customer
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
 DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Days) သည်စွမ်းဆောင်ရည်စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,အာမခံပြောဆိုချက်ကို
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} က Grand စုစုပေါင်း {2} ထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျဆန့်ကျင်ပေးဆောင်ကြိုတင်မဲ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်ထုတ်ယူကိုလျော့ချ
 DocType: Territory,Territory Manager,နယ်မြေတွေကို Manager က
 DocType: Packed Item,To Warehouse (Optional),ဂိုဒေါင် (Optional) မှ
@@ -1343,15 +1377,15 @@
 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 အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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} ဖျက်ပြီးမရနိုင်ပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
+DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",ဥပမာ &quot;XYZ လို့အမျိုးသားဘဏ်မှ&quot;
+DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
 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,စုစုပေါင်း Target က
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,စျေးဝယ်လှည်း enabled ဖြစ်ပါတယ်
 DocType: Job Applicant,Applicant for a Job,တစ်ဦးယောဘသည်လျှောက်ထားသူ
 DocType: Production Plan Material Request,Production Plan Material Request,ထုတ်လုပ်မှုစီမံကိန်းပစ္စည်းတောင်းဆိုခြင်း
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,အဓိက
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ 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,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,တစ်ဦးယောဘသည်လျှောက်ထားသူ။
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,လိပ်စာများ
+apps/erpnext/erpnext/hooks.py +91,Addresses,လိပ်စာများ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,item ထုတ်လုပ်မှုအမိန့်ရှိခွင့်မပြုခဲ့တာဖြစ်ပါတယ်။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,item ထုတ်လုပ်မှုအမိန့်ရှိခွင့်မပြုခဲ့တာဖြစ်ပါတယ်။
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
 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,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,ကုန်ထုတ်လုပ်မှုသည်အချိန် Logs ။
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,တာဝန်များကိုအချိန်အထဲ။
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,ကုန်အမှတ်တံဆိပ်
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
 DocType: Quotation Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
+DocType: Request for Quotation Supplier,Send Email to Supplier,ပေးသွင်းဖို့အီးမေးလ်ပို့ပါ
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 DocType: Packing Slip,To Package No.,အမှတ် Package မှ
 DocType: Production Planning Tool,Material Requests,ပစ္စည်းတောင်းဆိုချက်များ
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Delivery ဂိုဒေါင်
 DocType: Stock Settings,Allowance Percent,ထောက်ပံ့ကြေးရာခိုင်နှုန်း
 DocType: SMS Settings,Message Parameter,message Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,ဘဏ္ဍာရေးကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,ဘဏ္ဍာရေးကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 DocType: Serial No,Delivery Document No,Delivery Document ဖိုင်မရှိပါ
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ဝယ်ယူခြင်းလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get
 DocType: Serial No,Creation Date,ဖန်ဆင်းခြင်းနေ့စွဲ
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} နေသူများကဖန်တီး
 DocType: Delivery Note Item,Against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်
 ,Serial No Status,serial မရှိပါနဲ့ Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,item table ကိုအလွတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","row {0}: နေ့စွဲ \ ထဲကနေနှင့်မှအကြားခြားနားချက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {2} တန်းတူဖြစ်ရမည်, {1} ကာလကိုသတ်မှတ်ဖို့"
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
 DocType: Employee,Salary Information,လစာပြန်ကြားရေး
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,တာဝန်နှင့်အခွန်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,ငွေပေးချေမှုရမည့် Gateway ရဲ့အကောင့်ကို configure လုပ်မထားဘူး
 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: Production Order,Material Request Item,material တောင်းဆိုမှု Item
+DocType: Request for Quotation Item,Material Request Item,material တောင်းဆိုမှု Item
 apps/erpnext/erpnext/config/stock.py +85,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,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
+DocType: Asset,Sold,ကိုရောင်းချ
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,နီသော
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
 DocType: Sales Invoice,Accounting Details,စာရင်းကိုင် Details ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ဒီကုမ္ပဏီအပေါငျးတို့သငွေကြေးကိစ္စရှင်းလင်းမှု Delete
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,ရင်းနှီးမြှုပ်နှံမှုများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,နေရာချထားခြင်း
 DocType: Quality Inspection Reading,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,အထက်ပါဇယားတွင်ပစ္စည်းတောင်းဆိုမှုများကိုထည့်သွင်းပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,အထက်ပါဇယားတွင်ပစ္စည်းတောင်းဆိုမှုများကိုထည့်သွင်းပါ
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 DocType: Item Group,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,အစု
@@ -1527,6 +1567,7 @@
 ,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 အတွက်အမှတ်တံဆိပ်နာမကိုခြေရာခံဖို့"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,အားလုံးအလုပ်များကို Gantt ဇယား။
+DocType: Pricing Rule,Margin Type,margin အမျိုးအစား
 DocType: Appraisal,For Employee Name,န်ထမ်းနာမတော်အဘို့
 DocType: Holiday List,Clear Table,Clear ကိုဇယား
 DocType: Features Setup,Brands,ကုန်အမှတ်တံဆိပ်
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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 လိပ်စာနှင့်ဆက်သွယ်ရန်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,အတန်း # {0}: ပိုင်ဆိုင်မှုတစ် Fixed Asset Item ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,လင်မယား
+DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 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: Asset,Purchase Date,အရစ်ကျနေ့စွဲ
 DocType: Employee,Personal Details,ပုဂ္ဂိုလ်ရေးအသေးစိတ်
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ&#39; &#39;set ကျေးဇူးပြု.
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,ပြန်. Entries Include
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,က Non-Group ကိုမှ Group က
 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 +272,Unit,ယူနစ်
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,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,စရိတ်စွပ်စွဲ
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
 ,BOM Search,BOM ရှာရန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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} အတွက်လိုအပ်သည်
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},ရှင်းလင်းရေးနေ့စွဲအတန်း {0} အတွက်စစ်ဆေးခြင်းရက်စွဲမီမဖွစျနိုငျ
 DocType: Salary Slip,Deduction,သဘောအယူအဆ
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
 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 ကိုရိုက်ထည့်ပေးပါ
 DocType: Territory,Classification of Customers by region,ဒေသအားဖြင့် Customer များ၏ခွဲခြား
 DocType: Project,% Tasks Completed,% Tasks ကို Completed
 DocType: Project,Gross Margin,gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,တွက်ချက် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,မသန်မစွမ်းအသုံးပြုသူ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ကိုးကာချက်
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 DocType: Quotation,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ကုန်ကျစရိတ် Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Employee,Date of Birth,မွေးနေ့
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
+DocType: Request for Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
 apps/erpnext/erpnext/hooks.py +71,Shipments,တင်ပို့ရောင်းချမှု
 DocType: Purchase Order Item,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
@@ -1629,12 +1675,12 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,row #
 DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင်
-DocType: Pricing Rule,Supplier,ကုန်သွင်းသူ
+DocType: Asset,Supplier,ကုန်သွင်းသူ
 DocType: C-Form,Quarter,လေးပုံတစ်ပုံ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
 DocType: Global Defaults,Default Company,default ကုမ္ပဏီ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,အသုံးပြုသူ {0} ပိတ်ထားတယ်
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","အတန်း # {0}: item ကိုတစ်ဦးပစ္စည်းနှင့်ဆက်စပ်နေသည်အဖြစ်အရည်အတွက်, 1 ရှိရမည်"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ကလေး Item တစ်ကုန်ပစ္စည်း Bundle ကိုမဖြစ်သင့်ပါဘူး။ `{0} ကို item ကိုဖယ်ရှား` ကယ်တင်ပေးပါ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,နယူးကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; နှင့်အခွန်နှုန်းကိုဖော်ပြထားခြင်းလုပ်ပါ။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,နယူးကုန်ကျစရိတ် Center က
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
 DocType: Quality Inspection,In Process,Process ကိုအတွက်
@@ -1670,10 +1716,11 @@
 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 အကောင့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
 DocType: Quotation Item,Stock Balance,စတော့အိတ် Balance
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,အချိန် Logs နေသူများကဖန်တီး:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,အချိန် Logs နေသူများကဖန်တီး:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Employee,Blood Group,လူအသွေး Group က
@@ -1691,13 +1738,13 @@
 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 လုပ်ပါ။"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,ဒီအသဘောင်္တင်စိုးမိုးရေးများအတွက်တိုင်းပြည် specify သို့မဟုတ် Worldwide မှသဘောင်္တင်စစ်ဆေးပါ
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,debit ရန်လိုအပ်သည်
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Offer Letter Term,Offer Term,ကမ်းလှမ်းမှုကို Term
 DocType: Quality Inspection,Quality Manager,အရည်အသွေးအ Manager က
 DocType: Job Applicant,Job Opening,ယောဘသည်အဖွင့်ပွဲ
 DocType: Payment Reconciliation,Payment Reconciliation,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေး
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ကမ်းလှမ်းမှုကိုပေးစာ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ပစ္စည်းတောင်းဆို (MRP) နှင့်ထုတ်လုပ်မှုအမိန့် Generate ။
@@ -1705,22 +1752,22 @@
 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 +103,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
 DocType: Stock Reconciliation Item,Current Valuation Rate,လက်ရှိအကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,အမိန့်သို့မဟုတ်ငွေတောင်းခံလွှာဆန့်ကျင်ငွေပေးချေမှုရမည့် Entries ဖန်တီးပါ။
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,အမိန့်သို့မဟုတ်ငွေတောင်းခံလွှာဆန့်ကျင်ငွေပေးချေမှုရမည့် Entries ဖန်တီးပါ။
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
@@ -1729,10 +1776,11 @@
 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,ဥပမာအား: Next ကိုနေ့ Shipping
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,{0} မတွေ့ရှိ serial No
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,{0} မတွေ့ရှိ serial No
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,သင့် Customer
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,အခုဆိုရင် Apply
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,အခုဆိုရင် Apply
 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 ။"
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,အလုပ်အကိုင်အခွင့်အအသေးစိတ်ကို
 DocType: Employee,New Workplace,နယူးလုပ်ငန်းခွင်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ပိတ်ထားသောအဖြစ် Set
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Barcode {0} နှင့်အတူမရှိပါ Item
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Barcode {0} နှင့်အတူမရှိပါ Item
 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,သင်အရောင်းရေးအဖွဲ့နှင့်ရောင်းမည်မိတ်ဖက် (Channel ကိုမိတ်ဖက်) ရှိပါကသူတို့ tagged နှင့်အရောင်းလုပ်ဆောင်မှုအတွက်သူတို့ရဲ့ပံ့ပိုးထိန်းသိမ်းရန်နိုင်ပါတယ်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},item {0} {1} အတွက်အရောင်း item ဖြစ်ရပါမည်
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,လုပ်သား
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,မှစ. သွင်းကုန်အီးမေးလ်
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,အသုံးပြုသူအဖြစ် Invite
 DocType: Features Setup,After Sale Installations,အရောင်း installation ပြီးသည့်နောက်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},ကုမ္ပဏီ {1} အတွက် {0} သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 DocType: Workstation Working Hour,End Time,အဆုံးအချိန်
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,အရောင်းသို့မဟုတ်ဝယ်ယူခြင်းအဘို့အစံစာချုပ်ဝေါဟာရများ။
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Sales Invoice,Mass Mailing,mass စာပို့
 DocType: Rename Tool,File to Rename,Rename မှ File
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,ဆေးဝါး
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက်ရောက်
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Gateway Account,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,Accepted,လက်ခံထားတဲ့
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
 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}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 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 +206,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,သတင်းလွှာစာပို့စာရင်း
 DocType: Delivery Note,Transporter Name,Transporter အမည်
 DocType: Authorization Rule,Authorized Value,Authorized Value ကို
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} ပိတ်ပါသည်
 DocType: Email Digest,How frequently?,ဘယ်လိုမကြာခဏ?
 DocType: Purchase Receipt,Get Current Stock,လက်ရှိစတော့အိတ် Get
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် ( &quot;ဘဏ်ကို&quot; သင့်လျော်သောအုပ်စု (ရန်ပုံငွေများ၏များသောအားဖြင့်လျှောက်လွှာ&gt; လက်ရှိပိုင်ဆိုင်မှုများ&gt; ဘဏ်ကို Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ပစ္စည်းများ၏ဘီလ်၏သစ်ပင်ကို
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,မာကုလက်ရှိ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Production Order,Actual End Date,အမှန်တကယ် End Date ကို
 DocType: Authorization Rule,Applicable To (Role),(အခန်းက္ပ) ရန်သက်ဆိုင်သော
 DocType: Stock Entry,Purpose,ရည်ရွယ်ချက်
+DocType: Company,Fixed Asset Depreciation Settings,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုတန်ဖိုးက Settings
 DocType: Item,Will also apply for variants unless overrridden,စ overrridden မဟုတ်လျှင်မျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
 DocType: Purchase Invoice,Advances,ကြိုတင်ငွေ
 DocType: Production Order,Manufacture against Material Request,ပစ္စည်းတောင်းဆိုမှုဆန့်ကျင်ထုတ်လုပ်
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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 ရှိပါတယ်
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
+DocType: Asset Category Account,Asset Category Account,ပိုင်ဆိုင်မှုအမျိုးအစားအကောင့်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,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,ငွေကြေးစနစ်သင်္ကေတဝှက်
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ဥပမာဘဏ်, ငွေ, Credit Card ကို"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် ( &quot;ဘဏ်ကို&quot; သင့်လျော်သောအုပ်စု (ရန်ပုံငွေများ၏များသောအားဖြင့်လျှောက်လွှာ&gt; လက်ရှိပိုင်ဆိုင်မှုများ&gt; ဘဏ်ကို Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
 DocType: Journal Entry,Credit Note,ခရက်ဒစ်မှတ်ချက်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},ပြီးစီး Qty {1} စစ်ဆင်ရေးသည် {0} ထက်ပိုမဖွစျနိုငျ
 DocType: Features Setup,Quality,အရည်အသွေးပြည့်
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,အကြှနျုပျ၏လိပ်စာ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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 ဝယ်ယူစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,အထက်ပါရွေးချယ်ထားသောစံနှုန်းများကို OR လစာစလစ်အဘို့အဘယ်သူမျှမကန်ထမ်းပြီးသားနေသူများကဖန်တီး
@@ -1972,7 +2024,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,အခစာရင်း
 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} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Receipt ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,အထူးပြုလုပ်ခြင်း Form များ
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,မျှမတွေ့ default အနေနဲ့လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့်တံဆိပ်တပ်&gt; လိပ်စာ Template ကနေအသစ်တစ်ခုကိုတဦးတည်းဖန်တီးပေးပါ။
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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 ကိုတာဝန်သိမှုဧရိယာ
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
 DocType: Purchase Invoice,Taxes and Charges Deducted,အခွန်နှင့်စွပ်စွဲချက်နုတ်ယူ
-apps/erpnext/erpnext/config/support.py +7,Issues,အရေးကိစ္စများ
+apps/erpnext/erpnext/hooks.py +90,Issues,အရေးကိစ္စများ
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},အဆင့်အတန်း {0} တယောက်ဖြစ်ရပါမည်
 DocType: Sales Invoice,Debit To,debit ရန်
 DocType: Delivery Note,Required only for sample item.,သာနမူနာကို item လိုအပ်သည်။
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,အပိုအကြီးစား
 ,Profit and Loss Statement,အမြတ်နှင့်အရှုံးထုတ်ပြန်ကြေညာချက်
@@ -2033,10 +2087,10 @@
 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 +139,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
 ,Requested,မေတ္တာရပ်ခံ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,အဘယ်သူမျှမမှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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,အရောင်းနှင့်ဝယ်ယူခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
 DocType: Supplier Quotation Item,Material Request No,material တောင်းဆိုမှုမရှိပါ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ဖောက်သည်ရဲ့ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
@@ -2119,7 +2174,7 @@
 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;
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 DocType: Payment Request,Recipient and Message,လက်ခံမဲ့သူကိုနဲ့ Message
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,ပေးသွင်းလိပ်စာကို Select လုပ်ပါ
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 DocType: Payment Request,Mute Email,အသံတိတ်အီးမေးလ်
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,quotation အဘို့တောင်းဆိုခြင်း။
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;စတော့အိတ် Item ရှိ၏&quot; ဘယ်မှာ Item ကို select &quot;No&quot; ဖြစ်ပါတယ်နှင့် &quot;အရောင်း Item ရှိ၏&quot; &quot;ဟုတ်တယ်&quot; ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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 ကိုနေ့စွဲ
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Document ဖိုင်မျှဆန့်ကျင်
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,အရောင်း Partners Manage ။
 DocType: Quality Inspection,Inspection Type,စစ်ဆေးရေး Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},{0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ထငျရှားတက်ရောက်
@@ -2183,6 +2239,7 @@
 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,ကျွွောငာခကျြ
+DocType: Asset Category Account,Depreciation Expense Account,တန်ဖိုးသုံးစွဲမှုအကောင့်
 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,စရိတ်အတည်ပြုချက်
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,အတည်ပြုပြောကြား
 DocType: Payment Gateway,Gateway,Gateway မှာ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},{0} {1} ရန်အဘို့အငွေလဲနှုန်းရှာတွေ့ဖို့မအောင်မြင်ဘူး
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} {1} ရန်အဘို့အငွေလဲနှုန်းရှာတွေ့ဖို့မအောင်မြင်ဘူး
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,မာကုတစ်ဝက်နေ့
 DocType: Sales Invoice,Sales Team,အရောင်းရေးအဖွဲ့
 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 +410,[Error],[အမှား]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,အကျိုးတူ 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 +49,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Sales Invoice Item,Customer Warehouse (Optional),ဖောက်သည်ဂိုဒေါင် (Optional)
 DocType: Pricing Rule,Discount Percentage,လျော့စျေးရာခိုင်နှုန်း
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
@@ -2247,14 +2305,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,အရောင်းအဝယ်အမျိုးအစားကိုရွေးပါ
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
 DocType: Leave Allocation,Leave Allocation,ဖြန့်ဝေ Leave
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,ဝေါဟာရသို့မဟုတ်ကန်ထရိုက်၏ template ။
 DocType: Purchase Invoice,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Supplier,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Employee,Feedback,တုံ့ပြန်ချက်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
+DocType: Asset,Expected Value After Useful Life,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထား Value တစ်ခု
 DocType: Item,Reorder level based on Warehouse,ဂိုဒေါင်အပေါ်အခြေခံပြီး reorder level ကို
 DocType: Activity Cost,Billing Rate,ငွေတောင်းခံ Rate
 ,Qty to Deliver,လှတျတျောမူဖို့ Qty
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ဖျက်သိမ်းသို့မဟုတ်ပိတ်ပါသည်
 DocType: Delivery Note,Track this Delivery Note against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤ Delivery Note ကိုခြေရာခံ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,ရင်းနှီးမြှုပ်နှံမှုကနေ Net ကငွေ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,ပိုင်ဆိုင်မှု {0} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,လိပ်စာ Manage
-DocType: Pricing Rule,Item Code,item Code ကို
+DocType: Asset,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,ပစ္စည်းတောင်းဆို Create
 DocType: Employee Education,School/University,ကျောင်း / တက္ကသိုလ်က
 DocType: Payment Request,Reference Details,ကိုးကားစရာ Details ကို
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Sales Invoice Item,Available Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Qty
 ,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
+DocType: Asset,Double Declining Balance,နှစ်ချက်ကျဆင်းနေ Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ပိတ်ထားသောအမိန့်ကိုဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့မပိတ်ထားသည့်။
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates ကိုရယူပါ
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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; နောက်မှာဖြစ်ရပါမည်
+DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,မိနစ်
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 ,Qty to Receive,လက်ခံမှ Qty
 DocType: Leave Block List,Leave Block List Allowed,Block List ကို Allowed Leave
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
 DocType: Global Defaults,Disable In Words,စကားထဲမှာ disable
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,လုံခြုံသောချေးငွေ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ပိုင်ဆိုင်မှုအမျိုးအစား {0} သို့မဟုတ်ကုမ္ပဏီ {1} အတွက်တန်ဖိုးနှင့်ဆက်စပ်သော Accounts ကိုသတ်မှတ်ထားပေးပါ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},ကုန်ပစ္စည်းပေးသွင်း {0} မှစလှေတျတျောအီးမေးလ်
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
@@ -2344,7 +2410,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Workstation Working Hour,Start Time,Start ကိုအချိန်
 DocType: Item Price,Bulk Import Help,ထုထည်ကြီးသွင်းကုန်အကူအညီ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,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,ဒီအအီးမေးလ် Digest မဂ္ဂဇင်းထဲကနေနှုတ်ထွက်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,message Sent
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,စုစုပေါင်း Margin
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
 DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 DocType: Hub Settings,Publish Items to Hub,Hub မှပစ္စည်းများထုတ်ဝေ
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
 DocType: Payment Gateway Account,Default Payment Request Message,Default အနေနဲ့ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်းကို Message
 DocType: Item Group,Check this if you want to show in website,သင်ဝက်ဘ်ဆိုက်အတွက်ကိုပြချင်တယ်ဆိုရင်ဒီစစ်ဆေး
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,ဘဏ်လုပ်ငန်းနှင့်ငွေပေးချေ
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,ဘဏ်လုပ်ငန်းနှင့်ငွေပေးချေ
 ,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ဘောက်ချာ Detail နံပါတ်
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,စျေးနှုန်းဆီသို့ဦးတည်
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
 DocType: Journal Entry,Remark,ပွောဆို
 DocType: Purchase Receipt Item,Rate and Amount,rate နှင့်ငွေပမာဏ
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,အရွက်များနှင့်အားလပ်ရက်
 DocType: Sales Order,Not Billed,ကြေညာတဲ့မ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ကုန်ကျစရိတ်ဘောက်ချာငွေပမာဏဆင်းသက်
 DocType: Time Log,Batched for Billing,Billing သည် Batched
@@ -2419,15 +2486,17 @@
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
+DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,ပိုင်ဆိုင်မှု {0} ၏အရစ်ကျနေ့စွဲအရစ်ကျငွေတောင်းခံလွှာရက်စွဲနှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,ဂိုဒေါင် {0}: ကုမ္ပဏီမသင်မနေရ
 ,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Account,Payable,ပေးအပ်သော
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),ကိုက် ({0})
-DocType: Project,Margin,margin
+DocType: Pricing Rule,Margin,margin
 DocType: Salary Slip,Arrear Amount,ကြွေးကျန်ပမာဏ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,နယူး Customer များ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,စုစုပေါင်းအမြတ်%
@@ -2435,20 +2504,23 @@
 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,သင်လစာစလစ်တင်ပြစဉ်တစ်ခုချင်းစီန်ထမ်းမှမေးလ်အတွက်လစာစလစ်ပို့ချင်လျှင်စစ်ဆေး
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
 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 +57,Where manufacturing operations are carried.,အဘယ်မှာရှိကုန်ထုတ်လုပ်မှုလုပ်ငန်းများကိုသယ်ဆောင်ကြသည်။
 DocType: Stock Entry Detail,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 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 Max Qty ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+DocType: Account,Accumulated Depreciation,စုဆောင်းတန်ဖိုး
 DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
 DocType: Payment Request,Email To,အီးမေးလ်ကရန်
 DocType: Lead,Lead Owner,ခဲပိုင်ရှင်
 DocType: Bin,Requested Quantity,တောင်းဆိုထားသောပမာဏ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
 DocType: Employee,Marital Status,အိမ်ထောင်ရေးအခြေအနေ
 DocType: Stock Settings,Auto Material Request,မော်တော်ကားပစ္စည်းတောင်းဆိုခြင်း
 DocType: Time Log,Will be updated when billed.,"ကြေညာတဲ့အခါ, updated လိမ့်မည်။"
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,တူညီတဲ့ကုန်ပစ္စည်းပေးသွင်းအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ဝယ်ယူခြင်းအမိန့် Item ထောက်ပံ့
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,ကုမ္ပဏီအမည် Company ကိုမဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
@@ -2470,13 +2543,14 @@
 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 အတွက်ကြောင်းသေချာပါစေ။
 DocType: Payment Request,Payment Details,ငွေပေးချေမှုရမည့်အသေးစိတ်အကြောင်းအရာ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,အပိုင်းအစအဘို့အဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","အမျိုးအစားအီးမေးလ်အားလုံးဆက်သွယ်ရေးစံချိန်, ဖုန်း, chat, အလည်အပတ်ခရီး, etc"
 DocType: Manufacturer,Manufacturers used in Items,ပစ္စည်းများအတွက်အသုံးပြုထုတ်လုပ်သူများ
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,ကုမ္ပဏီအတွက်က Round ပိတ်ဖော်ပြရန် ကျေးဇူးပြု. ကုန်ကျစရိတ် Center က
 DocType: Purchase Invoice,Terms,သက်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,နယူး Create
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,နယူး Create
 DocType: Buying Settings,Purchase Order Required,အမိန့်လိုအပ်ပါသည်ယ်ယူ
 ,Item-wise Sales History,item-ပညာရှိသအရောင်းသမိုင်း
 DocType: Expense Claim,Total Sanctioned Amount,စုစုပေါင်းပိတ်ဆို့ငွေပမာဏ
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,စတော့အိတ်လယ်ဂျာ
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,လစာစလစ်ဖြတ်ပိုင်းပုံစံထုတ်ယူ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,ပထမဦးဆုံးအဖွဲ့တစ်ဖွဲ့ node ကိုရွေးချယ်ပါ။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,ပထမဦးဆုံးအဖွဲ့တစ်ဖွဲ့ node ကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ဝန်ထမ်းနှင့်တက်ရောက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ဒါကြောင့်သင့်ရဲ့ကုမ္ပဏီလိပ်စာသည်အတိုင်း, ဖောက်သည်, ကုန်ပစ္စည်းပေးသွင်း, အရောင်းမိတ်ဖက်များနှင့်ခဲ၏ရည်ညွှန်း Remove"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} မှစ.
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Next ကိုနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Show ကိုအခွန်ချိုး-up က
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form ကို / ပစ္စည်း / {0}) စတော့ရှယ်ယာထဲကဖြစ်ပါတယ်
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Next ကိုနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/accounts/party.py +289,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; နိုင်ပါတယ်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ငွေတောင်းခံလွှာ Post date
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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;ပါစေ။"
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,template
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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,မော်တော်ယာဉ်
+DocType: Asset Category Account,Fixed Asset Account,Fixed Asset အကောင့်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Time Log,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
 DocType: Purchase Invoice Item,Rate,rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,BOM ကနေ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,နေ့စွဲမှတစ်ဝက်နေ့ခွင့်ယူသည်နေ့စွဲ မှစ. အဖြစ်အတူတူဖြစ်သင့်
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,လစာဖွဲ့စည်းပုံ
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ကိုးကား
 DocType: Hub Settings,Access Token,Access Token
 DocType: Sales Invoice Item,Serial No,serial No
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
-DocType: Item,Is Fixed Asset Item,Fixed Asset Item ဖြစ်ပါတယ်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice,Print Language,ပုံနှိပ်ပါဘာသာစကားများ
 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 ကိုခွဲထွက်ဖို့အသုံးပြုနိုင်ပါတယ်
+DocType: Asset,Number of Depreciations,တန်ဖိုးအရေအတွက်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 DocType: Fiscal Year,Year Name,တစ်နှစ်တာအမည်
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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 အမည်
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,ကိုးကားချက်များတောင်းခံ
 DocType: Payment Reconciliation,Maximum Invoice Amount,အမြင့်ဆုံးပမာဏပြေစာ
 DocType: Purchase Invoice Item,Image View,image ကိုကြည့်ရန်
 apps/erpnext/erpnext/config/selling.py +23,Customers,Customer များ
+DocType: Asset,Partially Depreciated,တစ်စိတ်တစ်ပိုင်းတန်ဖိုးလျော့ကျ
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,ပြုပြင်ထိန်းသိမ်းမှု Manager က
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,စုစုပေါင်းသုညမဖြစ်နိုင်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,ထက် သာ. ကြီးမြတ်သို့မဟုတ်သုညနဲ့ညီမျှဖြစ်ရမည် &#39;&#39; ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. Days &#39;ဟူ.
-DocType: C-Form,Amended From,မှစ. ပြင်ဆင်
+DocType: Asset,Amended From,မှစ. ပြင်ဆင်
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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 သယ်
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,ကုမ္ပဏီအတွက် &#39;&#39; ပိုင်ဆိုင်မှုရှင်းအပေါ် Gain / ပျောက်ဆုံးခြင်းအကောင့် &#39;&#39; ဖော်ပြထားခြင်း ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,စျေးဝယ်ခြင်းထဲသို့ထည့်သည်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group မှဖြင့်
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
 DocType: Production Planning Tool,Get Material Request,ပစ္စည်းတောင်းဆိုမှု Get
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါင်း (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Quality Inspection,Item Serial No,item Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,စုစုပေါင်းလက်ရှိ
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,စာရင်းကိုင်ဖော်ပြချက်
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,စာရင်းကိုင်ဖော်ပြချက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 မရနိုင်ပါ
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
 DocType: Features Setup,Item Groups in Details,အသေးစိတ်အတွက် item အဖွဲ့များ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 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 +32,Visit report for maintenance call.,ပြုပြင်ထိန်းသိမ်းမှုခေါ်ဆိုမှုအစီရင်ခံစာသွားရောက်ခဲ့ကြသည်။
 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 +169,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: Item,Website Description,website ဖော်ပြချက်များ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
@@ -2703,12 +2783,13 @@
 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 လှုပ်ရှားမှုများ
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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 ဆန့်ကျင်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},အမှား: {0}&gt; {1}
 DocType: Item,Attributes,Attribute တွေ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,ပစ္စည်းများ Get
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,ပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: C-Form,C-Form,C-Form တွင်
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,မိုဘိုင်းလ်မရှိပါ
 DocType: Payment Tool,Make Journal Entry,ဂျာနယ် Entry &#39;ပါစေ
 DocType: Leave Allocation,New Leaves Allocated,ခွဲဝေနယူးရွက်
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},အမှား: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 DocType: Cost Center,Distribution Id,ဖြန့်ဖြူး Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,အားလုံးသည်ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ။
 DocType: Supplier Quotation,Supplier Address,ပေးသွင်းလိပ်စာ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty out
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
+apps/erpnext/erpnext/config/accounts.py +259,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,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Attribute တန်ဖိုး {0} {1} {3} ၏ထပ်တိုး {2} မှများ၏အကွာအဝေးအတွင်းဖြစ်ရပါမည်
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,လွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,အမှာစကား
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
 DocType: Features Setup,POS View,POS ကြည့်ရန်
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,အချိန်အထဲ Billed သိရသည်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို Settings&gt;&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထားပေးပါ
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),ယာယီအမြတ်ခွန် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},{1} ကုမ္ပဏီအတွက် {0} default တန်ဖိုးထားပေးပါ
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+DocType: Asset,Straight Line,မျဥ်းဖြောင့်
+DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
 DocType: Features Setup,Sales Discounts,အရောင်းလျှော့စျေး
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,အမိန့်အရေအတွက်
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ထုတ်ကုန်စာရင်း၏ထိပ်ပေါ်မှာပြလတံ့သောက HTML / Banner ။
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ရေကြောင်းပမာဏကိုတွက်ချက်ရန်အခြေအနေများကိုသတ်မှတ်
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,ကလေး Add
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,ဖွင့်လှစ် Value တစ်ခု
 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,အရောင်းအပေါ်ကော်မရှင်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
 DocType: Offer Letter Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 ,Customers Not Buying Since Long Time,ဖောက်သည်ကို Long အချိန်ကတည်းကဝယ်ယူမ
 DocType: Production Order,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,ခွင့်သည်ပလီကေးရှင်း။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,ဥပဒေရေးရာအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
 DocType: Sales Invoice,Posting Time,posting အချိန်
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,တယ်လီဖုန်းအသုံးစရိတ်များ
 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.,သင်ချွေတာရှေ့တော်၌စီးရီးကိုရွေးဖို့ user ကိုတွန်းအားပေးချင်တယ်ဆိုရင်ဒီစစ်ဆေးပါ။ သင်သည်ဤစစ်ဆေးလျှင်အဘယ်သူမျှမက default ရှိပါတယ်ဖြစ်လိမ့်မည်။
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Serial No {0} နှင့်အတူမရှိပါ Item
 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/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,တိုက်ရိုက်အသုံးစရိတ်များ
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;&#39; သတိပေးချက် \ Email လိပ်စာ &#39;၌တစ်ဦးဟာမမှန်ကန်အီးမေးလ်လိပ်စာဖြစ်ပါသည်
 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,ခရီးသွားအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ပေးသွင်း Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 DocType: Sales Partner,Contact Desc,ဆက်သွယ်ရန် Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ကျပန်း, ဖျားနာစသည်တို့ကဲ့သို့သောအရွက်အမျိုးအစား"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,ပိုင်ဆိုင်မှု {0} ၏ပေးသွင်းဝယ်ယူငွေတောင်းခံလွှာအတွက်ကုန်ပစ္စည်းပေးသွင်းနှင့်အတူမကိုက်ညီ
 DocType: Newsletter,Test Email Id,စမ်းသပ်မှုအီးမေးလ် Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,ကုန်ကြမ်းအဓိက Item အဖြစ်အတူတူမဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,လစာ template ကိုမာစတာ။
@@ -2887,12 +2973,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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 လိပ်စာ
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,ငွေတောင်းခံငွေကြေးစနစ်ကို default comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီရဲ့ payble အကောင့်ငွေကြေးဖြစ်ဖြစ်တန်းတူဖြစ်ရပါမည်
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,အတွင်းဝန်
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","ကို disable လြှငျ, လယ်ပြင် &#39;&#39; စကားထဲမှာ &#39;&#39; ဆိုငွေပေးငွေယူမြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,ဒါဟာအချိန်အထဲ Batch ဖျက်သိမ်းခဲ့ကြောင်းသိရသည်။
 ,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,အကြွေးရှင်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,အကြွေးရှင်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,row # {0}: Serial မရှိပါမဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,item ပညာရှိခွန် Detail
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Hub Settings,Name Token,Token အမည်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
-DocType: Project,Project Name,စီမံကိန်းအမည်
+DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
 DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Features Setup,Item Batch Nos,item Batch အမှတ်
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,စတော့အိတ်အရောင်းအဝယ်
 DocType: Employee,Internal Work History,internal လုပ်ငန်းသမိုင်း
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,စုဆောင်းတန်ဖိုးပမာဏ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","ဒါကြောင့်သင့်ရဲ့ကုမ္ပဏီလိပ်စာဖြစ်သကဲ့သို့ကုမ္ပဏီ, မဖြစ်မနေဖြစ်ပါသည်"
 DocType: Item Attribute,From Range,Range ထဲထဲကနေ
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,ကစတော့ရှယ်ယာကို item မဟုတ်ပါဘူးကတည်းက item {0} လျစ်လျူရှု
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,နောက်ထပ် processing အဘို့ဤထုတ်လုပ်မှုအမိန့် Submit ။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,နောက်ထပ် processing အဘို့ဤထုတ်လုပ်မှုအမိန့် Submit ။
 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.","တစ်ဦးအထူးသဖြင့်အရောင်းအဝယ်အတွက်စျေးနှုန်းများ Rule လျှောက်ထားမ, ရှိသမျှသက်ဆိုင်သောစျေးနှုန်းများနည်းဥပဒေများကိုပိတ်ထားသင့်ပါတယ်။"
 DocType: Company,Domain,ဒိုမိန်း
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ဂျော့ဘ်
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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) မရှိရင်ထွက်ခွာသည်အလုပ်လုပ်ပြီးဝင်ငွေကိုလျော့ချ
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,ကုန်ပို့ရက်စွဲ
 DocType: Opportunity,Opportunity Date,အခွင့်အလမ်းနေ့စွဲ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
+DocType: Request for Quotation Item,Request for Quotation Item,စျေးနှုန်းပစ္စည်းများအတွက်တောင်းဆိုခြင်း
 DocType: Purchase Order,To Bill,ဘီလ်မှ
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ စစ်ကြောင်းအလွတ်ရှိရမည်
 DocType: Accounts Settings,Accounts Settings,Settings ကိုအကောင့်
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုရှင်းအကောင့်&#39; &#39;set ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,စက်ရုံတရုံနှင့် Machinery
 DocType: Sales Partner,Partner's Website,လုပ်ဖော်ကိုင်ဖက်ရဲ့ဝက်ဘ်ဆိုက်
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,ယာယီ Accounts ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,ကို disable
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,ပေးဆောင်ရန်ဒီနေရာကိုနှိပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","ဒါကြောင့် {1} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု {0}, ဖျက်သိမ်းမရနိုငျ"
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,customer Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,မာကုဒူးယောင်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,အချိန်မှအချိန် မှစ. ထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,အထဲကပစ္စည်းတွေကို Add
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,အထဲကပစ္စည်းတွေကို Add
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID ကို
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",ဥပမာ &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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 ရှိသည်မဟုတ်နိုင်
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,အရည်အသွေးအစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
 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,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
@@ -3068,7 +3160,7 @@
 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 ကိုဆက်သွယ်ရန်
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup ကို Gateway ရဲ့အကောင့်။
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup ကို Gateway ရဲ့အကောင့်။
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
 ,Cash Flow,ငွေလည်ပတ်မှု
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
 DocType: Authorization Rule,Customer / Item Name,customer / Item အမည်
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,အကွာအဝေးမှ / ထံမှ specify ကျေးဇူးပြု.
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
 DocType: BOM Replace Tool,Current BOM,လက်ရှိ BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Serial No Add
 apps/erpnext/erpnext/config/support.py +43,Warranty,အာမခံချက်
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,ပုံနှိပ်နှင့်စာရေး
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,အုပ်စု Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Finished ကုန်စည် Update
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Finished ကုန်စည် Update
 DocType: Workstation,per hour,တစ်နာရီကို
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ယ်ယူခြင်း
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,အဆိုပါကုန်လှောင်ရုံ (ထာဝရစာရင်း) ကိုအကောင့်ကိုဒီအကောင့်အောက်မှာနေသူများကဖန်တီးလိမ့်မည်။
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Paid ငွေပမာဏ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
 DocType: Leave Block List,Applies to Company,ကုမ္ပဏီသက်ဆိုင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
 DocType: Purchase Invoice,In Words,စကားအတွက်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
 DocType: Production Planning Tool,Material Request For Warehouse,ဂိုဒေါင်သည် material တောင်းဆိုခြင်း
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,ပူးပေါင်း
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
+DocType: Pricing Rule,Margin Rate or Amount,margin နှုန်းသို့မဟုတ်ပမာဏ
 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
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},မမှန်ကန်ခြင်း {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို Settings&gt;&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
@@ -3198,14 +3290,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,အထွေထွေလယ်ဂျာ
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ကြည့်ရန်ခဲ
 DocType: Item Attribute Value,Attribute Value,attribute Value တစ်ခု
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","အီးမေးလ်က id ထူးခြားသောဖြစ်ရမည်, ပြီးသား {0} သည်တည်ရှိ"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","အီးမေးလ်က id ထူးခြားသောဖြစ်ရမည်, ပြီးသား {0} သည်တည်ရှိ"
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 DocType: Features Setup,To get Item Group in details table,အသေးစိတ်အချက်အလက်များကို table ထဲမှာ Item Group မှရရန်
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},{0} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
 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>
@@ -3226,23 +3319,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze တော့စျေးကွက် Older Than`% ဃရက်ပတ်လုံးထက်သေးငယ်ဖြစ်သင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
 ,Project wise Stock Tracking,Project သည်ပညာရှိသောသူသည်စတော့အိတ်ခြေရာကောက်
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} {0} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} {0} ဆန့်ကျင်ရှိတယျဆိုတာကို
 DocType: Stock Entry Detail,Actual Qty (at source/target),(အရင်းအမြစ် / ပစ်မှတ်မှာ) အမှန်တကယ် Qty
 DocType: Item Customer Detail,Ref Code,Ref Code ကို
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ဝန်ထမ်းမှတ်တမ်းများ။
 DocType: Payment Gateway,Payment Gateway,ငွေပေးချေမှုရမည့် Gateway မှာ
 DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကို
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,အရပ်ဌာနအမိန့်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,အမြစ်မိဘတစ်ဦးကုန်ကျစရိတ်အလယ်ဗဟိုရှိသည်မဟုတ်နိုင်
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ကုန်အမှတ်တံဆိပ်ကိုရွေးပါ ...
 DocType: Sales Invoice,C-Form Applicable,သက်ဆိုင်သည့် C-Form တွင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,ဂိုဒေါင်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,အားဖြင့်ပြေလည်
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,eg ။ smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,transaction ငွေကြေးငွေပေးချေမှုရမည့် Gateway မှာငွေကြေးအဖြစ်အတူတူဖြစ်ရပါမည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,လက်ခံရရှိ
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 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 +137,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 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 +187,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,ငါ့အမိန့်
@@ -3296,10 +3389,10 @@
 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,ပေးပို့ခြင်းမပြုမီသတင်းစကားကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/config/accounts.py +258,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} ပြီးသားကြေညာ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,မလုံခြုံချေးငွေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
 DocType: Maintenance Schedule Detail,Scheduled Date,Scheduled နေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,စုစုပေါင်း Paid Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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; ဆက်လက်ဆောင်ရွက်စေပါလော့။
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
 DocType: Purchase Invoice,Contact,ထိတှေ့
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,မှစ. ရရှိထားသည့်
 DocType: Features Setup,Exports,ပို့ကုန်များ
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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,အကောင့်ဖွင့်ဦးခေါင်း
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,လစာစလစ် Generate
 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: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,တစ်နှစ်တာစတင်နေ့စွဲသို့မဟုတ်အဆုံးနေ့စွဲ {0} နှင့်အတူထပ်ဖြစ်ပါတယ်။ ရှောင်ရှားရန်ကုမ္ပဏီသတ်မှတ်ထားကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,နယူးသတင်းလွှာ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
 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 ##### စီးရီးကိုသတ်မှတ်ထားခြင်းနှင့် Serial No ငွေကြေးလွှဲပြောင်းမှုမှာဖျောပွမပြီးတော့အော်တို serial number ကိုဒီစီးရီးအပေါ်အခြေခံပြီးနေသူများကဖန်တီးလိမ့်မည်ဆိုပါက။ သင်တို့၌အစဉ်အတိအလင်းဒီအချက်ကိုသည် Serial အမှတ်ဖော်ပြထားခြင်းချင်လျှင်။ ဒီကွက်လပ်ထားခဲ့။
 DocType: Upload Attendance,Upload Attendance,တက်ရောက် upload
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,အရောင်း Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,ကုန်ထုတ်လုပ်မှု Settings ကို
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,အီးမေးလ်ကိုတည်ဆောက်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,ကုမ္ပဏီနှင့် Master အတွက် default အနေနဲ့ငွေကြေးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,ကုမ္ပဏီနှင့် Master အတွက် default အနေနဲ့ငွေကြေးရိုက်ထည့်ပေးပါ
 DocType: Stock Entry Detail,Stock Entry Detail,စတော့အိတ် Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
 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 +206,New Account Name,နယူးအကောင့်အမည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,နယူးအကောင့်အမည်
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ကုန်ကြမ်းပစ္စည်းများကုန်ကျစရိတ်ထောက်ပံ့
 DocType: Selling Settings,Settings for Selling Module,ရောင်းချသည့် Module သည် Settings ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ဧည့်ဝန်ဆောင်မှု
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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 ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွက်ရက်ထက်ပိုပါတယ်
+DocType: Pricing Rule,Percentage,ရာခိုင်နှုန်း
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,item {0} တစ်ခုအရောင်း Item ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/get_item_details.py +131,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 ကို
@@ -3431,11 +3527,12 @@
 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,ရှာဖွေရန် Sub စညျးဝေး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
 DocType: Purchase Taxes and Charges,Actual,အမှန်တကယ်
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; နှင့်အခွန်နှုန်းကိုဖော်ပြထားခြင်းလုပ်ပါ။
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Tax Rule,Validity,တရားဝင်မှု
+DocType: Request for Quotation,Supplier Detail,ပေးသွင်း Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced ငွေပမာဏ
 DocType: Attendance,Attendance,သွားရောက်ရှိနေခြင်း
 apps/erpnext/erpnext/config/projects.py +55,Reports,အစီရင်ခံစာများ
 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 +508,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
 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 +455,Change,ပွောငျးလဲခွငျး
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
+DocType: Asset Category,Asset Category Name,ပိုင်ဆိုင်မှုအမျိုးအစားအမည်
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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-စတော့ရှယ်ယာပစ္စည်းများဖြစ်ကြသည်
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,batch
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,အရောင်းပုဂ္ဂိုလ်
 DocType: Sales Invoice,Cold Calling,အေး Calling မှ
 DocType: SMS Parameter,SMS Parameter,SMS ကို Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
 DocType: Maintenance Schedule Item,Half Yearly,တစ်ဝက်နှစ်အလိုက်
 DocType: Lead,Blog Subscriber,ဘလော့ Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,တန်ဖိုးများကိုအပေါ်အခြေခံပြီးအရောင်းအကနျ့သစည်းမျဉ်းစည်းကမ်းတွေကိုဖန်တီးပါ။
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,တူညီသည့်အယ်ယူ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 DocType: Sales Invoice,Is POS,POS စက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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,လက်ခံခဲ့သည်ပမာဏ
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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; ကိုကြည့်ပါ"
 DocType: Account,Parent Account,မိဘအကောင့်
@@ -3574,7 +3673,7 @@
 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 +219,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
 DocType: Address,Office,ရုံး
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,batch Inventory
 DocType: Employee,Contract End Date,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲ
 DocType: Sales Order,Track this Sales Order against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤအရောင်းအမိန့်အားခြေရာခံ
+DocType: Sales Invoice Item,Discount and Margin,လျှော့စျေးနဲ့ Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,အထက်ပါသတ်မှတ်ချက်များအပေါ်အခြေခံပြီးအရောင်းအမိန့် (ကယ်နှုတ်ရန်ဆိုင်းငံ့ထား) Pull
 DocType: Deduction Type,Deduction Type,သဘောအယူအဆကအမျိုးအစား
 DocType: Attendance,Half Day,တစ်ဝက်နေ့
@@ -3609,7 +3709,7 @@
 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 လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +234,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,လစဉ်လစာမှတ်ပုံတင်မည်
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,ငွေပေးချေမှုရမည့် URL ကိုကို Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,စုစုပေါင်း Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,အချိန်အထဲ billable မဟုတ်ပါဘူး
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
+DocType: Asset,Asset Category,ပိုင်ဆိုင်မှုအမျိုးအစား
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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 ခွန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,ပေးသွင်းဖို့ material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,ယစ်မျိုးပြေစာ
 DocType: Expense Claim,Employees Email Id,န်ထမ်းအီးမေးလ် Id
 DocType: Employee Attendance Tool,Marked Attendance,တခုတ်တရတက်ရောက်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,လက်ရှိမှုစိစစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,လက်ရှိမှုစိစစ်
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Logo ကို Attach
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,မျှမတွေ့ default အနေနဲ့လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့်တံဆိပ်တပ်&gt; လိပ်စာ Template ကနေအသစ်တစ်ခုကိုတဦးတည်းဖန်တီးပေးပါ။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,မြို့တော်စတော့အိတ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,မြို့တော်စတော့အိတ်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
 DocType: Payment Gateway Account,Payment Gateway Account,ငွေပေးချေမှုရမည့် Gateway ရဲ့အကောင့်ကို
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ငွေပေးချေမှုပြီးစီးပြီးနောက်ရွေးချယ်ထားသည့်စာမျက်နှာအသုံးပြုသူ redirect ။
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
+DocType: Asset,Current Value (After Depreciation),(တန်ဖိုးပြီးနောက်) လက်ရှိ Value တစ်ခု
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref နေ့စွဲ
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 0ecff3e..b153894 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Verhuurd
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Wil je echt om dit actief te schrappen?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Gelieve setup Employee Naming System in Human Resource&gt; HR-instellingen
 DocType: Purchase Order,Customer Contact,Customer Contact
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Boom
 DocType: Job Applicant,Job Applicant,Sollicitant
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Toon geopend
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Reeks succesvol bijgewerkt
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Nieuwe Verlofaanvraag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Toon Varianten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Leningen (Passiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Accounts tabel kan niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Benaming
@@ -64,7 +66,7 @@
 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 +642,Invoice,Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nieuwe {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nieuwe {0}: # {1}
 ,Sales Partners Commission,Verkoop Partners Commissie
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Afkorting kan niet meer dan 5 tekens lang zijn
 DocType: Payment Request,Payment Request,Betaal verzoek
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Getrouwd
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Niet toegestaan voor {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Krijgen items uit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activiteitenlogboek:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Geneesmiddelen
+DocType: Item,Is Fixed Asset,Is vaste activa
 DocType: Expense Claim Detail,Claim Amount,Claim Bedrag
 DocType: Employee,Mr,De heer
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Alle Contact
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} is bevroren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Voorraadkosten
 DocType: Newsletter,Email Sent?,E-mail verzonden?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Logs
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Installatie Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Artikel {0} moet een inkoopbaar artikel zijn
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 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 +507,"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 +533,"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 +170,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Nieuwe Eenheid
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Vul Bedrijf in
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
 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 +217,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
 DocType: Newsletter List,Total Subscribers,Totaal Abonnees
 ,Contact Name,Contact Naam
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 DocType: Payment Tool,Reference No,Referentienummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Notificatie Beheer
 DocType: Lead,Suggestions,Suggesties
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item Group-wise budgetten op dit gebied. U kunt ook seizoensinvloeden door de Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vul ouderaccount groep voor magazijn {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Vul ouderaccount groep voor magazijn {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Leren
+DocType: Asset,Next Depreciation Date,Volgende Afschrijvingen Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activiteitskosten per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Leverancier factuur nr bestaat in Purchase Invoice {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Beheer Sales Person Boom .
 DocType: Job Applicant,Cover Letter,Voorblad
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito&#39;s te ontruimen
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Verkeerd Wachtwoord
 DocType: Item,Variant Of,Variant van
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide Aantal kan niet groter zijn dan 'Aantal aan Manufacture'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide Aantal kan niet groter zijn dan 'Aantal aan Manufacture'
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} eenheden van [{1}] (# Vorm / Item / {1}) gevonden in [{2}] (# Vorm / Magazijn / {2})
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Functieprofiel
 DocType: Newsletter,Newsletter,Nieuwsbrief
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Vrachtbrief
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Het opzetten van Belastingen
 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 +381,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Selecteer maand en jaar
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totaal Bestel Beschouwd
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Selecteer Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -336,9 +343,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Artikel Kwaliteitsinspectie Parameter
 DocType: Leave Application,Leave Approver Name,Verlaat Goedkeurder Naam
-,Schedule Date,Plan datum
+DocType: Depreciation Schedule,Schedule Date,Plan datum
 DocType: Packed Item,Packed Item,Levering Opmerking Verpakking Item
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Standaardinstellingen voor Inkooptransacties .
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standaardinstellingen voor Inkooptransacties .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Activiteit Kosten bestaat voor Employee {0} tegen 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.,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
@@ -347,6 +354,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Offerte
 DocType: Workstation,Working Hours,Werkuren
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
@@ -387,15 +395,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
-DocType: Material Request Item,Required Date,Benodigd op datum
+DocType: Request for Quotation Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Boodschap voor Supplier
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totaal Aantal
 DocType: Employee,Health Concerns,Gezondheidszorgen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Onbetaald
@@ -417,17 +426,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Bestaat niet"
 DocType: Pricing Rule,Valid Upto,Geldig Tot
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -436,6 +445,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Managing Subcontracting
+DocType: Project,Project will be accessible on the website to these users,Project zal toegankelijk op de website van deze gebruikers
 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 +53,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
@@ -447,7 +457,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Toename kan niet worden 0
 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 +86,Item {0} is not Purchase Item,ARtikel {0} is geen inkoopbaar artikel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,ARtikel {0} is geen inkoopbaar artikel
 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
@@ -458,7 +468,7 @@
 DocType: Production Plan Item,Pending Qty,In afwachting Aantal
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -468,13 +478,13 @@
 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 +126,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 +230,Financial / accounting year.,Financiële / boekjaar .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,verzameld Waarden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Boekjaar Startdatum mag niet groter zijn dan het Boekjaar Einddatum
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Levertijd: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verschuldigd Account
@@ -482,7 +492,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Terugkerende verkoop
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Salaris componenten.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database van potentiële klanten.
@@ -491,7 +501,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -501,7 +511,7 @@
 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/config/accounts.py +70,Masters,Stamdata
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update Bank transactiedata
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update Bank transactiedata
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tijdregistratie
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
@@ -519,27 +529,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Vul Kwitantie eerste
 DocType: Buying Settings,Supplier Naming By,Leverancier Benaming Door
 DocType: Activity Type,Default Costing Rate,Standaard Costing Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Onderhoudsschema
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto wijziging in Inventory
 DocType: Employee,Passport Number,Paspoortnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Stel een Holiday List voor de medewerker of de Vennootschap
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,afschrijvingen Bedrag
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Activiteit Type
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Afgeleverd Bedrag
 DocType: Supplier,Fixed Days,Vaste Dagen
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Paklijst
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Inkooporders voor leveranciers.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inkooporders voor leveranciers.
 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
@@ -554,8 +564,10 @@
 DocType: BOM Operation,Operation Time,Operatie Tijd
 DocType: Pricing Rule,Sales Manager,Verkoopsmanager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Groep Groep
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,mijn projecten
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
 DocType: Journal Entry,Bill No,Factuur nr
+DocType: Company,Gain/Loss Account on Asset Disposal,Winst / verliesrekening op de verkoop van activa
 DocType: Purchase Invoice,Quarterly,Kwartaal
 DocType: Selling Settings,Delivery Note Required,Vrachtbrief Verplicht
 DocType: Sales Order Item,Basic Rate (Company Currency),Basis Tarief (Bedrijfs Valuta)
@@ -567,13 +579,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Betaling Entry is al gemaakt
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Totaal facturering dit jaar
 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 +529,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -596,6 +609,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
 ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
@@ -610,14 +624,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandsalaris overzicht.
 DocType: Item Group,Website Specifications,Website Specificaties
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Er is een fout in uw Address Template {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nieuwe Rekening
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nieuwe Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Van {0} van type {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {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.,Boekingen kunnen worden gemaakt tegen leaf nodes. Inzendingen tegen groepen zijn niet toegestaan.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -665,17 +679,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Gebouwen Onderhoudskosten
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standaard kosten van verkochte goederen Account
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prijslijst niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -683,7 +697,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mijn facturen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mijn facturen
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Geen werknemer gevonden
 DocType: Supplier Quotation,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
@@ -692,10 +707,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Upload voorraadsaldo via csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Support Analyse
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Denkfout: Moet overlappende vinden
 DocType: Item,Website Warehouse,Website Magazijn
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
 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 +267,C-Form records,C -Form records
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C -Form records
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Klant en leverancier
 DocType: Email Digest,Email Digest Settings,E-mail Digest Instellingen
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support vragen van klanten.
@@ -719,7 +735,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -756,14 +772,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Wordt uitbesteed
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaarden
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Bekijk Abonnees
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Ontvangstbevestiging
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
 DocType: Employee,Ms,Mevrouw
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Wisselkoers stam.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Wisselkoers stam.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Sales Partners en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Stuklijst {0} moet actief zijn
+DocType: Journal Entry,Depreciation Entry,afschrijvingen Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Naar winkelwagen
 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
@@ -782,7 +799,7 @@
 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 +524,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -792,10 +809,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Inkoopfactuur
+DocType: Asset,Purchase Invoice,Inkoopfactuur
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail nr
 DocType: Stock Entry,Total Outgoing Value,Totaal uitgaande waardeoverdrachten
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en de uiterste datum moet binnen dezelfde fiscale jaar
@@ -805,21 +822,24 @@
 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 is dit Valuta record niet gemaakt voor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Publiceren op de website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Verzendingen naar klanten.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Indirecte Inkomsten
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Bedrag = openstaande bedrag
 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 +672,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Kies Punt voor Overdracht
 DocType: Purchase Invoice,Additional Discount Percentage,Extra Korting Procent
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rij {0}: Invoice {1} is ongeldig, het zou kunnen worden opgezegd / niet bestaat. \ Voer een geldige factuur"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
@@ -828,14 +848,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
 ,Employee Holiday Attendance,Werknemer Holiday Toeschouwers
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Inzendingen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock Inzendingen
 DocType: Item,Inspection Criteria,Inspectie Criteria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overgebrachte
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Maken
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Maken
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
 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 +5,My Cart,Mijn winkelwagen
@@ -845,7 +865,8 @@
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 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 +180,Qty for {0},Aantal voor {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Wil je echt wilt deze gesloopt activa te herstellen?
+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 +80,Leave Allocation Tool,Verlof Toewijzing Tool
 DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
@@ -858,7 +879,7 @@
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
 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 +547,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Korting
@@ -873,20 +894,21 @@
 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
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selling Bedrag
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Tijd Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Tijd Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,gesloopt
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Werving
 DocType: BOM Operation,Operation,Operatie
 DocType: Lead,Organization Name,Naam van de Organisatie
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Verkoopkosten
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
@@ -903,7 +925,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Naar {0} | {1} {2}
 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
@@ -912,7 +934,7 @@
 DocType: Company,Default Currency,Standaard valuta
 DocType: Contact,Enter designation of this Contact,Voer aanduiding van deze Contactpersoon in
 DocType: Expense Claim,From Employee,Van Medewerker
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -920,7 +942,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Bijdrage%
@@ -929,22 +951,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Project Uitnodiging Collaboration
 DocType: Salary Slip,Deductions,Inhoudingen
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Deze Tijd Log Batch is gefactureerd.
 DocType: Salary Slip,Leave Without Pay,Onbetaald verlof
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacity Planning Fout
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacity Planning Fout
 ,Trial Balance for Party,Trial Balance voor Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Verdiensten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Het openen van Accounting Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Niets aan te vragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Beheer
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Soorten activiteiten voor Time Sheets
@@ -955,18 +978,18 @@
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Stel Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Stel Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelcode kan niet worden gewijzigd voor Serienummer
 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/config/buying.py +33,Supplier database.,Leverancierbestand
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverancierbestand
 DocType: Account,Balance Sheet,Balans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Belastingen en andere inhoudingen op het salaris.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
@@ -980,6 +1003,7 @@
 DocType: Holiday,Holiday,Feestdag
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-vorm is niet van toepassing voor de factuur: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Niet overeenstemmende betalingsgegevens
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
@@ -993,19 +1017,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
 DocType: Contact,User ID,Gebruikers-ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Bekijk Grootboek
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Bekijk Grootboek
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividenden betaald
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividenden betaald
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Verschil Bedrag
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Ingehouden winsten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Ingehouden winsten
 DocType: BOM Item,Item Description,Artikelomschrijving
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Is Terugkerende
@@ -1013,7 +1038,7 @@
 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,Opportuniteit artikel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tijdelijke Opening
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Tijdelijke Opening
 ,Employee Leave Balance,Werknemer Verlof Balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
@@ -1028,8 +1053,8 @@
 ,Accounts Payable Summary,Crediteuren Samenvatting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
@@ -1037,7 +1062,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Hoofdrekening {0} aangemaakt
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totaal Bereikt
@@ -1045,12 +1070,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,landbouw
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
 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
@@ -1060,19 +1085,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Verkoper Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Productie Order status is {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Productie Order status is {0}
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,voor Leverancier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Niet elk item met de naam niet vinden {0}
 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
@@ -1080,10 +1106,10 @@
 DocType: Item,Website Item Groups,Website Artikelgroepen
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
-DocType: Journal Entry,Journal Entry,Journaalpost
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
 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
@@ -1092,6 +1118,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offerte Supplier
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Sales Order,Recurring Upto,terugkerende Tot
 DocType: Attendance,HR Manager,HR Manager
@@ -1102,6 +1129,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Beoordeling Sjabloon Doel
 DocType: Salary Slip,Earning,Verdienen
 DocType: Payment Tool,Party Account Currency,Party account Valuta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Huidige waarde na afschrijvingen moet kleiner zijn dan gelijk aan {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Toevoegen of aftrekken
 DocType: Company,If Yearly Budget Exceeded (for expense account),Als jaarlijks budget overschreden (voor declaratierekening)
@@ -1116,21 +1144,22 @@
 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}
 DocType: Project,Start and End Dates,Begin- en einddatum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Gemiddelde korting
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Boekhouding
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Asset,Depreciation Schedules,afschrijvingen Roosters
 DocType: Item,Is Service Item,Is service-artikel
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 DocType: Payment Request,Transaction Currency,transactie Munt
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Van {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Van {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operatie Beschrijving
 DocType: Item,Will also apply to variants,Zal ook van toepassing op varianten
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Kan Boekjaar Startdatum en Boekjaar Einde Datum  niet wijzigen, als het boekjaar is opgeslagen."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Kan Boekjaar Startdatum en Boekjaar Einde Datum  niet wijzigen, als het boekjaar is opgeslagen."
 DocType: Quotation,Shopping Cart,Winkelwagen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gem Daily Uitgaande
 DocType: Pricing Rule,Campaign,Campagne
@@ -1144,8 +1173,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Netto wijziging in vaste activa
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
@@ -1153,8 +1182,8 @@
 DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
 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 +472,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,mag niet groter zijn dan 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1176,11 +1205,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Fiscale Regel voor transacties.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Fiscale Regel voor transacties.
 DocType: Rename Tool,Type of document to rename.,Type document te hernoemen.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,We kopen dit artikel
 DocType: Address,Billing,Facturering
@@ -1190,12 +1219,15 @@
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Uitbesteed werk
+DocType: Asset,Asset Name,Asset Naam
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Pakbon
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kantoorhuur
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Pakbon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Instellingen SMS gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Offerte aanvragen kan de toegang worden door te klikken op deze link
+DocType: Asset,Number of Months in a Period,Aantal maanden in een periode
 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,Werkstation Werkuur
@@ -1212,19 +1244,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Overheid
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Item Varianten
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Totaal ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Totaal ({0})
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
 DocType: Sales Invoice,Source,Bron
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Toon gesloten
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Geen records gevonden in de betaling tabel
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Boekjaar Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,De kasstroom uit investeringsactiviteiten
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Item Group,Item Group Name,Artikel groepsnaam
 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 +86,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
 DocType: Pricing Rule,For Price List,Voor Prijslijst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1233,7 +1266,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Maak nieuwe rekening van Rekeningschema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Onderhoud Bezoek
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Onderhoud Bezoek
 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: Landed Cost Voucher,Landed Cost Help,Vrachtkosten Help
@@ -1247,7 +1280,6 @@
 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 +196,Brand master.,Merk meester.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Leverancier Type
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Doos
@@ -1275,7 +1307,7 @@
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Claims voor bedrijfsonkosten
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Receipt,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
@@ -1284,7 +1316,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,E-mail opnieuw te verzenden Betaling
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,andere rapporten
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1294,26 +1326,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} View
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto wijziging in cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Vorig boekjaar is niet gesloten
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Leverancier Type stam.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverancier Type stam.
 DocType: Purchase Order Item,Supplier Part Number,Leverancier Onderdeelnummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
 DocType: Purchase Invoice,Reference Document,Referentie document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% gefactureerd
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
@@ -1335,8 +1368,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto wijziging in Accounts Payable
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Controleer uw e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Klant nodig voor 'Klantgebaseerde Korting'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
 DocType: Quotation,Term Details,Voorwaarde Details
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter zijn dan 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning Voor (Dagen)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantie Claim
@@ -1354,7 +1388,7 @@
 DocType: Employee,Permanent Address,Vast Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Voorschot betaald tegen {0} {1} kan niet groter zijn \ dan eindtotaal {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Selecteer artikelcode
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Selecteer artikelcode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Verminderen Aftrek voor onbetaald verlof
 DocType: Territory,Territory Manager,Regio Manager
 DocType: Packed Item,To Warehouse (Optional),Om Warehouse (optioneel)
@@ -1364,15 +1398,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Enkel stuks van een artikel.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1389,33 +1423,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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
+DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","bv ""XYZ Nationale Bank """
+DocType: Asset,Depreciation Method,afschrijvingsmethode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
 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 +29,Shopping Cart is enabled,Winkelwagen is ingeschakeld
 DocType: Job Applicant,Applicant for a Job,Aanvrager van een baan
 DocType: Production Plan Material Request,Production Plan Material Request,Productie Plan Materiaal aanvragen
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Geen productieorders aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Geen productieorders aangemaakt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Hoofd
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht"
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1423,31 +1459,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
 DocType: Territory,Territory Name,Regio Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adressen
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adressen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,taxaties
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Item is niet toegestaan om Productieorder hebben.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item is niet toegestaan om Productieorder hebben.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
 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: 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 +27,Time Logs for manufacturing.,Time Logs voor de productie.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tijd Log voor taken.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Merk
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 DocType: Quotation Item,Actual Qty,Werkelijk aantal
 DocType: Sales Invoice Item,References,Referenties
@@ -1458,6 +1495,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,associëren
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
+DocType: Request for Quotation Supplier,Send Email to Supplier,E-mail verzenden aan Leverancier
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 DocType: Packing Slip,To Package No.,Naar pakket nr
 DocType: Production Planning Tool,Material Requests,materiaal aanvragen
@@ -1475,7 +1513,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Toelage Procent
 DocType: SMS Settings,Message Parameter,Bericht Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Boom van de financiële Cost Centers.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Boom van de financiële Cost Centers.
 DocType: Serial No,Delivery Document No,Leveringsdocument nr.
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Krijg items uit Aankoopfacturen
 DocType: Serial No,Creation Date,Aanmaakdatum
@@ -1507,41 +1545,43 @@
 ,Amount to Deliver,Bedrag te leveren
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} aangemaakt
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} aangemaakt
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
 ,Serial No Status,Serienummer Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Artikel tabel kan niet leeg zijn
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rij {0}: Instellen {1} periodiciteit, tijdsverschil tussen begin- en einddatum \
  groter dan of gelijk aan {2}"
 DocType: Pricing Rule,Selling,Verkoop
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Verloopdatum kan niet voor de Boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Invoerrechten en Belastingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Vul Peildatum in
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Payment Gateway account is niet geconfigureerd
 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: Production Order,Material Request Item,Materiaal Aanvraag Artikel
+DocType: Request for Quotation Item,Material Request Item,Materiaal Aanvraag Artikel
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,uitverkocht
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rood
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Installatie Tijd
 DocType: Sales Invoice,Accounting Details,Boekhouding Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Verwijder alle transacties voor dit bedrijf
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Toekenningen
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptatiecriteria
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 DocType: Item Group,Show In Website,Toon in Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Groep
@@ -1549,6 +1589,7 @@
 ,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 te 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 +25,Gantt chart of all tasks.,Gantt-diagram van alle taken.
+DocType: Pricing Rule,Margin Type,marge Type
 DocType: Appraisal,For Employee Name,Voor Naam werknemer
 DocType: Holiday List,Clear Table,Wis Tabel
 DocType: Features Setup,Brands,Merken
@@ -1556,20 +1597,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Rij # {0}: Asset is verplicht tegen een post der vaste activa
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve setup nummering serie voor Attendance via Setup&gt; Numbering Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,paar
+DocType: Asset,Depreciation Schedule,afschrijving Schedule
 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: Asset,Purchase Date,aankoopdatum
 DocType: Employee,Personal Details,Persoonlijke Gegevens
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Stel &#39;Asset Afschrijvingen Cost Center&#39; in Company {0}
 ,Maintenance Schedules,Onderhoudsschema&#39;s
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
@@ -1583,23 +1629,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Omvatten Reconciled Entries
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Groep om Non-groep
 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/public/js/setup_wizard.js +272,Unit,eenheid
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Specificeer Bedrijf
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Declaraties
 DocType: Issue,Support,Support
 ,BOM Search,BOM Zoeken
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Sluiting (openen + Totalen)
@@ -1608,29 +1653,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Klaring mag niet voor check datum in rij {0}
 DocType: Salary Slip,Deduction,Aftrek
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
 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
 DocType: Territory,Classification of Customers by region,Indeling van de klanten per regio
 DocType: Project,% Tasks Completed,% van de taken afgerond
 DocType: Project,Gross Margin,Bruto Marge
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Vul eerst Productie Artikel in
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Vul eerst Productie Artikel in
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Berekende bankafschrift balans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Gedeactiveerde gebruiker
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Offerte
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 DocType: Quotation,Maintenance User,Onderhoud Gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kosten Bijgewerkt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kosten Bijgewerkt
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Gelieve setup Employee Naming System in Human Resource&gt; HR-instellingen
 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
@@ -1642,8 +1688,8 @@
 ,SO Qty,VO Aantal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
+DocType: Request for Quotation,Manufacturing Manager,Productie Manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Zendingen
 DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
@@ -1651,12 +1697,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Diverse Kosten
 DocType: Global Defaults,Default Company,Standaard Bedrijf
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Gebruiker {0} is uitgeschakeld
@@ -1665,7 +1711,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Currency Exchange,From Currency,Van Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
@@ -1675,11 +1721,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Rij # {0}: Aantal moet 1, als punt is gekoppeld aan een actief"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item moet niet een Product Bundle. Gelieve te verwijderen `{0}` en op te slaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankieren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Nieuwe Kostenplaats
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 de Fondsen&gt; Kortlopende verplichtingen&gt; Belastingen en plichten en maak een nieuwe account (door te klikken op Toevoegen Kind) van het type &quot;Tax&quot; en doe noemen het belastingtarief.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nieuwe Kostenplaats
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Quality Inspection,In Process,In Process
@@ -1692,10 +1738,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
 DocType: Quotation Item,Stock Balance,Voorraad Saldo
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Tijd Logs gemaakt:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Tijd Logs gemaakt:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Selecteer juiste account
 DocType: Item,Weight UOM,Gewicht Eenheid
 DocType: Employee,Blood Group,Bloedgroep
@@ -1713,13 +1760,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Geef aub een land dat voor deze verzending Rule of kijk Wereldwijde verzending
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debet Om vereist
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
 DocType: Offer Letter Term,Offer Term,Aanbod Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Vacature
 DocType: Payment Reconciliation,Payment Reconciliation,Afletteren
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Aanbod Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Aanvragen (MRP) en Productieorders.
@@ -1727,22 +1774,22 @@
 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 +103,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
 DocType: Manufacturing Settings,Allow Overtime,Laat Overwerk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Huidige Valuation Rate
 DocType: Item,Customer Item Codes,Customer Item Codes
 DocType: Opportunity,Lost Reason,Reden van verlies
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Maak Betaling Inzendingen tegen bestellingen of facturen.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Maak Betaling Inzendingen tegen bestellingen of facturen.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1751,10 +1798,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Geen loonstrook gevonden voor deze maand:
 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 +175,Serial No {0} not found,Serienummer {0} niet gevonden
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serienummer {0} niet gevonden
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Uw Klanten
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
 DocType: Leave Block List Date,Block Date,Blokeer Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Nu toepassen
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Nu toepassen
 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 ."
@@ -1778,7 +1826,7 @@
 DocType: Employee,Employment Details,Dienstverband Details
 DocType: Employee,New Workplace,Nieuwe werkplek
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Instellen als Gesloten
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Geen Artikel met Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Geen Artikel met Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 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,Als je Sales Team en Verkoop Partners (Channel Partners) ze kunnen worden gelabeld en onderhouden van hun bijdrage in de commerciële activiteit
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
@@ -1796,10 +1844,10 @@
 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 +608,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Verplaats Materiaal
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Punt {0} moet een Sales voorwerp in zijn {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Stel terugkerende na het opslaan
 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
@@ -1813,12 +1861,13 @@
 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: Process Payroll,Create Salary Slip,Maak loonstrook
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import e-mail van
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Uitnodigen als gebruiker
 DocType: Features Setup,After Sale Installations,Na Verkoop Installaties
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Stel {0} in Company {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{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 .
@@ -1827,9 +1876,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
@@ -1846,25 +1895,25 @@
 DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Gateway Account,Payment Account,Betaalrekening
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,Accepted,Geaccepteerd
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} is niet ingediend
 apps/erpnext/erpnext/config/stock.py +27,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
@@ -1873,7 +1922,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Nieuwsbrief Mailing List
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
 DocType: Authorization Rule,Authorized Value,Authorized Value
@@ -1891,13 +1940,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} is gesloten
 DocType: Email Digest,How frequently?,Hoe vaak?
 DocType: Purchase Receipt,Get Current Stock,Get Huidige voorraad
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Boom van de Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
 DocType: Production Order,Actual End Date,Werkelijke Einddatum
 DocType: Authorization Rule,Applicable To (Role),Van toepassing zijn op (Rol)
 DocType: Stock Entry,Purpose,Doel
+DocType: Company,Fixed Asset Depreciation Settings,Fixed Asset Afschrijvingen Instellingen
 DocType: Item,Will also apply for variants unless overrridden,Geldt ook voor varianten tenzij overrridden
 DocType: Purchase Invoice,Advances,Vooruitgang
 DocType: Production Order,Manufacture against Material Request,Fabricage tegen Material Request
@@ -1906,6 +1955,7 @@
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1956,12 +2006,14 @@
  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: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Categorie Account
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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,Stad
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","bijv. Bank, Kas, Credit Card"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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: Journal Entry,Credit Note,Creditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Afgesloten Aantal niet meer dan {0} bedrijfsgereed {1}
 DocType: Features Setup,Quality,Kwaliteit
@@ -1985,9 +2037,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mijn Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisatie tak meester .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Geen enkele werknemer voor de hierboven geselecteerde criteria of salarisstrook al gemaakt
@@ -2014,7 +2066,7 @@
 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 +200,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'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Loonlijst
 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"
@@ -2024,8 +2076,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ontvangstbevestiging Artikelen
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassen Formulieren
 DocType: Account,Income Account,Inkomstenrekening
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Geen standaard Address Template gevonden. Maak een nieuwe Setup&gt; Afdrukken en Branding&gt; Address Template.
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2047,21 +2100,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Beheer Customer Group Boom .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nieuwe Kostenplaats Naam
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
 DocType: Appraisal,HR User,HR Gebruiker
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belastingen en Toeslagen Afgetrokken
-apps/erpnext/erpnext/config/support.py +7,Issues,Kwesties
+apps/erpnext/erpnext/hooks.py +90,Issues,Kwesties
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet één zijn van {0}
 DocType: Sales Invoice,Debit To,Debitering van
 DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot
 ,Profit and Loss Statement,Winst-en verliesrekening
@@ -2075,10 +2129,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
 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 +139,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
 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 +142,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
@@ -2146,13 +2200,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Aangevraagd
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Geen Opmerkingen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset punt moet een niet-voorraad artikel zijn
 DocType: Supplier Quotation Item,Material Request No,Materiaal Aanvraag nr.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2173,7 +2228,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 DocType: Payment Request,Recipient and Message,Ontvanger en bericht
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
@@ -2187,7 +2242,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Select Leverancier Adres
 DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute-mail
@@ -2209,11 +2264,12 @@
 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/config/buying.py +18,Request for quotation.,Aanvraag voor een offerte.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 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 +294,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2222,7 +2278,7 @@
 DocType: Installation Note Item,Against Document No,Tegen Document nr.
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Beheer Verkoop Partners.
 DocType: Quality Inspection,Inspection Type,Inspectie Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Selecteer {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
 DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte aanwezigheid
@@ -2237,6 +2293,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Afschrijvingen Account
 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
@@ -2250,7 +2307,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bevestigd
 DocType: Payment Gateway,Gateway,Poort
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Vul het verlichten datum .
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2264,18 +2321,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Niet in staat om wisselkoers voor {0} te vinden {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Niet in staat om wisselkoers voor {0} te vinden {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halve dag
 DocType: Sales Invoice,Sales Team,Verkoop Team
 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 +410,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serienummer {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Leverancier Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (optioneel)
 DocType: Pricing Rule,Discount Percentage,Kortingspercentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
@@ -2301,14 +2359,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecteer type transactie
 DocType: GL Entry,Voucher No,Voucher nr.
 DocType: Leave Allocation,Leave Allocation,Verlof Toewijzing
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Sjabloon voor contractvoorwaarden
 DocType: Purchase Invoice,Address and Contact,Adres en contactgegevens
 DocType: Supplier,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Employee,Feedback,Terugkoppeling
 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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Account
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
+DocType: Asset,Expected Value After Useful Life,Verwachte waarde Na Nuttig Life
 DocType: Item,Reorder level based on Warehouse,Bestelniveau gebaseerd op Warehouse
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Aantal te leveren
@@ -2321,12 +2381,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} is geannuleerd of gesloten
 DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,De netto kasstroom uit investeringsactiviteiten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root-account kan niet worden verwijderd
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} moet worden ingediend
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Beheren Adressen
-DocType: Pricing Rule,Item Code,Artikelcode
+DocType: Asset,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
@@ -2345,8 +2405,10 @@
 DocType: Production Planning Tool,Create Material Requests,Maak Materiaal Aanvragen
 DocType: Employee Education,School/University,School / Universiteit
 DocType: Payment Request,Reference Details,Reference Details
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty bij Warehouse
 ,Billed Amount,Gefactureerd Bedrag
+DocType: Asset,Double Declining Balance,Double degressief
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Gesloten bestelling kan niet worden geannuleerd. Openmaken om te annuleren.
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Krijg Updates
@@ -2365,6 +2427,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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
+DocType: Asset,Fully Depreciated,volledig is afgeschreven
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Attendance HTML
@@ -2372,25 +2435,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serienummer en Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Retailer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Uitschakelen In Woorden
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bank Kredietrekening
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Leningen met onderpand
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Stel afschrijvingen gerelateerd Accounts in Vermogensbeheer categorie {0} of Company {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Opening Balance Equity
 DocType: Appraisal,Appraisal,Beoordeling
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail verzonden naar leverancier {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum wordt herhaald
 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 +187,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
@@ -2398,7 +2464,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Workstation Working Hour,Start Time,Starttijd
 DocType: Item Price,Bulk Import Help,Bulk Import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Kies aantal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Kies aantal
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeuring Rol kan niet hetzelfde zijn als de rol van de regel is van toepassing op
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden
@@ -2426,6 +2492,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Totaal Marge
 DocType: Supplier,Supplier Details,Leverancier Details
 DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiceer Artikelen toevoegen aan Hub
@@ -2439,7 +2506,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klantengroep / Klant
 DocType: Payment Gateway Account,Default Payment Request Message,Standaard bericht Payment Request
 DocType: Item Group,Check this if you want to show in website,Selecteer dit als u wilt weergeven in de website
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bank- en betalingen
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bank- en betalingen
 ,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
@@ -2447,17 +2514,17 @@
 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 +199,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Issue,Opening Date,Openingsdatum
 DocType: Journal Entry,Remark,Opmerking
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Bladeren en vakantie
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Vrachtkosten Voucher Bedrag
 DocType: Time Log,Batched for Billing,Gebundeld voor facturering
@@ -2473,15 +2540,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Afschrijvingen kostenplaats
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Aankoopdatum van activa {0} komt niet overeen met de aankoop Factuurdatum
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Magazijn {0}: Bedrijf is verplicht
 ,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}
 DocType: Journal Entry,Stock Entry,Voorraadtransactie
 DocType: Account,Payable,betaalbaar
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debiteuren ({0})
-DocType: Project,Margin,Marge
+DocType: Pricing Rule,Margin,Marge
 DocType: Salary Slip,Arrear Amount,Achterstallig bedrag
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nieuwe klanten
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brutowinst%
@@ -2489,20 +2558,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
 DocType: Newsletter,Newsletter List,Nieuwsbrief Lijst
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Controleer of u wilt loonstrook sturen mail naar elke werknemer, terwijl het indienen van loonstrook"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
 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 +57,Where manufacturing operations are carried.,Waar de productie-activiteiten worden uitgevoerd.
 DocType: Stock Entry Detail,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: C-Form,Total Invoiced Amount,Totaal Gefactureerd bedrag
 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: Account,Accumulated Depreciation,cumulatieve afschrijvingen
 DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
 DocType: Payment Request,Email To,Email naar
 DocType: Lead,Lead Owner,Lead Eigenaar
 DocType: Bin,Requested Quantity,gevraagde hoeveelheid
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Warehouse is vereist
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2510,11 +2582,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Geleverd
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Dezelfde leverancier is meerdere keren ingevoerd
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inkooporder Artikel geleverd
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2524,13 +2597,14 @@
 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.
 DocType: Payment Request,Payment Details,Betalingsdetails
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
+DocType: Asset,Journal Entry for Scrap,Journal Entry voor Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Record van alle communicatie van het type e-mail, telefoon, chat, bezoek, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabrikanten gebruikt in Items
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Maak nieuw
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2543,7 +2617,7 @@
 ,Stock Ledger,Voorraad Dagboek
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salarisstrook Aftrek
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Selecteer eerst een groep knooppunt.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Selecteer eerst een groep knooppunt.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Werknemer en Aanwezigheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Doel moet één zijn van {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Verwijder referentie van de klant, leverancier, sales partner en lood, want het is uw bedrijfsadres"
@@ -2565,13 +2639,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Van {1}
 DocType: Task,depends_on,hangt af van
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Volgende Date moet groter zijn dan Posting Date
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Toon tax break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Verloop- / Referentie Datum kan niet na {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is niet op voorraad
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Volgende Date moet groter zijn dan Posting Date
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Factuur Boekingsdatum
@@ -2586,7 +2661,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2600,7 +2675,7 @@
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2610,7 +2685,7 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact E-mail
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
@@ -2621,7 +2696,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
@@ -2630,11 +2705,12 @@
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Van Vrachtbrief
 DocType: Time Log,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Tarief
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,intern
@@ -2642,7 +2718,7 @@
 DocType: Stock Entry,From BOM,Van BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
@@ -2650,17 +2726,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Salarisstructuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Kwestie Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Kwestie Materiaal
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citaten
 DocType: Hub Settings,Access Token,Toegang Token
 DocType: Sales Invoice Item,Serial No,Serienummer
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
-DocType: Item,Is Fixed Asset Item,Is Vast Activum
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
 DocType: Purchase Invoice,Print Language,Print Taal
 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"
+DocType: Asset,Number of Depreciations,Aantal Afschrijvingen
 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
@@ -2668,13 +2744,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Verzoek om Offertes
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximumfactuur Bedrag
 DocType: Purchase Invoice Item,Image View,Afbeelding Bekijken
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klanten
+DocType: Asset,Partially Depreciated,gedeeltelijk afgeschreven
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
@@ -2690,13 +2768,13 @@
 DocType: Quotation,Maintenance Manager,Maintenance Manager
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totaal kan niet nul zijn
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Gewijzigd Van
+DocType: Asset,Amended From,Gewijzigd Van
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2709,21 +2787,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Vermeld &#39;winst / verliesrekening op de verkoop van activa in Company
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Betalingen met Facturen
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Betalingen met Facturen
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,In winkelwagen
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Groeperen volgens
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,In- / uitschakelen valuta .
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,In- / uitschakelen valuta .
 DocType: Production Planning Tool,Get Material Request,Krijg Materiaal Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portokosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Portokosten
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Totaal Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Accounting Statements
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Accounting Statements
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2743,15 +2822,16 @@
 DocType: C-Form,Invoices,Facturen
 DocType: Job Opening,Job Title,Functietitel
 DocType: Features Setup,Item Groups in Details,Artikelgroepen in Details
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 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 +32,Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
 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 +169,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: Item,Website Description,Website Beschrijving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Netto wijziging in het eigen vermogen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 ,Sales Register,Verkoopregister
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
@@ -2759,12 +2839,13 @@
 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
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Fout: {0}&gt; {1}
 DocType: Item,Attributes,Attributen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Voer Afschrijvingenrekening in
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Laatste Bestel Date
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Account {0} niet behoort tot bedrijf {1}
 DocType: C-Form,C-Form,C-Form
@@ -2776,18 +2857,18 @@
 DocType: Purchase Invoice,Mobile No,Mobiel nummer
 DocType: Payment Tool,Make Journal Entry,Maak Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Nieuwe Verloven Toegewezen
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,commercieel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Fout: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Alle producten of diensten.
 DocType: Supplier Quotation,Supplier Address,Adres Leverancier
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Waarde voor Attribute {0} moet binnen het bereik van {1} tot {2} zijn, in stappen van {3}"
@@ -2798,10 +2879,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Verplaatsen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Verplaatsen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date is verplicht
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
@@ -2821,20 +2902,22 @@
 DocType: GL Entry,Remarks,Opmerkingen
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Stuur Leverancier Emails
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Installatie record voor een Serienummer
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Log is gefactureerd
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series voor {0} via Setup&gt; Instellingen&gt; Naming Series
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Voorlopige winst / verlies (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Stel standaard waarde {0} in Company {1}
@@ -2844,12 +2927,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve setup nummering serie voor Attendance via Setup&gt; Numbering Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Krijg Items uit Product Bundle
+DocType: Asset,Straight Line,Rechte lijn
+DocType: Project User,Project User,project Gebruiker
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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
@@ -2863,39 +2947,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Onderliggende toevoegen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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
 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/report/stock_balance/stock_balance.py +47,Opening Value,opening Value
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Commissie op de verkoop
 DocType: Offer Letter Term,Value / Description,Waarde / Beschrijving
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
 DocType: Tax Rule,Billing Country,Land
 ,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 +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representatiekosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Representatiekosten
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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,Factuurbedrag
 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 +60,Applications for leave.,Aanvragen voor verlof.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Juridische Kosten
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Geen Artikel met Serienummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,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/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Directe Kosten
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} is een ongeldig e-mailadres in 'Kennisgeving \ e-mailadres'
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
@@ -2912,7 +2997,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Wij verkopen dit artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverancier Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Contact Omschr
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
@@ -2923,11 +3008,12 @@
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle contactpersonen.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Leverancier van vermogensbeheer {0} komt niet overeen met de leverancier in de aankoopfactuur
 DocType: Newsletter,Test Email Id,Test E-mail ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Grondstof kan niet hetzelfde zijn als hoofdartikel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Salaris sjabloon stam .
@@ -2943,12 +3029,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Billing munt moet gelijk zijn aan valuta ofwel standaard comapany of partij payble rekening valuta
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretaresse
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Als uitschakelen, &#39;In de woorden&#39; veld niet zichtbaar in elke transactie"
@@ -2958,13 +3045,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Deze Tijd Log Batch is geannuleerd.
 ,Reqd By Date,Benodigd op datum
 DocType: Salary Slip Earning,Salary Slip Earning,Salarisstrook Inkomen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Crediteuren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Crediteuren
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Rij # {0}: Serienummer is verplicht
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelgebaseerde BTW Details
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Geplande evenementen
@@ -2985,15 +3072,14 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Vul Standaard eenheid in
-DocType: Project,Project Name,Naam van het project
+DocType: Request for Quotation Item,Project Name,Naam van het project
 DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
 DocType: Features Setup,Item Batch Nos,Artikel Batchnummers
@@ -3023,6 +3109,7 @@
 DocType: Sales Invoice,End Date,Einddatum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transactions
 DocType: Employee,Internal Work History,Interne Werk Geschiedenis
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Cumulatieve afschrijvingen Bedrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
@@ -3030,7 +3117,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Company is verplicht, want het is uw bedrijfsadres"
 DocType: Item Attribute,From Range,Van Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Artikel {0} genegeerd omdat het niet een voorraadartikel is
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Dien deze productieorder in voor verdere verwerking .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Dien deze productieorder in voor verdere verwerking .
 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.","Om de prijsbepalingsregel in een specifieke transactie niet toe te passen, moeten alle toepasbare prijsbepalingsregels worden uitgeschakeld."
 DocType: Company,Domain,Domein
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -3042,6 +3129,7 @@
 DocType: Time Log,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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
@@ -3058,6 +3146,7 @@
 DocType: Sales Order,Delivery Date,Leveringsdatum
 DocType: Opportunity,Opportunity Date,Datum opportuniteit
 DocType: Purchase Receipt,Return Against Purchase Receipt,Terug Tegen Aankoop Receipt
+DocType: Request for Quotation Item,Request for Quotation Item,Offerte Item
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Besteld
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,stukwerk
@@ -3072,11 +3161,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} is niet ingesteld voor serienummers. Kolom moet leeg zijn
 DocType: Accounts Settings,Accounts Settings,Rekeningen Instellingen
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Stel &#39;Asset Verwijdering Account&#39; in Company {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Fabriek en Machinepark
 DocType: Sales Partner,Partner's Website,Website partner
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Tijdelijke Accounts
 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
@@ -3085,21 +3175,22 @@
 DocType: Pricing Rule,Disable,Uitschakelen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klik hier om te betalen
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan niet worden gesloopt, want het is al {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Afwezig
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Items uit voegen
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Items uit voegen
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","bijv. ""MB"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazijn {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3114,6 +3205,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} is uitgeschakeld
 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
@@ -3125,7 +3217,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Gateway accounts.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Gateway accounts.
 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
 ,Cash Flow,Geldstroom
@@ -3139,7 +3231,7 @@
 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 +132,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Bankafschrift saldo per General Ledger
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
 DocType: Authorization Rule,Customer / Item Name,Klant / Naam van het punt
@@ -3155,19 +3247,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Gelieve te specificeren van / naar variëren
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
 DocType: BOM Replace Tool,Current BOM,Huidige Stuklijst
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Voeg Serienummer toe
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantie
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Kantoorartikelen
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groeperingsnode
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Bijwerken Gereed Product
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Bijwerken Gereed Product
 DocType: Workstation,per hour,per uur
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,inkoop
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Betaald bedrag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
@@ -3197,7 +3288,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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."
 DocType: Leave Block List,Applies to Company,Geldt voor Bedrijf
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
 DocType: Purchase Invoice,In Words,In Woorden
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiaal Aanvraag voor magazijn
@@ -3210,9 +3301,11 @@
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,toetreden
 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 +564,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
+DocType: Pricing Rule,Margin Rate or Amount,Margin Rate of Bedrag
 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
@@ -3222,7 +3315,7 @@
 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 +782,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3230,14 +3323,13 @@
 DocType: Customer,Sales Team Details,Verkoop Team Details
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Ongeldige {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series voor {0} via Setup&gt; Instellingen&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Warenhuizen
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Oplaadbare
 DocType: Company,Change Abbreviation,Verandering Afkorting
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
@@ -3255,14 +3347,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Grootboek
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Bekijk Leads
 DocType: Item Attribute Value,Attribute Value,Eigenschap Waarde
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail ID moet uniek zijn, bestaat al voor {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-mail ID moet uniek zijn, bestaat al voor {0}"
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Stel een standaard Holiday-lijst voor Employee {0} of Company {0}
 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>
@@ -3294,23 +3387,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
 ,Project wise Stock Tracking,Projectgebaseerde Aandelenhandel
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Onderhoudsschema {0} bestaat tegen {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Onderhoudsschema {0} bestaat tegen {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Werkelijke Aantal (bij de bron / doel)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Werknemer regel.
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Plaats bestelling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan niet een bovenliggende kostenplaats hebben
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecteer merk ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Toepasselijk
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Magazijn is verplicht
 DocType: Supplier,Address and Contacts,Adres en Contacten
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3328,7 +3421,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transactie valuta moet hetzelfde zijn als Payment Gateway valuta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Ontvangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3336,14 +3429,14 @@
 DocType: Purchase Invoice,Submit on creation,Toevoegen aan de creatie
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren verklaren, omdat Offerte is gemaakt."
 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 +137,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mijn Bestellingen
@@ -3364,10 +3457,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Leningen zonder onderpand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplande Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Totale betaalde Amt
@@ -3379,11 +3472,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Leverancier Part No
 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
@@ -3392,12 +3486,12 @@
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Van {0} voor {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
 DocType: Payment Reconciliation,From Invoice Date,Na factuurdatum
@@ -3406,7 +3500,7 @@
 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 +351,'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 +356,'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
@@ -3419,7 +3513,7 @@
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
@@ -3433,15 +3527,15 @@
 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 +576,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Project activiteit / taak.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstroken
 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: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3461,8 +3555,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Jaar begindatum of einddatum overlapt met {0}. Om te voorkomen dat stel bedrijf
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nieuw Nieuwsbrief
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Voorbeeld: ABCD.##### Als reeks is ingesteld en het serienummer is niet vermeld in een transactie, dan zal een serienummer automatisch worden aangemaakt, op basis van deze reeks. Als u altijd expliciet een serienummer wilt vemelden voor dit artikel bij een transatie, laat dan dit veld leeg."
 DocType: Upload Attendance,Upload Attendance,Upload Aanwezigheid
@@ -3473,11 +3568,11 @@
 ,Sales Analytics,Verkoop analyse
 DocType: Manufacturing Settings,Manufacturing Settings,Productie Instellingen
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Het opzetten van e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Vul de standaard valuta in in Bedrijfsstam
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Vul de standaard valuta in in Bedrijfsstam
 DocType: Stock Entry Detail,Stock Entry Detail,Voorraadtransactie Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daily Reminders
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nieuwe Rekening Naam
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Klantenservice
@@ -3487,11 +3582,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Percentage
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn
 DocType: Naming Series,Update Series Number,Serienummer bijwerken
 DocType: Account,Equity,Vermogen
 DocType: Sales Order,Printing Details,Afdrukken Details
@@ -3499,11 +3595,12 @@
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
 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 +385,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Werkelijk
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 de Fondsen&gt; Kortlopende verplichtingen&gt; Belastingen en plichten en maak een nieuwe account (door te klikken op Toevoegen Kind) van het type &quot;Tax&quot; en doe noemen het belastingtarief.
 DocType: Production Order,Production Order,Productieorder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
 DocType: Quotation Item,Against Docname,Tegen Docname
@@ -3522,18 +3619,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Production Order,Planned End Date,Geplande Einddatum
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Tax Rule,Validity,Geldigheid
+DocType: Request for Quotation,Supplier Detail,Leverancier Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Factuurbedrag
 DocType: Attendance,Attendance,Aanwezigheid
 apps/erpnext/erpnext/config/projects.py +55,Reports,rapporten
 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 +508,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
 ,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
@@ -3543,10 +3641,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratie Kosten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administratie Kosten
 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 +455,Change,Verandering
@@ -3554,6 +3652,7 @@
 DocType: Appraisal Goal,Score Earned,Verdiende Score
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
+DocType: Asset Category,Asset Category Name,Asset Categorie Naam
 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
@@ -3565,13 +3664,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Partij
@@ -3585,7 +3684,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Verkoper
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Begroting en Cost Center
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Begroting en Cost Center
 DocType: Maintenance Schedule Item,Half Yearly,Halfjaarlijkse
 DocType: Lead,Blog Subscriber,Blog Abonnee
 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.
@@ -3616,9 +3715,9 @@
 DocType: Purchase Common,Purchase Common,Inkoop Gemeenschappelijk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
 DocType: Sales Invoice,Is POS,Is POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3626,7 +3725,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factureren aan Klanten
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Bovenliggende rekening
@@ -3642,7 +3741,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
 DocType: Address,Office,Kantoor
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
@@ -3657,6 +3756,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Korting en Marge
 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: Deduction Type,Deduction Type,Aftrek Type
 DocType: Attendance,Half Day,Halve dag
@@ -3677,7 +3777,7 @@
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
@@ -3685,22 +3785,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Betaling URL Bericht
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Totaal Onbetaalde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Tijd Log is niet factureerbaar
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
+DocType: Asset,Asset Category,Asset Categorie
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiaal aan Leverancier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Accijnzen Factuur
 DocType: Expense Claim,Employees Email Id,Medewerkers E-mail ID
 DocType: Employee Attendance Tool,Marked Attendance,Gemarkeerde Attendance
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortlopende Schulden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kortlopende Schulden
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Werkelijke aantal is verplicht
@@ -3721,17 +3822,16 @@
 DocType: Item Attribute,Numeric Values,Numerieke waarden
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Bevestig Logo
 DocType: Customer,Commission Rate,Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok verlaten toepassingen per afdeling.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Winkelwagen is leeg
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Geen standaard Address Template gevonden. Maak een nieuwe Setup&gt; Afdrukken en Branding&gt; Address Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapitaal Stock
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Account
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Na betaling voltooiing omleiden gebruiker geselecteerde pagina.
@@ -3740,20 +3840,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
+DocType: Asset,Current Value (After Depreciation),Current Value (na afschrijvingen)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Stuklijst
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Date
@@ -3761,6 +3862,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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.
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 54e4315..3969278 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Leide
 DocType: POS Profile,Applicable for User,Gjelder for User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Employee Naming System i Human Resource&gt; HR-innstillinger
 DocType: Purchase Order,Customer Contact,Kundekontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} treet
 DocType: Job Applicant,Job Applicant,Jobbsøker
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Vis åpen
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serien er oppdatert
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,New La Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Vis Varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Antall
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (gjeld)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Betegnelse
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},New {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Sales Partners Commission
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
 DocType: Payment Request,Payment Request,Betaling Request
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tillatt for {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitetsloggen:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
+DocType: Item,Is Fixed Asset,Er Fast Asset
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,All kontakt
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Aksje Utgifter
 DocType: Newsletter,Email Sent?,E-post sendt?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Logger
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Installasjon Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Elementet {0} må være et kjøp varen
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Skriv inn Firma
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Netto kontantstrøm fra finansierings
 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 +217,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Abonnenter
 ,Contact Name,Kontakt Navn
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 DocType: Payment Tool,Reference No,Referansenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Varsling kontroll
 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-messig budsjetter på dette territoriet. Du kan også inkludere sesongvariasjoner ved å sette Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Skriv inn forelder kontogruppe for lageret {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Skriv inn forelder kontogruppe for lageret {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Lære
+DocType: Asset,Next Depreciation Date,Neste Avskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per Employee
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Administrer Sales Person treet.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheter av [{1}] (# Form / post / {1}) finnes i [{2}] (# Form / Lager / {2})
 DocType: Lead,Industry,Industry
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Nyhetsbrev
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Sette opp skatter
 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 +381,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Velg måned og år
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Velg element
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Sak Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,La Godkjenner Name
-,Schedule Date,Schedule Date
+DocType: Depreciation Schedule,Schedule Date,Schedule Date
 DocType: Packed Item,Packed Item,Pakket Element
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Standardinnstillingene for å kjøpe transaksjoner.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardinnstillingene for å kjøpe transaksjoner.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Kostnad finnes for Employee {0} mot 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.,Vennligst ikke opprette kontoer for kunder og leverandører. De er laget direkte fra kunde / leverandør mestere.
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
@@ -346,6 +353,7 @@
 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
+DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
 DocType: Workstation,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
-DocType: Material Request Item,Required Date,Nødvendig Dato
+DocType: Request for Quotation Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Beskjed til Leverandør
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
 DocType: Employee,Health Concerns,Helse Bekymringer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ubetalte
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Administrerende Underleverandører
+DocType: Project,Project will be accessible on the website to these users,Prosjektet vil være tilgjengelig på nettstedet til disse brukerne
 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 +53,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Tilveksten kan ikke være 0
 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 +86,Item {0} is not Purchase Item,Element {0} er ikke kjøpe varen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Element {0} er ikke kjøpe varen
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Venter Stk
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Finansiell / regnskap år.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,akkumulerte verdier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Levering: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Fortsett Vedlegg
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Sales Return
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Lønn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Oppdater Banktransaksjons Datoer
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Oppdater Banktransaksjons Datoer
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Skriv inn Kjøpskvittering først
 DocType: Buying Settings,Supplier Naming By,Leverandør Naming Av
 DocType: Activity Type,Default Costing Rate,Standard Koster Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Vedlikeholdsplan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Netto endring i varelager
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Still et Holiday liste for enten den ansatte eller selskapet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,avskrivninger Beløp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Konverter til konsernet
 DocType: Activity Cost,Activity Type,Aktivitetstype
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløp
 DocType: Supplier,Fixed Days,Faste Days
 DocType: Quotation Item,Item Balance,Sak Balance
 DocType: Sales Invoice,Packing List,Pakkeliste
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Innkjøpsordrer gis til leverandører.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Innkjøpsordrer gis til leverandører.
 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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operation Tid
 DocType: Pricing Rule,Sales Manager,Salgssjef
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Gruppe til gruppe
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Mine prosjekter
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
 DocType: Journal Entry,Bill No,Bill Nei
+DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / tap-konto på Asset Avhending
 DocType: Purchase Invoice,Quarterly,Quarterly
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Betaling Entry er allerede opprettet
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Total fakturering i år
 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 +529,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Kunde Group&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
 DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Det er en feil i adresse Mal {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Ny Konto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Ny Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {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.,Regnskaps Oppføringer kan gjøres mot bladnoder. Føringer mot grupper er ikke tillatt.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen ansatte funnet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Last opp lagersaldo via csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send Nå
 ,Support Analytics,Støtte Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logisk feil: Må finne overlapp
 DocType: Item,Website Warehouse,Nettsted Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form poster
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form poster
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kunde og leverandør
 DocType: Email Digest,Email Digest Settings,E-post Digest Innstillinger
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Støtte henvendelser fra kunder.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Er underleverandør
 DocType: Item Attribute,Item Attribute Values,Sak attributtverdier
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Valutakursen mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Salgs Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} må være aktiv
+DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto vognen
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Fakturaen
+DocType: Asset,Purchase Invoice,Fakturaen
 DocType: Stock Ledger Entry,Voucher Detail No,Kupong Detail Ingen
 DocType: Stock Entry,Total Outgoing Value,Total Utgående verdi
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Lead Tid Dato
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;Produkt Bundle&#39; elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra &quot;Pakkeliste&quot; bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen &quot;Product Bundle &#39;elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til&quot; Pakkeliste &quot;bord."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;Produkt Bundle&#39; elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra &quot;Pakkeliste&quot; bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen &quot;Product Bundle &#39;elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til&quot; Pakkeliste &quot;bord."
 DocType: Job Opening,Publish on website,Publiser på nettstedet
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunder.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Indirekte inntekt
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Still Betalingsbeløp = utestående beløp
 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 +672,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Velg elementet for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatt Prosent
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rad {0}: Faktura {1} er ugyldig, kan det bli kansellert / finnes ikke. \ Vennligst skriv inn en gyldig faktura"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
 ,Employee Holiday Attendance,Medarbeider Holiday Oppmøte
 DocType: Opportunity,Walk In,Gå Inn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Aksje Entries
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Aksje Entries
 DocType: Item,Inspection Criteria,Inspeksjon Kriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Gjøre
 DocType: Journal Entry,Total Amount in Words,Totalbeløp 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.,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 +5,My Cart,Handlekurv
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 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 +180,Qty for {0},Antall for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
+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 +80,Leave Allocation Tool,La Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 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 +547,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Kvitteringen Element
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selge Beløp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Tid Logger
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Tid Logger
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,skrotet
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
 DocType: BOM Operation,Operation,Operasjon
 DocType: Lead,Organization Name,Organization Name
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Salgs Utgifter
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt 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,oppdatert via Tid Logger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Angi utpeking av denne kontakten
 DocType: Expense Claim,From Employee,Fra Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Bidrag%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Global Defaults
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
 DocType: Salary Slip,Deductions,Fradrag
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Logg Batch har blitt fakturert.
 DocType: Salary Slip,Leave Without Pay,La Uten Pay
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapasitetsplanlegging Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Inntjeningen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åpning Regnskap Balanse
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ingenting å be om
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Typer aktiviteter for timelister
@@ -935,18 +958,18 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Vennligst sett Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Vennligst sett Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres 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 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/config/buying.py +33,Supplier database.,Leverandør database.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Skatt og andre lønnstrekk.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Ferie
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-skjemaet er ikke aktuelt for faktura: {0}
 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
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
 DocType: Contact,User ID,Bruker-ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Vis Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,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 +431,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Utbytte betalt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Utbytte betalt
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Regnskap Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskjellen Beløp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Opptjent egenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Opptjent egenkapital
 DocType: BOM Item,Item Description,Element Beskrivelse
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Er Recurring
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Midlertidig Åpning
 ,Employee Leave Balance,Ansatt La Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Leverandørgjeld Sammendrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Konto hodet {0} opprettet
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Oppnådd Total
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Landbruk
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 apps/erpnext/erpnext/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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Selger Hjemmeside
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produksjonsordrestatus er {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produksjonsordrestatus er {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,For Leverandør
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Fant ikke noe element som heter {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Website varegrupper
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
-DocType: Journal Entry,Journal Entry,Journal Entry
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Forespørsel om prisanslag Leverandør
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Tilbakevendende Opp
 DocType: Attendance,HR Manager,HR Manager
@@ -1082,6 +1109,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Appraisal Mal Goal
 DocType: Salary Slip,Earning,Tjene
 DocType: Payment Tool,Party Account Currency,Partiet konto Valuta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Nåværende verdi etter avskrivninger må være mindre enn eller lik {0}
 ,BOM Browser,BOM Nettleser
 DocType: Purchase Taxes and Charges,Add or Deduct,Legge til eller trekke fra
 DocType: Company,If Yearly Budget Exceeded (for expense account),Hvis Årlig budsjett Skredet (for regning)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Start- og sluttdato
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
 DocType: Address,Utilities,Verktøy
 DocType: Purchase Invoice Item,Accounting,Regnskap
 DocType: Features Setup,Features Setup,Funksjoner Setup
+DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
 DocType: Item,Is Service Item,Er Tjenesten Element
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 DocType: Payment Request,Transaction Currency,transaksjonsvaluta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Fra {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operasjon Beskrivelse
 DocType: Item,Will also apply to variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke endre regnskapsåret Startdato og regnskapsår sluttdato når regnskapsåret er lagret.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke endre regnskapsåret Startdato og regnskapsår sluttdato når regnskapsåret er lagret.
 DocType: Quotation,Shopping Cart,Handlevogn
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gjennomsnittlig Daily Utgående
 DocType: Pricing Rule,Campaign,Kampanje
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Netto endring i Fixed Asset
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
 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 +472,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,kan ikke være større enn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Skatteregel for transaksjoner.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Skatteregel for transaksjoner.
 DocType: Rename Tool,Type of document to rename.,Type dokument for å endre navn.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Vi kjøper denne varen
 DocType: Address,Billing,Billing
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assemblies
+DocType: Asset,Asset Name,Asset Name
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Pakkseddel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontor Leie
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Forespørsel om tilbud kan være tilgang ved å klikke på følgende link
+DocType: Asset,Number of Months in a Period,Antall måneder i en periode
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regjeringen
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
 DocType: Sales Invoice,Source,Source
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Vis stengt
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Regnskapsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kontantstrøm fra investerings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Item Group,Item Group Name,Sak Gruppenavn
 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 +86,Transfer Materials for Manufacture,Transfer Materialer for produksjon
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transfer Materialer for produksjon
 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 +406,"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."
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opprett ny konto fra kontoplanen.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Vedlikehold Visit
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Vedlikehold Visit
 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: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjelp
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Brand mester.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Eske
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Krav på bekostning av selskapet.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,andre rapporter
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto endring i kontanter
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Antall må ikke være mer enn {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Foregående regnskapsår er ikke stengt
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Leverandør Type mester.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
 DocType: Purchase Invoice,Reference Document,Reference Document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturert
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto endring i leverandørgjeld
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bekreft e-id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden nødvendig for &#39;Customerwise Discount&#39;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
 DocType: Quotation,Term Details,Term Detaljer
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasitetsplanlegging For (dager)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garantikrav
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Permanent Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance betalt mot {0} {1} kan ikke være større \ enn Totalsum {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Velg elementet kode
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Velg elementet kode
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduser Fradrag for permisjon uten lønn (LWP)
 DocType: Territory,Territory Manager,Distriktssjef
 DocType: Packed Item,To Warehouse (Optional),Til Warehouse (valgfritt)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Enkelt enhet av et element.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",f.eks &quot;XYZ National Bank&quot;
+DocType: Asset,Depreciation Method,avskrivningsmetode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
 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 +29,Shopping Cart is enabled,Handlevogn er aktivert
 DocType: Job Applicant,Applicant for a Job,Kandidat til en jobb
 DocType: Production Plan Material Request,Production Plan Material Request,Produksjonsplan Material Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Ingen produksjonsordrer som er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produksjonsordrer som er opprettet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
 DocType: Territory,Territory Name,Territorium Name
-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 Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresser
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresser
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,medarbeidersamtaler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Varen er ikke lov til å ha produksjonsordre.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Varen er ikke lov til å ha produksjonsordre.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
 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: 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 +27,Time Logs for manufacturing.,Tid Logger for industrien.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tid Logg for oppgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Forbinder
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
+DocType: Request for Quotation Supplier,Send Email to Supplier,Send e-post til Leverandør
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 DocType: Packing Slip,To Package No.,Å pakke No.
 DocType: Production Planning Tool,Material Requests,material~~POS=TRUNC Forespørsler
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Fradrag Prosent
 DocType: SMS Settings,Message Parameter,Melding Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tre av finansielle kostnadssteder.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tre av finansielle kostnadssteder.
 DocType: Serial No,Delivery Document No,Levering Dokument nr
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra innkjøps Receipts
 DocType: Serial No,Creation Date,Dato opprettet
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Beløp å levere
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} opprettet
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
 ,Serial No Status,Serial No Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Sak bordet kan ikke være tomt
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Slik stiller {1} periodisitet, forskjellen mellom fra og til dato \ må være større enn eller lik {2}"
 DocType: Pricing Rule,Selling,Selling
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Skatter og avgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Betaling Gateway-konto er ikke konfigurert
 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: Production Order,Material Request Item,Materialet Request Element
+DocType: Request for Quotation Item,Material Request Item,Materialet Request Element
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,selges
 ,Item-wise Purchase History,Element-messig Purchase History
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Installasjon Tid
 DocType: Sales Invoice,Accounting Details,Regnskap Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Slett alle transaksjoner for dette selskapet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
 DocType: Quality Inspection Reading,Acceptance Criteria,Akseptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
 DocType: Item Attribute,Attribute Name,Attributt navn
 DocType: Item Group,Show In Website,Show I Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Gruppe
@@ -1527,6 +1567,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt diagram av alle oppgaver.
+DocType: Pricing Rule,Margin Type,margin Type
 DocType: Appraisal,For Employee Name,For Employee Name
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Merker
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset er obligatorisk mot et driftsmiddel Element
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummerering serie for Oppmøte via Setup&gt; Numbering Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 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: Asset,Purchase Date,Kjøpsdato
 DocType: Employee,Personal Details,Personlig Informasjon
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett &#39;Asset Avskrivninger kostnadssted &quot;i selskapet {0}
 ,Maintenance Schedules,Vedlikeholdsplaner
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkluder forsonet Entries
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe til Non-gruppe
 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/public/js/setup_wizard.js +272,Unit,Enhet
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Vennligst oppgi selskapet
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Regninger
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukking (Åpning + Totals)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 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
 DocType: Territory,Classification of Customers by region,Klassifisering av kunder etter region
 DocType: Project,% Tasks Completed,% Oppgaver Fullført
 DocType: Project,Gross Margin,Bruttomargin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Skriv inn Produksjon varen først
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Skriv inn Produksjon varen først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Beregnet kontoutskrift balanse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Sitat
 DocType: Salary Slip,Total Deduction,Total Fradrag
 DocType: Quotation,Maintenance User,Vedlikehold Bruker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kostnad Oppdatert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Employee Naming System i Human Resource&gt; HR-innstillinger
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Antall
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
+DocType: Request for Quotation,Manufacturing Manager,Produksjonssjef
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Forsendelser
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Bruker {0} er deaktivert
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Salgsordre kreves for Element {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset",Row # {0}: Antall må være en som element er knyttet til en eiendel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Varen bør ikke være et produkt Bundle. Vennligst fjern element `{0}` og lagre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,New kostnadssted
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 avgifter, og opprette en ny konto (ved å klikke på Legg Child) av type &quot;Tax&quot; og gjøre nevne skattesatsen."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,New kostnadssted
 DocType: Bin,Ordered Quantity,Bestilte Antall
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
 DocType: Quality Inspection,In Process,Igang
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Tid Logger opprettet:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Tid Logger opprettet:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Employee,Blood Group,Blodgruppe
@@ -1691,13 +1738,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debet Å kreves
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 DocType: Offer Letter Term,Offer Term,Tilbudet Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Avstemming
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Vennligst velg Incharge persons navn
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Vennligst velg Incharge persons navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
@@ -1705,22 +1752,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Prisliste {0} er deaktivert
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prisliste {0} er deaktivert
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Item,Customer Item Codes,Kunden element Codes
 DocType: Opportunity,Lost Reason,Mistet Reason
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Lag Betalings Entries mot bestillinger eller fakturaer.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Lag Betalings Entries mot bestillinger eller fakturaer.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønn slip funnet for måned:
 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 +175,Serial No {0} not found,Serial No {0} ikke funnet
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} ikke funnet
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Dine kunder
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
 DocType: Leave Block List Date,Block Date,Block Dato
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Søk nå
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Søk nå
 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."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Sysselsetting Detaljer
 DocType: Employee,New Workplace,Nye arbeidsplassen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Sett som Stengt
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ingen Element med Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ingen Element med Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan 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 merkes og vedlikeholde sitt bidrag i salgsaktivitet
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Material
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Element {0} må være en Sales element i {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Vennligst sett gjentakende etter lagring
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Lag Lønn Slip
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import E-post fra
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Inviter som User
 DocType: Features Setup,After Sale Installations,Etter kjøp Installasjoner
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Vennligst sett {0} i selskapet {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} er fullt fakturert
 DocType: Workstation Working Hour,End Time,Sluttid
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktsvilkår for salg eller kjøp.
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Sales Invoice,Mass Mailing,Masseutsendelse
 DocType: Rename Tool,File to Rename,Filen til Rename
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Akseptert
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Hurtig Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ikke er sendt
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Nyhetsbrev postliste
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorisert Verdi
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} er stengt
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Current Stock
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den aktuelle gruppen (vanligvis anvendelse av midler&gt; Omløpsmidler&gt; bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av type &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
 DocType: Production Order,Actual End Date,Selve sluttdato
 DocType: Authorization Rule,Applicable To (Role),Gjelder til (Role)
 DocType: Stock Entry,Purpose,Formålet
+DocType: Company,Fixed Asset Depreciation Settings,Fast Asset Avskrivninger Innstillinger
 DocType: Item,Will also apply for variants unless overrridden,Vil også gjelde for varianter med mindre overrridden
 DocType: Purchase Invoice,Advances,Fremskritt
 DocType: Production Order,Manufacture against Material Request,Produksjon mot Material Request
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
 DocType: Campaign,Campaign-.####,Kampanje -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Antall
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den aktuelle gruppen (vanligvis anvendelse av midler&gt; Omløpsmidler&gt; bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av type &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen ansatte for de oven valgte kriterier ELLER lønn slip allerede opprettet
@@ -1972,7 +2024,7 @@
 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 +200,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;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,lønn
 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"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
 DocType: Account,Income Account,Inntekt konto
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett&gt; Trykking og merkevarebygging&gt; Adressemal.
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,New kostnadssted Navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
-apps/erpnext/erpnext/config/support.py +7,Issues,Problemer
+apps/erpnext/erpnext/hooks.py +90,Issues,Problemer
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status må være en av {0}
 DocType: Sales Invoice,Debit To,Debet Å
 DocType: Delivery Note,Required only for sample item.,Kreves bare for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Resultatregnskap
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
 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 +139,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
 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 +142,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
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Spurt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nei Anmerkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fast Asset varen må være et ikke-lagervare
 DocType: Supplier Quotation Item,Material Request No,Materialet Request Ingen
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2119,7 +2174,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Payment Request,Recipient and Message,Mottaker og melding
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Velg Leverandør Adresse
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Demp Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Forespørsel om kostnadsoverslag.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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 totalsummen ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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 totalsummen ({2})
 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 +294,Price List Currency not selected,Prisliste Valuta ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Mot Dokument nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Administrer Salgs Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksjon Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Vennligst velg {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Umerket Oppmøte
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekreftet
 DocType: Payment Gateway,Gateway,Inngangsport
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Skriv inn lindrende dato.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Å finne kursen for {0} klarer {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Å finne kursen for {0} klarer {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
 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 +410,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serial No {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (valgfritt)
 DocType: Pricing Rule,Discount Percentage,Rabatt Prosent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
@@ -2247,14 +2305,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Velg type transaksjon
 DocType: GL Entry,Voucher No,Kupong Ingen
 DocType: Leave Allocation,Leave Allocation,La Allocation
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Mal av begreper eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
+DocType: Asset,Expected Value After Useful Life,Forventet verdi Etter Levetid
 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
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} er kansellert eller lukket
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette følgeseddel mot ethvert prosjekt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Netto kontantstrøm fra investerings
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root-kontoen kan ikke slettes
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} må fremlegges
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Administrer Adresser
-DocType: Pricing Rule,Item Code,Sak Kode
+DocType: Asset,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
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
 DocType: Employee Education,School/University,Skole / universitet
 DocType: Payment Request,Reference Details,Referanse Detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
 ,Billed Amount,Fakturert beløp
+DocType: Asset,Double Declining Balance,Dobbel degressiv
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Stengt for kan ikke avbestilles. Unclose å avbryte.
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Få oppdateringer
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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;
+DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serial No og Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Deaktiver I Ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Kassekreditt konto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Sak Kode&gt; Element Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Sikret lån
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vennligst sett Avskrivninger relatert kontoer i Asset Kategori {0} eller selskapet {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Åpningsbalanse Equity
 DocType: Appraisal,Appraisal,Appraisal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-post sendt til leverandøren {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gjentas
 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 +187,Leave approver must be one of {0},La godkjenner må være en av {0}
@@ -2344,7 +2410,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Workstation Working Hour,Start Time,Starttid
 DocType: Item Price,Bulk Import Help,Bulk Import Hjelp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Velg Antall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Velg Antall
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkjenne Role kan ikke være det samme som rollen regelen gjelder for
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Melding Sendt
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Total Margin
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Expense Claim,Approval Status,Godkjenningsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiser varer i Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
 DocType: Payment Gateway Account,Default Payment Request Message,Standard betalingsforespørsel Message
 DocType: Item Group,Check this if you want to show in website,Sjekk dette hvis du vil vise på nettstedet
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bank og Betalinger
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bank og Betalinger
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blader og Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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å.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløp
 DocType: Time Log,Batched for Billing,Dosert for Billing
@@ -2419,15 +2486,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Kjøpsdato eiendel {0} samsvarer ikke med kjøp Fakturadato
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Skyldnere ({0})
-DocType: Project,Margin,Margin
+DocType: Pricing Rule,Margin,Margin
 DocType: Salary Slip,Arrear Amount,Etterskudd Beløp
 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 +72,Gross Profit %,Bruttofortjeneste%
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
 DocType: Newsletter,Newsletter List,Nyhetsbrev List
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Sjekk om du ønsker å sende lønn slip i posten til hver ansatt under innsending lønn slip
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
 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 +57,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
 DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
 DocType: Employee,Confirmation Date,Bekreftelse Dato
 DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
 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: Account,Accumulated Depreciation,akkumulerte avskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
 DocType: Payment Request,Email To,E-post til
 DocType: Lead,Lead Owner,Lead Eier
 DocType: Bin,Requested Quantity,Requested Antall
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Warehouse er nødvendig
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Leveres
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Leveres
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Samme leverandør er angitt flere ganger
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Innkjøpsordre Sak Leveres
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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.
 DocType: Payment Request,Payment Details,Betalingsinformasjon
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Bilagsregistrering for Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Registrering av all kommunikasjon av typen e-post, telefon, chat, besøk, etc."
 DocType: Manufacturer,Manufacturers used in Items,Produsenter som brukes i Items
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Opprett ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Valuta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønn Slip Fradrag
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Velg en gruppe node først.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Velg en gruppe node først.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbeider og oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Hensikten må være en av {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern referanse av kunde, leverandør, salg partner og bly, som det er et selskap adresse"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
 DocType: Task,depends_on,kommer an på
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Neste dato må være større enn konteringsdato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Vis skatt break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / post / {0}) er utsolgt
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Neste dato må være større enn konteringsdato
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Publiseringsdato
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Fast Asset konto
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,Fra BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Lønn Struktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sitater
 DocType: Hub Settings,Access Token,Tilgang Token
 DocType: Sales Invoice Item,Serial No,Serial No
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
-DocType: Item,Is Fixed Asset Item,Er Fixed Asset Element
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
 DocType: Purchase Invoice,Print Language,Print Språk
 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"
+DocType: Asset,Number of Depreciations,Antall Avskrivninger
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Forespørsel om Sitater
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Fakturert beløp
 DocType: Purchase Invoice Item,Image View,Bilde Vis
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
+DocType: Asset,Partially Depreciated,delvis Avskrives
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Vedlikeholdsbehandling
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan ikke være null
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Endret Fra
+DocType: Asset,Amended From,Endret Fra
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Vennligst oppgi &#39;Gevinst / tap-konto på Asset Deponering &quot;i selskapet
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Betalinger med Fakturaer
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Betalinger med Fakturaer
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Legg til i handlevogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupper etter
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Aktivere / deaktivere valutaer.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 DocType: Production Planning Tool,Get Material Request,Få Material Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Post Utgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Sak Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Total Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,regnskaps~~POS=TRUNC Uttalelser
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,regnskaps~~POS=TRUNC Uttalelser
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
 DocType: Features Setup,Item Groups in Details,Varegrupper i detaljer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 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 +32,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
 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 +169,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: Item,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Netto endring i egenkapital
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Feil: {0}&gt; {1}
 DocType: Item,Attributes,Egenskaper
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Få Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Skriv inn avskrive konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Siste Order Date
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
 DocType: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Gjør Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Nye Leaves Avsatt
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Commercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Feil: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Alle produkter eller tjenester.
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Bemerkninger
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Send Leverandør e-post
 DocType: Features Setup,POS View,POS Vis
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Installasjon rekord for en Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Tid Logg har blitt fakturert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst sett Naming Series for {0} via Oppsett&gt; Innstillinger&gt; Naming Series
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Vennligst angi standardverdien {0} i selskapet {1}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummerering serie for Oppmøte via Setup&gt; Numbering Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+DocType: Asset,Straight Line,Rett linje
+DocType: Project User,Project User,prosjekt Bruker
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
 DocType: Features Setup,Sales Discounts,Salgs Rabatter
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Legg Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,åpning Verdi
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Underholdning Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Underholdning Utgifter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Søknader om permisjon.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Rettshjelp
 DocType: Sales Invoice,Posting Time,Postering Tid
 DocType: Sales Order,% Amount Billed,% Mengde Fakturert
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefon Utgifter
 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.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ingen Element med Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Element med Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Åpne Påminnelser
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte kostnader
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Direkte kostnader
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} er en ugyldig e-postadresse i &quot;Melding om \ e-postadresse &#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Vi selger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Mengden skal være større enn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Mengden skal være større enn 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blader som casual, syke etc."
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Total driftskostnader
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Leverandør av eiendelen {0} samsvarer ikke med leverandøren i fakturaen
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Lønn mal mester.
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Fakturering valuta må være lik enten standard comapany valuta eller partiets payble konto valuta
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Ord-feltet ikke vil være synlig i enhver transaksjon"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Logg Batch har blitt kansellert.
 ,Reqd By Date,Reqd etter dato
 DocType: Salary Slip Earning,Salary Slip Earning,Lønn Slip Tjene
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditorer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Serial No er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Skriv inn standard måleenhet
-DocType: Project,Project Name,Prosjektnavn
+DocType: Request for Quotation Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
 DocType: Features Setup,Item Batch Nos,Sak Batch Nos
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Sluttdato
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,aksje~~POS=TRUNC
 DocType: Employee,Internal Work History,Intern Work History
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumulerte avskrivninger beløp
 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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Selskapet er obligatorisk, så det er et selskap adresse"
 DocType: Item Attribute,From Range,Fra Range
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignorert siden det ikke er en lagervare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
 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 bruke Prissetting regel i en bestemt transaksjon, bør alle gjeldende reglene for prissetting deaktiveres."
 DocType: Company,Domain,Domene
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Leveringsdato
 DocType: Opportunity,Opportunity Date,Opportunity Dato
 DocType: Purchase Receipt,Return Against Purchase Receipt,Tilbake Against Kjøpskvittering
+DocType: Request for Quotation Item,Request for Quotation Item,Forespørsel om prisanslag Element
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkord
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} er ikke oppsett for Serial Nos. Kolonne må være tomt
 DocType: Accounts Settings,Accounts Settings,Regnskap Innstillinger
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Vennligst sett &#39;Asset Deponering konto &quot;i selskapet {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Maskiner og anlegg
 DocType: Sales Partner,Partner's Website,Partner rens nettsted
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Midlertidige kontoer
 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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Avventer omtale
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Klikk her for å betale
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan ikke bli vraket, som det er allerede {1}"
 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/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Legg elementer fra
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Legg elementer fra
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",f.eks &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Element {0} har blitt deaktivert
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Oppsett Gateway kontoer.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Oppsett Gateway kontoer.
 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
 ,Cash Flow,Cash Flow
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vedlagt {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
 DocType: Job Applicant,Applicant Name,Søkerens navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Navn
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Vennligst oppgi fra / til spenner
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Kunde Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
 DocType: BOM Replace Tool,Current BOM,Nåværende BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Legg Serial No
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garanti
 DocType: Production Order,Warehouses,Næringslokaler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stasjonær
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print og Stasjonær
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Oppdater ferdigvarer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Oppdater ferdigvarer
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,innkjøp
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Beløpet Betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
 DocType: Purchase Invoice,In Words,I Words
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,I dag er {0} s bursdag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialet Request For Warehouse
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {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 å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Bli med
 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 +564,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Salary Slip,Salary Slip,Lønn Slip
+DocType: Pricing Rule,Margin Rate or Amount,Margin Rate Beløp
 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
@@ -3165,7 +3258,7 @@
 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 +782,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensielle muligheter for å selge.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst sett Naming Series for {0} via Oppsett&gt; Innstillinger&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
@@ -3198,14 +3290,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,General Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vis Leads
 DocType: Item Attribute Value,Attribute Value,Attributtverdi
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-id må være unikt, finnes allerede for {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-id må være unikt, finnes allerede for {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {0}
 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>
@@ -3226,23 +3319,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
 ,Project wise Stock Tracking,Prosjektet klok Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Vedlikeholdsplan {0} finnes mot {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Vedlikeholdsplan {0} finnes mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske antall (ved kilden / target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbeider poster.
 DocType: Payment Gateway,Payment Gateway,Betaling Gateway
 DocType: HR Settings,Payroll Settings,Lønn Innstillinger
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Legg inn bestilling
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke ha en forelder kostnadssted
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Velg merke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transaksjons valuta må være samme som Payment Gateway valuta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Motta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Send inn på skapelse
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 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 +137,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mine bestillinger
@@ -3296,10 +3389,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikret lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
 DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Sum innskutt Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Leverandør varenummer
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Prosjektet aktivitet / oppgave.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
 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: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller sluttdato er overlappende med {0}. For å unngå vennligst sett selskap
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhetsbrev
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er satt og serienummer er ikke nevnt i transaksjoner, og deretter automatisk serienummer vil bli opprettet basert på denne serien. Hvis du alltid vil eksplisitt nevne Serial Nos for dette elementet. la dette stå tomt."
 DocType: Upload Attendance,Upload Attendance,Last opp Oppmøte
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Salgs Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Sette opp e-post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Daglige påminnelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Account Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Prosentdel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Elementet {0} må være en Sales Element
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
 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 +385,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
 DocType: Purchase Invoice,Against Expense Account,Mot regning
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 avgifter, og opprette en ny konto (ved å klikke på Legg Child) av type &quot;Tax&quot; og gjøre nevne skattesatsen."
 DocType: Production Order,Production Order,Produksjon Bestill
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
 DocType: Quotation Item,Against Docname,Mot Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Vellykket Forsonet
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Hvor varene er lagret.
 DocType: Tax Rule,Validity,Gyldighet
+DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturert beløp
 DocType: Attendance,Attendance,Oppmøte
 apps/erpnext/erpnext/config/projects.py +55,Reports,Reports
 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 +508,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrative utgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrative utgifter
 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 +455,Change,Endre
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Resultat tjent
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Category Name
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Parti
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budsjett og kostnadssted
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budsjett og kostnadssted
 DocType: Maintenance Schedule Item,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blogg Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Lage regler for å begrense transaksjoner basert på verdier.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Kjøp Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Sak Kode&gt; Element Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger hevet til kundene.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Parent konto
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Rabatt og Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Betaling URL Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Total Ubetalte
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Tid Log er ikke fakturerbar
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
+DocType: Asset,Asset Category,Asset Kategori
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiale til Leverandør
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Vesenet Faktura
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
 DocType: Employee Attendance Tool,Marked Attendance,merket Oppmøte
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortsiktig gjeld
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kortsiktig gjeld
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Selve Antall er obligatorisk
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Numeriske verdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Fest Logo
 DocType: Customer,Commission Rate,Kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Handlevognen er tom
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett&gt; Trykking og merkevarebygging&gt; Adressemal.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapitalbeholdningen
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Etter betaling ferdigstillelse omdirigere brukeren til valgt side.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Asset,Current Value (After Depreciation),Current Value (etter avskrivninger)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Dato
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Konto {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 7a6e8be..0970117 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Diler
 DocType: Employee,Rented,Wynajęty
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę setup Pracownik Naming System w Human Resource&gt; Ustawienia HR
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo
 DocType: Job Applicant,Job Applicant,Aplikujący o pracę
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Pokaż otwarta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria zaktualizowana
 DocType: Pricing Rule,Apply On,Zastosuj Na
 DocType: Item Price,Multiple Item prices.,Wiele cen przedmiotu.
 ,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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Druk Nowego Zwolnienia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Pokaż Warianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Ilość
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Konta tabeli nie może być puste.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,Mijający rok
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie
 DocType: Designation,Designation,Nominacja
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
@@ -74,14 +76,14 @@
 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 +557,Please select Price List,Wybierz Cennik
-DocType: Production Order Operation,Work In Progress,Praca w toku
+DocType: Production Order Operation,Work In Progress,Produkty w toku
 DocType: Employee,Holiday List,Lista świąt
 DocType: Time Log,Time Log,Czas logowania
 apps/erpnext/erpnext/public/js/setup_wizard.js +180,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 +131,New {0}: #{1},Nowy {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nowy {0}: # {1}
 ,Sales Partners Commission,Prowizja Partnera Sprzedaży
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
 DocType: Payment Request,Payment Request,Żądanie zapłaty
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Żonaty / Zamężna
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Elementy z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,
 DocType: BOM,Total Cost,Koszt całkowity
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dziennik aktywności:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
 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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
+DocType: Item,Is Fixed Asset,Czy trwałego
 DocType: Expense Claim Detail,Claim Amount,Kwota roszczenia
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Typ dostawy / dostawca
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Wszystkie dane Kontaktu
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} jest zamrożone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Wydatki na składowanie
 DocType: Newsletter,Email Sent?,Wiadomość wysłana?
 DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
 DocType: Production Order Operation,Show Time Logs,Pokaż logi czasu
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Status instalacji
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Element {0} musi być dostępnym do zakupu przedmiotem
+apps/erpnext/erpnext/stock/get_item_details.py +139,Item {0} must be a Purchase Item,Element {0} musi być dostępnym do zakupu przedmiotem
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
  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,"Element {0} nie jest aktywny, lub osiągnął datę przydatności"
 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 +507,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,Ustawienia dla modułu HR
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: BOM Replace Tool,New BOM,Nowe zestawienie materiałowe
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista serii dla tej transakcji
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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,Dystrybutor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Proszę wpisać Firmę
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Przepływy pieniężne netto z finansowania
 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 +217,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
 DocType: Newsletter List,Total Subscribers,Wszystkich zapisani
 ,Contact Name,Nazwa kontaktu
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
 DocType: Item Website Specification,Item Website Specification,Element Specyfikacja Strony
 DocType: Payment Tool,Reference No,Nr Odniesienia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Operacje bankowe
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Item,Publish in Hub,Publikowanie w Hub
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Kontrola Wypowiedzenia
 DocType: Lead,Suggestions,Sugestie
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Proszę wprowadzić grupę konto rodzica magazynowy {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Proszę wprowadzić grupę konto rodzica magazynowy {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Maksymalnie 5 znaków
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Samouczek
+DocType: Asset,Next Depreciation Date,Następny Amortyzacja Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Koszt aktywność na pracownika
 DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dostawca Faktura Nie istnieje faktura zakupu {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Zarządzaj Drzewem Sprzedawców
 DocType: Job Applicant,Cover Letter,List motywacyjny
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć"
 DocType: Item,Synced With Hub,Synchronizowane z Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Niepoprawne hasło
 DocType: Item,Variant Of,Wariant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednostki [{1}] (# Kształt / szt / {1}) znajduje się w [{2}] (# Kształt / Warehouse / {2})
 DocType: Lead,Industry,Przedsiębiorstwo
 DocType: Employee,Job Profile,Profil stanowiska Pracy
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Dowód dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Dowód dostawy
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Konfigurowanie podatki
 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 +381,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Wybierz miesiąc i rok
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Zamówienie razem Uważany
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca"""
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca"""
 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","Dostępne w BOM, dowód dostawy, faktura zakupu, zamówienie produkcji, zamówienie zakupu, faktury sprzedaży, zlecenia sprzedaży, Stan początkowy, ewidencja czasu pracy"
 DocType: Item Tax,Tax Rate,Stawka podatku
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Wybierz produkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,17 +344,18 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Nr seryjny {0} nie należy do żadnego potwierdzenia dostawy {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Element Parametr Inspekcja Jakości
 DocType: Leave Application,Leave Approver Name,Imię Zatwierdzającego Urlop
-,Schedule Date,Planowana Data
+DocType: Depreciation Schedule,Schedule Date,Planowana Data
 DocType: Packed Item,Packed Item,Przedmiot pakowany
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Domyślne ustawienia dla transakcji kupna
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Domyślne ustawienia dla transakcji kupna
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Istnieje aktywny Koszt Pracodawcy {0} przed Type Aktywny - {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.,Proszę nie tworzyć konta dla klientów i dostawców. Są one tworzone bezpośrednio od mistrzów klienta / dostawcy.
+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 zarządzane z poziomu Klient / Dostawca.
 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","Produkty, które należy zamówić są ""Wyprzedane"" rozważ wszystkie ilości na podstawie prognozowanego minimum i Ilość zamówień"
+DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
 DocType: Workstation,Working Hours,Godziny pracy
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,Wysłano w
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
-DocType: Material Request Item,Required Date,Data wymagana
+DocType: Request for Quotation Item,Required Date,Data wymagana
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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","Jeśli zaznaczone, kwota podatku zostanie wliczona w cenie Drukuj Cenę / Drukuj Podsumowanie"
+DocType: Request for Quotation,Message for Supplier,Wiadomość dla dostawcy
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Razem szt
 DocType: Employee,Health Concerns,Problemy Zdrowotne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Niezapłacone
@@ -418,17 +427,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/setup_wizard/install_fixtures.py +88,Administrative Officer,Urzędnik administracyjny
 DocType: Payment Tool,Received Or Paid,Otrzymane lub zapłacone
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +378,Please enter Warehouse for which Material Request will be raised,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 ,Serial No Warranty Expiry,Gwarancja o nr seryjnym wygasa
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Zarządzanie Podwykonawstwo
+DocType: Project,Project will be accessible on the website to these users,Projekt będzie dostępny na stronie internetowej dla tych użytkowników
 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 +53,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Przyrost nie może być 0
 DocType: Production Planning Tool,Material Requirement,Wymagania odnośnie materiału
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 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 numerów: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
 DocType: Pricing Rule,Valid From,Ważny od
 DocType: Sales Invoice,Total Commission,Całkowita kwota prowizji
 DocType: Pricing Rule,Sales Partner,Partner Sprzedaży
@@ -471,13 +481,13 @@
  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 +126,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 +230,Financial / accounting year.,Rok finansowy / księgowy.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,skumulowane wartości
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Niestety, numery seryjne nie mogą zostać połączone"
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Całkowita suma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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,Rozstrzygnięcie
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Dostarczone: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Konto płatności
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,W skrócie Załącznik
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Zwrot sprzedaży
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Składniki wynagrodzenia
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza danych potencjalnych klientów.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -504,7 +514,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanie Wniosku
 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/config/accounts.py +70,Masters,
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Aktualizacja bankowe dni transakcji
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Aktualizacja bankowe dni transakcji
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Błąd Zasobów ({6}) dla pozycji {0} w magazynie {1} w dniu {2} {3} {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Proszę wpierw wprowadzić dokument zakupu
 DocType: Buying Settings,Supplier Naming By,Po nazwie dostawcy
 DocType: Activity Type,Default Costing Rate,Domyślnie Costing Cena
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Plan Konserwacji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Zmiana netto stanu zapasów
 DocType: Employee,Passport Number,Numer Paszportu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Ta sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Ta sama pozycja została wprowadzona wielokrotnie.
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
 DocType: Sales Person,Sales Person Targets,Cele Sprzedawcy
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,Data Rozstrzygnięcia
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Proszę ustawić listę wakacje zarówno dla pracownika lub Spółki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
 DocType: Selling Settings,Customer Naming By,
+DocType: Depreciation Schedule,Depreciation Amount,Kwota amortyzacji
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Przekształć w Grupę
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Dostarczone Ilość
 DocType: Supplier,Fixed Days,Stałe Dni
 DocType: Quotation Item,Item Balance,Bilans Item
 DocType: Sales Invoice,Packing List,Lista przedmiotów do spakowania
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Zamówienia Kupna dane Dostawcom
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Zamówienia Kupna dane Dostawcom
 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
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Czas operacji
 DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupa do grupy
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Moje projekty
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
 DocType: Journal Entry,Bill No,Numer Rachunku
+DocType: Company,Gain/Loss Account on Asset Disposal,Konto Zysk / Strata na Aktywów pozbywaniu
 DocType: Purchase Invoice,Quarterly,Kwartalnie
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
 DocType: Sales Order Item,Basic Rate (Company Currency),Podstawowy wskaźnik (Waluta Firmy)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Wejście Płatność jest już utworzony
 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.,Śledź pozycję w sprzedaży i dokumentów zakupowych w oparciu o ich numer seryjny. Możesz również śledzić szczegóły gwarancji produktu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
+apps/erpnext/erpnext/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Razem rozliczeniowy w tym roku
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Employee,Provide email id registered in company,Wprowadź ID adresu email zarejestrowanego w firmie
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu:
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Element {0} nie został znaleziony
 DocType: Bin,Stock Value,Wartość zapasów
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Typ drzewa
@@ -589,7 +602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Lotnictwo
 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/accounts.py +40,Company and Accounts,Spółka oraz Konta
+apps/erpnext/erpnext/config/accounts.py +40,Company and Accounts,Ustawienia księgowości jednostki
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Produkty otrzymane od dostawców.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,w polu Wartość
 DocType: Lead,Campaign Name,Nazwa kampanii
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Wybierz tygodniowe dni wolne
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
 ,Sales Person Target Variance Item Group-Wise,
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
 DocType: Item Group,Website Specifications,Specyfikacja strony WWW
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Wystąpił błąd w szablonie Adres {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nowe konto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nowe konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: od {0} typu {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {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.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,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 +84,Sales campaigns.,Kampanie sprzedażowe
 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.
@@ -668,17 +682,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Wydatki na obsługę biura
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Cennik nie wybrany
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Process Payroll,Send Email,Wyślij E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moje Faktury
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nie znaleziono pracowników
 DocType: Supplier Quotation,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Wyślij bilans asortymentu używając csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Wyślij teraz
 ,Support Analytics,
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Błąd logiczny: Musi znaleźć nakładania
 DocType: Item,Website Warehouse,Magazyn strony WWW
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Wynik musi być niższy lub równy 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Klient i Dostawca
 DocType: Email Digest,Email Digest Settings,ustawienia przetwarzania maila
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Zapytania klientów o wsparcie techniczne
@@ -722,7 +738,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Czy zlecony
 DocType: Item Attribute,Item Attribute Values,Wartości Element Atrybut
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobacz subskrybentów
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Potwierdzenia Zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
 DocType: Employee,Ms,Pani
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Główna wartość Wymiany walut
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Główna wartość Wymiany walut
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Partnerzy handlowi i terytorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} musi być aktywny
+DocType: Journal Entry,Depreciation Entry,amortyzacja Wejście
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Idź do koszyka
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią
@@ -782,10 +799,10 @@
 DocType: Bank Reconciliation,Account Currency,Waluta konta
 apps/erpnext/erpnext/accounts/general_ledger.py +137,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
+DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
 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 +524,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę
 DocType: Address,Shop,Sklep
@@ -795,10 +812,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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ą
-DocType: Journal Entry Account,Purchase Invoice,Faktura zakupu
+DocType: Asset,Purchase Invoice,Faktura zakupu
 DocType: Stock Ledger Entry,Voucher Detail No,Nr Szczegółu Bonu
 DocType: Stock Entry,Total Outgoing Value,Całkowita wartość wychodząca
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otwarcie Data i termin powinien być w obrębie samego roku podatkowego
@@ -808,21 +825,24 @@
 DocType: Material Request Item,Lead Time Date,Termin realizacji
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,jest obowiązkowe. Może rekord Wymiana walut nie jest stworzony dla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Dla pozycji &quot;Produkt Bundle&quot;, magazyn, nr seryjny i numer partii będą rozpatrywane z &quot;packing list&quot; tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego &quot;produkt Bundle&quot;, wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do &quot;packing list&quot; tabeli."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Dla pozycji &quot;Produkt Bundle&quot;, magazyn, nr seryjny i numer partii będą rozpatrywane z &quot;packing list&quot; tabeli. Jeśli magazynowe oraz Batch Nie są takie same dla wszystkich elementów Opakowanie do pozycji każdego &quot;produkt Bundle&quot;, wartości te mogą zostać wpisane do tabeli głównej pozycji, wartości zostaną skopiowane do &quot;packing list&quot; tabeli."
 DocType: Job Opening,Publish on website,Publikuje na stronie internetowej
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Dostawy do klientów.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Przychody pośrednie
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ustaw Kwota płatności = zaległej kwoty
 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),Razem ilość wiadomości
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Wybierz produkt Transferu
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatkowy rabat procentowy
 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,Zezwól użytkowi edytować cenę i stawkę w transakcjach
 DocType: Pricing Rule,Max Qty,Maks. Ilość
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Wiersz {0}: {1} Faktura jest nieważny, to może być anulowane / nie istnieje. \ Proszę podać poprawną fakturę"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypomnień o urodzinach Pracowników
 ,Employee Holiday Attendance,Pracownik Frekwencja na wakacje
 DocType: Opportunity,Walk In,Wejście
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Zbiory Wpisy
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Zbiory Wpisy
 DocType: Item,Inspection Criteria,Kryteria kontrolne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Przeniesione
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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),Wszystkie Leady (Otwarte)
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Stwórz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Stwórz
 DocType: Journal Entry,Total Amount in Words,Wartość całkowita słownie
 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.,Wystąpił błąd. Przypuszczalnie zostało to spowodowane niezapisaniem formularza. Proszę skontaktować się z support@erpnext.com jeżeli problem będzie nadal występował.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mój koszyk
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 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 +180,Qty for {0},Ilość dla {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Czy na pewno chcesz przywrócić złomowane atut?
+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 +80,Leave Allocation Tool,Narzędzie do przydziału urlopu
 DocType: Leave Block List,Leave Block List Dates,Opuść Zablokowaną Listę Dat
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
 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 +547,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Zniżka (rabat)
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Przedmiot Potwierdzenia Zakupu
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kwota sprzedaży
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Logi czasu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Logi czasu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Zatwierdzasz wydatek dla tego rekordu. Proszę zaktualizować ""status"" i Zachowaj"
 DocType: Serial No,Creation Document No,
 DocType: Issue,Issue,Zdarzenie
+DocType: Asset,Scrapped,złomowany
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto nie pasuje do firmy.
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrutacja
 DocType: BOM Operation,Operation,Operacja
 DocType: Lead,Organization Name,Nazwa organizacji
 DocType: Tax Rule,Shipping State,Stan zakupu
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Koszty Sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standardowe zakupy
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
 DocType: Sales Person,Select company name first.,Wybierz najpierw nazwę firmy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Do {0} | {1} {2}
 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,Średni wiek
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Domyślna waluta
 DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu
 DocType: Expense Claim,From Employee,Od pracownika
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,Wprowadź różnicę
 DocType: Upload Attendance,Attendance From Date,Usługa od dnia
 DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników
@@ -923,7 +945,7 @@
 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 +130,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 +131,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 +42,Contribution %,Udział %
@@ -932,22 +954,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Zamówienie Produkcji {0} musi być odwołane przed odwołaniem Zamówienia Sprzedaży
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.,Wybierz zakresy czasu i podsumuj aby stworzyć nową fakturę sprzedaży
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt zaproszenie Współpraca
 DocType: Salary Slip,Deductions,Odliczenia
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,
 DocType: Salary Slip,Leave Without Pay,Urlop bezpłatny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Planowanie zdolności błąd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Planowanie zdolności błąd
 ,Trial Balance for Party,Trial Balance for Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Dochody
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Stan z bilansu otwarcia
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktura Zaliczkowa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Brak żądań
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Brak żądań
 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,Zarząd
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Rodzaje działań na kartach czasu pracy
@@ -958,18 +981,18 @@
 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,"Kolejne powiązania mogą być tworzone tylko w powiązaniach typu ""grupa"""
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Proszę ustawić Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Proszę ustawić Email ID
 DocType: Item,UOMs,Jednostki miary
 apps/erpnext/erpnext/stock/utils.py +171,{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.,Kod przedmiotu nie może być zmieniony na podstawie numeru seryjnego
 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/config/buying.py +33,Supplier database.,Baza dostawców
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza dostawców
 DocType: Account,Balance Sheet,Arkusz Bilansu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Sprzedawca otrzyma w tym dniu przypomnienie, aby skontaktować się z klientem"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Podatki i inne potrącenia wynagrodzenia.
 DocType: Lead,Lead,Trop
 DocType: Email Digest,Payables,Zobowiązania
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Święto
 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,
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nie ma zastosowania do faktury: {0}
 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
@@ -996,19 +1020,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
 DocType: Contact,User ID,ID Użytkownika
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Podgląd księgi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Podgląd księgi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dywidendy wypłacone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dywidendy wypłacone
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger rachunkowości
 DocType: Stock Reconciliation,Difference Amount,Kwota różnicy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Zyski zatrzymane
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Zyski zatrzymane
 DocType: BOM Item,Item Description,Opis produktu
 DocType: Payment Tool,Payment Mode,Tryb Płatności
 DocType: Purchase Invoice,Is Recurring,Czy cykliczne
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Tymczasowe otwarcia
 ,Employee Leave Balance,Bilans zwolnień pracownika
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Zobowiązania Podsumowanie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mały
@@ -1040,7 +1065,7 @@
 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),Zafakturowana kwota netto
 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,Stworzono konto główne {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Stworzono konto główne {0}
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Razem Osiągnięte
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
@@ -1063,19 +1088,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Sprzedawca WWW
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Zlecenie produkcji ma status: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Zlecenie produkcji ma status: {0}
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ustawienie Typu Konta pomaga w wyborze tego konta w transakcji.
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Nie znaleziono żadnych pozycji o nazwie {0}
 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""","Może być tylko jedna Zasada dostawy z wartością 0 lub pustą wartością w polu ""Wartość"""
 DocType: Authorization Rule,Transaction,Transakcja
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Grupy przedmiotów strony WWW
 DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
-DocType: Journal Entry,Journal Entry,Zapis księgowy
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,Dystrybucja docelowa
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Jest to numer ostatniej transakcji utworzonego z tym prefix
@@ -1095,6 +1121,7 @@
 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,Obliczanie podatków i opłat
 DocType: BOM Operation,Workstation,Stacja robocza
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zapytanie ofertowe Dostawcę
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Sprzęt komputerowy
 DocType: Sales Order,Recurring Upto,Cyklicznie upto
 DocType: Attendance,HR Manager,
@@ -1105,6 +1132,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Wartość bieżąca po amortyzacji może być mniejsza niż równa {0}
 ,BOM Browser,Przeglądarka BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodatki lub Potrącenia
 DocType: Company,If Yearly Budget Exceeded (for expense account),Jeśli Roczny budżet Przekroczono (dla rachunku kosztów)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Daty rozpoczęcia i zakończenia
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operacje nie może być puste.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Średni rabat
 DocType: Address,Utilities,Usługi komunalne
 DocType: Purchase Invoice Item,Accounting,Księgowość
 DocType: Features Setup,Features Setup,Ustawienia właściwości
+DocType: Asset,Depreciation Schedules,Rozkłady amortyzacyjne
 DocType: Item,Is Service Item,Jest usługą
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,walucie transakcji
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Opis operacji
 DocType: Item,Will also apply to variants,Stosuje się również do wariantów
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nie można zmienić Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego, gdy rok obrotowy jest zapisane."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nie można zmienić Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego, gdy rok obrotowy jest zapisane."
 DocType: Quotation,Shopping Cart,Koszyk
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Średnia dzienna Wychodzące
 DocType: Pricing Rule,Campaign,Kampania
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Wpisy dla zasobów już utworzone na podst. Zlecenia Produkcji
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Zmiana netto stanu trwałego
 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 +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
 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 +472,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nie może być większa niż 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,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 stanowiska pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
-apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
 DocType: Rename Tool,Type of document to rename.,"Typ dokumentu, którego zmieniasz nazwę"
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Kupujemy ten przedmiot
 DocType: Address,Billing,Rozliczenie
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,
+DocType: Asset,Asset Name,Zaleta Nazwa
 DocType: Shipping Rule Condition,To Value,Określ wartość
 DocType: Supplier,Stock Manager,Kierownik magazynu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Magazyn źródłowy jest obowiązkowy dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,List przewozowy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Wydatki na wynajem
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,List przewozowy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Zapytanie ofertowe może być dostęp, klikając poniższy link"
+DocType: Asset,Number of Months in a Period,Liczbę miesięcy w okresie
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
 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
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Rząd
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Razem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Razem ({0})
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
 DocType: Sales Invoice,Source,Źródło
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Pokaż closed
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Data początku roku finansowego
 DocType: Employee External Work History,Total Experience,Całkowita kwota wydatków
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,List(y) przewozowe anulowane
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Item Group,Item Group Name,Element Nazwa grupy
 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 +86,Transfer Materials for Manufacture,Materiały transferowe dla Produkcji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Materiały transferowe dla Produkcji
 DocType: Pricing Rule,For Price List,Dla Listy Cen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1269,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Proszę utworzyć nowe konto wg planu kont.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Wizyta Konserwacji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Wizyta Konserwacji
 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: Landed Cost Voucher,Landed Cost Help,Ugruntowany Koszt Pomocy
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ Dostawca
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transportu
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Pudło
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Zwrot wydatków
 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,Zadłużenie zapasów
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Zadłużenie zapasów
 DocType: Purchase Receipt,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 ,Material Requests for which Supplier Quotations are not created,
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Wyślij ponownie płatności E-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Inne raporty
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Zobacz
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura Odliczeń od Wynagrodzenia
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Ilość nie może być większa niż {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Poprzedni rok finansowy nie jest zamknięta
 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/report/trial_balance/trial_balance.py +40,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,Nr seryjny {0} dla ilości {1} nie może być ułamkiem
-apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
 DocType: Purchase Invoice,Reference Document,Dokument referencyjny
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% rozliczono
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
+DocType: Company,Default Payable Account,Domyślne konto Rozrachunki z dostawcami
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Zmiana netto stanu zobowiązań
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Proszę sprawdzić swój identyfikator e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Aktualizacja terminów płatności banowych
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Aktualizacja terminów płatności banowych
 DocType: Quotation,Term Details,Szczegóły warunków
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musi być większy niż 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planowanie zdolności Do (dni)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Roszczenie gwarancyjne
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Stały adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Zaliczki wypłaconej przed {0} {1} nie może być większa \ niż RAZEM {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Wybierz kod produktu
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Wybierz kod produktu
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmniejsz potrącenie za Bezpłatny Urlop
 DocType: Territory,Territory Manager,Kierownik Regionalny
 DocType: Packed Item,To Warehouse (Optional),Aby Warehouse (opcjonalnie)
@@ -1367,15 +1401,15 @@
 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,Podaj dokładnie Ilość lub Stawkę lub obie
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,Element Zgłoś Niedobór
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Jednostka produktu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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,Całkowita ilość przyznanych dni zwolnienia od pracy
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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,Następny Kontakt Po
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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,Powiadomienie adres e-mail
 DocType: Payment Tool,Find Invoices to Match,Znajdź pasujące faktury
 ,Item-wise Sales Register,
+DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """
+DocType: Asset,Depreciation Method,Metoda amortyzacji
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Czy podatek wliczony jest w opłaty?
 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 +29,Shopping Cart is enabled,Koszyk jest włączony
 DocType: Job Applicant,Applicant for a Job,Aplikant do Pracy
 DocType: Production Plan Material Request,Production Plan Material Request,Produkcja Plan Materiał Zapytanie
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nie ma Zamówienia Produkcji
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nie ma Zamówienia Produkcji
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Główny
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
 DocType: Territory,Territory Name,Nazwa Regionu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
 apps/erpnext/erpnext/config/hr.py +40,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,Informacje prawne na temat dostawcy
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresy
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,wyceny
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunki wysyłki
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Produkt nie może mieć produkcja na zamówienie.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Produkt nie może mieć produkcja na zamówienie.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Masa netto tego pakietu. (Obliczone automatycznie jako suma masy netto poszczególnych pozycji)
 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 +27,Time Logs for manufacturing.,Czas Logi do produkcji.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Czas logowania do zadań
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Płatność
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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},Zamówienie produktu o maksymalnej ilości {0} może być zrealizowane dla przedmiotu {1} w zamówieniu {2}
 DocType: Employee,Salutation,Forma grzecznościowa
 DocType: Pricing Rule,Brand,Marka
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Pakiet przedmiotów w momencie sprzedaży
 DocType: Quotation Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Współpracownik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,
+DocType: Request for Quotation Supplier,Send Email to Supplier,Wyślij e-mail do Dostawcy
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 DocType: Packing Slip,To Package No.,Do zapakowania Nr
 DocType: Production Planning Tool,Material Requests,materiał Wnioski
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Magazyn Dostawa
 DocType: Stock Settings,Allowance Percent,Dopuszczalny procent
 DocType: SMS Settings,Message Parameter,Parametr Wiadomości
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Drzewo MPK finansowych.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Drzewo MPK finansowych.
 DocType: Serial No,Delivery Document No,Nr dokumentu dostawy
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Uzyskaj pozycje z potwierdzeń zakupu.
 DocType: Serial No,Creation Date,Data utworzenia
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,Kwota do Deliver
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} utworzone
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} utworzone
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
 ,Serial No Status,Status nr seryjnego
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Element tabela nie może być pusta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: aby okresowość {1} w zależności od od i do tej pory \
  musi być większa niż lub równe {2}"
 DocType: Pricing Rule,Selling,Sprzedaż
 DocType: Employee,Salary Information,Informacja na temat wynagrodzenia
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Podatki i cła
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Gateway płatności konto nie jest skonfigurowany
 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: Production Order,Material Request Item,
+DocType: Request for Quotation Item,Material Request Item,
 apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,Drzewo grupy produktów
 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,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty
+DocType: Asset,Sold,Sprzedany
 ,Item-wise Purchase History,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Czerwony
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Inwestycje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Inwestycje
 DocType: Issue,Resolution Details,Szczegóły Rozstrzygnięcia
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,przydziały
 DocType: Quality Inspection Reading,Acceptance Criteria,Kryteria akceptacji
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 DocType: Item Group,Show In Website,Pokaż na stronie internetowej
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupa
@@ -1552,6 +1592,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Wykres Gantta dla wszystkich zadań.
+DocType: Pricing Rule,Margin Type,margines Rodzaj
 DocType: Appraisal,For Employee Name,Dla Imienia Pracownika
 DocType: Holiday List,Clear Table,Wyczyść tabelę
 DocType: Features Setup,Brands,Marki
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Wiersz # {0}: atutem jest obowiązkowe przed trwałego przedmiot
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę numeracji setup serię za obecność poprzez Setup&gt; Numeracja serii
 DocType: Employee,Resignation Letter Date,Data wypowiedzenia
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Para
+DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 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: Asset,Purchase Date,Data zakupu
 DocType: Employee,Personal Details,Dane Osobowe
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Proszę ustawić &quot;aktywa Amortyzacja Cost Center&quot; w towarzystwie {0}
 ,Maintenance Schedules,Plany Konserwacji
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Dołącz uzgodnione wpisy
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} musi być typu ""trwałego"" jak pozycja {1} dla pozycji aktywów."
 DocType: HR Settings,HR Settings,Ustawienia HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporty
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,szt.
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Sprecyzuj Firmę
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
 ,BOM Search,BOM Szukaj
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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.","Pokaż / Ukryj funkcje, takie jak nr seryjny, POS itp"
 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 +249,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowy. Waluta konto musi być {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta 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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},
 DocType: Salary Slip,Deduction,Odliczenie
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
 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
 DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu
 DocType: Project,% Tasks Completed,% Zadania Zakończone
 DocType: Project,Gross Margin,Marża brutto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Obliczona komunikat bilans Banku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Wycena
 DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
 DocType: Quotation,Maintenance User,Użytkownik Konserwacji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Koszt Zaktualizowano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Koszt Zaktualizowano
 DocType: Employee,Date of Birth,Data urodzenia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Element {0} został zwrócony
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę setup Pracownik Naming System w Human Resource&gt; Ustawienia HR
 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
@@ -1645,8 +1691,8 @@
 ,SO Qty,
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
+DocType: Request for Quotation,Manufacturing Manager,Kierownik Produkcji
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Przypisz dokumenty dostawy do paczek.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Przesyłki
 DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
@@ -1654,12 +1700,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Nr seryjny: {0} nie należy do żadnego Magazynu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Wiersz #
 DocType: Purchase Invoice,In Words (Company Currency),Słownie
-DocType: Pricing Rule,Supplier,Dostawca
+DocType: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Pozostałe drobne wydatki
 DocType: Global Defaults,Default Company,Domyślna Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Użytkownik {0} jest wyłączony
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Currency Exchange,From Currency,Od Waluty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
@@ -1678,11 +1724,11 @@
 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,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie"
+apps/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Wiersz # {0}: Ilość musi być jeden, a przedmiot jest związany z aktywami"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dziecko pozycja nie powinna być Bundle produktu. Proszę usunąć pozycję `` {0} i zapisać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kliknij na ""Generuj Harmonogram"" aby otrzymać harmonogram"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nowe Centrum Kosztów
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 finansowania zobowiązań krótkoterminowych&gt;&gt; Podatki i cła i utworzyć nowe konto (klikając na Dodaj dziecko) typu &quot;podatek&quot; i zrobić wspomnieć stawki podatkowej.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nowe Centrum Kosztów
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Quality Inspection,In Process,W trakcie
@@ -1695,10 +1741,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
 DocType: Quotation Item,Stock Balance,Bilans zapasów
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Czas Logi utworzone:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Czas Logi utworzone:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Item,Weight UOM,Waga jednostkowa
 DocType: Employee,Blood Group,Grupa Krwi
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Proszę podać kraj, w tym wysyłka Reguły lub sprawdź wysyłka na cały świat"
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Aby debetowej wymagane jest
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Aby debetowej wymagane jest
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Manager Jakości
 DocType: Job Applicant,Job Opening,Otwarcie naboru na stanowisko
 DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta List
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
@@ -1730,22 +1777,22 @@
 DocType: Time Log,To Time,Do czasu
 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.",Aby dodać nowe elementy rozwiń elementy drzewa i kliknij na element pod którym chcesz je dodać.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,Credit To account must be a Payable account
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Credit To account must be a Payable account
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"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 +273,Price List {0} is disabled,Cennik {0} jest wyłączony
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cennik {0} jest wyłączony
 DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktualny Wycena Cena
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
 DocType: Opportunity,Lost Reason,Powód straty
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Element Seryjne numery
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
@@ -1754,12 +1801,13 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nie znaleziono poślizgu wynagrodzenia miesięcznie:
 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 +175,Serial No {0} not found,Nr seryjny {0} nie znaleziono
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Nr seryjny {0} nie znaleziono
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Twoi Klienci
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
 DocType: Leave Block List Date,Block Date,Zablokowana Data
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplikuj teraz
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplikuj teraz
 DocType: Sales Order,Not Delivered,Nie dostarczony
-,Bank Clearance Summary,
+,Bank Clearance Summary,Rozliczenia bankowe
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",
 DocType: Appraisal Goal,Appraisal Goal,Cel oceny
 DocType: Time Log,Costing Amount,Kwota zestawienia kosztów
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Szczegóły zatrudnienia
 DocType: Employee,New Workplace,Nowe Miejsce Pracy
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ustaw jako zamknięty
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nie istnieje Przedmiot o kodzie kreskowym {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nie istnieje Przedmiot o kodzie kreskowym {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Numer sprawy nie może wynosić 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,Pokazuj slideshow na górze strony
@@ -1799,10 +1847,10 @@
 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,Element Zamów ponownie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer materiału
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Element {0} musi być pozycją sprzedaży w {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
 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
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pasywa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importowania wiadomości z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Zaproś jako Użytkownik
 DocType: Features Setup,After Sale Installations,Posprzedażowe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Proszę ustawić {0} w Spółce {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 DocType: Workstation Working Hour,End Time,Czas zakończenia
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardowe warunki umowy sprzedaży lub kupna.
@@ -1830,9 +1879,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane na
 DocType: Sales Invoice,Mass Mailing,Mailing Masowy
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Frekwencja - usługa do dnia
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Gateway Account,Payment Account,Konto Płatność
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Zmiana netto stanu należności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,
 DocType: Quality Inspection Reading,Accepted,Przyjęte
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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ąć."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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,Etykieta z zasadami wysyłki i transportu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Surowce nie może być puste.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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'","Dla pozycji z istniejącymi zapisami transakcji magazynowych nie można zmienić opcji 'Posiada numer seryjny', 'Posiada nr partii', 'Pozycja magazynowa' i 'Metoda wyceny'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +449,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
 DocType: Stock Entry,For Quantity,Dla Ilości
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nie zostało dodane
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Oddzielne zamówienie produkcji będzie tworzone dla każdej ukończonej, dobrej rzeczy"
@@ -1876,7 +1925,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Biuletyn Mailing List
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
 DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} jest zamknięty
 DocType: Email Digest,How frequently?,Jak często?
 DocType: Purchase Receipt,Get Current Stock,Pobierz aktualny stan magazynowy
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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; rachunkach bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drzewo Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
 DocType: Production Order,Actual End Date,Rzeczywista Data Zakończenia
 DocType: Authorization Rule,Applicable To (Role),Stosowne dla (Rola)
 DocType: Stock Entry,Purpose,Cel
+DocType: Company,Fixed Asset Depreciation Settings,Ustawienia Amortyzacja środka trwałego
 DocType: Item,Will also apply for variants unless overrridden,"Również zostanie zastosowany do wariantów, chyba że zostanie nadpisany"
 DocType: Purchase Invoice,Advances,Zaliczki
 DocType: Production Order,Manufacture against Material Request,Wytwarzanie przeciwko Materiały Zamówienie
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
 DocType: Campaign,Campaign-.####,Kampania-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,
@@ -1959,12 +2009,14 @@
  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: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
-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
+DocType: Asset Category Account,Asset Category Account,Konto Aktywów Kategoria
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","np. Bank, Gotówka, Karta kredytowa"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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; rachunkach bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu &quot;Bank&quot;
 DocType: Journal Entry,Credit Note,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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ść
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Szef oddziału Organizacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Żaden pracownik nie dla wyżej wybranych kryteriów lub specyfikacji wynagrodzenia już utworzony
@@ -2017,7 +2069,7 @@
 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 +200,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"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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,Do produkcji
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lista płac
 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"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
 DocType: Account,Income Account,Konto przychodów
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nie Szablon domyślny adres znaleziony. Proszę utworzyć nowy Setup&gt; Druk i Branding&gt; Szablon adresowej.
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Patrz ""Oceń Materiały w oparciu o"" w sekcji Kalkulacji kosztów"
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
 DocType: Item Supplier,Item Supplier,Dostawca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Zarządzaj drzewem grupy klientów
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nazwa nowego Centrum Kosztów
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
 DocType: Appraisal,HR User,Kadry - użytkownik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Podatki i opłaty potrącenia
-apps/erpnext/erpnext/config/support.py +7,Issues,Zagadnienia
+apps/erpnext/erpnext/hooks.py +90,Issues,Zagadnienia
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status musi być jednym z {0}
 DocType: Sales Invoice,Debit To,Debet na
 DocType: Delivery Note,Required only for sample item.,
 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
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Bardzo Duży
 ,Profit and Loss Statement,Rachunek zysków i strat
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Duży
 DocType: C-Form Invoice Detail,Territory,Region
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
 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 +142,Quotation {0} is cancelled,Wycena {0} jest anulowana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Zamówiony
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Brak Uwag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Konto root musi być grupą
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Wynagrodzenia brutto + Kwota zaległości + Kwota inkaso - Razem Odliczenie
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,Sprzedaż i Zakup
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Trwałego Rzecz musi być element non-stock
 DocType: Supplier Quotation Item,Material Request No,Zamówienie produktu nr
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2167,7 +2222,7 @@
 DocType: Sales Invoice Item,Time Log Batch,
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Wygenerowano pasek wynagrodzenia
-DocType: Company,Default Receivable Account,Domyślnie konto należności
+DocType: Company,Default Receivable Account,Domyślnie konto Rozrachunki z odbiorcami
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Utwórz zapis bankowy dla sumy wynagrodzenia dla wybranych wyżej kryteriów
 DocType: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
 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 procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
@@ -2176,7 +2231,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Team Sprzedażowy1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} nie istnieje
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Element {0} nie istnieje
 DocType: Sales Invoice,Customer Address,Adres klienta
 DocType: Payment Request,Recipient and Message,Odbiorca i Message
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Wybierz Dostawca Adres
 DocType: Quality Inspection,Quality Inspection,Kontrola jakości
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Wyciszenie email
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Zapytanie ofertowe.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
 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 +294,Price List Currency not selected,Nie wybrano Cennika w Walucie
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Nie wybrano Cennika w Walucie
 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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Zarządzaj Partnerami Sprzedaży.
 DocType: Quality Inspection,Inspection Type,Typ kontroli
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Proszę wybrać {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Nieoznakowany Frekwencja
@@ -2240,6 +2296,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Konto amortyzacji wydatków
 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
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potwierdzone
 DocType: Payment Gateway,Gateway,Przejście
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Podanie adresu jest wymagane
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
@@ -2267,18 +2324,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nie można znaleźć kurs wymiany dla {0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nie można znaleźć kurs wymiany dla {0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Oznacz pół dnia
 DocType: Sales Invoice,Sales Team,Team Sprzedażowy
 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 +410,[Error],[Błąd]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Błąd]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Słownie, będzie widoczne w Zamówieniu Sprzedaży, po zapisaniu"
 ,Employee Birthday,Data urodzenia pracownika
 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),Nowe Zwolnienie Przypisano (W Dniach)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Nr seryjny {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ Dostawca
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazyn klienta (opcjonalnie)
 DocType: Pricing Rule,Discount Percentage,Procent zniżki
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
@@ -2296,7 +2354,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% materiałów rozliczonych w ramach tego zlecenia sprzedaży
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Wpis Kończący Okres
 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ę
-DocType: Account,Depreciation,Spadek wartości
+DocType: Account,Depreciation,Amortyzacja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Pracownik Frekwencja Narzędzie
 DocType: Supplier,Credit Limit,
@@ -2304,14 +2362,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Szablon z warunkami lub umową.
 DocType: Purchase Invoice,Address and Contact,Adres i Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana konta Amortyzacja
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
+DocType: Asset,Expected Value After Useful Life,Przewidywany okres użytkowania wartości po
 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
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} zostanie anulowane lub zamknięte
 DocType: Delivery Note,Track this Delivery Note against any Project,Śledź potwierdzenie dostawy w każdym projekcie
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Przepływy pieniężne netto z inwestycji
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root konta nie może być usunięty
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Zaleta {0} należy składać
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Odnośnik #{0} z datą {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Zarządzaj adresy
-DocType: Pricing Rule,Item Code,Kod identyfikacyjny
+DocType: Asset,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
 DocType: Journal Entry,User Remark,Nota Użytkownika
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,
 DocType: Employee Education,School/University,Szkoła/Uniwersytet
 DocType: Payment Request,Reference Details,Szczegóły odniesienia
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
 DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magazynie
 ,Billed Amount,Ilość Rozliczenia
+DocType: Asset,Double Declining Balance,Podwójne Bilans Spadek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Kolejność Zamknięty nie mogą być anulowane. Unclose aby anulować.
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,pełni zamortyzowanych
 ,Stock Projected Qty,Przewidywana ilość zapasów
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczony Frekwencja HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Numer seryjny oraz Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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,Możesz opuścić Blok Zablokowanych List
 DocType: Sales Partner,Retailer,Detalista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Konto kredytowane powinno być kontem bilansowym
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
 DocType: Global Defaults,Disable In Words,Wyłącz w słowach
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Kod elementu jest obowiązkowy, ponieważ pozycja ta nie jest automatycznie numerowana"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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,Konto z kredytem w rachunku bankowym
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Konto z kredytem w rachunku bankowym
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Rzecz kod&gt; Przedmiot Group&gt; Marka
 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,Kredyty Hipoteczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Kredyty Hipoteczne
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Proszę ustawić amortyzacyjny dotyczący Konta aktywów z kategorii {0} lub {1} Spółki
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Niesamowite produkty
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Bilans otwarcia Kapitału własnego
 DocType: Appraisal,Appraisal,Ocena
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail wysłany do dostawcy {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data jest powtórzona
 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 +187,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
@@ -2401,7 +2467,7 @@
 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
 DocType: Item Price,Bulk Import Help,Luzem Importuj Pomoc
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Wybierz ilość
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Wybierz ilość
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Rola Zatwierdzająca nie może być taka sama jak rola którą zatwierdza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Wypisać się z tej Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Wiadomość wysłana
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Razem Margin
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
 DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 DocType: Hub Settings,Publish Items to Hub,Publikowanie produkty do Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa Klientów / Klient
 DocType: Payment Gateway Account,Default Payment Request Message,Domyślnie Płatność Zapytanie Wiadomość
 DocType: Item Group,Check this if you want to show in website,Zaznacz czy chcesz uwidocznić to na stronie WWW
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bankowe i płatności
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Operacje bankowe i płatności
 ,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
@@ -2450,17 +2517,17 @@
 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 +199,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 +201,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Nr seryjny {0} nie należy do magazynu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0
 DocType: Notification Control,Quotation Message,Wiadomość Wyceny
 DocType: Issue,Opening Date,Data Otwarcia
 DocType: Journal Entry,Remark,Uwaga
 DocType: Purchase Receipt Item,Rate and Amount,Stawka i Ilość
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Liście i wakacje
 DocType: Sales Order,Not Billed,Nie zaksięgowany
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kwota Kosztu Voucheru
 DocType: Time Log,Batched for Billing,
@@ -2476,15 +2543,17 @@
 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 +53,"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.
+DocType: Company,Asset Depreciation Cost Center,Zaleta Centrum Amortyzacja kosztów
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Data zakupu aktywów {0} nie zgadza się z datą dowodu zakupu
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowa
 ,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}
 DocType: Journal Entry,Stock Entry,Zapis magazynowy
 DocType: Account,Payable,Płatność
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dłużnicy ({0})
-DocType: Project,Margin,
+DocType: Pricing Rule,Margin,
 DocType: Salary Slip,Arrear Amount,Zaległa Kwota
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Zysk brutto%
@@ -2492,20 +2561,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Data Czystki
 DocType: Newsletter,Newsletter List,Lista biuletyn
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
 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 +57,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
 DocType: Stock Entry Detail,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
 DocType: Employee,Confirmation Date,Data potwierdzenia
 DocType: C-Form,Total Invoiced Amount,Całkowita zafakturowana kwota
 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,Minimalna ilość nie może być większa niż maksymalna Ilość
+DocType: Account,Accumulated Depreciation,skumulowana amortyzacja
 DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
 DocType: Payment Request,Email To,E-mail do
 DocType: Lead,Lead Owner,Właściciel Tropu
 DocType: Bin,Requested Quantity,Oczekiwana ilość
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Magazyn jest wymagany
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Magazyn jest wymagany
 DocType: Employee,Marital Status,Stan cywilny
 DocType: Stock Settings,Auto Material Request,Zapytanie Auto Materiał
 DocType: Time Log,Will be updated when billed.,Zostanie zaktualizowane w chwili rozliczenia
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 DocType: Sales Invoice,Against Income Account,Konto przychodów
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dostarczono
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% dostarczono
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 DocType: Territory,Territory Targets,Cele Regionalne
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,"Tego samego dostawcy, który został wpisany wielokrotnie"
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Zamówienie Kupna Zaopatrzenia
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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
@@ -2527,13 +2600,14 @@
 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.,
 DocType: Payment Request,Payment Details,Szczegóły płatności
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
+DocType: Asset,Journal Entry for Scrap,Księgowanie na złom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Wyciągnij elementy z dowodu dostawy
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Zapis wszystkich komunikatów typu e-mail, telefon, czat, wizyty, itd"
 DocType: Manufacturer,Manufacturers used in Items,Producenci używane w pozycji
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Utwórz nowy
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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,Całkowita kwota uznań
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Księga zapasów
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Cena: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Odliczenia Slip od Wynagrodzenia
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Na początku wybierz węzeł grupy.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Na początku wybierz węzeł grupy.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pracownik i obecność
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Cel musi być jednym z {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Usuń odniesienie do klientów, dostawców, partnerów sprzedaży i ołowiu, ponieważ jest Twój adres firmy"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} od
 DocType: Task,depends_on,zależy_od
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Następna data musi być większe niż Data publikacji
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Pokaż Podatek rozpad
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Postać / poz / {0}) jest niedostępne
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Następna data musi być większe niż Data publikacji
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/accounts/party.py +289,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',
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktura Data zamieszczenia
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Informacje o własnej firmie.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Proszę wprowadź 'Spodziewaną Datę Dstawy'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{0} is not a valid Batch Number for Item {1},
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {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."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,Starzenie się zapasów
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako otwarty
 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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2612,7 +2687,7 @@
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
 DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Wejście płatność nie zostanie utworzone, gdyż nie została określona wartość ""gotówka lub rachunek bankowy"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Wejście płatność nie zostanie utworzone, gdyż nie została określona wartość ""gotówka lub rachunek bankowy"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,Szablon
 DocType: Sales Person,Sales Person Name,Imię Sprzedawcy
@@ -2623,7 +2698,7 @@
 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),Dodano podatki i opłaty (Firmowe)
-apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
@@ -2632,19 +2707,20 @@
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Całkowita kwota debetu powinna być równa całkowitej kwocie kredytu. Różnica wynosi {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
+DocType: Asset Category Account,Fixed Asset Account,Konto trwałego
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Od dowodu dostawy
 DocType: Time Log,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Bankowość inwestycyjna
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Cennik Kursowy
 DocType: Purchase Invoice Item,Rate,Stawka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stażysta
 DocType: Newsletter,A Lead with this email id should exist,Podane dane z tym adresem e-mail powinny istnieć
 DocType: Stock Entry,From BOM,Od BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Transakcji giełdowych przed {0} są zamrożone
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram"""
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Operacje magazynowe przed {0} są zamrożone
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Do daty powinno być takie samo jak Od daty na pół dnia zwolnienia
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
@@ -2652,17 +2728,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Struktura Wynagrodzenia
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Wydanie Materiał
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Notowania
 DocType: Hub Settings,Access Token,Dostęp za pomocą Tokenu
 DocType: Sales Invoice Item,Serial No,Nr seryjny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
-DocType: Item,Is Fixed Asset Item,Jest stałą pozycją aktywów
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
 DocType: Purchase Invoice,Print Language,Język drukowania
 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","Jeśli masz duże, wielostronicowe pliki dokumentów do drukowania, ta funkcja może być używana do dzielenia stron,  tak by były na każdej stronie drukowane dane z wszystkich nagłówków i stopek"
+DocType: Asset,Number of Depreciations,Ilość amortyzacją
 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
@@ -2670,13 +2746,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Jest więcej świąt niż dni pracujących
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,Imię Partnera Sprzedaży
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Zapytanie o cenę
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksymalna kwota faktury
 DocType: Purchase Invoice Item,Image View,Widok obrazka
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienci
+DocType: Asset,Partially Depreciated,częściowo Zamortyzowany
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Papiery i Notowania Giełdowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
@@ -2692,13 +2770,13 @@
 DocType: Quotation,Maintenance Manager,Menager Konserwacji
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Razem nie może być wartością zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Zmodyfikowany od
+DocType: Asset,Amended From,Zmodyfikowany od
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kwota podatku po odliczeniu wysokości rabatu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +198,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 +195,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 +486,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2711,21 +2789,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,Attach Letterhead,Załącz blankiet firmowy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nie można wywnioskować, kiedy kategoria dotyczy ""Ocena"" a kiedy ""Oceny i Total"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Powołaj &#39;wpływ konto / strata na aktywach unieszkodliwianie &quot;w Spółce
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nr-y seryjne Wymagane do szeregowania pozycji {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Płatności mecz fakturami
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Płatności mecz fakturami
 DocType: Journal Entry,Bank Entry,Operacja bankowa
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj do Koszyka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuj według
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Włącz/wyłącz waluty.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Włącz/wyłącz waluty.
 DocType: Production Planning Tool,Get Material Request,Uzyskaj Materiał Zamówienie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Wydatki pocztowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Wydatki pocztowe
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Quality Inspection,Item Serial No,Nr seryjny
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Razem Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,księgowymi
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Raporty księgowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2745,15 +2824,16 @@
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Nazwa stanowiska pracy
 DocType: Features Setup,Item Groups in Details,Element Szczegóły grupy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Rozpocznij sesję POS
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji.
 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.,"Procent który wolno Ci otrzymać lub dostarczyć ponad zamówioną ilość. Na przykład: jeśli zamówiłeś 100 jednostek i Twój procent wynosi 10% oznacza to, że możesz otrzymać 110 jednostek"
 DocType: Pricing Rule,Customer Group,Grupa Klientów
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,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 +171,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: Item,Website Description,Opis strony WWW
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Zmiana netto w kapitale własnym
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
 ,Sales Register,Rejestracja Sprzedaży
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
@@ -2761,12 +2841,13 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nie ma nic do edycji
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Błąd: {0}&gt; {1}
 DocType: Item,Attributes,Atrybuty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Pobierz produkty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Pobierz produkty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data Ostatniego Zamówienia
 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: C-Form,C-Form,
@@ -2776,20 +2857,20 @@
 DocType: Serial No,Creation Document Type,
 DocType: Leave Type,Is Encash,
 DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego
-DocType: Payment Tool,Make Journal Entry,Dodać Journal Entry
+DocType: Payment Tool,Make Journal Entry,Dodaj wpis do dziennika
 DocType: Leave Allocation,New Leaves Allocated,Nowe Zwolnienie Przypisano
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Komercyjny
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Błąd: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Niesamowity Serwis
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Wszystkie produkty i usługi.
 DocType: Supplier Quotation,Supplier Address,Adres dostawcy
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Brak Ilości
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
+apps/erpnext/erpnext/config/accounts.py +259,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,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2798,12 +2879,12 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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
+DocType: Customer,Default Receivable Accounts,Domyślne konta Rozrachunki z odbiorcami
 DocType: Tax Rule,Billing State,Stan Billing
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Due Date jest obowiązkowe
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
 DocType: Journal Entry,Pay To / Recd From,Zapłać / Rachunek od
 DocType: Naming Series,Setup Series,Konfigurowanie serii
@@ -2823,20 +2904,22 @@
 DocType: GL Entry,Remarks,Uwagi
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Wyślij e-maile Dostawca
 DocType: Features Setup,POS View,Podgląd POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Numer instalacyjny dla numeru seryjnego
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Czas Zaloguj została Zapowiadane
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Naming serii dla {0} poprzez Konfiguracja&gt; Ustawienia&gt; Seria Naming
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Konto {0} nie może być grupą
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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,Błąd Szacowania Wartość nie jest dozwolona
 DocType: Holiday List,Weekly Off,Tygodniowy wyłączony
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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,Pozycja 5
 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}
@@ -2846,12 +2929,13 @@
 ,Monthly Attendance Sheet,Miesięczna karta obecności
 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę numeracji setup serię za obecność poprzez Setup&gt; Numeracja serii
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Elementy z Bundle produktu
+DocType: Asset,Straight Line,Linia prosta
+DocType: Project User,Project User,Użytkownik projektu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,Konto {0} jest nieaktywne
 DocType: GL Entry,Is Advance,Zaawansowany proces
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Frekwencja od dnia i usługa do dnia jest obowiązkowa
-apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Proszę wprowadź ""Zlecona"" jako Tak lub Nie"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"Proszę wprowadź ""Zlecona"" jako Tak lub Nie"
 DocType: Sales Team,Contact No.,Numer Kontaktu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'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: Features Setup,Sales Discounts,Obniżki Sprzedaży
@@ -2865,39 +2949,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numer zlecenia
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, który pokaże się na górze listy produktów."
 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 +117,Add Child,Dodaj Dziecko
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,Add Child,Dodaj Dziecko
 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,"Nie można przekonwertować centrum kosztów do księgi głównej, jak to ma węzły potomne"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Wartość otwarcia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seryjny #
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Prowizja od sprzedaży
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Prowizja od sprzedaży
 DocType: Offer Letter Term,Value / Description,Wartość / Opis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
 DocType: Tax Rule,Billing Country,Kraj fakturowania
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Wydatki na reprezentację
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Wydatki na reprezentację
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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.,Nieprawidłowa ilość określona dla elementu {0}. Ilość powinna być większa niż 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Wnioski o rezygnację
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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ą
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Wydatki na obsługę prawną
 DocType: Sales Invoice,Posting Time,Czas publikacji
 DocType: Sales Order,% Amount Billed,% wartości rozliczonej
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Wydatki telefoniczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Wydatki telefoniczne
 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.,
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Brak przedmiotu o podanym numerze seryjnym {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otwarte Powiadomienia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Wydatki bezpośrednie
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Wydatki bezpośrednie
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} nie jest prawidłowym adresem e-mail w &#39;\&#39; Notification
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,Rozkład
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
@@ -2914,7 +2999,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Sprzedajemy ten przedmiot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID Dostawcy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Ilość powinna być większa niż 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Ilość powinna być większa niż 0
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 DocType: Sales Partner,Contact Desc,Opis kontaktu
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ urlopu (okolicznościowy, chorobowy, itp.)"
@@ -2925,11 +3010,12 @@
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Wszystkie kontakty.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dostawca zasobu {0} nie zgadza się z dostawcą w zakupie faktury
 DocType: Newsletter,Test Email Id,E-mail testowy
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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,Brak autoryzacji od {0} przekroczono granice
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Szablon wynagrodzenia
@@ -2945,12 +3031,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rola Zezwala na edycję zamrożonych zasobów
 ,Territory Target Variance Item Group-Wise,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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,Preferowany Adres Rozliczeniowy
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Walutą Rozliczenia musi być równa walucie ustawione zostały comapany lub payble walucie konta partii
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretarka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Jeśli wyłączyć &quot;w słowach&quot; pole nie będzie widoczne w każdej transakcji
@@ -2960,13 +3047,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,
 ,Reqd By Date,
 DocType: Salary Slip Earning,Salary Slip Earning,
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Wierzyciele
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Wierzyciele
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Wiersz # {0}: Numer seryjny jest obowiązkowe
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,
 ,Item-wise Price List Rate,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Wyznaczony dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Wyznaczony dostawca
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,Rules for adding shipping costs.,Zasady naliczania kosztów transportu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
@@ -2987,15 +3074,14 @@
 DocType: Customer,From Lead,Od śladu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standard sprzedaży
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
 DocType: Serial No,Out of Warranty,Brak Gwarancji
 DocType: BOM Replace Tool,Replace,Zamień
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
-DocType: Project,Project Name,Nazwa projektu
+DocType: Request for Quotation Item,Project Name,Nazwa projektu
 DocType: Supplier,Mention if non-standard receivable account,"Wspomnieć, jeśli nie standardowe konto należności"
 DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
 DocType: Features Setup,Item Batch Nos,
@@ -3023,8 +3109,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,Płatny i niedostarczone
 DocType: Project,Default Cost Center,Domyślne Centrum Kosztów
 DocType: Sales Invoice,End Date,Data zakończenia
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,transakcji giełdowych
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Operacje magazynowe
 DocType: Employee,Internal Work History,Wewnętrzne Historia Pracuj
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Skumulowana amortyzacja Kwota
 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
@@ -3032,7 +3119,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Spółka jest obowiązkowe, ponieważ jest Twój adres firmy"
 DocType: Item Attribute,From Range,Od zakresu
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Element {0} jest ignorowany od momentu, kiedy nie ma go w magazynie"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Zgłoś zamówienie produkcji dla dalszego przetwarzania.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Zgłoś zamówienie produkcji dla dalszego przetwarzania.
 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.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
 DocType: Company,Domain,Domena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Oferty pracy
@@ -3044,6 +3131,7 @@
 DocType: Time Log,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,Przychodzące
 DocType: BOM,Materials Required (Exploded),Materiał Wymaga (Rozdzielony)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
@@ -3060,6 +3148,7 @@
 DocType: Sales Order,Delivery Date,Data dostawy
 DocType: Opportunity,Opportunity Date,Data szansy
 DocType: Purchase Receipt,Return Against Purchase Receipt,Powrót Przeciwko ZAKUPU
+DocType: Request for Quotation Item,Request for Quotation Item,Przedmiot zapytania ofertowego
 DocType: Purchase Order,To Bill,Wystaw rachunek
 DocType: Material Request,% Ordered,% Zamówione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Praca akordowa
@@ -3074,11 +3163,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste
 DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Proszę ustawić &quot;Konto Zbycie aktywów&quot; w Spółkę {0}
 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,Do omówienia
 DocType: SMS Settings,SMS Settings,Ustawienia SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Rachunki tymczasowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Rachunki tymczasowe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Account,Auditor,Audytor
@@ -3087,21 +3177,22 @@
 DocType: Pricing Rule,Disable,Wyłącz
 DocType: Project Task,Pending Review,Czekający na rewizję
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Kliknij tutaj, aby zapłacić"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Składnik {0} nie może zostać wycofane, jak to jest już {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID klienta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Oznacz Nieobecna
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,Do czasu musi być większy niż od czasu
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Dodaj elementy z
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Dodaj elementy z
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
 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/public/js/setup_wizard.js +20,"e.g. ""MC""","np. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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,
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazyn {0} nie istnieje
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3116,6 +3207,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Element {0} została wyłączona
 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},Wprowadź ilość dla przedmiotu {0}
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
@@ -3127,7 +3219,7 @@
 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ępny Kontakt
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Rachunki konfiguracji bramy.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Rachunki konfiguracji bramy.
 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
 ,Cash Flow,Cash Flow
@@ -3141,7 +3233,7 @@
 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 +132,Please find attached {0} #{1},Załączeniu {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Załączeniu {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Bank bilans komunikat jak na Księdze Głównej
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
 DocType: Authorization Rule,Customer / Item Name,Klient / Nazwa Przedmiotu
@@ -3157,19 +3249,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Proszę określić zakres od/do
 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,Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilość kupon wylądował
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
 DocType: BOM Replace Tool,Current BOM,Obecny BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj nr seryjny
 apps/erpnext/erpnext/config/support.py +43,Warranty,Gwarancja
 DocType: Production Order,Warehouses,Magazyny
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Materiały biurowe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Materiały biurowe
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Węzeł Grupy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Zaktualizuj Ukończone Dobra
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Zaktualizuj Ukończone Dobra
 DocType: Workstation,per hour,na godzinę
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabywczy
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto dla magazynu (Ciągła Inwentaryzacja) zostanie utworzone w ramach tego konta.
-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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Kwota zapłacona
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menadżer Projektu
@@ -3199,7 +3290,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd"
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
 DocType: Purchase Invoice,In Words,Słownie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
 DocType: Production Planning Tool,Material Request For Warehouse,Zamówienie produktu dla Magazynu
@@ -3212,9 +3303,11 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Aby ustawić ten rok finansowy jako domyślny, kliknij przycisk ""Ustaw jako domyślne"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,łączyć
 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 +564,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,Pasek wynagrodzenia
+DocType: Pricing Rule,Margin Rate or Amount,Margines szybkości lub wielkości
 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
@@ -3224,7 +3317,7 @@
 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.","Jeżeli którakolwiek z zaznaczonych transakcji ""Wysłane"", e-mail pop-up otwierany automatycznie, aby wysłać e-mail do powiązanego ""Kontakt"" w tej transakcji z transakcją jako załącznik. Użytkownik może lub nie może wysłać e-mail."
 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 +782,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 +793,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nr seryjny {0} otrzymano
@@ -3232,14 +3325,13 @@
 DocType: Customer,Sales Team Details,Szczegóły dotyczące Teamu Sprzedażowego
 DocType: Expense Claim,Total Claimed Amount,Całkowita kwota roszczeń
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Nieprawidłowy {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Naming serii dla {0} poprzez Konfiguracja&gt; Ustawienia&gt; Seria Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Zapisz dokument jako pierwszy.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
 DocType: Company,Change Abbreviation,Zmień Skrót
 DocType: Expense Claim Detail,Expense Date,Data wydatku
@@ -3257,14 +3349,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,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/stock/doctype/warehouse/warehouse.js +12,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 +67,"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,Pozycja Zalecany poziom powtórnego zamówienia
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Proszę najpierw wybrać {0}
 DocType: Features Setup,To get Item Group in details table,Pokaż Grupy produktów w tabeli z detalami
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub Spółka {0}
 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>
@@ -3296,23 +3389,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
 ,Project wise Stock Tracking,
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Plan Konserwacji {0} występuje przeciw {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Plan Konserwacji {0} występuje przeciw {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Rzeczywista Ilość (u źródła/celu)
 DocType: Item Customer Detail,Ref Code,Ref kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekordy pracownika.
 DocType: Payment Gateway,Payment Gateway,Bramki płatności
 DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Złożyć zamówienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nie może mieć rodzica w centrum kosztów
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Wybierz markę ...
 DocType: Sales Invoice,C-Form Applicable,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Magazyn jest obowiązkowe
 DocType: Supplier,Address and Contacts,Adres i Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Rozstrzygnięte przez
@@ -3330,7 +3423,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,"Waluta transakcji musi być taka sama, jak waluta wybranej płatności"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Odbierać
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3338,14 +3431,14 @@
 DocType: Purchase Invoice,Submit on creation,Prześlij na tworzeniu
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 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,Zamówienie Produkcji {0} musi być zgłoszone
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"""Do daty"" nie może być terminem przed ""od daty"""
 DocType: Purchase Receipt Item,Prevdoc DocType,Typ dokumentu dla poprzedniego dokumentu
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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,Proszę o Zamówienie Przedmiotów
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,Moje Zamówienia
@@ -3366,10 +3459,10 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Wprowadź poprawny numer telefonu kom
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/config/accounts.py +258,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 logowania {0} już rozliczony
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pożyczki bez pokrycia
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
 DocType: Maintenance Schedule Detail,Scheduled Date,Zaplanowana Data
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Łączna wypłacona Amt
@@ -3381,11 +3474,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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,Pomoc HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Twoi Dostawcy
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
 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ć."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Dostawca Część nr
 DocType: Purchase Invoice,Contact,Kontakt
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Otrzymane od
 DocType: Features Setup,Exports,Eksport
@@ -3394,12 +3488,12 @@
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
 DocType: Payment Reconciliation,From Invoice Date,Od daty faktury
@@ -3408,7 +3502,7 @@
 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}
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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 +356,'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,Usługa nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,Konto główne
@@ -3421,7 +3515,7 @@
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Konto debetowane powinno być kontem bilansowym
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Kapitał zasobów
@@ -3435,15 +3529,15 @@
 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 +576,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,Zamroź zapasy do
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Czynność / zadanie projektu
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Utwórz Paski Wypłaty
 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: Purchase Invoice,Write Off Amount (Company Currency),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Powtórz w Dniu Miesiąca
@@ -3463,8 +3557,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,data rozpoczęcia roku lub data końca pokrywa się z {0}. Aby uniknąć należy ustawić firmę
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nowy biuletyn
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Data startu powinna być niższa od daty końca dla {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Data startu powinna być niższa od daty końca dla {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Przykład:. ABCD ##### 
  Jeśli seria jest ustawiona i nr seryjny nie jest wymieniony w transakcjach, automatyczny numer seryjny zostanie utworzony na podstawie tej serii. Jeśli chcesz zawsze jednoznacznie ustawiać numery seryjne dla tej pozycji, pozostaw to pole puste."
@@ -3476,11 +3571,11 @@
 ,Sales Analytics,Analityka sprzedaży
 DocType: Manufacturing Settings,Manufacturing Settings,Ustawienia produkcyjne
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Konfiguracja e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Proszę dodać domyślną walutę w Głównych Ustawieniach Firmy
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Proszę dodać domyślną walutę w Głównych Ustawieniach Firmy
 DocType: Stock Entry Detail,Stock Entry Detail,Szczególy zapisu magazynowego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Codzienne Przypomnienia
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nowa nazwa konta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Obsługa Klienta
@@ -3490,11 +3585,12 @@
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Zaproponuj kandydatowi pracę
 DocType: Notification Control,Prompt for Email on Submission of,Potwierdzenie dla zgłoszeń dla email dla
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Liczba przyznanych zwolnień od pracy jest większa niż dni w okresie
+DocType: Pricing Rule,Percentage,Odsetek
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
 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ł
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Element {0} musi być pozycją w sprzedaży
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Element {0} musi być pozycją w sprzedaży
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
 DocType: Sales Order,Printing Details,Szczegóły Drukarnie
@@ -3502,11 +3598,12 @@
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
 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 +385,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
 DocType: Sales Partner,Partner Type,Typ Partnera
 DocType: Purchase Taxes and Charges,Actual,Właściwy
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
 DocType: Purchase Invoice,Against Expense Account,Konto wydatków
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 finansowania zobowiązań krótkoterminowych&gt;&gt; Podatki i cła i utworzyć nowe konto (klikając na Dodaj dziecko) typu &quot;podatek&quot; i zrobić wspomnieć stawki podatkowej.
 DocType: Production Order,Production Order,Zamówinie produkcji
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Notka instalacyjna {0} została już dodana
 DocType: Quotation Item,Against Docname,
@@ -3525,18 +3622,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Hurt i Detal
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Production Order,Planned End Date,Planowana data zakończenia
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Tax Rule,Validity,Ważność
+DocType: Request for Quotation,Supplier Detail,Dostawca Szczegóły
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Kwota zafakturowana
 DocType: Attendance,Attendance,Usługa
 apps/erpnext/erpnext/config/projects.py +55,Reports,Raporty
 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.","Jeśli nie jest zaznaczone, lista będzie musiała być dodana do każdego działu, w którym ma zostać zastosowany."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +508,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Szablon podatkowy dla transakcji zakupu.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Szablon podatkowy dla transakcji zakupu.
 ,Item Prices,Ceny
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Słownie będzie widoczna w Zamówieniu po zapisaniu
 DocType: Period Closing Voucher,Period Closing Voucher,Zamknięcie roku
@@ -3546,10 +3644,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,Cel dla magazynu w wierszu {0} musi być taki sam jak produkcja na zamówienie
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Wydatki na podstawową działalność
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Wydatki na podstawową działalność
 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 +455,Change,Reszta
@@ -3557,6 +3655,7 @@
 DocType: Appraisal Goal,Score Earned,Ilość zdobytych punktów
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
+DocType: Asset Category,Asset Category Name,Zaleta Nazwa kategorii
 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.,To jest obszar root i nie może być edytowany.
 DocType: Packing Slip,Gross Weight UOM,Waga brutto Jednostka miary
@@ -3568,13 +3667,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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,Proszę podać nadrzędne centrum kosztów
 DocType: Delivery Note,Print Without Amount,Drukuj bez wartości
-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ą podatku nie może być ""Wycena"" lub ""Wycena i Total"", ponieważ wszystkie elementy są elementy nie umieszczanymi w magazynie"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Kategorią podatku nie może być ""Wycena"" lub ""Wycena i Total"", ponieważ wszystkie elementy są elementy nie umieszczanymi w magazynie"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Łączny wynik (w skali do 5)
 DocType: Batch,Batch,Partia
@@ -3588,7 +3687,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sprzedawca
 DocType: Sales Invoice,Cold Calling,
 DocType: SMS Parameter,SMS Parameter,Parametr SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budżet i MPK
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budżet i MPK
 DocType: Maintenance Schedule Item,Half Yearly,Pół Roku
 DocType: Lead,Blog Subscriber,Subskrybent Bloga
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,
@@ -3619,9 +3718,9 @@
 DocType: Purchase Common,Purchase Common,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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.,Zatrzymaj możliwość składania zwolnienia chorobowego użytkownikom w następujące dni.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
 DocType: Sales Invoice,Is POS,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Rzecz kod&gt; Przedmiot Group&gt; Marka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
@@ -3629,7 +3728,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rachunki dla klientów.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Nadrzędne konto
@@ -3645,7 +3744,7 @@
 DocType: Employee,Education,Wykształcenie
 DocType: Selling Settings,Campaign Naming By,Nazwa Kampanii Przez
 DocType: Employee,Current Address Is,Obecny adres to
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
 DocType: Address,Office,Biuro
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
@@ -3660,6 +3759,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Inwentaryzacja partii
 DocType: Employee,Contract End Date,Data końcowa kontraktu
 DocType: Sales Order,Track this Sales Order against any Project,Śledź zamówienie sprzedaży w każdym projekcie
+DocType: Sales Invoice Item,Discount and Margin,Rabat i marży
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Wyciągnij zlecenia sprzedaży (oczekujące na dostarczenie) na podstawie powyższych kryteriów
 DocType: Deduction Type,Deduction Type,Typ odliczenia
 DocType: Attendance,Half Day,Pół Dnia
@@ -3680,7 +3780,7 @@
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Rejestr Miesięcznego Wynagrodzenia
 DocType: Warranty Claim,If different than customer address,Jeśli jest inny niż adres klienta
 DocType: BOM Operation,BOM Operation,
@@ -3688,22 +3788,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Płatność URL Wiadomość
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Razem Niezapłacone
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Czas logowania nie jest zliczony
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
+DocType: Asset,Asset Category,Aktywa Kategoria
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Proszę wprowadzić ręcznie z dowodami
 DocType: SMS Settings,Static Parameters,Parametry statyczne
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiał do Dostawcy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Akcyza Faktura
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
 DocType: Employee Attendance Tool,Marked Attendance,Oznaczone Obecność
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Bieżące Zobowiązania
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Bieżące Zobowiązania
 apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,Wyślij zbiorczo sms do swoich kontaktów
 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 +59,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
@@ -3724,17 +3825,16 @@
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Załącz Logo
 DocType: Customer,Commission Rate,Wartość prowizji
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zablokuj wnioski urlopowe według departamentów
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analityka
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Koszyk jest pusty
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nie Szablon domyślny adres znaleziony. Proszę utworzyć nowy Setup&gt; Druk i Branding&gt; Szablon adresowej.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,Root nie może być edytowany
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapitał zakładowy
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
 DocType: Payment Gateway Account,Payment Gateway Account,Płatność konto Brama
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokonaniu płatności przekierować użytkownika do wybranej strony.
@@ -3743,20 +3843,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
+DocType: Asset,Current Value (After Depreciation),Wartość bieżąca (po amortyzacji)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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,Adresy i kontakty dostawcy
 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 +13,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 +409, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Zestawienie materiałów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3764,6 +3865,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Zatwierdzona Kwota
 DocType: GL Entry,Is Opening,Otwiera się
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,Krótka notka na stronę i do innych publikacji
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 5d56b40..e92ba8c 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Employee,Rented,Alugado
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Você realmente quer se desfazer desse ativo?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
 DocType: Purchase Order,Customer Contact,Contato do cliente
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
@@ -36,25 +36,27 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de câmbio deve ser o mesmo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome do cliente
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +100,Bank account cannot be named as {0},A conta bancária não pode ser nomeado como {0}
-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.","Todos os campos relacionados à exportação, como moeda, taxa de conversão,total geral de exportação,total de exportação etc estão disponíveis na nota de entrega, POS, Cotação, Vendas fatura, Ordem de vendas etc"
+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.","Todos os campos relacionados à exportação, como moeda, taxa de conversão,total geral de exportação,total de exportação etc estão disponíveis na nota de entrega, POS, Orçamentos, Vendas fatura, Ordem de vendas etc"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ou grupos) contra o qual as entradas de Contabilidade são feitas e os saldos são mantidos.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 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/templates/pages/projects.js +81,Show open,Mostrar aberta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
 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
+,Purchase Order Items To Be Received,"Itens Comprados, mas não Recebidos"
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar Variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Quantidade
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Contas tabela não pode estar em branco.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Designação
@@ -64,7 +66,7 @@
 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 +642,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessária
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
@@ -81,8 +83,8 @@
 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 +131,New {0}: #{1},Nova {0}: # {1}
-,Sales Partners Commission,Vendas Partners Comissão
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nova {0}: # {1}
+,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
@@ -114,7 +116,7 @@
 DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
 DocType: Account,Credit,Crédito
 DocType: POS Profile,Write Off Cost Center,Eliminar Centro de Custos
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Stock
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Estoque
 DocType: Warehouse,Warehouse Detail,Detalhe do Almoxarifado
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Tipo de imposto
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Alvo Em
 DocType: BOM,Total Cost,Custo Total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,É Imobilização
 DocType: Expense Claim Detail,Claim Amount,Valor Requerido
 DocType: Employee,Mr,Sr.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornecedor Tipo / Fornecedor
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Todo o Contato
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} é congelado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Logs
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Estado da Instalação
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
- Todas as datas, os empregados e suas combinações para o período selecionado viram com o modelo, incluindo os registros já existentes."
+ Todas as datas, os empregados e suas combinações para o período selecionado virão com o modelo, incluindo os registros já 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 +507,"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 +533,"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 +170,Settings for HR Module,Configurações para o Módulo de RH
 DocType: SMS Center,SMS Center,Centro de SMS
 DocType: BOM Replace Tool,New BOM,Nova LDM
@@ -209,20 +213,20 @@
 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 +79,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: 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,Almoxarifado de destino necessário antes de enviar
+DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se a conta a receber aplicável não for a conta padrão
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,For Warehouse is required before Submit,Almoxarifado de destino necessário antes de 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 +24,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
+,Production Orders in Progress,Ordens em Produção
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Caixa Líquido de Financiamento
 DocType: Lead,Address & Contact,Endereço e Contato
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as licenças não utilizadas de atribuições anteriores
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
 ,Contact Name,Nome do Contato
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,entradas do banco
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -258,14 +262,14 @@
 DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos confirmados de clientes.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantidade rejeitada
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Campo disponível na Guia de Remessa, Cotação, Nota Fiscal de Venda, Ordem de Venda"
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Campo disponível na Guia de Remessa, Orçamento, Nota Fiscal de Venda, Ordem de Venda"
 DocType: SMS Settings,SMS Sender Name,Nome do remetente do SMS
 DocType: Contact,Is Primary Contact,É o contato principal
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +36,Time Log has been Batched for Billing,Tempo Log foi em lote para Faturamento
 DocType: Notification Control,Notification Control,Controle de Notificação
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir orçamentos para Grupos de Itens neste território. Você também pode incluir a sazonalidade, defininda na Distribuição."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Telefone Celular.
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Aprender
+DocType: Asset,Next Depreciation Date,Próximo depreciação Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo de Atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições para contas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Fornecedor Nota Fiscal n existe na factura de compra {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Gerenciar vendedores
 DocType: Job Applicant,Cover Letter,Carta de apresentação
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Cheques em circulação e depósitos para limpar
 DocType: Item,Synced With Hub,Sincronizado com o Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Senha Incorreta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Form / Item / {1}) encontrados em [{2}] (# Form / Armazém / {2})
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil da Vaga
 DocType: Newsletter,Newsletter,Boletim informativo
 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
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Guia de Remessa
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 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 +381,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Selecione mês e ano
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Order Total Considerado
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Designação do empregado (por exemplo, CEO , diretor , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já  está alocado para o Empregado {1} para o período {2} até {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parâmetro de Inspeção de Qualidade do Item
 DocType: Leave Application,Leave Approver Name,Nome do Aprovador de Licenças
-,Schedule Date,Data Agendada
+DocType: Depreciation Schedule,Schedule Date,Data Agendada
 DocType: Packed Item,Packed Item,Item do Pacote da Guia de Remessa
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,As configurações padrão para a compra de transações.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,As configurações padrão para a compra de transações.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Custo de Atividade para o Empregado {0} contra o Tipo de Atividade - {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.,"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
@@ -348,10 +355,11 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Request for Quotation
 DocType: Workstation,Working Hours,Horas de trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número sequencial de início/atual de uma série existente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
-,Purchase Register,Compra Registre
+,Purchase Register,Registro de Compras
 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 +192,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
@@ -380,7 +388,7 @@
 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/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: Lead,Channel Partner,Canal de Parceria
 DocType: Account,Old Parent,Pai Velho
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalize o texto introdutório que vai como uma parte do que e-mail. Cada transação tem um texto introdutório separado.
 DocType: Stock Reconciliation Item,Do not include symbols (ex. $),Não inclua símbolos (ex. $)
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,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 +70,Holiday master.,Mestre férias .
-DocType: Material Request Item,Required Date,Data Obrigatória
+DocType: Request for Quotation Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Faturamento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Mensagem para o Fornecedor
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
 DocType: Employee,Health Concerns,Preocupações com a Saúde
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Não Pago
@@ -418,17 +427,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazém para que Pedido de materiais serão levantados"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gerenciando Subcontratação
+DocType: Project,Project will be accessible on the website to these users,Projeto estará acessível no site para os usuários
 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 +53,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento não pode ser 0
 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 +86,Item {0} is not Purchase Item,Item {0} não é comprar item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Item {0} não é comprar item
 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
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
 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 +126,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 +127,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
@@ -469,13 +479,13 @@
 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 +126,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 +230,Financial / accounting year.,Exercício / contabilidade.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Valores acumulados
 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"
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,Cliente em Potencial ID
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Entregue: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conta a Pagar
@@ -483,26 +493,26 @@
 DocType: Job Applicant,Resume Attachment,Anexo currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Retorno de Vendas
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,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 +22,Customer database.,Banco de Dados de Clientes
-DocType: Quotation,Quotation To,Cotação para
-DocType: Lead,Middle Income,Rendimento Médio
+DocType: Quotation,Quotation To,Orçamento para
+DocType: Lead,Middle Income,Média Renda
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,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/stock/doctype/item/item.py +707,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 +91,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
-DocType: Sales Invoice,Customer's Vendor,Vendedor do cliente
+DocType: Sales Invoice,Customer's Vendor,Revenda
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,Ordem de produção é obrigatória
 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/config/accounts.py +70,Masters,Cadastros
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Datas das transações de atualização do banco
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Conciliação Bancária
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -520,27 +530,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
 DocType: Buying Settings,Supplier Naming By,Fornecedor de nomeação
 DocType: Activity Type,Default Costing Rate,Preço de Custo Padrão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Programação da Manutenção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Mudança na Net Inventory
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data da Resolução
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Por favor, defina uma lista de feriados para o trabalhador ou para a Companhia"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,depreciação Valor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Converter em Grupo
 DocType: Activity Cost,Activity Type,Tipo da Atividade
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montante Entregue
 DocType: Supplier,Fixed Days,Dias Fixos
 DocType: Quotation Item,Item Balance,Saldo do item
 DocType: Sales Invoice,Packing List,Lista de embalagem
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Ordens de Compra dadas a fornecedores.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordens de Compra dadas a fornecedores.
 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
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,Tempo de Operação
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupo de Grupo
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,meus projetos
 DocType: Journal Entry,Write Off Amount,Eliminar Valor
 DocType: Journal Entry,Bill No,Fatura Nº
+DocType: Company,Gain/Loss Account on Asset Disposal,Conta ganho / perda de Ativos Eliminação
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Obrigatória
 DocType: Sales Order Item,Basic Rate (Company Currency),Taxa Básica (Moeda da Empresa)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Entrada de pagamento já está criado
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Faturamento total este ano
 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,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -597,6 +610,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,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
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Há um erro no seu modelo de endereço {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nova Conta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -666,17 +680,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Despesas de manutenção de escritório
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Por favor, indique primeiro item"
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum colaborador encontrado
 DocType: Supplier Quotation,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,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 de Pós-Vendas
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,erro lógico: deve encontrar sobreposição
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo de Fatura
 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 +267,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +301,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 +12,Support queries from customers.,Suporte as perguntas de clientes.
@@ -706,7 +722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: Production Order,Target Warehouse,Almoxarifado de destino
-DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
+DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
@@ -719,13 +735,13 @@
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+DocType: Newsletter,Newsletter Manager,Gestor de Email Massivo
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
+,Purchase Receipt Trends,Tendências de Recebimento
 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/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Valor a ser Faturado
@@ -755,16 +771,17 @@
 DocType: Employee,Date of Joining,Data da Efetivação
 DocType: Naming Series,Update Series,Atualizar Séries
 DocType: Supplier Quotation,Is Subcontracted,É subcontratada
-DocType: Item Attribute,Item Attribute Values,Valores de Atributo item
+DocType: Item Attribute,Item Attribute Values,Valores dos Atributos
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Recibo de Compra
-,Received Items To Be Billed,Itens recebidos a ser cobrado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Recibo de Compra
+,Received Items To Be Billed,"Itens Recebidos, mas não Faturados"
 DocType: Employee,Ms,Sra.
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Taxa de Câmbio Mestre
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Taxa de Câmbio Mestre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Parceiros de vendas e Território
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} deve ser ativo
+DocType: Journal Entry,Depreciation Entry,Entrada depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto carrinho
 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
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -793,10 +810,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Nota Fiscal de Compra
+DocType: Asset,Purchase Invoice,Nota Fiscal de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Nº do Detalhe do comprovante
 DocType: Stock Entry,Total Outgoing Value,Valor total de saída
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
@@ -806,37 +823,40 @@
 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 ,é obrigatório. Talvez o registro de taxas de câmbios não está criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Publicar em website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Os embarques para os clientes.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Fornecedor Data da fatura não pode ser maior que data de lançamento
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
 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 +672,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Selecionar item para Transferência
 DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto adicional
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Fatura {1} é inválido, poderia ser cancelado / não existe. \ Por favor, indique uma factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,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
 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
-,Employee Holiday Attendance,Empregado Presença de férias
-DocType: Opportunity,Walk In,Caminhe em
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de Stock
+,Employee Holiday Attendance,Empregados com Presença em Feriados
+DocType: Opportunity,Walk In,Vitrine
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Entradas de Stock
 DocType: Item,Inspection Criteria,Critérios de Inspeção
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total por extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro . 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 +5,My Cart,Meu carrinho
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,Nome da lista de feriados
 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 +180,Qty for {0},Qtde para {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo desfeito?
+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 +80,Leave Allocation Tool,Ferramenta de Alocação de Licenças
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
@@ -859,7 +880,7 @@
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
 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 para
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,A tabela de atributos é 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/public/js/pos/pos.html +28,Discount,Desconto
@@ -874,20 +895,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Item do Recibo de Compra
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Vendas / armazém de produtos acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Valor de venda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Tempo Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Tempo Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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,Solicitação
+DocType: Asset,Scrapped,desmantelada
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,A conta não coincide com a Empresa
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutamento
 DocType: BOM Operation,Operation,Operação
 DocType: Lead,Organization Name,Nome da Organização
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Despesas com Vendas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
@@ -904,7 +926,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa por primeiro.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Cotações recebidas de fornecedores.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Orçamentos recebidas de fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 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
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite a designação deste contato
 DocType: Expense Claim,From Employee,Do colaborador
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -921,7 +943,7 @@
 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 +130,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 +131,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 +42,Contribution %,Contribuição%
@@ -930,22 +952,23 @@
 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 +208,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/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
-,Ordered Items To Be Billed,Itens encomendados a serem faturados
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+,Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Padrões globais
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Convite Colaboração em Projectos
 DocType: Salary Slip,Deductions,Deduções
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote Log O tempo tem sido anunciado.
 DocType: Salary Slip,Leave Without Pay,Licença Não Remunerada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacidade de erro Planejamento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacidade de erro Planejamento
 ,Trial Balance for Party,Balancete para o partido
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganhos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
 apps/erpnext/erpnext/config/learn.py +92,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 +473,Nothing to request,Nada de pedir
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 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 +45,Types of activities for Time Sheets,Tipos de atividades para quadro de horários
@@ -956,24 +979,24 @@
 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"""
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Por favor, defina-mail ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Por favor, defina-mail ID"
 DocType: Item,UOMs,UDMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Código do item não pode ser alterado para 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 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/config/buying.py +33,Supplier database.,Banco de dados do Fornecedor.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados do Fornecedor.
 DocType: Account,Balance Sheet,Balanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete nesta data para contatar o cliente
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Impostos e outras deduções salariais.
 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 +83,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
+,Purchase Order Items To Be Billed,"Itens Comprados, mas não 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
@@ -981,10 +1004,11 @@
 DocType: Holiday,Holiday,Feriado
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma não é aplicável para a fatura: {0}
 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
+DocType: Lead,Call,Chamada Telefônica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +410,'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
@@ -994,19 +1018,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
 DocType: Contact,User ID,ID de Usuário
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Ver Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Ver Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendos pagos
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Registro Contábil
 DocType: Stock Reconciliation,Difference Amount,Diferença Montante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Lucros Acumulados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Lucros Acumulados
 DocType: BOM Item,Item Description,Descrição do Item
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Abertura temporária
 ,Employee Leave Balance,Saldo de Licenças do Funcionário
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Taxa de avaliação exigido para o Item na linha {0}
@@ -1029,8 +1054,8 @@
 ,Accounts Payable Summary,Resumo do Contas a Pagar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,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 +165,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferir {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
@@ -1038,7 +1063,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Conta {0} criado
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
@@ -1046,12 +1071,12 @@
 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 +493,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de UDM é necessário para UDM: {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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Seus produtos ou serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +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
@@ -1061,19 +1086,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Site do Vendedor
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status de ordem de produção é {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status de ordem de produção é {0}
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,para Fornecedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Não havia nenhuma item chamado {0}
 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
@@ -1081,10 +1107,10 @@
 DocType: Item,Website Item Groups,Grupos de Itens do site
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
-DocType: Journal Entry,Journal Entry,Lançamento do livro Diário
+DocType: Depreciation Schedule,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 +433,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 +442,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
 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
@@ -1093,6 +1119,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Request for Quotation Fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ferragens
 DocType: Sales Order,Recurring Upto,recorrente Upto
 DocType: Attendance,HR Manager,Gerente de RH
@@ -1103,6 +1130,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valor atual Depois de depreciação deve ser menor ou igual a {0}
 ,BOM Browser,Navegador de LDM
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se orçamento anual excedida (para conta de despesas)
@@ -1117,21 +1145,22 @@
 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}
 DocType: Project,Start and End Dates,Iniciar e terminar datas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,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/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+,Delivered Items To Be Billed,"Itens Entregues, mas não 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: Authorization Rule,Average Discount,Desconto Médio
 DocType: Address,Utilities,Serviços Públicos
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração de características
+DocType: Asset,Depreciation Schedules,agendamentos de depreciação
 DocType: Item,Is Service Item,É item de serviço
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,Moeda de transação
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},A partir de {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descrição da operação
 DocType: Item,Will also apply to variants,Será também aplicável às variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
 DocType: Quotation,Shopping Cart,Carrinho de Compras
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Média diária de saída
 DocType: Pricing Rule,Campaign,Campanha
@@ -1145,8 +1174,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Alteração Líquida da Imobilizaçã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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
@@ -1154,13 +1183,13 @@
 DocType: Sales Invoice,Shipping Address Name,Nome do endereço para entrega
 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 +472,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,não pode ser maior do que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
 DocType: Pricing Rule,"Higher the number, higher the priority","Quanto maior o número, maior a prioridade"
-,Purchase Invoice Trends,Compra Tendências fatura
+,Purchase Invoice Trends,Tendência de Faturamento de Compras
 DocType: Employee,Better Prospects,Melhores perspectivas
 DocType: Appraisal,Goals,Metas
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado do CAM
@@ -1177,11 +1206,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Regra de imposto para transações.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
@@ -1191,12 +1220,15 @@
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assembléias
+DocType: Asset,Asset Name,Nome de ativos
 DocType: Shipping Rule Condition,To Value,Ao Valor
-DocType: Supplier,Stock Manager,Da Gerente
+DocType: Supplier,Stock Manager,Gerente de Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Guia de Remessa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Aluguel do Escritório
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Solicitação de cotação pode ser acessado clicando link abaixo
+DocType: Asset,Number of Months in a Period,Número de meses num período de
 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 da Estação de Trabalho
@@ -1209,23 +1241,24 @@
 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: Item Attribute,Item Attribute,Atributo item
+DocType: Item Attribute,Item Attribute,Item Atributos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
-DocType: Sales Invoice,Source,Fonte
+DocType: Sales Invoice,Source,Origem
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Mostrar fechada
 DocType: Leave Type,Is Leave Without Pay,É Licença Não Remunerada
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
 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 +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1234,7 +1267,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Total do Disconto adicional (moeda da empresa)
 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 ."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visita de manutenção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visita de manutenção
 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: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
@@ -1248,7 +1281,6 @@
 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 +196,Brand master.,Cadastro de Marca.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; tipo de fornecedor
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Caixa
@@ -1263,7 +1295,7 @@
 DocType: Shopping Cart Settings,Payment Success URL,Pagamento URL Sucesso
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,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
+,Bank Reconciliation Statement,Extrato Bancário Conciliado
 DocType: Address,Lead Name,Nome do Cliente em Potencial
 ,POS,POS
 apps/erpnext/erpnext/config/stock.py +295,Opening Stock Balance,Abertura da Balance
@@ -1276,16 +1308,16 @@
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Os pedidos de despesa da empresa.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Passivo estoque
 DocType: Purchase Receipt,Supplier Warehouse,Almoxarifado do Fornecedor
 DocType: Opportunity,Contact Mobile No,Celular do Contato
-,Material Requests for which Supplier Quotations are not created,Os pedidos de materiais para os quais Fornecedor Quotations não são criados
+,Material Requests for which Supplier Quotations are not created,"Itens Requisitados, mas não Quotados"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Pagamento reenviar Email
-apps/erpnext/erpnext/config/selling.py +210,Other Reports,outros Relatórios
+apps/erpnext/erpnext/config/selling.py +210,Other Reports,Relatórios Adicionais
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1295,30 +1327,31 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Visão
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Anterior Exercício não está fechada
 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: Quotation Item,Quotation Item,Item do Orçamento
 DocType: Account,Account Name,Nome da Conta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Fornecedor Tipo de mestre.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça do Fornecedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 DocType: Purchase Invoice,Reference Document,Documento de referência
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Cobrada
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
-DocType: Lead,Upper Income,Renda superior
+DocType: Lead,Upper Income,Alta Renda
 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
 DocType: BOM Item,BOM Item,Item da LDM
@@ -1336,8 +1369,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variação Líquida em contas a pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique seu e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
 DocType: Quotation,Term Details,Detalhes dos Termos
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Reclamação de Garantia
@@ -1355,9 +1389,9 @@
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior do que o Total Geral {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Por favor seleccione código do item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
-DocType: Territory,Territory Manager,Gerenciador de Territórios
+DocType: Territory,Territory Manager,Gestor de Territórios
 DocType: Packed Item,To Warehouse (Optional),Para Warehouse (Opcional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
@@ -1365,15 +1399,15 @@
 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 +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Despesas de Marketing
+,Item Shortage Report,Relatório de Escassez de Itens
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Unidade única de um item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Almoxarifado necessário na Coluna No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Almoxarifado necessário na Coluna No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1390,33 +1424,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+,Item-wise Sales Register,Registro de Vendas por Item
+DocType: Asset,Gross Purchase Amount,Valor Comprar Gross
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","ex: ""XYZ National Bank """
+DocType: Asset,Depreciation Method,Método de depreciação
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este imposto está incluído no Valor Base?
 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 +29,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 DocType: Production Plan Material Request,Production Plan Material Request,Produção Request Plano de materiais
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Não há ordens de produção criadas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não há ordens de produção criadas
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 DocType: Employee Attendance Tool,Employees HTML,funcionários HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças Cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Criar ordem de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Criar ordem de compra
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1424,31 +1460,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliação de Estoque
 DocType: Territory,Territory Name,Nome do Território
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Endereços
+apps/erpnext/erpnext/hooks.py +91,Addresses,Endereços
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,apreciações
+apps/erpnext/erpnext/config/hr.py +141,Appraisals,Avaliações
 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 +337,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Logs de horário para a fabricação.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Também se aplica a variantes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtde Real
 DocType: Sales Invoice Item,References,Referências
@@ -1459,6 +1496,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
+DocType: Request for Quotation Supplier,Send Email to Supplier,Enviar e-mail para Fornecedor
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 DocType: Packing Slip,To Package No.,Para Pacote Nº.
 DocType: Production Planning Tool,Material Requests,Os pedidos de material
@@ -1469,21 +1507,21 @@
 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 +126,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
+,Sales Invoice Trends,Tendência de Faturamento de Vendas
 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,Almoxarifado de entrega
 DocType: Stock Settings,Allowance Percent,Percentual de tolerância
 DocType: SMS Settings,Message Parameter,Parâmetro da mensagem
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Árvore de Centros de custo financeiro.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Árvore de Centros de custo financeiro.
 DocType: Serial No,Delivery Document No,Nº do Documento de Entrega
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obter itens De recibos de compra
 DocType: Serial No,Creation Date,Data de criação
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} aparece várias vezes na Lista de Preço {1}
 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: Production Plan Material Request,Material Request Date,Material Data de Solicitação
-DocType: Purchase Order Item,Supplier Quotation Item,Item da Cotação do Fornecedor
+DocType: Purchase Order Item,Supplier Quotation Item,Item do Orçamento de Fornecedor
 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
 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.
@@ -1508,48 +1546,51 @@
 ,Amount to Deliver,Valor a entregar
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} criado
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra a Ordem de Vendas
 ,Serial No Status,Estado do Nº de Série
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Mesa Item não pode estar em branco
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para definir {1} periodicidade, diferença entre a data de \
  e deve ser maior do que ou igual a {2}"
 DocType: Pricing Rule,Selling,Vendas
 DocType: Employee,Salary Information,Informação Salarial
 DocType: Sales Person,Name and Employee ID,Nome e identificação do funcionário
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Gateway de Pagamento de Conta não está configurado
 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: Production Order,Material Request Item,Item de solicitação de material
+DocType: Request for Quotation Item,Material Request Item,Item de solicitação de material
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Vendido
+,Item-wise Purchase History,Histórico de Compras por Item
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
+,Open Production Orders,Ordens a serem Produzidas
 DocType: Installation Note,Installation Time,O tempo de Instalação
 DocType: Sales Invoice,Accounting Details,Detalhes Contabilidade
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Apagar todas as transações para esta empresa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes da Resolução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Por favor insira os pedidos de materiais na tabela acima
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Por favor insira os pedidos de materiais na tabela acima
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: Item Group,Show In Website,Mostrar No Site
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,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"
+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 um marca no seguintes documentos: Nota de Entrega, Oportunidade, Pedido de Material, Item, Pedido de Compra, Recibo de Compra, Orçamentos, Notas Fiscais, Pacote de Produtos, Pedido de Vendas, Nºs de Série"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
+DocType: Pricing Rule,Margin Type,Tipo margem
 DocType: Appraisal,For Employee Name,Para Nome do Funcionário
 DocType: Holiday List,Clear Table,Limpar Tabela
 DocType: Features Setup,Brands,Marcas
@@ -1557,20 +1598,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Linha # {0}: ativos é obrigatória contra um ativo ponto fixo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure séries de numeração para Participação em Configurar&gt; Numeração Series"
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,par
+DocType: Asset,Depreciation Schedule,Tabela de depreciação
 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: Asset,Purchase Date,data de compra
 DocType: Employee,Personal Details,Detalhes pessoais
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
 ,Maintenance Schedules,Horários de Manutenção
-,Quotation Trends,Tendências de cotação
+,Quotation Trends,Tendências de orçamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
 ,Pending Amount,Enquanto aguarda Valor
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
@@ -1578,29 +1624,28 @@
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 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
+,Supplier-Wise Sales Analytics,Análise de Vendas por Fornecedor
 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: Production Order,Use Multi-Level BOM,Utilize LDM de Vários Níveis
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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,Total do Disconto adicional
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de Não-Grupo
 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/public/js/setup_wizard.js +272,Unit,unidade
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Por favor, especifique Empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Pós-Vendas
 ,BOM Search,Pesquisar LDM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
@@ -1609,29 +1654,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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},Fator de Conversão de UDM é necessário na linha {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 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
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 DocType: Project,% Tasks Completed,% Tarefas Concluídas
 DocType: Project,Gross Margin,Margem Bruta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Por favor, indique item Produção primeiro"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Por favor, indique item Produção primeiro"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculado equilíbrio extrato bancário
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Cotação
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Custo Atualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
 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
@@ -1643,8 +1689,8 @@
 ,SO Qty,SO Qtde
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
+DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufatura
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Os embarques
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
@@ -1652,12 +1698,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Usuário {0} está desativado
@@ -1666,7 +1712,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 DocType: Currency Exchange,From Currency,De Moeda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ordem de venda necessário para item {0}
@@ -1676,13 +1722,13 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Linha # {0}: Quantidade deve ser 1, como o artigo está vinculado a um ativo"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Criança item não deve ser um pacote de produtos. Por favor remover o item `` {0} e salvar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Novo Centro de Custo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Ir para o grupo apropriado (geralmente Fonte de Recursos&gt; Passivo Circulante&gt; Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e mencionam a taxa de imposto.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade encomendada
-apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","ex: ""Construa ferramentas para os construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
 apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,Árvore de contas financeiras.
@@ -1693,10 +1739,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Estoque
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Time Logs criado:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Logs criado:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
 DocType: Employee,Blood Group,Grupo sanguíneo
@@ -1714,13 +1761,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta regra de envio ou verifique Transporte mundial"
 DocType: Stock Entry,Total Incoming Value,Valor total entrante
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Para Débito é necessária
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Gerente da Qualidade
 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 +141,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Ofeta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produção.
@@ -1728,22 +1775,22 @@
 DocType: Time Log,To Time,Para Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Função de Aprovador ( para autorização de valo r excedente )
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Preço de {0} está desativado
-DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Preço de {0} está desativado
+DocType: Manufacturing Settings,Allow Overtime,Permitir Hora Extra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} número de série é necessário para item {1}. Você forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taxa Atual de Avaliação
 DocType: Item,Customer Item Codes,Item de cliente Códigos
-DocType: Opportunity,Lost Reason,Razão da perda
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas.
+DocType: Opportunity,Lost Reason,Motivo da Perda
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo endereço
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1752,12 +1799,13 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nenhuma folha de salário encontrada para o mês:
 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 +175,Serial No {0} not found,Serial No {0} não foi encontrado
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} não foi encontrado
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Clientes
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplique agora
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplique agora
 DocType: Sales Order,Not Delivered,Não Entregue
-,Bank Clearance Summary,Banco Resumo Clearance
+,Bank Clearance Summary,Resumo da Liquidação Bancária
 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."
 DocType: Appraisal Goal,Appraisal Goal,Meta de Avaliação
 DocType: Time Log,Costing Amount,Custando Montante
@@ -1779,7 +1827,7 @@
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Definir como Fechado
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nenhum artigo com código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nenhum artigo com código de barras {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso n não pode ser 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,Se você tiver Equipe de Vendas e Parceiros de Venda (Parceiros de Canal) eles podem ser marcadas e manter suas contribuições na atividade de vendas
 DocType: Item,Show a slideshow at the top of the page,Mostrar uma apresentação de slides no topo da página
@@ -1797,10 +1845,10 @@
 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 +608,Transfer Material,transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,transferência de Material
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} deve ser um item de vendas em {1}
 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."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
 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
@@ -1814,12 +1862,13 @@
 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: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Colaborador
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Instalações Pós-Venda
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Por favor, defina {0} in Company {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
@@ -1828,9 +1877,9 @@
 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: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Por favor, selecione BOM para o Item na linha {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione BOM para o Item na linha {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
@@ -1847,25 +1896,25 @@
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Gateway Account,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceito
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Breve Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} não foi enviado
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1874,7 +1923,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,As seguintes ordens de produção foram criadas:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,As seguintes ordens de produção foram criadas:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome da Transportadora
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
@@ -1886,19 +1935,19 @@
 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
-,Completed Production Orders,Ordens de produção concluídas
+,Completed Production Orders,Ordens Produzidas
 DocType: Operation,Default Workstation,Workstation Padrão
 DocType: Notification Control,Expense Claim Approved Message,Mensagem de aprovação do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} é fechado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} esta fechado(a)
 DocType: Email Digest,How frequently?,Com que frequência?
 DocType: Purchase Receipt,Get Current Stock,Obter Estoque atual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir para o grupo apropriado (geralmente Aplicações de Recursos&gt; Ativo Circulante&gt; contas bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árvore da Bill of Materials
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcar Presença
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
 DocType: Production Order,Actual End Date,Data Final Real
 DocType: Authorization Rule,Applicable To (Role),Aplicável Para (Função)
 DocType: Stock Entry,Purpose,Finalidade
+DocType: Company,Fixed Asset Depreciation Settings,Configurações de depreciação do ativo imobilizado
 DocType: Item,Will also apply for variants unless overrridden,Também se aplica a variantes a não ser que seja sobrescrito
 DocType: Purchase Invoice,Advances,Avanços
 DocType: Production Order,Manufacture against Material Request,Fabricação de encontro Pedido de Material
@@ -1907,6 +1956,7 @@
 DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,"Por favor, informe os itens especificados com as melhores tarifas possíveis"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1957,12 +2007,14 @@
  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: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
-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}
+DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir para o grupo apropriado (geralmente Aplicações de Recursos&gt; Ativo Circulante&gt; contas bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Journal Entry,Credit Note,Nota de Crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1986,9 +2038,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nenhum funcionário para os critérios acima selecionado ou folha de salário já criado
@@ -2001,9 +2053,9 @@
 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
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,Razão
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,Livro Razão
 DocType: Target Detail,Target  Amount,Valor da meta
-DocType: Shopping Cart Settings,Shopping Cart Settings,Carrinho Configurações
+DocType: Shopping Cart Settings,Shopping Cart Settings,Configurações do Carrinho de Compras
 DocType: Journal Entry,Accounting Entries,Lançamentos contábeis
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Duplicar entrada . Por favor, verifique Regra de Autorização {0}"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global de POS perfil {0} já criado para a empresa {1}
@@ -2015,7 +2067,7 @@
 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 +200,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 """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Folha de pagamento
 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"
@@ -2025,8 +2077,9 @@
 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
 DocType: Account,Income Account,Conta de Receitas
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No modelo padrão de endereços encontrados. Por favor, crie um novo a partir Setup&gt; Printing and Branding&gt; modelo de endereço."
 DocType: Payment Request,Amount in customer's currency,Montante em moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2048,26 +2101,27 @@
 apps/erpnext/erpnext/config/selling.py +168,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 +326,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 +665,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} orçamento_para {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Todos os Endereços.
-DocType: Company,Stock Settings,Configurações da
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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"
+DocType: Company,Stock Settings,Configurações de Estoque
+apps/erpnext/erpnext/accounts/doctype/account/account.py +215,"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 +92,Manage Customer Group Tree.,Gerenciar grupos de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Novo Centro de Custo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
 DocType: Appraisal,HR User,HR Usuário
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
-apps/erpnext/erpnext/config/support.py +7,Issues,Issues
+apps/erpnext/erpnext/hooks.py +90,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado deve ser um dos {0}
 DocType: Sales Invoice,Debit To,Débito Para
 DocType: Delivery Note,Required only for sample item.,Necessário apenas para o item de amostra.
 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/accounts/party.py +322,{0} {1} is disabled,{0} {1} está desativado
+DocType: Supplier,Billing Currency,Moeda de Faturamento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
-,Profit and Loss Statement,Demonstração dos Resultados
+,Profit and Loss Statement,Demonstrativo de Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número do cheque
-DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
+DocType: Payment Tool Detail,Payment Tool Detail,Detalhes da Consolidação de Pagamentos
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
@@ -2076,12 +2130,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 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 +139,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
 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 +142,Quotation {0} is cancelled,Cotação {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,O Orçamento {0} está cancelado
 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
@@ -2147,13 +2201,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,solicitado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Não Observações
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Imobilização O artigo deve ser um item não inventariado
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2162,7 +2217,7 @@
 apps/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,Gerenciar territórios
 DocType: Journal Entry Account,Sales Invoice,Nota Fiscal de Venda
 DocType: Journal Entry Account,Party Balance,Balance Partido
-DocType: Sales Invoice Item,Time Log Batch,Tempo Batch Log
+DocType: Sales Invoice Item,Time Log Batch,Logs de Tempo em Lote
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +85,Salary Slip Created,Deslizamento Salário Criado
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
@@ -2174,7 +2229,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Payment Request,Recipient and Message,Destinatário ea mensagem
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2188,7 +2243,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Escolha um Fornecedor Endereço
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mudo Email
@@ -2210,11 +2265,12 @@
 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/config/buying.py +18,Request for quotation.,Solicitação de cotação.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 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 +294,Price List Currency not selected,Lista de Preço Moeda não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2223,10 +2279,10 @@
 DocType: Installation Note Item,Against Document No,Contra o Documento Nº
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Gerenciar parceiros de vendas.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Por favor seleccione {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
-DocType: Employee Attendance Tool,Unmarked Attendance,Presença Unmarked
+DocType: Employee Attendance Tool,Unmarked Attendance,Presença Desmarcada
 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 +25,Name or Email is mandatory,Nome ou E-mail é obrigatório
@@ -2238,6 +2294,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Conta depreciação Despesa
 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
@@ -2251,7 +2308,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 DocType: Payment Gateway,Gateway,Porta de entrada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Por favor, indique data alívio ."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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.
@@ -2265,18 +2322,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Meio Dia
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Meio Dia
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
 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 +410,[Error],[Erro]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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 dos Funcionários
 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 +49,Serial No {0} does not exist,Serial Não {0} não existe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; tipo de fornecedor
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Almoxarifado Cliente (Opcional)
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
@@ -2286,9 +2344,9 @@
 DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
 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
+,Issued Items Against Production Order,Itens Produzidos versus Ordens de Produção
 DocType: Pricing Rule,Purchase Manager,Gerente de Compras
-DocType: Payment Tool,Payment Tool,Ferramenta de pagamento
+DocType: Payment Tool,Payment Tool,Consolidação de Pagamentos
 DocType: Target Detail,Target Detail,Detalhe da meta
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Todos os trabalhos
 DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado contra esta Ordem de Venda
@@ -2296,20 +2354,22 @@
 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
 DocType: Account,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
-DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta de comparecimento do empregado
+DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta para Lançamento de Ponto
 DocType: Supplier,Credit Limit,Limite de Crédito
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Date
 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
 DocType: Leave Allocation,Leave Allocation,Alocação de Licenças
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Pedidos de Materiais {0} criado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Pedidos de Materiais {0} criado
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Modelo de termos ou contratos.
 DocType: Purchase Invoice,Address and Contact,Endereço e Contato
 DocType: Supplier,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 +280,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/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Conta de depreciação acumulada
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
+DocType: Asset,Expected Value After Useful Life,Valor Esperado após sua vida útil
 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
@@ -2319,19 +2379,19 @@
 DocType: Quality Inspection,Outgoing,De Saída
 DocType: Material Request,Requested For,solicitadas para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
-apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} é cancelada ou fechada
+apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} está cancelado(a) ou fechado(a)
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Guia de Remessa contra qualquer projeto
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Caixa Líquido de Investimentos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Conta root não pode ser excluído
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Activo {0} deve ser apresentado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Gerenciar endereços
-DocType: Pricing Rule,Item Code,Código do Item
+DocType: Asset,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
 DocType: Serial No,Warranty / AMC Details,Garantia / Detalhes do CAM
 DocType: Journal Entry,User Remark,Observação do Usuário
-DocType: Lead,Market Segment,Segmento de mercado
+DocType: Lead,Market Segment,Segmento de Renda
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Indiferente
@@ -2346,8 +2406,10 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais
 DocType: Employee Education,School/University,Escola / Universidade
 DocType: Payment Request,Reference Details,Detalhes Referência
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Gross Compra Valor
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque
 ,Billed Amount,valor faturado
+DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ordem fechada não pode ser cancelada. Unclose para cancelar.
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliação Bancária
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
@@ -2366,32 +2428,36 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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
+DocType: Asset,Fully Depreciated,totalmente depreciados
+,Stock Projected Qty,Projeção de Estoque
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,O número de série e de lote
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Encomendas produções não podem ser levantadas para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Encomendas produções não podem ser levantadas para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Varejista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Desativar In Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,Quotation {0} not of type {1},O Orçamento {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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Conta Bancária Garantida
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Empréstimos garantidos
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as contas relacionadas com depreciação de ativos em Categoria {0} ou Empresa {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Abertura Patrimônio Balance
 DocType: Appraisal,Appraisal,Avaliação
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail enviado ao fornecedor {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetida
 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 +187,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
@@ -2399,7 +2465,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,A importação em massa de Ajuda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Select Quantidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Select Quantidade
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Perfil Aprovandor não pode ser o mesmo Perfil da regra é aplicável a
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Cancelar a inscrição nesse Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem enviada
@@ -2427,6 +2493,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margem total
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
 DocType: Expense Claim,Approval Status,Estado da Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
@@ -2440,7 +2507,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Cliente/Cliente
 DocType: Payment Gateway Account,Default Payment Request Message,Padrão Pedido de Pagamento Mensagem
 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/config/accounts.py +118,Banking and Payments,Bancária e de Pagamentos
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bancos e Pagamentos
 ,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,Fazer um Orçamento
@@ -2448,17 +2515,17 @@
 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 +199,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 da Cotação
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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 do Orçamento
 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/config/hr.py +55,Leaves and Holiday,Folhas e férias
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Faturamento
@@ -2472,38 +2539,43 @@
 apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,Presença Mark empregado em massa
 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
+DocType: Shopping Cart Settings,Quotation Series,Séries de Orçamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Activo Centro de Custo Depreciação
 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
-,Payment Period Based On Invoice Date,Período de pagamento com base no fatura Data
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Data de compra de ativos {0} não coincide com a data de compra Fatura
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
+,Payment Period Based On Invoice Date,Prazo Médio de Pagamento Baseado na Emissão da Nota
 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}
 DocType: Journal Entry,Stock Entry,Lançamento no Estoque
 DocType: Account,Payable,a pagar
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Devedores ({0})
-DocType: Project,Margin,Margem
+DocType: Pricing Rule,Margin,Margem
 DocType: Salary Slip,Arrear Amount,Quantidade em atraso
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Lucro Bruto%
 DocType: Appraisal Goal,Weightage (%),Peso (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
-DocType: Newsletter,Newsletter List,Lista boletim informativo
+DocType: Newsletter,Newsletter List,Lista de disparo do boletim informativo
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Marque se você quiser enviar a folha de pagamento pelo correio a cada empregado ao enviar a folha de pagamento
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Valor Comprar Gross é obrigatória
 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 +57,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
 DocType: Stock Entry Detail,Source Warehouse,Almoxarifado de origem
 DocType: Installation Note,Installation Date,Data de Instalação
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
 DocType: Employee,Confirmation Date,Data de Confirmação
 DocType: C-Form,Total Invoiced Amount,Valor Total Faturado
 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: Account,Accumulated Depreciation,Depreciação acumulada
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
 DocType: Payment Request,Email To,Email para
 DocType: Lead,Lead Owner,Proprietário do Cliente em Potencial
 DocType: Bin,Requested Quantity,solicitada Quantidade
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Armazém é necessária
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2511,11 +2583,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Rendimentos
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregue
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Entregue
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas do Território
 DocType: Delivery Note,Transporter Info,Informações da Transportadora
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Mesmo fornecedor foi inserido várias vezes
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item da Ordem de Compra fornecido
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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 .
@@ -2525,13 +2598,14 @@
 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 .
 DocType: Payment Request,Payment Details,Detalhes do pagamento
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
+DocType: Asset,Journal Entry for Scrap,Entrada de diário para sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
 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 +73,"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."
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados em Itens
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Criar Novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2544,8 +2618,8 @@
 ,Stock Ledger,Livro de Inventário
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução da folha de pagamento
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empregado e Presença
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empregado e Ponto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Remover de referência de cliente, fornecedor, parceiro de vendas e chumbo, como é o seu endereço de empresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,Preencha o formulário e salvá-lo
@@ -2566,13 +2640,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: A partir de {1}
 DocType: Task,depends_on,depende_de
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mostrar imposto break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) está fora de estoque
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Data de lançamento
@@ -2587,7 +2662,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,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 +101,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2601,7 +2676,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' é desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2611,7 +2686,7 @@
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Warranty Claim,Item and Warranty Details,Itens e Garantia Detalhes
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Modelo
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
@@ -2622,7 +2697,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
@@ -2631,11 +2706,12 @@
 DocType: Journal Entry,Printing Settings,Configurações de impressão
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Conta de Imobilização
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investimento Bancário
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Preço
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
@@ -2643,7 +2719,7 @@
 DocType: Stock Entry,From BOM,De BOM
 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 +96,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 +204,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","por exemplo, kg, Unidade, nº, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
@@ -2651,31 +2727,33 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Estrutura Salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Almoxarifado
 DocType: Employee,Offer Date,Oferta Data
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Orçamentos
 DocType: Hub Settings,Access Token,Token de Acesso
 DocType: Sales Invoice Item,Serial No,Nº de Série
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
-DocType: Item,Is Fixed Asset Item,É item de Imobilização
-DocType: Purchase Invoice,Print Language,Imprimir Idioma
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
+DocType: Purchase Invoice,Print Language,Idioma de Impressã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"
+DocType: Asset,Number of Depreciations,Número de Amortizações
 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
+DocType: Process Payroll,Process Payroll,Processar a Folha de Pagamento
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Solicitação de Cotações
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montante Máximo Invoice
 DocType: Purchase Invoice Item,Image View,Ver imagem
 apps/erpnext/erpnext/config/selling.py +23,Customers,clientes
+DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Almoxarifado de origem
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
@@ -2691,13 +2769,13 @@
 DocType: Quotation,Maintenance Manager,Gerente de Manutenção
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Corrigido a partir de
+DocType: Asset,Amended From,Corrigido a partir de
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Não existe LDM padrão para o item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Não existe LDM padrão para o item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2710,21 +2788,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Por favor, mencione &#39;Conta Perda / Ganho na Ativos Eliminação&#39; in Company"
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Pagamentos combinar com Facturas
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Pagamentos combinar com Facturas
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adicionar ao carrinho
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Ativar / desativar moedas.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Ativar / desativar moedas.
 DocType: Production Planning Tool,Get Material Request,Get Material Pedido
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despesas Postais
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Despesas Postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Presente total
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,demonstrações contábeis
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Demonstrativos Contábeis
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2744,28 +2823,30 @@
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
 DocType: Features Setup,Item Groups in Details,Detalhes dos Grupos de Itens
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 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 +32,Visit report for maintenance call.,Relatório da visita da chamada de manutenção.
 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 +169,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 +171,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Mudança no Patrimônio Líquido
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Por favor cancelar factura de compra {0} primeiro
 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
+,Sales Register,Registro de Vendas
+DocType: Quotation,Quotation Lost Reason,Motivo da perda do Orçamento
 DocType: Address,Plant,Fábrica
 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
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Erro: {0}&gt; {1}
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Última data do pedido
 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: C-Form,C-Form,Formulário-C
@@ -2777,18 +2858,18 @@
 DocType: Purchase Invoice,Mobile No,Telefone Celular
 DocType: Payment Tool,Make Journal Entry,Faça Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Novas Licenças alocadas
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
+apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,Dados do baseados em projeto não estão disponíveis para Orçamentos
 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/setup_wizard/setup_wizard.py +343,Commercial,Comercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Erro: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Todos os Produtos ou Serviços.
 DocType: Supplier Quotation,Supplier Address,Endereço do Fornecedor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # A conta deve ser do tipo &quot;Ativo Fixo &#39;
 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 +251,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2797,60 +2878,63 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
-DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
+DocType: Customer,Default Receivable Accounts,Padrões de Contas a Receber
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date é obrigatória
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar Para/ Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
 DocType: Payment Reconciliation,To Invoice Date,Para Data da fatura
 DocType: Supplier,Contact HTML,Contato HTML
-,Inactive Customers,Os clientes inativos
+,Inactive Customers,Clientes Inativos
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Como regra de preços é aplicada?
 DocType: Quality Inspection,Delivery Note No,Nº da Guia de Remessa
 DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,Pacote de Produtos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelo de Encargos em Impostos sobre Compras
 DocType: Upload Attendance,Download Template,Baixar o Modelo
 DocType: GL Entry,Remarks,Observações
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matérias-Primas
 DocType: Journal Entry,Write Off Based On,Eliminar Baseado em
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Enviar e-mails de fornecedores
 DocType: Features Setup,POS View,Visualizar PDV
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Registro de instalação de um nº de série
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Tempo Log foi faturada
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +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
+,Monthly Attendance Sheet,Folha de Ponto 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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure séries de numeração para Participação em Configurar&gt; Numeração Series"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obter Itens de Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
+DocType: Asset,Straight Line,Linha reta
+DocType: Project User,Project User,Usuário projecto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Descontos de Vendas
@@ -2859,44 +2943,45 @@
 DocType: Authorization Rule,Authorization Rule,Regra de autorização
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condições
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,especificações
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelo de Encargos e Impostos sobre Vendas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Adicionar sub-item
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Valor de abertura
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser submetido, já é {2}"
 DocType: Tax Rule,Billing Country,País de faturamento
 ,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 +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e Crédito não são iguais para {0} # {1}. A diferença é de {2}.
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,despesas de representação
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,despesas legais
 DocType: Sales Invoice,Posting Time,Horário da Postagem
 DocType: Sales Order,% Amount Billed,Valor faturado %
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Despesas de telefone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Despesas de telefone
 DocType: Sales Partner,Logo,Logotipo
 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.,Marque esta opção se você deseja forçar o usuário a selecionar uma série antes de salvar. Não haverá nenhum padrão se você marcar isso.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abertas Notificações
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despesas Diretas
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
-						Email Address'",{0} é um endereço de e-mail inválido em &#39;Notificação \ Email Address&#39;
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Despesas Diretas
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
+						Email Address'",{0} é um endereço de e-mail inválido em 'Notificação \ Endereço de Email'
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,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 +60,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
@@ -2913,7 +2998,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Quantidade deve ser maior do que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Quantidade deve ser maior do que 0
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
@@ -2924,11 +3009,12 @@
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Fornecedor de ativos {0} não coincide com o fornecedor da factura de compra
 DocType: Newsletter,Test Email Id,Endereço de Email de Teste
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Modelo Mestre de Salário .
@@ -2944,12 +3030,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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,Endereço preferido de faturamento
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,moeda de faturamento deve ser igual à moeda quer padrão do comapany ou moeda da conta payble do partido
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se desativar &quot;, nas palavras de campo não será visível em qualquer transação"
@@ -2959,13 +3046,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote Log Tempo foi cancelada.
 ,Reqd By Date,Requisições Por Data
 DocType: Salary Slip Earning,Salary Slip Earning,Ganhos da folha de pagamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Credores
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Credores
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: O número de série é obrigatória
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhe Imposto item Sábio
-,Item-wise Price List Rate,-Item sábio Preço de Taxa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+,Item-wise Price List Rate,Lista de Preços por Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Orçamento de Fornecedor
+DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar o orçamento.
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2986,16 +3073,15 @@
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
-DocType: Project,Project Name,Nome do Projeto
-DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
+DocType: Request for Quotation Item,Project Name,Nome do Projeto
+DocType: Supplier,Mention if non-standard receivable account,Mencione se a conta a receber não for a conta padrão
 DocType: Journal Entry Account,If Income or Expense,Se 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
@@ -3022,8 +3108,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,Pago e não entregue
 DocType: Project,Default Cost Center,Centro de Custo Padrão
 DocType: Sales Invoice,End Date,Data final
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Stock
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Estoque
 DocType: Employee,Internal Work History,História Trabalho Interno
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Acumulado montante de depreciação
 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
@@ -3031,7 +3118,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Empresa é obrigatório, como é o seu endereço de empresa"
 DocType: Item Attribute,From Range,De Faixa
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Item {0} ignorado uma vez que não é um item de estoque
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
 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.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
 DocType: Company,Domain,Domínio
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -3043,6 +3130,7 @@
 DocType: Time Log,Additional Cost,Custo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3051,7 +3139,7 @@
 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 +350,Note: {0},Nota : {0}
-,Delivery Note Trends,Nota de entrega Trends
+,Delivery Note Trends,Tendência de Remessas
 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
@@ -3059,7 +3147,8 @@
 DocType: Sales Order,Delivery Date,Data de entrega
 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: Request for Quotation Item,Request for Quotation Item,Solicitação de Cotação do Item
+DocType: Purchase Order,To Bill,Para Faturar
 DocType: Material Request,% Ordered,% Ordenado
 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 +68,Avg. Buying Rate,Méd. Taxa de Compra
@@ -3069,15 +3158,16 @@
 DocType: Address,Shipping,Expedição
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lançamento do Livro de Inventário
 DocType: Department,Leave Block List,Lista de Bloqueio de Licença
-DocType: Customer,Tax ID,CPF
+DocType: Customer,Tax ID,CPF/CNPJ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} não está configurado para Serial Coluna N º s deve estar em branco
 DocType: Accounts Settings,Accounts Settings,Configurações de contas
-DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
+DocType: Customer,Sales Partner and Commission,Parceiro de Vendas e Comissão
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},"Por favor, defina &#39;Conta baixa de ativos &quot;in Company {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Máquinas e instalações
 DocType: Sales Partner,Partner's Website,Site do parceiro
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Contas temporárias
 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
@@ -3086,21 +3176,22 @@
 DocType: Pricing Rule,Disable,Desativar
 DocType: Project Task,Pending Review,Revisão pendente
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Clique aqui para pagar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}"
 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
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Ausente
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Adicionar itens de
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Adicionar itens de
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Mestre {1} não pertence à empresa {2}
 DocType: BOM,Last Purchase Rate,Valor da última compra
 DocType: Account,Asset,Ativo
 DocType: Project Task,Task ID,ID Tarefa
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","por exemplo "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Armazém {0} não existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3115,6 +3206,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} foi desativado
 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
@@ -3126,7 +3218,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Configuração contas Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Configuração contas Gateway.
 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
 ,Cash Flow,Fluxo de caixa
@@ -3140,7 +3232,7 @@
 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 +132,Please find attached {0} #{1},Segue em anexo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Segue em anexo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Balanço banco Declaração de acordo com General Ledger
 DocType: Job Applicant,Applicant Name,Nome do Candidato
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
@@ -3156,19 +3248,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,As configurações padrão para a venda de transações.
 DocType: BOM Replace Tool,Current BOM,LDM atual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar Serial No
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantia
 DocType: Production Order,Warehouses,Armazéns
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Atualizar Produtos Acabados
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Atualizar Produtos Acabados
 DocType: Workstation,per hour,por hora
-apps/erpnext/erpnext/config/buying.py +7,Purchasing,aquisitivo
+apps/erpnext/erpnext/config/buying.py +7,Purchasing,Requisições
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
@@ -3198,7 +3289,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
 DocType: Purchase Invoice,In Words,Por extenso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Hoje é {0} 's aniversário!
 DocType: Production Planning Tool,Material Request For Warehouse,Pedido de material para Armazém
@@ -3211,9 +3302,11 @@
 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/projects/doctype/project/project.py +133,Join,Junte-se
 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 +564,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de pagamento
+DocType: Pricing Rule,Margin Rate or Amount,Margem de velocidade ou quantidade
 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
@@ -3223,22 +3316,21 @@
 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 +782,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
-,Requested Items To Be Transferred,Itens solicitados para ser transferido
+,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
 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 +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Inválido {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Licença Médica
 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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Taxável
 DocType: Company,Change Abbreviation,Mudança abreviação
 DocType: Expense Claim Detail,Expense Date,Data da despesa
@@ -3256,14 +3348,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Livro Razão
 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/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ID de e-mail deve ser único, já existe para {0}"
+,Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Por favor, defina um padrão Lista férias para Employee {0} ou Empresa {0}"
 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>
@@ -3294,24 +3387,24 @@
 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 .
 DocType: Tax Rule,Purchase Tax Template,Comprar Template Tax
-,Project wise Stock Tracking,Projeto sábios Stock Rastreamento
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
+,Project wise Stock Tracking,Rastreio de Estoque por Projeto
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Real (na origem / destino)
 DocType: Item Customer Detail,Ref Code,Código de Ref.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de funcionários.
 DocType: Payment Gateway,Payment Gateway,Gateway de pagamento
 DocType: HR Settings,Payroll Settings,Configurações da folha de pagamento
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Almoxarifado é obrigatório
 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/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3329,7 +3422,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Por exemplo: smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Moeda de transação deve ser o mesmo da moeda gateway de pagamento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3337,22 +3430,22 @@
 DocType: Purchase Invoice,Submit on creation,Enviar na criação
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Funcionário Aprovada
 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 +420,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 +65,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido , porque Cotação foi feita."
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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
+,Requested Items To Be Ordered,"Itens Requisitados, mas não Pedidos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,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/general_ledger/general_ledger.py +174,Totals,Totais
 DocType: BOM,Manufacturing,Fabricação
-,Ordered Items To Be Delivered,Itens encomendados a serem entregues
+,Ordered Items To Be Delivered,"Itens Vendidos, mas não Despachados"
 DocType: Account,Income,Receitas
 DocType: Industry Type,Industry Type,Tipo de indústria
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Algo deu errado!
@@ -3365,10 +3458,10 @@
 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á-
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Perfil
+apps/erpnext/erpnext/config/accounts.py +258,Point-of-Sale Profile,Perfil do Ponto de Vendas
 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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Empréstimos não garantidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Empréstimos não garantidos
 DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total pago Amt
@@ -3380,11 +3473,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Seus Fornecedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Fornecedor da peça
 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
@@ -3393,12 +3487,12 @@
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} não existe no sistema
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,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: Payment Reconciliation,From Invoice Date,A partir de Data de Fatura
@@ -3407,7 +3501,7 @@
 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 +351,'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 +356,'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
@@ -3420,7 +3514,7 @@
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos estoque
@@ -3434,16 +3528,16 @@
 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 +576,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Atividade / tarefa do projeto.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Pagamento
 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: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,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/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+DocType: Landed Cost Voucher,Landed Cost Voucher,Comprovante de Custos de Desembarque
 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
 DocType: Employee,Health Details,Detalhes sobre a Saúde
@@ -3462,12 +3556,13 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Ano data de início ou data de término é a sobreposição com {0}. Para evitar defina empresa
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,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}
 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.","Exemplo:. ABCD ##### 
  Se série é ajustada e número de série não é mencionado em transações, número de série, em seguida automática será criado com base nesta série. Se você sempre quis mencionar explicitamente Serial Nos para este item. deixe em branco."
-DocType: Upload Attendance,Upload Attendance,Enviar Presenças
+DocType: Upload Attendance,Upload Attendance,Enviar o Ponto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,A LDM e a Quantidade para Fabricação são necessá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 +451,Amount,Quantidade
@@ -3475,11 +3570,11 @@
 ,Sales Analytics,Analítico de Vendas
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe do lançamento no Estoque
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Lembretes diários
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Novo Nome da conta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
@@ -3489,11 +3584,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Percentagem
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Trabalho padrão em progresso no almoxarifado
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3501,11 +3597,12 @@
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
 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 +385,Item Code required at Row No {0},Código do item exigido no Row Não {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Ir para o grupo apropriado (geralmente Fonte de Recursos&gt; Passivo Circulante&gt; Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e mencionam a taxa de imposto.
 DocType: Production Order,Production Order,Ordem de Produção
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra o Docname
@@ -3524,18 +3621,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
+DocType: Request for Quotation,Supplier Detail,Detalhe fornecedor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor faturado
 DocType: Attendance,Attendance,Comparecimento
 apps/erpnext/erpnext/config/projects.py +55,Reports,Relatórios
 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 +508,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,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
@@ -3544,11 +3642,11 @@
 DocType: Purchase Invoice,Advance Payments,Adiantamentos
 DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Sem permissão para usar Consolidação de Pagamentos
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Despesas Administrativas
 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 +455,Change,Alteração
@@ -3556,6 +3654,7 @@
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Ativo Categoria Nome
 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
@@ -3567,13 +3666,13 @@
 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 +559,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 de Encerramento Atual (via Registros de Tempo)
 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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Lote
@@ -3585,9 +3684,9 @@
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Padrão Acabou Mercadorias Armazém
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedor
-DocType: Sales Invoice,Cold Calling,Cold Calling
+DocType: Sales Invoice,Cold Calling,Chamada Telefônica
 DocType: SMS Parameter,SMS Parameter,Parâmetro de SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Orçamento e Centro de Custo
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Orçamento e Centro de Custo
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Assinante do Blog
 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.
@@ -3599,11 +3698,11 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,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: Supplier,Credit Days Based On,Dias crédito com base em
-DocType: Tax Rule,Tax Rule,Regra imposto
+DocType: Tax Rule,Tax Rule,Regras de Aplicação de Impostos
 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
+,Items To Be Requested,Itens para Requisitar
 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
@@ -3618,9 +3717,9 @@
 DocType: Purchase Common,Purchase Common,Compras comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Cotação fornecedor {0} criado
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3628,7 +3727,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturas levantdas para Clientes.
 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 +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Conta pai
@@ -3644,7 +3743,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3659,6 +3758,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Desconto e Margem
 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: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Parcial
@@ -3679,30 +3779,31 @@
 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/erpnext/erpnext/accounts/party.py +234,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,Folha de Pagamento Mensal
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Valor na linha anterior
 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
 DocType: Payment Gateway Account,Payment URL Message,Pagamento URL Mensagem
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Tempo Log não é cobrável
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
+DocType: Asset,Asset Category,Categoria de ativos
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material a Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Excise Invoice
 DocType: Expense Claim,Employees Email Id,Endereços de e-mail dos Funcionários
-DocType: Employee Attendance Tool,Marked Attendance,Presença marcante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Passivo Circulante
+DocType: Employee Attendance Tool,Marked Attendance,Presença Marcada
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Passivo Circulante
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Quant. Real é obrigatória
@@ -3723,39 +3824,39 @@
 DocType: Item Attribute,Numeric Values,Os valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Faça Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear licenças por departamento.
-apps/erpnext/erpnext/config/stock.py +201,Analytics,analítica
+apps/erpnext/erpnext/config/stock.py +201,Analytics,Análise
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,O carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo Operacional Real
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No modelo padrão de endereços encontrados. Por favor, crie um novo a partir Setup&gt; Printing and Branding&gt; modelo de endereço."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Detalhes do peso do pacote
-DocType: Payment Gateway Account,Payment Gateway Account,Pagamento conta de gateway
+DocType: Payment Gateway Account,Payment Gateway Account,Integração com API's de Meios de Pagamento
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Após a conclusão do pagamento redirecionar usuário para a página selecionada.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Por favor, selecione um arquivo csv"
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
+DocType: Asset,Current Value (After Depreciation),Valor Atual (depois de amortizações)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
-,Item-wise Purchase Register,Item-wise Compra Register
+,Item-wise Purchase Register,Registro de Compras por Item
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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/stock/doctype/item/item.py +413,"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,Endereços e Contatos de Fornecedores
 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 +13,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 +409, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obter itens de BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Por favor, indique pedidos de vendas na tabela acima"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, indique pedidos de vendas na tabela acima"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Lista de Materiais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3763,6 +3864,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,É abertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,A Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,A Conta {0} não existe
 DocType: Account,Cash,Dinheiro
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 8f5092d..3d3cb87 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Employee,Rented,Alugado
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Você realmente quer se desfazer desse ativo?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
 DocType: Purchase Order,Customer Contact,Contato do cliente
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Deixe Nome Tipo
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Mostrar aberta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Mostrar Variantes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Quantidade
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Contas tabela não pode estar em branco.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Designação
@@ -64,7 +66,7 @@
 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 +642,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessária
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,defesa
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nova {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Vendas Partners Comissão
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Item,Is Fixed Asset,É Imobilização
 DocType: Expense Claim Detail,Claim Amount,Quantidade reivindicação
 DocType: Employee,Mr,Sr.
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Todos os Contactos
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} é congelado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Logs
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Status da instalação
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Configurações para o Módulo HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Novo BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Conta {0} não pertence à empresa {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Vul Company
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Caixa Líquido de Financiamento
 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 +217,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
 ,Contact Name,Nome de Contato
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,entradas do banco
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Controle de Notificação
 DocType: Lead,Suggestions,Sugestões
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir item Group-wise orçamentos sobre este território. Você também pode incluir sazonalidade, definindo a distribuição."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Digite grupo conta pai para armazém {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Aprender
+DocType: Asset,Next Depreciation Date,Próximo depreciação Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo atividade por Funcionário
 DocType: Accounts Settings,Settings for Accounts,Definições para contas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Fornecedor Nota Fiscal n existe na factura de compra {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Gerenciar Vendas Pessoa Tree.
 DocType: Job Applicant,Cover Letter,Carta de apresentação
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Cheques em circulação e depósitos para limpar
 DocType: Item,Synced With Hub,Sincronizado com o Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Senha Incorreta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Concluído Qtde não pode ser maior do que ""Qtde de Fabricação"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Form / Item / {1}) encontrados em [{2}] (# Form / Armazém / {2})
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil
 DocType: Newsletter,Newsletter,Boletim informativo
 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
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Guia de remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Guia de remessa
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 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 +381,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Selecione mês e ano
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Order Total Considerado
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Designação do empregado (por exemplo, CEO , diretor , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} já alocado para Employee {1} para {2} período para {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Selecionar item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Parâmetro de Inspeção de Qualidade
 DocType: Leave Application,Leave Approver Name,Deixar Nome Approver
-,Schedule Date,tijdschema
+DocType: Depreciation Schedule,Schedule Date,tijdschema
 DocType: Packed Item,Packed Item,Entrega do item embalagem Nota
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,As configurações padrão para a compra de transações.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,As configurações padrão para a compra de transações.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe atividade Custo por Empregado {0} contra o tipo de atividade - {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.,"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
@@ -348,6 +355,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Request for Quotation
 DocType: Workstation,Working Hours,Horas de trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número de seqüência de partida / corrente de uma série existente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas Upto
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,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 +70,Holiday master.,Férias Principais.
-DocType: Material Request Item,Required Date,Data Obrigatória
+DocType: Request for Quotation 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 +770,Please enter Item Code.,Vul Item Code .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Mensagem para o Fornecedor
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
 DocType: Employee,Health Concerns,Preocupações com a Saúde
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Não remunerado
@@ -418,17 +427,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Vul Warehouse waarvoor Materiaal Request zal worden verhoogd
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gerenciando Subcontratação
+DocType: Project,Project will be accessible on the website to these users,Projeto estará acessível no site para os usuários
 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 +53,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento não pode ser 0
 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 +86,Item {0} is not Purchase Item,Item {0} não é comprar item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Item {0} não é comprar item
 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
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
 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 +126,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 +127,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
@@ -471,13 +481,13 @@
  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 +126,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 +230,Financial / accounting year.,Exercício / contabilidade.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Os valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , kan de serienummers niet worden samengevoegd"
 DocType: Project Task,Project Task,Projeto Tarefa
 ,Lead Id,lead Id
 DocType: C-Form Invoice Detail,Grand Total,Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Entregue: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Conta a Pagar
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,Anexo currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Atribuír
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Vendas Retorno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Vendas Retorno
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,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/stock/doctype/item/item.py +707,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.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Mestres
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Datas das transações de atualização do banco
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Datas das transações de atualização do banco
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -522,27 +532,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
 DocType: Buying Settings,Supplier Naming By,Fornecedor de nomeação
 DocType: Activity Type,Default Costing Rate,A taxa de custeio padrão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Programação de Manutenção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Mudança na Net Inventory
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,gerente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data resolução
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Por favor, defina uma lista de feriados para o trabalhador ou para a Companhia"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,depreciação Valor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Tipo de Atividade
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montante Entregue
 DocType: Supplier,Fixed Days,Dias Fixos
 DocType: Quotation Item,Item Balance,Saldo do item
 DocType: Sales Invoice,Packing List,Lista de embalagem
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,As ordens de compra dadas a fornecedores.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,As ordens de compra dadas a fornecedores.
 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
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Tempo de Operação
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupo de Grupo
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,meus projetos
 DocType: Journal Entry,Write Off Amount,Escreva Off Quantidade
 DocType: Journal Entry,Bill No,Projeto de Lei n
+DocType: Company,Gain/Loss Account on Asset Disposal,Conta ganho / perda de Ativos Eliminação
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de Entrega Obrigatório
 DocType: Sales Order Item,Basic Rate (Company Currency),Taxa Básica (Moeda Company)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Entrada de pagamento já está criado
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Faturamento total este ano
 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 +529,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Fila deve ser definido se Opportunity é feito de chumbo
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,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
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salário mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Há um erro no seu modelo de endereço {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nova Conta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -668,17 +682,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Despesas de manutenção de escritório
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Gelieve eerst in Item
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Custo padrão de Conta Produtos Vendidos
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Lista de Preço não selecionado
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Supplier Quotation,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Carregar saldo de estoque via csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Nu verzenden
 ,Support Analytics,Analytics apoio
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,erro lógico: deve encontrar sobreposição
 DocType: Item,Website Warehouse,Armazém site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo de Fatura
 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 +267,C-Form records,C -Form platen
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C -Form platen
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Clientes e Fornecedores
 DocType: Email Digest,Email Digest Settings,E-mail Digest Configurações
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Suporte a consultas de clientes.
@@ -722,7 +738,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,É subcontratada
 DocType: Item Attribute,Item Attribute Values,Valores de Atributo item
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Compra recibo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Compra recibo
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Mestre taxa de câmbio .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Mestre taxa de câmbio .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Parceiros de vendas e Território
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} deve ser ativo
+DocType: Journal Entry,Depreciation Entry,Entrada depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto carrinho
 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
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -795,10 +812,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Compre Fatura
+DocType: Asset,Purchase Invoice,Compre Fatura
 DocType: Stock Ledger Entry,Voucher Detail No,Detalhe folha no
 DocType: Stock Entry,Total Outgoing Value,Valor total de saída
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
@@ -808,21 +825,24 @@
 DocType: Material Request Item,Lead Time Date,Chumbo Data Hora
 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/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Publicar em website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Os embarques para os clientes.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Fornecedor Data da fatura não pode ser maior que data de lançamento
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
 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 +672,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Selecionar item para Transferência
 DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto adicional
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Fatura {1} é inválido, poderia ser cancelado / não existe. \ Por favor, indique uma factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
 ,Employee Holiday Attendance,Presença de férias do empregado
 DocType: Opportunity,Walk In,Entrar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Entradas de Stock
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Entradas de Stock
 DocType: Item,Inspection Criteria,Critérios de inspeção
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
 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 +5,My Cart,Meu carrinho
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
 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 +180,Qty for {0},Qtde para {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo desfeito?
+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 +80,Leave Allocation Tool,Deixe Ferramenta de Alocação
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
@@ -861,7 +882,7 @@
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
 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 +547,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Desconto
@@ -876,20 +897,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Comprar item recepção
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Vendas / armazém de produtos acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Valor de venda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Tempo Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Tempo Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,desmantelada
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutamento
 DocType: BOM Operation,Operation,Operação
 DocType: Lead,Organization Name,Naam van de Organisatie
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Despesas com Vendas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
@@ -906,7 +928,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa em primeiro lugar.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Citações recebidas de fornecedores.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citações recebidas de fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 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
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite designação de este contato
 DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -923,7 +945,7 @@
 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 +130,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 +131,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 +42,Contribution %,Contribuição%
@@ -932,22 +954,23 @@
 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 +208,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/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,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.
 DocType: Global Defaults,Global Defaults,Padrões globais
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Convite Colaboração em Projectos
 DocType: Salary Slip,Deductions,Deduções
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Este lote Log O tempo tem sido anunciado.
 DocType: Salary Slip,Leave Without Pay,Licença sem vencimento
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacidade de erro Planejamento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacidade de erro Planejamento
 ,Trial Balance for Party,Balancete para o partido
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganhos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo de Contabilidade
 DocType: Sales Invoice Advance,Sales Invoice Advance,Vendas antecipadas Fatura
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Niets aan te vragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,gestão
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Tipos de atividades para folhas de tempo
@@ -958,18 +981,18 @@
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Por favor, defina-mail ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Por favor, defina-mail ID"
 DocType: Item,UOMs,UOMS
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} N º s de série válido para o item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan niet worden gewijzigd voor Serienummer
 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/config/buying.py +33,Supplier database.,Banco de dados de fornecedores.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados de fornecedores.
 DocType: Account,Balance Sheet,Balanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centro de custo para item com o Código do item '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centro de custo para item com o Código do item '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Fiscais e deduções salariais outros.
 DocType: Lead,Lead,Conduzir
 DocType: Email Digest,Payables,Contas a pagar
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Férias
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma não é aplicável para a fatura: {0}
 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
@@ -996,19 +1020,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
 DocType: Contact,User ID,ID de utilizador
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Ver Diário
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Ver Diário
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendos pagos
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Diferença Montante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Lucros Acumulados
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Lucros Acumulados
 DocType: BOM Item,Item Description,Item Descrição
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Abertura temporária
 ,Employee Leave Balance,Empregado Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Taxa de avaliação exigido para o Item na linha {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Resumo das Contas a Pagar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 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 +165,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferir {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Conta principal {0} criada
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +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
@@ -1063,19 +1088,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Vendedor Site
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status de ordem de produção é {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status de ordem de produção é {0}
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,voor Leverancier
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Não havia nenhuma item chamado {0}
 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
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Item Grupos site
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
-DocType: Journal Entry,Journal Entry,Diário de entradas
+DocType: Depreciation Schedule,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 +433,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 +442,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
 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
@@ -1095,6 +1121,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Request for Quotation Fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,recorrente Upto
 DocType: Attendance,HR Manager,Gestor de RH
@@ -1105,6 +1132,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valor atual Depois de depreciação deve ser menor ou igual a {0}
 ,BOM Browser,BOM Navegador
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Deduzir
 DocType: Company,If Yearly Budget Exceeded (for expense account),Se orçamento anual excedida (para conta de despesas)
@@ -1119,21 +1147,22 @@
 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}
 DocType: Project,Start and End Dates,Iniciar e terminar datas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Desconto médio
 DocType: Address,Utilities,Utilitários
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração características
+DocType: Asset,Depreciation Schedules,agendamentos de depreciação
 DocType: Item,Is Service Item,É item de serviço
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,Moeda de transação
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},A partir de {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Descrição da operação
 DocType: Item,Will also apply to variants,Será também aplicável às variantes
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar o Ano Fiscal Data de Início e Data de Fim Ano Fiscal uma vez que o Ano Fiscal é salvo.
 DocType: Quotation,Shopping Cart,Carrinho de Compras
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Média diária de saída
 DocType: Pricing Rule,Campaign,Campanha
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Alteração Líquida da Imobilizaçã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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de comunicação.
@@ -1156,8 +1185,8 @@
 DocType: Sales Invoice,Shipping Address Name,Endereço para envio Nome
 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 +472,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,não pode ser maior do que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Regra de imposto para transações.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assembléias
+DocType: Asset,Asset Name,Nome de ativos
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Embalagem deslizamento
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,alugar escritório
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Embalagem deslizamento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,alugar escritório
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configurações de gateway SMS Setup
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Solicitação de cotação pode ser acessado clicando link abaixo
+DocType: Asset,Number of Months in a Period,Número de meses num período de
 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
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Mostrar fechada
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Fluxo de Caixa de Investimentos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Item Group,Item Group Name,Nome do Grupo item
 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 +86,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1269,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta do Plano de Contas ."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Visita de manutenção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Visita de manutenção
 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: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,Mestre marca.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; tipo de fornecedor
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,caixa
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Os pedidos de despesa da empresa.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Passivo stock
 DocType: Purchase Receipt,Supplier Warehouse,Armazém fornecedor
 DocType: Opportunity,Contact Mobile No,Contato móveis não
 ,Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Pagamento reenviar Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,outros Relatórios
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vista
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,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/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo de itens emitidos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Anterior Exercício não está fechada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item de Orçamento
 DocType: Account,Account Name,Nome da conta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Fornecedor Tipo de mestre.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça de fornecedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 DocType: Purchase Invoice,Reference Document,Documento de referência
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Tida
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Variação Líquida em contas a pagar
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique seu e-mail id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
 DocType: Quotation,Term Details,Detalhes prazo
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Reclamação de Garantia
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Adiantamento pago contra {0} {1} não pode ser maior \ do total geral {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Por favor seleccione código do item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Por favor seleccione código do item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduzir Dedução por licença sem vencimento (LWP)
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Para Warehouse (Opcional)
@@ -1367,15 +1401,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Punt Tekort Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Única unidade de um item.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Valor Comprar Gross
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","eg ""XYZ National Bank """
+DocType: Asset,Depreciation Method,Método de depreciação
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,É este imposto incluído na Taxa Básica?
 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 +29,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 DocType: Production Plan Material Request,Production Plan Material Request,Produção Request Plano de materiais
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Não há ordens de produção criadas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não há ordens de produção criadas
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,Funcionários HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,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/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Maak Bestelling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Maak Bestelling
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1426,31 +1462,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Código do Cliente item
 DocType: Stock Reconciliation,Stock Reconciliation,Da Reconciliação
 DocType: Territory,Territory Name,Nome território
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Endereços
+apps/erpnext/erpnext/hooks.py +91,Addresses,Endereços
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,apreciações
 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 +337,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma de peso líquido dos itens)
 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 +27,Time Logs for manufacturing.,Logs de horário para a fabricação.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Será que também se aplicam para as variantes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtde Atual
 DocType: Sales Invoice Item,References,Referências
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
+DocType: Request for Quotation Supplier,Send Email to Supplier,Enviar e-mail para Fornecedor
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 DocType: Packing Slip,To Package No.,Para empacotar Não.
 DocType: Production Planning Tool,Material Requests,Os pedidos de material
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Armazém de entrega
 DocType: Stock Settings,Allowance Percent,Subsídio Percentual
 DocType: SMS Settings,Message Parameter,Parâmetro mensagem
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Árvore de Centros de custo financeiro.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Árvore de Centros de custo financeiro.
 DocType: Serial No,Delivery Document No,Documento de Entrega Não
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obter itens De recibos de compra
 DocType: Serial No,Creation Date,aanmaakdatum
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,Valor a entregar
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} criado
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra Ordem de Venda
 ,Serial No Status,No Estado de série
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Item tabel kan niet leeg zijn
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para definir {1} periodicidade, diferença entre a data de \
  e deve ser maior do que ou igual a {2}"
 DocType: Pricing Rule,Selling,Vendas
 DocType: Employee,Salary Information,Informação salarial
 DocType: Sales Person,Name and Employee ID,Nome e identificação do funcionário
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Gateway de Pagamento de Conta não está configurado
 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: Production Order,Material Request Item,Item de solicitação de material
+DocType: Request for Quotation Item,Material Request Item,Item de solicitação de material
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Item-wise Histórico de compras
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,O tempo de instalação
 DocType: Sales Invoice,Accounting Details,Detalhes Contabilidade
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Apagar todas as transações para esta empresa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes de Resolução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Por favor insira os pedidos de materiais na tabela acima
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Por favor insira os pedidos de materiais na tabela acima
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: Item Group,Show In Website,Mostrar No Site
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupo
@@ -1552,6 +1592,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt de todas as tarefas.
+DocType: Pricing Rule,Margin Type,Tipo margem
 DocType: Appraisal,For Employee Name,Para Nome do Funcionário
 DocType: Holiday List,Clear Table,Tabela clara
 DocType: Features Setup,Brands,Marcas
@@ -1559,20 +1600,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Linha # {0}: ativos é obrigatória contra um ativo ponto fixo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure séries de numeração para Participação em Configurar&gt; Numeração Series"
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a regra de 'Aprovador de Despesas'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,par
+DocType: Asset,Depreciation Schedule,Tabela de depreciação
 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: Asset,Purchase Date,data de compra
 DocType: Employee,Personal Details,Detalhes pessoais
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina &quot;de ativos Centro de Custo Depreciação &#39;in Company {0}"
 ,Maintenance Schedules,Horários de Manutenção
 ,Quotation Trends,Tendências cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de Não-Grupo
 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/public/js/setup_wizard.js +272,Unit,unidade
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Por favor, especifique Empresa"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Apoiar
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 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
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
 DocType: Project,% Tasks Completed,% Tarefas Concluídas
 DocType: Project,Gross Margin,Margem Bruta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Vul Productie Item eerste
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Vul Productie Item eerste
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculado equilíbrio extrato bancário
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Custo Atualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; Configurações de RH"
 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
@@ -1645,8 +1691,8 @@
 ,SO Qty,SO Aantal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
+DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufatura
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Os embarques
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
@@ -1654,12 +1700,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Utilizador {0} está desativado
@@ -1668,7 +1714,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
 DocType: Currency Exchange,From Currency,De Moeda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ordem de venda necessário para item {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Linha # {0}: Quantidade deve ser 1, como o artigo está vinculado a um ativo"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Criança item não deve ser um pacote de produtos. Por favor remover o item `` {0} e salvar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Novo Centro de Custo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Ir para o grupo apropriado (geralmente Fonte de Recursos&gt; Passivo Circulante&gt; Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e mencionam a taxa de imposto.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade pedida
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
 DocType: Quality Inspection,In Process,Em Processo
@@ -1695,10 +1741,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de stock
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Time Logs criado:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Time Logs criado:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Grupo sanguíneo
@@ -1716,13 +1763,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta regra de envio ou verifique Transporte mundial"
 DocType: Stock Entry,Total Incoming Value,Valor total entrante
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Para Débito é necessária
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Gerente da Qualidade
 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 +141,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferecer Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e Ordens de Produção.
@@ -1730,22 +1777,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Preço de {0} está desativado
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Preço de {0} está desativado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de série necessários para item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação actual Taxa
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão perdido
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Criar entradas de pagamento contra as ordens ou Faturas.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Criar entradas de pagamento contra as ordens ou Faturas.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Novo endereço
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1754,10 +1801,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No recibo de vencimento encontrado para o mês:
 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 +175,Serial No {0} not found,Serial No {0} não foi encontrado
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial No {0} não foi encontrado
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Os seus Clientes
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplique agora
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplique agora
 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."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Definir como Fechado
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nenhum artigo com código de barras {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nenhum artigo com código de barras {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 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,Se você tiver Equipe de Vendas e Parceiros de Venda (Parceiros de Canal) podem ser marcadas e manter sua contribuição na atividade de vendas
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,Transfer Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Materiaal
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} deve ser um item de vendas em {1}
 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 ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
 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
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Criar folha de salário
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar e-mail do
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Convidar como Usuário
 DocType: Features Setup,After Sale Installations,Após instalações Venda
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Por favor, defina {0} in Company {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente faturado
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
@@ -1830,9 +1879,9 @@
 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: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Por favor, selecione BOM para o Item na linha {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione BOM para o Item na linha {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
@@ -1849,25 +1898,25 @@
 DocType: Upload Attendance,Attendance To Date,Atendimento para a data
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Gateway Account,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceite
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Breve Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} não foi submetido
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1925,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,As seguintes ordens de produção foram criadas:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,As seguintes ordens de produção foram criadas:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome Transporter
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
@@ -1894,13 +1943,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} é fechado
 DocType: Email Digest,How frequently?,Com que frequência?
 DocType: Purchase Receipt,Get Current Stock,Obter stock atual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir para o grupo apropriado (geralmente Aplicações de Recursos&gt; Ativo Circulante&gt; contas bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árvore da Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
 DocType: Production Order,Actual End Date,Data final Atual
 DocType: Authorization Rule,Applicable To (Role),Aplicável a (Função)
 DocType: Stock Entry,Purpose,Propósito
+DocType: Company,Fixed Asset Depreciation Settings,Configurações de depreciação do ativo imobilizado
 DocType: Item,Will also apply for variants unless overrridden,Será que também se aplicam para as variantes menos que overrridden
 DocType: Purchase Invoice,Advances,Avanços
 DocType: Production Order,Manufacture against Material Request,Fabricação de encontro Pedido de Material
@@ -1909,6 +1958,7 @@
 DocType: SMS Log,No of Requested SMS,No pedido de SMS
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,"Por favor, informe os itens especificados com as melhores tarifas possíveis"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1959,12 +2009,14 @@
  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: Purchase Receipt Item,Recd Quantity,Quantidade RECD
-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}
+DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","por exemplo Banco, Dinheiro, cartão de crédito"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","por exemplo Banco, Dinheiro, cartão de crédito"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ir para o grupo apropriado (geralmente Aplicações de Recursos&gt; Ativo Circulante&gt; contas bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Journal Entry,Credit Note,Nota de Crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1988,9 +2040,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nenhum funcionário para os critérios acima selecionado ou folha de salário já criado
@@ -2017,7 +2069,7 @@
 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 +200,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 '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Folha de pagamento
 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"
@@ -2027,8 +2079,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Comprar Itens Recibo
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
 DocType: Account,Income Account,Conta Renda
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No modelo padrão de endereços encontrados. Por favor, crie um novo a partir Setup&gt; Printing and Branding&gt; modelo de endereço."
 DocType: Payment Request,Amount in customer's currency,Montante em moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,21 +2103,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Trilha leva por setor Type.
 DocType: Item Supplier,Item Supplier,Fornecedor item
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Vul de artikelcode voor batch niet krijgen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Todos os endereços.
 DocType: Company,Stock Settings,Configurações da
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Gerenciar Grupo Cliente Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nome de NOvo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nome de NOvo Centro de Custo
 DocType: Leave Control Panel,Leave Control Panel,Deixe Painel de Controle
 DocType: Appraisal,HR User,HR Utilizador
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
-apps/erpnext/erpnext/config/support.py +7,Issues,Issues
+apps/erpnext/erpnext/hooks.py +90,Issues,Issues
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado deve ser um dos {0}
 DocType: Sales Invoice,Debit To,Para débito
 DocType: Delivery Note,Required only for sample item.,Necessário apenas para o item amostra.
 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"
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Faturamento Moeda
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
 ,Profit and Loss Statement,Demonstração dos Resultados
@@ -2078,10 +2132,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
 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 +139,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
 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 +142,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
@@ -2149,13 +2203,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,gevraagd
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Não Observações
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Imobilização O artigo deve ser um item não inventariado
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2176,7 +2231,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
 DocType: Payment Request,Recipient and Message,Destinatário ea mensagem
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2190,7 +2245,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Escolha um Fornecedor Endereço
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mudo Email
@@ -2212,11 +2267,12 @@
 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/config/buying.py +18,Request for quotation.,Solicitação de cotação.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 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 +294,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2281,7 @@
 DocType: Installation Note Item,Against Document No,Contra documento No
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Gerenciar parceiros de vendas.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Por favor seleccione {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,C-Forma Não
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Presença Unmarked
@@ -2240,6 +2296,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Conta depreciação Despesa
 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
@@ -2253,7 +2310,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 DocType: Payment Gateway,Gateway,Porta de entrada
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Por favor, indique data alívio ."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2267,18 +2324,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Meio Dia
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
 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 +410,[Error],[Erro]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serial Não {0} não existe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; tipo de fornecedor
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém Cliente (Opcional)
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da fatura
@@ -2304,14 +2362,16 @@
 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.
 DocType: Leave Allocation,Leave Allocation,Deixe Alocação
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Pedidos de Materiais {0} criado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Pedidos de Materiais {0} criado
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Modelo de termos ou contratos.
 DocType: Purchase Invoice,Address and Contact,Endereço e Contato
 DocType: Supplier,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 +280,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/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Conta de depreciação acumulada
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
+DocType: Asset,Expected Value After Useful Life,Valor Esperado após sua vida útil
 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
@@ -2324,12 +2384,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} é cancelada ou fechada
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Nota de Entrega contra qualquer projeto
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Caixa Líquido de Investimentos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Conta root não pode ser excluído
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Activo {0} deve ser apresentado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Gerenciar endereços
-DocType: Pricing Rule,Item Code,Código do artigo
+DocType: Asset,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
@@ -2348,8 +2408,10 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Pedidos de Materiais
 DocType: Employee Education,School/University,Escola / Universidade
 DocType: Payment Request,Reference Details,Detalhes Referência
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Gross Compra Valor
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível em Armazém
 ,Billed Amount,gefactureerde bedrag
+DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,ordem fechada não pode ser cancelada. Unclose para cancelar.
 DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
@@ -2368,6 +2430,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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 '
+DocType: Asset,Fully Depreciated,totalmente depreciados
 ,Stock Projected Qty,Verwachte voorraad Aantal
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
@@ -2375,25 +2438,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,O número de série e de lote
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Encomendas produções não podem ser levantadas para:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Encomendas produções não podem ser levantadas para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Varejista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Desativar In Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Conta Garantida Banco
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Empréstimos garantidos
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as contas relacionadas com depreciação de ativos em Categoria {0} ou Empresa {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Abertura Patrimônio Balance
 DocType: Appraisal,Appraisal,Avaliação
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail enviado ao fornecedor {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetido
 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 +187,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
@@ -2401,7 +2467,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
 DocType: Item Price,Bulk Import Help,A importação em massa de Ajuda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Select Quantidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Select Quantidade
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprovando Responsabilidade não pode ser o mesmo que a regra em aplicável a
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Cancelar a inscrição nesse Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden
@@ -2429,6 +2495,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margem total
 DocType: Supplier,Supplier Details,Detalhes fornecedor
 DocType: Expense Claim,Approval Status,Status de Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
@@ -2442,7 +2509,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Klantenservice
 DocType: Payment Gateway Account,Default Payment Request Message,Padrão Pedido de Pagamento Mensagem
 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/config/accounts.py +118,Banking and Payments,Bancária e de Pagamentos
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bancária e de Pagamentos
 ,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
@@ -2450,17 +2517,17 @@
 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 +199,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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 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/config/hr.py +55,Leaves and Holiday,Folhas e férias
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Billing
@@ -2476,15 +2543,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Activo Centro de Custo Depreciação
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Data de compra de ativos {0} não coincide com a data de compra Fatura
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
 ,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}
 DocType: Journal Entry,Stock Entry,Entrada stock
 DocType: Account,Payable,a pagar
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Devedores ({0})
-DocType: Project,Margin,Margem
+DocType: Pricing Rule,Margin,Margem
 DocType: Salary Slip,Arrear Amount,Quantidade atraso
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Lucro Bruto%
@@ -2492,20 +2561,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
 DocType: Newsletter,Newsletter List,Lista boletim informativo
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Verifique se você quiser enviar folha de salário no correio a cada empregado ao enviar folha de salário
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Valor Comprar Gross é obrigatória
 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 +57,Where manufacturing operations are carried.,Sempre que as operações de fabricação são realizadas.
 DocType: Stock Entry Detail,Source Warehouse,Armazém fonte
 DocType: Installation Note,Installation Date,Data de instalação
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
 DocType: Employee,Confirmation Date,bevestiging Datum
 DocType: C-Form,Total Invoiced Amount,Valor total faturado
 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: Account,Accumulated Depreciation,Depreciação acumulada
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
 DocType: Payment Request,Email To,Email para
 DocType: Lead,Lead Owner,Levar Proprietário
 DocType: Bin,Requested Quantity,solicitada Quantidade
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Armazém é necessária
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,11 +2585,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Atual BOM e Nova BOM não pode ser o mesmo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Juntando
 DocType: Sales Invoice,Against Income Account,Contra Conta a Receber
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Proferido
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Proferido
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas território
 DocType: Delivery Note,Transporter Info,Informações Transporter
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Mesmo fornecedor foi inserido várias vezes
 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 +60,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 .
@@ -2527,13 +2600,14 @@
 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 .
 DocType: Payment Request,Payment Details,Detalhes do pagamento
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
+DocType: Asset,Journal Entry for Scrap,Entrada de diário para sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
 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 +73,"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."
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados em Itens
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Create New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2546,7 +2620,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução folha de salário
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empregado e Presença
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Remover de referência de cliente, fornecedor, parceiro de vendas e chumbo, como é o seu endereço de empresa"
@@ -2568,13 +2642,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: A partir de {1}
 DocType: Task,depends_on,depende de
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Mostrar imposto break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) está fora de estoque
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Data de lançamento
@@ -2589,7 +2664,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2603,7 +2678,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2688,7 @@
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Warranty Claim,Item and Warranty Details,Itens e Garantia Detalhes
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Modelo
 DocType: Sales Person,Sales Person Name,Vendas Nome Pessoa
@@ -2624,7 +2699,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
@@ -2633,11 +2708,12 @@
 DocType: Journal Entry,Printing Settings,Configurações de impressão
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Conta de Imobilização
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Banca de Investimento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Taxa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
@@ -2645,7 +2721,7 @@
 DocType: Stock Entry,From BOM,De BOM
 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 +96,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 +204,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","kg por exemplo, Unidade, n, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
@@ -2653,17 +2729,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Estrutura Salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Armazém
 DocType: Employee,Offer Date,aanbieding Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
 DocType: Hub Settings,Access Token,Token de Acesso
 DocType: Sales Invoice Item,Serial No,N º de Série
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
-DocType: Item,Is Fixed Asset Item,É item de Imobilização
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
 DocType: Purchase Invoice,Print Language,Imprimir Idioma
 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"
+DocType: Asset,Number of Depreciations,Número de Amortizações
 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
@@ -2671,13 +2747,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Solicitação de Cotações
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montante Máximo Invoice
 DocType: Purchase Invoice Item,Image View,Ver imagem
 apps/erpnext/erpnext/config/selling.py +23,Customers,clientes
+DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Tempo de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
@@ -2693,13 +2771,13 @@
 DocType: Quotation,Maintenance Manager,Gerente de Manutenção
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Alterado De
+DocType: Asset,Amended From,Alterado De
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2712,21 +2790,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Por favor, mencione &#39;Conta Perda / Ganho na Ativos Eliminação&#39; in Company"
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Pagamentos combinar com Facturas
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Pagamentos combinar com Facturas
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Para aplicável (Designação)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adicionar ao carrinho de compras
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Ativar / desativar moedas.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Ativar / desativar moedas.
 DocType: Production Planning Tool,Get Material Request,Get Material Pedido
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,despesas postais
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,despesas postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Quality Inspection,Item Serial No,No item de série
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Presente total
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,demonstrações contábeis
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,demonstrações contábeis
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2746,15 +2825,16 @@
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
 DocType: Features Setup,Item Groups in Details,Grupos de itens em Detalhes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 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 +32,Visit report for maintenance call.,Relatório de visita para a chamada manutenção.
 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 +169,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 +171,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Mudança no Patrimônio Líquido
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Por favor cancelar factura de compra {0} primeiro
 DocType: Serial No,AMC Expiry Date,AMC Data de Validade
 ,Sales Register,Vendas Registrar
 DocType: Quotation,Quotation Lost Reason,Cotação Perdeu Razão
@@ -2762,12 +2842,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nome do grupo de clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Erro: {0}&gt; {1}
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Última data do pedido
 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: C-Form,C-Form,C-Form
@@ -2779,18 +2860,18 @@
 DocType: Purchase Invoice,Mobile No,No móvel
 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 +261,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,comercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Erro: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Todos os produtos ou serviços.
 DocType: Supplier Quotation,Supplier Address,Endereço do Fornecedor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # A conta deve ser do tipo &quot;Ativo Fixo &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2801,10 +2882,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date é obrigatória
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Para pagar / RECD De
 DocType: Naming Series,Setup Series,Série de configuração
@@ -2824,20 +2905,22 @@
 DocType: GL Entry,Remarks,Observações
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Item Código de matérias-primas
 DocType: Journal Entry,Write Off Based On,Escreva Off Baseado em
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Enviar e-mails de fornecedores
 DocType: Features Setup,POS View,POS Ver
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Registro de instalação de um n º de série
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Tempo Log foi faturado
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
 DocType: Salary Slip,Earning & Deduction,Ganhar &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Conta {0} não pode ser um grupo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
@@ -2847,12 +2930,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure séries de numeração para Participação em Configurar&gt; Numeração Series"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obter Itens de Bundle Produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obter Itens de Bundle Produto
+DocType: Asset,Straight Line,Linha reta
+DocType: Project User,Project User,Usuário projecto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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: Features Setup,Sales Discounts,Descontos de vendas
@@ -2866,39 +2950,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Adicionar Descendente
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Valor de abertura
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser submetido, já é {2}"
 DocType: Tax Rule,Billing Country,País de faturamento
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,despesas de representação
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Os pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,despesas legais
 DocType: Sales Invoice,Posting Time,Postagem Tempo
 DocType: Sales Order,% Amount Billed,% Valor faturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Despesas de telefone
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Despesas de telefone
 DocType: Sales Partner,Logo,Logotipo
 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.,"Marque esta opção se você deseja forçar o usuário para selecionar uma série antes de salvar. Não haverá nenhum padrão, se você verificar isso."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nenhum artigo com Serial Não {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Abertas Notificações
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Despesas Diretas
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Despesas Diretas
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} é um endereço de e-mail inválido em &#39;Notificação \ Email Address&#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
@@ -2915,7 +3000,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Quantidade deve ser maior do que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Quantidade deve ser maior do que 0
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Contato Descr
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de folhas como etc, casual doente"
@@ -2926,11 +3011,12 @@
 DocType: Production Order,Total Operating Cost,Custo Operacional Total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Fornecedor de ativos {0} não coincide com o fornecedor da factura de compra
 DocType: Newsletter,Test Email Id,Email Id teste
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Mestre modelo Salário .
@@ -2946,12 +3032,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,moeda de faturamento deve ser igual à moeda quer padrão do comapany ou moeda da conta payble do partido
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se desativar &quot;, nas palavras de campo não será visível em qualquer transação"
@@ -2961,13 +3048,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote Log Tempo foi cancelada.
 ,Reqd By Date,Reqd Por Data
 DocType: Salary Slip Earning,Salary Slip Earning,Folha de salário Ganhando
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Credores
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Credores
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: O número de série é obrigatória
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhe Imposto item Sábio
 ,Item-wise Price List Rate,Item- wise Prijslijst Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Cotação fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2988,15 +3075,14 @@
 DocType: Customer,From Lead,De Chumbo
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} contra Faturas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
-DocType: Project,Project Name,Nome do projeto
+DocType: Request for Quotation Item,Project Name,Nome do projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Lote n item
@@ -3026,6 +3112,7 @@
 DocType: Sales Invoice,End Date,Data final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Stock
 DocType: Employee,Internal Work History,História Trabalho Interno
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Acumulado montante de depreciação
 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
@@ -3033,7 +3120,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Empresa é obrigatório, como é o seu endereço de empresa"
 DocType: Item Attribute,From Range,De Faixa
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Item {0} ignorado uma vez que não é um item de Stock
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Submit deze productieorder voor verdere verwerking .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Submit deze productieorder voor verdere verwerking .
 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.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
 DocType: Company,Domain,Domínio
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -3045,6 +3132,7 @@
 DocType: Time Log,Additional Cost,Custo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3061,6 +3149,7 @@
 DocType: Sales Order,Delivery Date,Data de entrega
 DocType: Opportunity,Opportunity Date,Data oportunidade
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
+DocType: Request for Quotation Item,Request for Quotation Item,Solicitação de Cotação do Item
 DocType: Purchase Order,To Bill,Para Bill
 DocType: Material Request,% Ordered,Ordem%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
@@ -3075,11 +3164,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} não está configurado para Serial Coluna N º s deve estar em branco
 DocType: Accounts Settings,Accounts Settings,Configurações de contas
 DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},"Por favor, defina &#39;Conta baixa de ativos &quot;in Company {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Máquinas e instalações
 DocType: Sales Partner,Partner's Website,Site do parceiro
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Contas temporárias
 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
@@ -3088,21 +3178,22 @@
 DocType: Pricing Rule,Disable,incapacitar
 DocType: Project Task,Pending Review,Revisão pendente
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Clique aqui para pagar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Ausente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Adicionar itens de
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Adicionar itens de
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: conta Parent {1} não Bolong à empresa {2}
 DocType: BOM,Last Purchase Rate,Compra de última
 DocType: Account,Asset,ativos
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","Ex: "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Armazém {0} não existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3117,6 +3208,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} foi desativado
 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
@@ -3128,7 +3220,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Configuração contas Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Configuração contas Gateway.
 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
 ,Cash Flow,Fluxo de caixa
@@ -3142,7 +3234,7 @@
 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 +132,Please find attached {0} #{1},Segue em anexo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Segue em anexo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Balanço banco Declaração de acordo com General Ledger
 DocType: Job Applicant,Applicant Name,Nome do requerente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do item
@@ -3158,19 +3250,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo Cliente&gt; Território
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,As configurações padrão para a venda de transações.
 DocType: BOM Replace Tool,Current BOM,BOM atual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar número de série
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garantia
 DocType: Production Order,Warehouses,Armazéns
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimir e estacionária
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Imprimir e estacionária
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupo de nós
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Afgewerkt update Goederen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Afgewerkt update Goederen
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,aquisitivo
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Valor pago
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
@@ -3200,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
 DocType: Purchase Invoice,In Words,Em Palavras
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Hoje é {0} 's aniversário!
 DocType: Production Planning Tool,Material Request For Warehouse,Pedido de material para Armazém
@@ -3213,9 +3304,11 @@
 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'","Om dit fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Junte-se
 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 +564,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de salário
+DocType: Pricing Rule,Margin Rate or Amount,Margem de velocidade ou quantidade
 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
@@ -3225,7 +3318,7 @@
 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 +782,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3233,14 +3326,13 @@
 DocType: Customer,Sales Team Details,Vendas Team Detalhes
 DocType: Expense Claim,Total Claimed Amount,Montante reclamado total
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Série Naming"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Imputável
 DocType: Company,Change Abbreviation,Mudança abreviação
 DocType: Expense Claim Detail,Expense Date,Data despesa
@@ -3258,14 +3350,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Razão
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veja Leads
 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}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Por favor, defina um padrão Lista férias para Employee {0} ou Empresa {0}"
 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>
@@ -3297,23 +3390,23 @@
 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 .
 DocType: Tax Rule,Purchase Tax Template,Comprar Template Tax
 ,Project wise Stock Tracking,Projeto sábios Stock Rastreamento
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Atual (na origem / destino)
 DocType: Item Customer Detail,Ref Code,Ref Código
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de funcionários.
 DocType: Payment Gateway,Payment Gateway,Gateway de pagamento
 DocType: HR Settings,Payroll Settings,payroll -instellingen
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Combinar não vinculados faturas e pagamentos.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Combinar não vinculados faturas e pagamentos.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Faça a encomenda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selecione o cadastro ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Armazém é obrigatória
 DocType: Supplier,Address and Contacts,Endereços e contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Detalhe Conversão
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3331,7 +3424,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex:. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Moeda de transação deve ser o mesmo da moeda gateway de pagamento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3339,14 +3432,14 @@
 DocType: Purchase Invoice,Submit on creation,Enviar na criação
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Kan niet verklaren als verloren , omdat Offerte is gemaakt."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Meus pedidos
@@ -3367,10 +3460,10 @@
 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á-
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Perfil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Empréstimos não garantidos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Empréstimos não garantidos
 DocType: Cost Center,Cost Center Name,Custo Nome Centro
 DocType: Maintenance Schedule Detail,Scheduled Date,Data prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total pago Amt
@@ -3382,11 +3475,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Fornecedor da peça
 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
@@ -3395,12 +3489,12 @@
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Issue,Content Type,Tipo de conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computador
 DocType: Item,List this Item in multiple groups on the website.,Lista este item em vários grupos no site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} não existe no sistema
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} não existe no sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,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: Payment Reconciliation,From Invoice Date,A partir de Data de Fatura
@@ -3409,7 +3503,7 @@
 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 +351,'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 +356,'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
@@ -3422,7 +3516,7 @@
 DocType: Item,Customer Code,Código Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds vorige Bestel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock activo
@@ -3436,15 +3530,15 @@
 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 +576,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Atividade de projeto / tarefa.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Vencimento
 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: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3464,8 +3558,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Ano data de início ou data de término é a sobreposição com {0}. Para evitar defina empresa
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,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}
 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.","Exemplo:. ABCD ##### 
  Se série é ajustada e número de série não é mencionado em transações, número de série, em seguida automática será criado com base nesta série. Se você sempre quis mencionar explicitamente Serial Nos para este item. deixe em branco."
@@ -3477,11 +3572,11 @@
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe Entrada stock
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Lembretes diários
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nieuw account Naam
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
@@ -3491,11 +3586,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Percentagem
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3503,11 +3599,12 @@
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
 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 +385,Item Code required at Row No {0},Código do item exigido no Row Não {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
 DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Ir para o grupo apropriado (geralmente Fonte de Recursos&gt; Passivo Circulante&gt; Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e mencionam a taxa de imposto.
 DocType: Production Order,Production Order,Ordem de Produção
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra Docname
@@ -3526,18 +3623,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
+DocType: Request for Quotation,Supplier Detail,Detalhe fornecedor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor faturado
 DocType: Attendance,Attendance,Comparecimento
 apps/erpnext/erpnext/config/projects.py +55,Reports,Relatórios
 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 +508,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
 ,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
@@ -3547,10 +3645,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Em Líquida Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Despesas Administrativas
 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 +455,Change,Mudança
@@ -3558,6 +3656,7 @@
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Ativo Categoria Nome
 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
@@ -3569,13 +3668,13 @@
 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 +559,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Fornada
@@ -3589,7 +3688,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendas Pessoa
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Parâmetro SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Orçamento e Centro de Custo
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Orçamento e Centro de Custo
 DocType: Maintenance Schedule Item,Half Yearly,Semestrais
 DocType: Lead,Blog Subscriber,Assinante Blog
 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.
@@ -3620,9 +3719,9 @@
 DocType: Purchase Common,Purchase Common,Compre comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Cotação fornecedor {0} criado
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Item Grupo&gt; Marca
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3630,7 +3729,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Contas levantou a Clientes.
 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 +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Conta pai
@@ -3646,7 +3745,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3661,6 +3760,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Desconto e Margem
 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: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
@@ -3681,7 +3781,7 @@
 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}."
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação BOM
@@ -3689,22 +3789,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pagamento URL Mensagem
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Tempo Log não é cobrável
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
+DocType: Asset,Asset Category,Categoria de ativos
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material a Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Excise Invoice
 DocType: Expense Claim,Employees Email Id,Funcionários ID e-mail
 DocType: Employee Attendance Tool,Marked Attendance,Presença marcante
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,passivo circulante
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,passivo circulante
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Qtde real é obrigatória
@@ -3725,17 +3826,16 @@
 DocType: Item Attribute,Numeric Values,Os valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Faça Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear deixar aplicações por departamento.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analítica
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo operacional real
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No modelo padrão de endereços encontrados. Por favor, crie um novo a partir Setup&gt; Printing and Branding&gt; modelo de endereço."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Peso Detalhes do pacote
 DocType: Payment Gateway Account,Payment Gateway Account,Pagamento conta de gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Após a conclusão do pagamento redirecionar usuário para a página selecionada.
@@ -3744,20 +3844,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Termos e Condições de modelo
 DocType: Serial No,Delivery Details,Detalhes da entrega
+DocType: Asset,Current Value (After Depreciation),Valor Atual (depois de amortizações)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obter itens da Lista de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Por favor, indique pedidos de vendas na tabela acima"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, indique pedidos de vendas na tabela acima"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3765,6 +3866,6 @@
 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 +169,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 +212,Account {0} does not exist,Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 39018bf..ccc88a9 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Închiriate
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să Configurarea angajatului Sistem Atribuirea de nume în resurse umane&gt; Setări HR
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} arbore
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Afișați deschis
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Actualizat cu succes
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Noua cerere de concediu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Arată Variante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Cantitate
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Imprumuturi (Raspunderi)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Conturile de masă nu poate fi necompletat.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Destinatie
@@ -64,7 +66,7 @@
 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 +642,Invoice,Factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
@@ -81,7 +83,7 @@
 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."
-apps/erpnext/erpnext/controllers/recurring_document.py +131,New {0}: #{1},Nou {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nou {0}: # {1}
 ,Sales Partners Commission,Agent vânzări al Comisiei
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
 DocType: Payment Request,Payment Request,Cerere de plata
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Căsătorit
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nu este permisă {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Obține elemente din
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Jurnal Activitati:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
+DocType: Item,Is Fixed Asset,Este activ fix
 DocType: Expense Claim Detail,Claim Amount,Suma Cerere
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizor Tip / Furnizor
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Toate contactele
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} este congelat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Cheltuieli stoc
 DocType: Newsletter,Email Sent?,Email Trimis?
 DocType: Journal Entry,Contra Entry,Contra intrare
 DocType: Production Order Operation,Show Time Logs,Arată timp Busteni
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Starea de instalare
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Articolul {0} trebuie să fie un Articol de Cumparare
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Nou BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Va rugam sa introduceti de companie
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Numerar net din Finantare
 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 +217,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
 DocType: Newsletter List,Total Subscribers,Abonații totale
 ,Contact Name,Nume Persoana de Contact
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 DocType: Payment Tool,Reference No,De referință nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Intrările bancare
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Controlul notificare
 DocType: Lead,Suggestions,Sugestii
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set bugetelor Grupa înțelept Articol de pe acest teritoriu. Puteți include, de asemenea, sezonier prin setarea distribuție."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Va rugam sa introduceti grup considerare mamă pentru depozit {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Va rugam sa introduceti grup considerare mamă pentru depozit {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Numar de mobil
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,A invata
+DocType: Asset,Next Depreciation Date,Amortizarea următor Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Activitatea de Cost per angajat
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Furnizor Factura nr există în factură Purchase {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile
 DocType: Job Applicant,Cover Letter,Scrisoare de intenție
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Cecuri restante și pentru a șterge Depozite
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unități de [{1}] (# Forma / Postul / {1}) găsit în [{2}] (# Forma / Depozit / {2})
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profilul postului
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Nota de Livrare
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurarea Impozite
 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 +381,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Vă rugăm selectați luna și anul
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Comanda total Considerat
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} {3} pentru a
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Selectați articol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,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: Leave Application,Leave Approver Name,Lăsați Nume aprobator
-,Schedule Date,Program Data
+DocType: Depreciation Schedule,Schedule Date,Program Data
 DocType: Packed Item,Packed Item,Articol ambalate
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Setări implicite pentru tranzacțiilor de achizitie.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Setări implicite pentru tranzacțiilor de achizitie.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Există cost activitate pentru angajatul {0} comparativ tipului de activitate - {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.,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
@@ -348,6 +355,7 @@
 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",
+DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
 DocType: Workstation,Working Hours,Ore de lucru
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
-DocType: Material Request Item,Required Date,Date necesare
+DocType: Request for Quotation Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Mesaj pentru Furnizor
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Raport Cantitate
 DocType: Employee,Health Concerns,Probleme de Sanatate
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Neachitat
@@ -418,17 +427,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Gestionarea Subcontracte
+DocType: Project,Project will be accessible on the website to these users,Proiectul va fi accesibil pe site-ul acestor utilizatori
 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 +53,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Creștere nu poate fi 0
 DocType: Production Planning Tool,Material Requirement,Cerința de material
 DocType: Company,Delete Company Transactions,Ștergeți Tranzacții de Firma
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
 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ță
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Așteptare Cantitate
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -469,13 +479,13 @@
 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 +126,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 +230,Financial / accounting year.,An financiar / contabil.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Valorile acumulate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Livrate: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Contul furnizori
@@ -483,7 +493,7 @@
 DocType: Job Applicant,Resume Attachment,CV-Atașamentul
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Vânzări de returnare
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Componente salariale.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza de date cu clienți potențiali.
@@ -492,7 +502,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -502,7 +512,7 @@
 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/config/accounts.py +70,Masters,Masterat
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Perioada tranzacție de actualizare Bank
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Perioada tranzacție de actualizare Bank
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Urmărirea timpului
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
@@ -520,27 +530,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Va rugam sa introduceti Primirea achiziția
 DocType: Buying Settings,Supplier Naming By,Furnizor de denumire prin
 DocType: Activity Type,Default Costing Rate,Implicit Rata Costing
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Program Mentenanta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Schimbarea net în inventar
 DocType: Employee,Passport Number,Numărul de pașaport
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Vă rugăm să setați o listă de vacanță pentru oricare angajat sau Societatea
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Sumă de amortizare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Transforma in grup
 DocType: Activity Cost,Activity Type,Tip Activitate
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Suma Pronunțată
 DocType: Supplier,Fixed Days,Zilele fixe
 DocType: Quotation Item,Item Balance,Postul Balanța
 DocType: Sales Invoice,Packing List,Lista de ambalare
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,A achiziționa ordine de date Furnizori.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,A achiziționa ordine de date Furnizori.
 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
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,Funcționare Ora
 DocType: Pricing Rule,Sales Manager,Director De Vânzări
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grup la grup
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Proiectele mele
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
 DocType: Journal Entry,Bill No,Factură nr.
+DocType: Company,Gain/Loss Account on Asset Disposal,Cont câștig / Pierdere de eliminare a activelor
 DocType: Purchase Invoice,Quarterly,Trimestrial
 DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
 DocType: Sales Order Item,Basic Rate (Company Currency),Rată elementară (moneda companiei)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Plata Intrarea este deja creat
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Facturare totală în acest an
 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 +529,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -597,6 +610,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienți&gt; Clienți Grup&gt; Teritoriul
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: Production Order Operation,Planned End Time,Planificate End Time
 ,Sales Person Target Variance Item Group-Wise,Persoana de vânzări țintă varianță Articol Grupa Înțelept
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declarația salariu lunar.
 DocType: Item Group,Website Specifications,Site-ul Specificații
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Există o eroare în șablon Address {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Cont nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Cont nou
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {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.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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ţă
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -666,17 +680,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Cheltuieli de întreținere birou
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Lista de prețuri nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Facturile mele
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Facturile mele
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nu a fost gasit angajat
 DocType: Supplier Quotation,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Încărcați echilibru stoc prin csv.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Trimite Acum
 ,Support Analytics,Suport Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Eroare logică: trebuie să găsească suprapunere
 DocType: Item,Website Warehouse,Site-ul Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Înregistrări formular-C
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Înregistrări formular-C
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Client și furnizor
 DocType: Email Digest,Email Digest Settings,Setari Email Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Interogări de suport din partea clienților.
@@ -720,7 +736,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -757,14 +773,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Este subcontractată
 DocType: Item Attribute,Item Attribute Values,Valori Postul Atribut
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Vezi Abonații
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Primirea de cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Maestru cursului de schimb valutar.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Maestru cursului de schimb valutar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Parteneri de vânzări și teritoriu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} trebuie să fie activ
+DocType: Journal Entry,Depreciation Entry,amortizare intrare
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Du-te la coș
 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
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -793,10 +810,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Factura de cumpărare
+DocType: Asset,Purchase Invoice,Factura de cumpărare
 DocType: Stock Ledger Entry,Voucher Detail No,Detaliu voucher Nu
 DocType: Stock Entry,Total Outgoing Value,Valoarea totală de ieșire
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Deschiderea și data inchiderii ar trebui să fie în același an fiscal
@@ -806,21 +823,24 @@
 DocType: Material Request Item,Lead Time Date,Data Timp Conducere
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,este obligatorie. Poate înregistrarea de schimb valutar nu este creeatã pentru
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Pentru elementele &quot;produse Bundle&quot;, Warehouse, Serial No și lot nr vor fi luate în considerare de la &quot;ambalare List&quot; masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice &quot;Bundle produs&quot;, aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate &quot;de ambalare Lista&quot; masă."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Pentru elementele &quot;produse Bundle&quot;, Warehouse, Serial No și lot nr vor fi luate în considerare de la &quot;ambalare List&quot; masa. Dacă Warehouse și Lot nr sunt aceleași pentru toate elementele de ambalaj pentru produs orice &quot;Bundle produs&quot;, aceste valori pot fi introduse în tabelul de punctul principal, valorile vor fi copiate &quot;de ambalare Lista&quot; masă."
 DocType: Job Opening,Publish on website,Publica pe site-ul
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Transporturile către clienți.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Venituri indirecte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set de plată Suma = suma restantă
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variație
 ,Company Name,Denumire Furnizor
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Selectați Element de Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Procentul discount suplimentar
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Rândul {0}: {1} factură nu este validă, aceasta ar putea fi anulate / nu există. \ Vă rugăm să introduceți o factură validă"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
@@ -829,14 +849,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
 ,Employee Holiday Attendance,Participarea angajat de vacanță
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stoc Entries
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stoc Entries
 DocType: Item,Inspection Criteria,Criteriile de inspecție
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferat
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Realizare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Realizare
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 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 +5,My Cart,Cosul meu
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 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 +180,Qty for {0},Cantitate pentru {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Sigur doriți să restabiliți acest activ casate?
+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 +80,Leave Allocation Tool,Mijloc pentru Alocare Concediu
 DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
@@ -859,7 +880,7 @@
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
 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 +547,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Reducere
@@ -874,20 +895,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Primirea de cumpărare Postul
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervat Warehouse în Vânzări Ordine / Produse finite Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Vanzarea Suma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Timp Busteni
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Timp Busteni
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,dezmembrate
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutare
 DocType: BOM Operation,Operation,Operație
 DocType: Lead,Organization Name,Numele organizației
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Cheltuieli de vânzare
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Cumpararea Standard
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
@@ -904,7 +926,7 @@
 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
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Pentru a {0} | {1} {2}
 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
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,Monedă implicită
 DocType: Contact,Enter designation of this Contact,Introduceți destinatia acestui Contact
 DocType: Expense Claim,From Employee,Din Angajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -921,7 +943,7 @@
 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 +130,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 +131,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 +42,Contribution %,Contribuția%
@@ -930,22 +952,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Colaborare proiect Invitație
 DocType: Salary Slip,Deductions,Deduceri
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Acest lot Timpul Log a fost facturat.
 DocType: Salary Slip,Leave Without Pay,Concediu Fără Plată
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Capacitate de eroare de planificare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Capacitate de eroare de planificare
 ,Trial Balance for Party,Trial Balance pentru Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Câștiguri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Postul terminat {0} trebuie să fie introdusă de intrare de tip fabricarea
 apps/erpnext/erpnext/config/learn.py +92,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 +473,Nothing to request,Nimic de a solicita
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 î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 +45,Types of activities for Time Sheets,Tipuri de activități de fișe de pontaj
@@ -956,18 +979,18 @@
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Vă rugăm să setați Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Vă rugăm să setați Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru 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} 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/config/buying.py +33,Supplier database.,Baza de date furnizor.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza de date furnizor.
 DocType: Account,Balance Sheet,Bilant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Impozitul și alte rețineri salariale.
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
@@ -981,6 +1004,7 @@
 DocType: Holiday,Holiday,Vacanță
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formă nu se aplică pentru factură: {0}
 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
@@ -994,19 +1018,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
 DocType: Contact,User ID,ID-ul de utilizator
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Vezi Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Vezi Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendele plătite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendele plătite
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Contabilitate Ledger
 DocType: Stock Reconciliation,Difference Amount,Diferența Suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Venituri Reținute
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Venituri Reținute
 DocType: BOM Item,Item Description,Descriere Articol
 DocType: Payment Tool,Payment Mode,Modul de plată
 DocType: Purchase Invoice,Is Recurring,Este recurent
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Deschiderea temporară
 ,Employee Leave Balance,Bilant Concediu Angajat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
@@ -1029,14 +1054,14 @@
 ,Accounts Payable Summary,Rezumat conturi pentru plăți
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Titularul contului {0} creat
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Raport Realizat
@@ -1044,12 +1069,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Agricultură
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 apps/erpnext/erpnext/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
@@ -1059,19 +1084,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Vânzător Site-ul
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Statutul de producție Ordinul este {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Statutul de producție Ordinul este {0}
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Nu am gasit nici un element numit {0}
 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
@@ -1079,10 +1105,10 @@
 DocType: Item,Website Item Groups,Site-ul Articol Grupuri
 DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
 apps/erpnext/erpnext/stock/utils.py +166,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: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
 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
@@ -1091,6 +1117,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Cerere de ofertă Furnizor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,recurente upto
 DocType: Attendance,HR Manager,Manager Resurse Umane
@@ -1101,6 +1128,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Valoarea curentă după amortizare trebuie să fie mai mic sau egal cu {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Adăugaţi sau deduceţi
 DocType: Company,If Yearly Budget Exceeded (for expense account),Dacă bugetul anual depășită (pentru contul de cheltuieli)
@@ -1115,21 +1143,22 @@
 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}
 DocType: Project,Start and End Dates,Începere și de încheiere Date
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Discount mediiu
 DocType: Address,Utilities,Utilitați
 DocType: Purchase Invoice Item,Accounting,Contabilitate
 DocType: Features Setup,Features Setup,Caracteristici de setare
+DocType: Asset,Depreciation Schedules,Orarele de amortizare
 DocType: Item,Is Service Item,Este Serviciul Articol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,Operațiuni valutare
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},De la {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},De la {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operație Descriere
 DocType: Item,Will also apply to variants,"Va aplică, de asemenea variante"
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
 DocType: Quotation,Shopping Cart,Cosul de cumparaturi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ieșire zilnică medie
 DocType: Pricing Rule,Campaign,Campanie
@@ -1143,8 +1172,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Schimbarea net în active fixe
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
@@ -1152,8 +1181,8 @@
 DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
 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 +472,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nu poate fi mai mare de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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ă
@@ -1175,11 +1204,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Cumparam acest articol
 DocType: Address,Billing,Facturare
@@ -1189,12 +1218,15 @@
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub Assemblies
+DocType: Asset,Asset Name,Denumire activ
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Slip de ambalare
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Birou inchiriat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Slip de ambalare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Cerere de ofertă poate fi de acces făcând clic pe următorul link
+DocType: Asset,Number of Months in a Period,Numărul de luni într-o perioadă
 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
@@ -1211,19 +1243,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Guvern
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Variante Postul
 DocType: Company,Services,Servicii
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
 DocType: Sales Invoice,Source,Sursă
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Afișează închis
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,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 +39,Financial Year Start Date,Data de Inceput An Financiar
 DocType: Employee External Work History,Total Experience,Experiența totală
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow de la Investiții
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Item Group,Item Group Name,Denumire Grup Articol
 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 +86,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1232,7 +1265,7 @@
 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/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.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Vizita Mentenanta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Vizita Mentenanta
 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: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
@@ -1246,7 +1279,6 @@
 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 +196,Brand master.,Deţinător marcă.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tip Furnizor
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Cutie
@@ -1273,7 +1305,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Cererile pentru cheltuieli companie.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Pasive stoc
 DocType: Purchase Receipt,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
@@ -1282,7 +1314,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Retrimite e-mail de plată
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,alte rapoarte
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1292,26 +1324,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Vezi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Schimbarea net în numerar
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Cerere de plată există deja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Exercițiul financiar precedent nu este închis
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Furnizor de tip maestru.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizor de tip maestru.
 DocType: Purchase Order Item,Supplier Part Number,Furnizor Număr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
 DocType: Purchase Invoice,Reference Document,Documentul de referință
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Taxat
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
@@ -1333,8 +1366,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Schimbarea net în conturi de plătit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Vă rugăm să verificați ID-ul dvs. de e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client necesar pentru 'Reducere Client'
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
 DocType: Quotation,Term Details,Detalii pe termen
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} trebuie să fie mai mare decât 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificarea capacitate de (zile)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garanție revendicarea
@@ -1352,7 +1386,7 @@
 DocType: Employee,Permanent Address,Permanent Adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avansul plătit împotriva {0} {1} nu poate fi mai mare \ decât Grand total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Vă rugăm să selectați codul de articol
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Vă rugăm să selectați codul de articol
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduce Deducerea pentru concediu fără plată (LWP)
 DocType: Territory,Territory Manager,Teritoriu Director
 DocType: Packed Item,To Warehouse (Optional),Pentru a Depozit (opțional)
@@ -1362,15 +1396,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Unitate unică a unui articol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1387,33 +1421,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
+DocType: Asset,Depreciation Method,Metoda de amortizare
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
 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 +29,Shopping Cart is enabled,Cosul de cumparaturi este activat
 DocType: Job Applicant,Applicant for a Job,Solicitant pentru un loc de muncă
 DocType: Production Plan Material Request,Production Plan Material Request,Producția Plan de material Cerere
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nu sunt comenzile de producție create
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nu sunt comenzile de producție create
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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ă
@@ -1421,31 +1457,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
 DocType: Territory,Territory Name,Teritoriului Denumire
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adrese
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,Cotatie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Postul nu este permis să aibă producție comandă.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Postul nu este permis să aibă producție comandă.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
 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: 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 +27,Time Logs for manufacturing.,Timp Busteni pentru productie.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Log timp de sarcini.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Plată
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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}
 DocType: Employee,Salutation,Salut
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Set de articole în momemntul vânzării.
 DocType: Quotation Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
@@ -1456,6 +1493,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
+DocType: Request for Quotation Supplier,Send Email to Supplier,Trimite e-mail la Furnizor
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 DocType: Packing Slip,To Package No.,La pachetul Nr
 DocType: Production Planning Tool,Material Requests,Cereri de materiale
@@ -1473,7 +1511,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Depozit de livrare
 DocType: Stock Settings,Allowance Percent,Procent Alocație
 DocType: SMS Settings,Message Parameter,Parametru mesaj
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Tree of centre de cost financiare.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Tree of centre de cost financiare.
 DocType: Serial No,Delivery Document No,Nr. de document de Livrare
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obține elemente din achiziție Încasări
 DocType: Serial No,Creation Date,Data creării
@@ -1505,40 +1543,42 @@
 ,Amount to Deliver,Sumă pentru livrare
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} creat
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
 ,Serial No Status,Serial Nu Statut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tabelul Articolului nu poate fi vid
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rând {0}: Pentru a stabili {1} periodicitate, diferența între de la și până în prezent \ trebuie să fie mai mare sau egal cu {2}"
 DocType: Pricing Rule,Selling,De vânzare
 DocType: Employee,Salary Information,Informațiile de salarizare
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Impozite și taxe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Vă rugăm să introduceți data de referință
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Plata Gateway cont nu este configurat
 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: Production Order,Material Request Item,Material Cerere Articol
+DocType: Request for Quotation Item,Material Request Item,Material Cerere Articol
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Vândut
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Roșu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Timp de instalare
 DocType: Sales Invoice,Accounting Details,Contabilitate Detalii
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocări
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteriile de receptie
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
 DocType: Item Attribute,Attribute Name,Denumire atribut
 DocType: Item Group,Show In Website,Arata pe site-ul
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grup
@@ -1546,6 +1586,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama Gantt a tuturor sarcinilor.
+DocType: Pricing Rule,Margin Type,Tipul de marjă
 DocType: Appraisal,For Employee Name,Pentru Numele Angajatului
 DocType: Holiday List,Clear Table,Sterge Masa
 DocType: Features Setup,Brands,Mărci
@@ -1553,20 +1594,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Rând # {0}: activ este obligatorie împotriva unui post de active fixe
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurare serie de numerotare pentru prezență prin intermediul Setup&gt; Numerotare Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pereche
+DocType: Asset,Depreciation Schedule,Program de amortizare
 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: Asset,Purchase Date,Data cumpărării
 DocType: Employee,Personal Details,Detalii personale
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Vă rugăm să setați &quot;Activ Center Amortizarea Cost&quot; în companie {0}
 ,Maintenance Schedules,Program de Mentenanta
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
@@ -1580,23 +1626,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Includ intrările împăcat
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup non-grup
 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/public/js/setup_wizard.js +272,Unit,Unitate
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Vă rugăm să specificați companiei
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Căutare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
@@ -1605,29 +1650,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {3}
 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/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 +249,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
 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
 DocType: Territory,Classification of Customers by region,Clasificarea clienți în funcție de regiune
 DocType: Project,% Tasks Completed,% Sarcini finalizate
 DocType: Project,Gross Margin,Marja Brută
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Calculat Bank echilibru Declaratie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizator dezactivat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Cost actualizat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Cost actualizat
 DocType: Employee,Date of Birth,Data Nașterii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să Configurarea angajatului Sistem Atribuirea de nume în resurse umane&gt; Setări HR
 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
@@ -1639,8 +1685,8 @@
 ,SO Qty,SO Cantitate
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
+DocType: Request for Quotation,Manufacturing Manager,Manufacturing Manager de
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Transporturile
 DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
@@ -1648,12 +1694,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Cheltuieli diverse
 DocType: Global Defaults,Default Company,Companie Implicita
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Utilizatorul {0} este dezactivat
@@ -1662,7 +1708,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Currency Exchange,From Currency,Din moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
@@ -1672,11 +1718,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Rând # {0}: Cant trebuie să fie 1, ca element este legat de un activ"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Postul copil nu ar trebui să fie un pachet de produse. Vă rugăm să eliminați elementul `{0}` și de a salva
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Centru de cost nou
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 de fonduri&gt; Pasive curente&gt; Impozite și taxe și de a crea un nou cont (făcând clic pe Add pentru copii) de tip &quot;Brut&quot; și nu menționează cota de impozitare."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Centru de cost nou
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Quality Inspection,In Process,În procesul de
@@ -1689,10 +1735,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
 DocType: Quotation Item,Stock Balance,Stoc Sold
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Timp Busteni creat:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Timp Busteni creat:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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
@@ -1710,13 +1757,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vă rugăm să specificați o țară pentru această regulă Transport sau verificați Expediere
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Pentru debit este necesar
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
 DocType: Offer Letter Term,Offer Term,Termen oferta
 DocType: Quality Inspection,Quality Manager,Manager de calitate
 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 +141,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Scrisoare
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereaza Cereri de Material (MRP) și Comenzi de Producție.
@@ -1724,22 +1771,22 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
 DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Rata de evaluare curentă
 DocType: Item,Customer Item Codes,Coduri client Postul
 DocType: Opportunity,Lost Reason,Motiv Pierdere
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1748,10 +1795,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,
 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 +175,Serial No {0} not found,Serial nr {0} nu a fost găsit
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial nr {0} nu a fost găsit
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Clienții dvs.
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
 DocType: Leave Block List Date,Block Date,Dată blocare
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Aplica acum
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Aplica acum
 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."
@@ -1775,7 +1823,7 @@
 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 +114,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,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
@@ -1793,10 +1841,10 @@
 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 +608,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Material de transfer
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Postul {0} trebuie să fie un element de vânzări în {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Vă rugăm să setați recurente după salvare
 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
@@ -1810,12 +1858,13 @@
 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: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email la
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Invitați ca utilizator
 DocType: Features Setup,After Sale Installations,Echipamente premergătoare vânzării
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Vă rugăm să setați {0} în {1} Company
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} este complet facturat
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Clauzele contractuale standard pentru vânzări sau de cumpărare.
@@ -1824,9 +1873,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatoriu pe
 DocType: Sales Invoice,Mass Mailing,Corespondență în masă
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
@@ -1843,25 +1892,25 @@
 DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Gateway Account,Payment Account,Cont de plăți
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,Accepted,Acceptat
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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ă.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick Jurnal de intrare
 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 +206,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nu este introdus
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1870,7 +1919,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nume
 DocType: Authorization Rule,Authorized Value,Valoarea autorizată
@@ -1888,13 +1937,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} este închis
 DocType: Email Digest,How frequently?,Cât de frecvent?
 DocType: Purchase Receipt,Get Current Stock,Obține stocul curent
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Du-te la grupul corespunzător (de obicei, Aplicarea fondurilor&gt; Active curente&gt; Conturi bancare și de a crea un nou cont (făcând clic pe Add pentru copii) de tip &quot;Banca&quot;"
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arborele de Bill de materiale
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Prezent
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
 DocType: Production Order,Actual End Date,Data efectiva de finalizare
 DocType: Authorization Rule,Applicable To (Role),Aplicabil pentru (rol)
 DocType: Stock Entry,Purpose,Scopul
+DocType: Company,Fixed Asset Depreciation Settings,Setări de amortizare fixă Activ
 DocType: Item,Will also apply for variants unless overrridden,Se va aplica și pentru variantele cu excepția cazului în overrridden
 DocType: Purchase Invoice,Advances,Avansuri
 DocType: Production Order,Manufacture against Material Request,Fabricare împotriva Cerere Material
@@ -1903,6 +1952,7 @@
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
 DocType: Campaign,Campaign-.####,Campanie-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1953,12 +2003,14 @@
  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: Purchase Receipt Item,Recd Quantity,Recd Cantitate
-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}
+DocType: Asset Category Account,Asset Category Account,Cont activ Categorie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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 +262,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Du-te la grupul corespunzător (de obicei, Aplicarea fondurilor&gt; Active curente&gt; Conturi bancare și de a crea un nou cont (făcând clic pe Add pentru copii) de tip &quot;Banca&quot;"
 DocType: Journal Entry,Credit Note,Nota de Credit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1982,9 +2034,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Adresele mele
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Ramură organizație maestru.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nici un angajat pentru criteriile de mai sus selectate sau biletul de salariu deja creat
@@ -2011,7 +2063,7 @@
 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 +200,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'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,stat de plată
 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"
@@ -2021,8 +2073,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primirea de cumpărare Articole
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare Personalizarea
 DocType: Account,Income Account,Contul de venit
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nici șablon implicit Adresa găsită. Vă rugăm să creați unul nou din Setup&gt; Imprimare și Branding&gt; Template Address.
 DocType: Payment Request,Amount in customer's currency,Suma în moneda clientului
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2044,21 +2097,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track conduce de Industrie tip.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Numele noului centru de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
 DocType: Appraisal,HR User,Utilizator HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
-apps/erpnext/erpnext/config/support.py +7,Issues,Probleme
+apps/erpnext/erpnext/hooks.py +90,Issues,Probleme
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Starea trebuie să fie una din {0}
 DocType: Sales Invoice,Debit To,Debit Pentru
 DocType: Delivery Note,Required only for sample item.,Necesar numai pentru element de probă.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra mare
 ,Profit and Loss Statement,Profit și pierdere
@@ -2072,10 +2126,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
 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 +139,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
 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 +142,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
@@ -2143,13 +2197,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Solicitată
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Nu Observații
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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 cumparari
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fix elementul de activ trebuie să fie un element de bază non-stoc
 DocType: Supplier Quotation Item,Material Request No,Cerere de material Nu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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
@@ -2170,7 +2225,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă clientului
 DocType: Payment Request,Recipient and Message,Destinatar și mesaje
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
@@ -2184,7 +2239,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Selectați Furnizor Adresă
 DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2206,11 +2261,12 @@
 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/config/buying.py +18,Request for quotation.,Cerere de ofertă.
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
 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 +294,Price List Currency not selected,Lista de pret Valuta nu selectat
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Lista de pret Valuta nu selectat
 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,Postul Rând {0}: Chitanță de achiziție {1} nu există în tabelul de mai sus &quot;Încasări de achiziție&quot;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,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
@@ -2219,7 +2275,7 @@
 DocType: Installation Note Item,Against Document No,Împotriva documentul nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Gestiona vânzările Partners.
 DocType: Quality Inspection,Inspection Type,Inspecție Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Vă rugăm să selectați {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Participarea nemarcat
@@ -2234,6 +2290,7 @@
 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ă
+DocType: Asset Category Account,Depreciation Expense Account,Contul de amortizare de cheltuieli
 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
@@ -2247,7 +2304,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 DocType: Payment Gateway,Gateway,Portal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2261,18 +2318,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Imposibilitatea de a găsi rata de schimb pentru {0} {1} la
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Imposibilitatea de a găsi rata de schimb pentru {0} {1} la
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark jumatate de zi
 DocType: Sales Invoice,Sales Team,Echipa de vânzări
 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 +410,[Error],[Eroare]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serial Nu {0} nu există
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tip Furnizor
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Depozit de client (opțional)
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
@@ -2298,14 +2356,16 @@
 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
 DocType: Leave Allocation,Leave Allocation,Alocare Concediu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Cererile de materiale {0} a creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Cererile de materiale {0} a creat
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Șablon de termeni sau contractului.
 DocType: Purchase Invoice,Address and Contact,Adresa si Contact
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
+DocType: Asset,Expected Value After Useful Life,Valoarea așteptată după viață utilă
 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
@@ -2318,12 +2378,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} este anulat sau închis
 DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Numerar net din Investiții
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Contul de root nu pot fi șterse
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Activ {0} trebuie depuse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Gestionați Adrese
-DocType: Pricing Rule,Item Code,Cod articol
+DocType: Asset,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
 DocType: Journal Entry,User Remark,Observație utilizator
@@ -2342,8 +2402,10 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
 DocType: Employee Education,School/University,Școlar / universitar
 DocType: Payment Request,Reference Details,Detalii de referință
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
 ,Billed Amount,Sumă facturată
+DocType: Asset,Double Declining Balance,Dublu degresive
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Pentru închis nu poate fi anulată. Pentru a anula redeschide.
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obțineți actualizări
@@ -2362,6 +2424,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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'
+DocType: Asset,Fully Depreciated,Depreciata pe deplin
 ,Stock Projected Qty,Stoc proiectată Cantitate
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
@@ -2369,25 +2432,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serial și Lot nr
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Nu fi de acord în cuvinte
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Descoperire cont bancar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Articol Cod&gt; Postul Grup&gt; Marca
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Împrumuturi garantate
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vă rugăm să setați Conturi aferente amortizării în categoria activelor {0} sau companie {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Sold Equity
 DocType: Appraisal,Appraisal,Expertiză
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mail trimis la furnizorul {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data se repetă
 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 +187,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
@@ -2395,7 +2461,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk Import Ajutor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Selectați Cantitate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Selectați Cantitate
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea unui rol nu poate fi aceeaşi cu rolul. Regula este aplicabilă pentru
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Dezabona de la acest e-mail Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesajul a fost trimis
@@ -2423,6 +2489,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Marja totală
 DocType: Supplier,Supplier Details,Detalii furnizor
 DocType: Expense Claim,Approval Status,Status aprobare
 DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
@@ -2436,7 +2503,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Client / Client
 DocType: Payment Gateway Account,Default Payment Request Message,Implicit solicita plata mesaj
 DocType: Item Group,Check this if you want to show in website,Bifati dacă doriți să fie afisat în site
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bancare și plăți
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bancare și plăți
 ,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ă
@@ -2444,17 +2511,17 @@
 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 +199,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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"
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Issue,Opening Date,Data deschiderii
 DocType: Journal Entry,Remark,Remarcă
 DocType: Purchase Receipt Item,Rate and Amount,Rata și volumul
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Frunze și de vacanță
 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/stock/doctype/warehouse/warehouse.py +115,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ă.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
 DocType: Time Log,Batched for Billing,Transformat în lot pentru facturare
@@ -2470,15 +2537,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Amortizarea activului Centru de cost
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Achiziționarea Data activ {0} nu se potrivește cu data achiziției facturii
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
 ,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}
 DocType: Journal Entry,Stock Entry,Stoc de intrare
 DocType: Account,Payable,Plătibil
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debitorilor ({0})
-DocType: Project,Margin,Margin
+DocType: Pricing Rule,Margin,Margin
 DocType: Salary Slip,Arrear Amount,Sumă restantă
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Profit Brut%
@@ -2486,20 +2555,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
 DocType: Newsletter,Newsletter List,List Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Verificați dacă doriți să trimiteți fișa de salariu în e-mail-ul fiecarui angajat în timpul introducerii salariului.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
 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 +57,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
 DocType: Stock Entry Detail,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
 DocType: Employee,Confirmation Date,Data de Confirmare
 DocType: C-Form,Total Invoiced Amount,Sumă totală facturată
 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: Account,Accumulated Depreciation,Amortizarea cumulată
 DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
 DocType: Payment Request,Email To,E-mail Pentru a
 DocType: Lead,Lead Owner,Proprietar Conducere
 DocType: Bin,Requested Quantity,Cantitatea solicitată
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Este necesar depozit
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2507,11 +2579,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Livrat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Livrat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Același furnizor a fost introdus de mai multe ori
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Comandă de aprovizionare Articol Livrat
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2521,13 +2594,14 @@
 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.
 DocType: Payment Request,Payment Details,Detalii de plata
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
+DocType: Asset,Journal Entry for Scrap,Jurnal de intrare pentru deseuri
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
 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 +73,"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."
 DocType: Manufacturer,Manufacturers used in Items,Producătorii utilizate în Articole
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Creeaza Nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2540,7 +2614,7 @@
 ,Stock Ledger,Stoc Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Evaluare: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salariul Slip Deducerea
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Selectați un nod grup prim.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Selectați un nod grup prim.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Angajaților și prezență
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminați de referință de client, furnizor, partener de vânzări și plumb, deoarece este adresa companiei"
@@ -2562,13 +2636,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: de la {1}
 DocType: Task,depends_on,depinde de
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Următoarea dată trebuie să fie mai mare de postare Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Arată impozit break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Postul / {0}) este din stoc
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Următoarea dată trebuie să fie mai mare de postare Data
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/accounts/party.py +289,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'
 Ignore,Ignora
@@ -2695,7 +2770,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,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 +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2709,7 +2784,7 @@
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2719,7 +2794,7 @@
 DocType: Purchase Order,Customer Contact Email,Contact Email client
 DocType: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
@@ -2730,7 +2805,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
@@ -2739,11 +2814,12 @@
 DocType: Journal Entry,Printing Settings,Setări de imprimare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Cont activ fix
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interna
@@ -2751,7 +2827,7 @@
 DocType: Stock Entry,From BOM,De la BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,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 +204,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,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 +63,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 +186,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
@@ -2759,17 +2835,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Structura salariu
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Eliberarea Material
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotațiile
 DocType: Hub Settings,Access Token,Acces Token
 DocType: Sales Invoice Item,Serial No,Nr. serie
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
-DocType: Item,Is Fixed Asset Item,Este fixă Asset Postul
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
 DocType: Purchase Invoice,Print Language,Limba de imprimare
 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ă"
+DocType: Asset,Number of Depreciations,Numărul de Deprecieri
 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
@@ -2777,13 +2853,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Cerere de Cotațiile
 DocType: Payment Reconciliation,Maximum Invoice Amount,Factură maxim Suma
 DocType: Purchase Invoice Item,Image View,Imagine Vizualizare
 apps/erpnext/erpnext/config/selling.py +23,Customers,clienţii care
+DocType: Asset,Partially Depreciated,parțial Depreciata
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
@@ -2799,13 +2877,13 @@
 DocType: Quotation,Maintenance Manager,Intretinere Director
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalul nu poate să fie zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Modificat din
+DocType: Asset,Amended From,Modificat din
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2818,21 +2896,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Vă rugăm să menționați &#39;Gain / Pierdere cont pe Eliminarea activelor &quot;în companie
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Plățile se potrivesc cu facturi
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Plățile se potrivesc cu facturi
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Adăugaţi în Coş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupul De
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Activare / dezactivare valute.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Activare / dezactivare valute.
 DocType: Production Planning Tool,Get Material Request,Material Cerere obțineți
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Cheltuieli poștale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Cheltuieli poștale
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Raport Prezent
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Declarațiile contabile
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Declarațiile contabile
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2852,15 +2931,16 @@
 DocType: C-Form,Invoices,Facturi
 DocType: Job Opening,Job Title,Denumire post
 DocType: Features Setup,Item Groups in Details,Grup Articol în Detalii
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start la punctul de vânzare (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
 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 +169,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 +171,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: Item,Website Description,Site-ul Descriere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Schimbarea net în capitaluri proprii
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
 ,Sales Register,Vânzări Inregistrare
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
@@ -2868,12 +2948,13 @@
 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
 DocType: Customer Group,Customer Group Name,Nume Group Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Eroare: {0}&gt; {1}
 DocType: Item,Attributes,Atribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Obtine Articole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Obtine Articole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima comandă Data
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
 DocType: C-Form,C-Form,Formular-C
@@ -2885,18 +2966,18 @@
 DocType: Purchase Invoice,Mobile No,Numar de mobil
 DocType: Payment Tool,Make Journal Entry,Asigurați Jurnal intrare
 DocType: Leave Allocation,New Leaves Allocated,Frunze noi alocate
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Comercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Eroare: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Toate produsele sau serviciile.
 DocType: Supplier Quotation,Supplier Address,Furnizor Adresa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Rândul {0} # cont trebuie să fie de tip &quot;Activ fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Cantitate
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2907,10 +2988,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
 DocType: Tax Rule,Billing State,Stat de facturare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date este obligatorie
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
@@ -2929,20 +3010,22 @@
 DocType: GL Entry,Remarks,Remarci
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Trimite email-uri Furnizor
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Timpul Jurnal a fost facturat
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Atribuirea de nume Seria pentru {0} prin Configurare&gt; Setări&gt; Seria Naming
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Profit provizorie / Pierdere (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Vă rugăm să setați valoare implicită {0} în {1} companie
@@ -2952,12 +3035,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Center de Cost este obligatoriu pentru articolul {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurare serie de numerotare pentru prezență prin intermediul Setup&gt; Numerotare Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Obține elemente din Bundle produse
+DocType: Asset,Straight Line,Linie dreapta
+DocType: Project User,Project User,utilizator proiect
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'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: Features Setup,Sales Discounts,Reduceri de vânzare
@@ -2971,39 +3055,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Adăugaţi fiu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Valoarea de deschidere
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Comision pentru Vânzări
 DocType: Offer Letter Term,Value / Description,Valoare / Descriere
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
 DocType: Tax Rule,Billing Country,Țara facturării
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Cheltuieli de Divertisment
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Cheltuieli de Divertisment
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Cererile de concediu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Cheltuieli Juridice
 DocType: Sales Invoice,Posting Time,Postarea de timp
 DocType: Sales Order,% Amount Billed,% Sumă facturată
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Cheltuieli de telefon
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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 +118,No Item with Serial No {0},Nici un articol cu ordine {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,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/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Cheltuieli Directe
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} este o adresă de e-mail nevalidă în &quot;Adresa de e-mail de notificare \ &#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
@@ -3020,7 +3105,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Vindem acest articol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizor Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
 DocType: Journal Entry,Cash Entry,Cash intrare
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip de frunze, cum ar fi casual, bolnavi, etc"
@@ -3031,11 +3116,12 @@
 DocType: Production Order,Total Operating Cost,Cost total de operare
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Furnizor de activ {0} nu se potrivește cu furnizorul din factura de cumpărare
 DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Materii prime nu poate fi la fel ca Item principal
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Maestru șablon salariu.
@@ -3051,12 +3137,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,"monedă de facturare trebuie să fie egală cu moneda, fie implicit comapany sau moneda contului payble partidului"
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","În cazul în care dezactivați, &quot;în cuvinte&quot; câmp nu vor fi vizibile în orice tranzacție"
@@ -3066,13 +3153,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Acest lot Timpul Log a fost anulat.
 ,Reqd By Date,Reqd de Date
 DocType: Salary Slip Earning,Salary Slip Earning,Salariul Slip Câștigul salarial
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Creditorii
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Creditorii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Nu serial este obligatorie
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Articol
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -3093,15 +3180,14 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
-DocType: Project,Project Name,Denumirea proiectului
+DocType: Request for Quotation Item,Project Name,Denumirea proiectului
 DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
 DocType: Features Setup,Item Batch Nos,Lot nr element
@@ -3131,6 +3217,7 @@
 DocType: Sales Invoice,End Date,Dată finalizare
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Tranzacții de stoc
 DocType: Employee,Internal Work History,Istoria interne de lucru
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Sumă Amortizarea cumulată
 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ă
@@ -3138,7 +3225,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Firma este obligatorie, deoarece este adresa companiei"
 DocType: Item Attribute,From Range,Din gama
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Element {0} ignorat, deoarece nu este un element de stoc"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Trimiteți acest comandă de producție pentru prelucrarea ulterioară.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Trimiteți acest comandă de producție pentru prelucrarea ulterioară.
 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.","De a nu aplica regula Preturi într-o anumită tranzacție, ar trebui să fie dezactivat toate regulile de tarifare aplicabile."
 DocType: Company,Domain,Domeniu
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Locuri de munca
@@ -3150,6 +3237,7 @@
 DocType: Time Log,Additional Cost,Cost aditional
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3165,6 +3253,7 @@
 DocType: Sales Order,Delivery Date,Data de Livrare
 DocType: Opportunity,Opportunity Date,Oportunitate Data
 DocType: Purchase Receipt,Return Against Purchase Receipt,Reveni cu confirmare de primire cumparare
+DocType: Request for Quotation Item,Request for Quotation Item,Cerere de ofertă Postul
 DocType: Purchase Order,To Bill,Pentru a Bill
 DocType: Material Request,% Ordered,Comandat%
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Muncă în acord
@@ -3179,11 +3268,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Articolul {0} nu este configurat pentru Numerotare Seriala. Coloana trebuie să fie vida
 DocType: Accounts Settings,Accounts Settings,Setări Conturi
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Vă rugăm să setați &quot;Eliminare Cont activ&quot; în companie {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Instalații tehnice și mașini
 DocType: Sales Partner,Partner's Website,Site-ul partenerului
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Conturi temporare
 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
@@ -3192,21 +3282,22 @@
 DocType: Pricing Rule,Disable,Dezactivati
 DocType: Project Task,Pending Review,Revizuirea în curs
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Click aici pentru a plăti
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Activ {0} nu poate fi scoase din uz, deoarece este deja {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Adauga articole din
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Adauga articole din
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
 DocType: Project Task,Task ID,Sarcina ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","de exemplu ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depozitul {0} nu există
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3221,6 +3312,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Postul {0} a fost dezactivat
 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
@@ -3232,7 +3324,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup conturi Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup conturi Gateway.
 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
 ,Cash Flow,Fluxul de numerar
@@ -3246,7 +3338,7 @@
 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 +132,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Banca echilibru Declarație pe General Ledger
 DocType: Job Applicant,Applicant Name,Nume solicitant
 DocType: Authorization Rule,Customer / Item Name,Client / Denumire articol
@@ -3262,19 +3354,18 @@
 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
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienți&gt; Clienți Grup&gt; Teritoriul
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
 DocType: BOM Replace Tool,Current BOM,FDM curent
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adăugaţi Nr. de Serie
 apps/erpnext/erpnext/config/support.py +43,Warranty,garanţie
 DocType: Production Order,Warehouses,Depozite
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Imprimare și staționare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Imprimare și staționare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nod Group
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Marfuri actualizare finite
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Marfuri actualizare finite
 DocType: Workstation,per hour,pe oră
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,cumpărare
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Sumă plătită
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
@@ -3304,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Se aplică companiei
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
 DocType: Purchase Invoice,In Words,În cuvinte
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Astăzi este {0} nu a aniversare!
 DocType: Production Planning Tool,Material Request For Warehouse,Cerere de material Pentru Warehouse
@@ -3317,9 +3408,11 @@
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,A adera
 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 +564,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Salary Slip,Salary Slip,Salariul Slip
+DocType: Pricing Rule,Margin Rate or Amount,Rata de marjă sau Sumă
 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
@@ -3329,7 +3422,7 @@
 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 +782,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3337,14 +3430,13 @@
 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 +17,Potential opportunities for selling.,Potențiale oportunități de vânzare.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Atribuirea de nume Seria pentru {0} prin Configurare&gt; Setări&gt; Seria Naming
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Magazine Departament
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
 DocType: Company,Change Abbreviation,Schimbarea abreviere
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
@@ -3362,14 +3454,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Registru Contabil General
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vezi Oportunitati
 DocType: Item Attribute Value,Attribute Value,Valoare Atribut
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Id Email trebuie să fie unic, există deja pentru {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Id Email trebuie să fie unic, există deja pentru {0}"
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {0}
 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>
@@ -3401,23 +3494,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cant efectivă (la sursă/destinaţie)
 DocType: Item Customer Detail,Ref Code,Cod de Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Înregistrări angajat.
 DocType: Payment Gateway,Payment Gateway,Gateway de plată
 DocType: HR Settings,Payroll Settings,Setări de salarizare
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Locul de comandă
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rădăcină nu poate avea un centru de cost părinte
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Selectați Marca ...
 DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,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}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse este obligatorie
 DocType: Supplier,Address and Contacts,Adresa si contact
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3435,7 +3528,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Moneda de tranzacție trebuie să fie aceeași ca și de plată Gateway monedă
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Primi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3443,14 +3536,14 @@
 DocType: Purchase Invoice,Submit on creation,Publica cu privire la crearea
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Comenzile mele
@@ -3471,10 +3564,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Punctul de vânzare profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Creditele negarantate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
 DocType: Maintenance Schedule Detail,Scheduled Date,Data programată
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total plătit Amt
@@ -3486,11 +3579,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Furnizorii dumneavoastră
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Furnizor de piesa
 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
@@ -3499,12 +3593,12 @@
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: de la {0} pentru {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
 DocType: Payment Reconciliation,From Invoice Date,De la data facturii
@@ -3513,7 +3607,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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
@@ -3526,7 +3620,7 @@
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Memento dată naştere pentru {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
@@ -3540,15 +3634,15 @@
 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 +576,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Activitatea de proiect / sarcină.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generează fluturașe de salariu
 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: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3568,8 +3662,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Anul Data de începere sau de încheiere este suprapunerea cu {0}. Pentru a evita vă rugăm să setați companie
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Noi Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {0}
 DocType: 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.","Exemplu:. ABCD ##### 
  Dacă seria este setat și nu de serie nu este menționat în tranzacții, numărul de atunci automat de serie va fi creat pe baza acestei serii. Dacă întotdeauna doriți să se menționeze explicit Serial nr de acest articol. părăsi acest gol."
@@ -3581,11 +3676,11 @@
 ,Sales Analytics,Analitice de vânzare
 DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurarea e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Va rugam sa introduceti moneda implicit în Compania de Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stoc de intrare Detaliu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Memento de zi cu zi
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nume nou cont
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Service Client
@@ -3595,11 +3690,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,Procent
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3607,11 +3703,12 @@
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
 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 +385,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
 DocType: Sales Partner,Partner Type,Tip partener
 DocType: Purchase Taxes and Charges,Actual,Efectiv
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
 DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 de fonduri&gt; Pasive curente&gt; Impozite și taxe și de a crea un nou cont (făcând clic pe Add pentru copii) de tip &quot;Brut&quot; și nu menționează cota de impozitare."
 DocType: Production Order,Production Order,Număr Comandă Producţie:
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
 DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
@@ -3630,18 +3727,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Împăcați cu succes
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Tax Rule,Validity,Valabilitate
+DocType: Request for Quotation,Supplier Detail,Detalii furnizor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Suma facturată
 DocType: Attendance,Attendance,Prezență
 apps/erpnext/erpnext/config/projects.py +55,Reports,rapoarte
 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 +508,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
 ,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
@@ -3651,10 +3749,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli administrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Cheltuieli administrative
 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 +455,Change,Schimbare
@@ -3662,6 +3760,7 @@
 DocType: Appraisal Goal,Score Earned,Scor Earned
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Nume activ Categorie
 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
@@ -3673,13 +3772,13 @@
 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 +559,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 +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Lot
@@ -3693,7 +3792,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Persoana de vânzări
 DocType: Sales Invoice,Cold Calling,Apelare Rece
 DocType: SMS Parameter,SMS Parameter,SMS Parametru
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Buget și centru de cost
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Buget și centru de cost
 DocType: Maintenance Schedule Item,Half Yearly,Semestrial
 DocType: Lead,Blog Subscriber,Abonat blog
 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.
@@ -3724,9 +3823,9 @@
 DocType: Purchase Common,Purchase Common,Cumpărare comună
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Furnizor de oferta {0} creat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
 DocType: Sales Invoice,Is POS,Este POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Articol Cod&gt; Postul Grup&gt; Marca
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3734,7 +3833,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Contul părinte
@@ -3750,7 +3849,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
@@ -3765,6 +3864,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Reducere și marja de profit
 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: Deduction Type,Deduction Type,Tip Deducerea
 DocType: Attendance,Half Day,Jumătate de zi
@@ -3785,7 +3885,7 @@
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
 DocType: BOM Operation,BOM Operation,Operațiune BOM
@@ -3793,22 +3893,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Plată URL Mesaj
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Totală neremunerată
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Timpul Conectare nu este facturabile
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"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"
+DocType: Asset,Asset Category,Categorie activ
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material de Furnizor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Accize factură
 DocType: Expense Claim,Employees Email Id,Id Email Angajat
 DocType: Employee Attendance Tool,Marked Attendance,Participarea marcat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Raspunderi Curente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Raspunderi Curente
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
@@ -3829,17 +3930,16 @@
 DocType: Item Attribute,Numeric Values,Valori numerice
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Atașați logo
 DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Google Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Coșul este gol
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nici șablon implicit Adresa găsită. Vă rugăm să creați unul nou din Setup&gt; Imprimare și Branding&gt; Template Address.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
 DocType: Payment Gateway Account,Payment Gateway Account,Plata cont Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,După finalizarea plății de redirecționare utilizator la pagina selectată.
@@ -3848,20 +3948,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
+DocType: Asset,Current Value (After Depreciation),Valoarea curentă (după amortizare)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Proiect de lege de materiale
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3869,6 +3970,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Contul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Contul {0} nu există
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 2bcb4ba..377dd39 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -1,5 +1,5 @@
 DocType: Employee,Salary Mode,Режим Зарплата
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Выберите ежемесячное распределение, если вы хотите, чтобы отслеживать на основе сезонности."
+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 +81,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Элементы уже синхронизированы
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Арендованный
 DocType: POS Profile,Applicable for User,Применимо для пользователя
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Вы действительно хотите отказаться от этого актива?
 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.,* Будет рассчитана в сделке.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, установите сотрудников система имен в людских ресурсов&gt; HR Настройки"
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Соискатель работы
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Показать открыт
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
-DocType: Pricing Rule,Apply On,Нанесите на
+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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Новый Оставить заявку
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Показать варианты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты (обязательства)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Учетные записи таблицы не может быть пустым.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличии
 DocType: Designation,Designation,Назначение
@@ -64,7 +66,7 @@
 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 +642,Invoice,Счет-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Счет
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Новый {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Новый {0}: # {1}
 ,Sales Partners Commission,Комиссионные Партнеров по продажам
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 DocType: Payment Request,Payment Request,Платежный запрос
@@ -90,7 +92,7 @@
 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: 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/public/js/setup_wizard.js +272,Kg,кг
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Открытие на работу.
@@ -101,12 +103,12 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Получить элементы из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Получить товары от
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
-DocType: Process Payroll,Make Bank Entry,Сделать Банк Стажер
+DocType: Process Payroll,Make Bank Entry,Создать проводку по Банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
@@ -114,7 +116,7 @@
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
 DocType: Account,Credit,Кредит
 DocType: POS Profile,Write Off Cost Center,Списание МВЗ
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Отчеты фонда
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Отчеты по Запасам
 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,Налоги Тип
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Целевая На
 DocType: BOM,Total Cost,Общая стоимость
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активности:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
+DocType: Item,Is Fixed Asset,Фиксирована Asset
 DocType: Expense Claim Detail,Claim Amount,Сумма претензии
 DocType: Employee,Mr,Г-н
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип Поставщик / Поставщик
@@ -152,11 +155,12 @@
 DocType: Upload Attendance,Import Log,Лог импорта
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Потянуть Материал запроса типа Производство на основе вышеуказанных критериев
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Отправить
-DocType: Sales Invoice Item,Delivered By Supplier,Поставляется Поставщиком
+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,Акции Расходы
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} заморожен
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Расходы по Запасам
 DocType: Newsletter,Email Sent?,Отправки сообщения?
 DocType: Journal Entry,Contra Entry,Contra запись
 DocType: Production Order Operation,Show Time Logs,Показать журналы Время
@@ -164,20 +168,20 @@
 DocType: Delivery Note,Installation Status,Состояние установки
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
 DocType: BOM Replace Tool,New BOM,Новый BOM
 apps/erpnext/erpnext/config/projects.py +40,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,Возвращаемое значение
+DocType: Leave Application,Reason,Причина
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Реализация
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Пожалуйста, введите название Компании"
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Чистые денежные средства от финансовой
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
 DocType: Newsletter List,Total Subscribers,Всего Подписчики
 ,Contact Name,Имя Контакта
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
@@ -236,11 +240,11 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 DocType: Payment Tool,Reference No,Ссылка Нет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Банковские записи
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,За год
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
+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,Не обращайтесь
@@ -249,12 +253,12 @@
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
-DocType: Employee,Relation,Relation
+DocType: Employee,Relation,Отношение
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всему миру
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
 DocType: Purchase Receipt Item,Rejected Quantity,Отклонен Количество
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Контроль Уведомлений
 DocType: Lead,Suggestions,Предложения
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Установите группу товаров стрелке бюджеты на этой территории. Вы можете также включить сезонность, установив распределение."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Пожалуйста, введите родительскую группу счета для склада {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Пожалуйста, введите родительскую группу счета для склада {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный номер
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Макс 5 символов
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Обучение
+DocType: Asset,Next Depreciation Date,Следующий Износ Дата
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Поставщик Счет-фактура не существует в счете-фактуре {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Управление менеджера по продажам дерево.
 DocType: Job Applicant,Cover Letter,Сопроводительное письмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,"Выдающиеся чеки и депозиты, чтобы очистить"
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклическая ссылка Ошибка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единиц [{1}] (# форма / Пункт / {1}) в [{2}] (# форма / Склад / {2})
 DocType: Lead,Industry,Промышленность
 DocType: Employee,Job Profile,Профиль работы
 DocType: 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,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,· Отметки о доставке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Документы  Отгрузки
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Пожалуйста, выберите месяц и год"
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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,"Скорость, с которой Заказчик валют преобразуется в базовой валюте клиента"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Выбрать пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
@@ -323,7 +330,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,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 +118,Batch (lot) of an Item.,Партия позиций.
-DocType: C-Form Invoice Detail,Invoice Date,Дата выставления счета
+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,Ваш адрес электронной почты
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Пункт Контроль качества Параметр
 DocType: Leave Application,Leave Approver Name,Оставить Имя утверждающего
-,Schedule Date,Дата планирования
+DocType: Depreciation Schedule,Schedule Date,Дата планирования
 DocType: Packed Item,Packed Item,Упакованные Пункт
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Настройки по умолчанию для покупки сделок.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Настройки по умолчанию для покупки сделок.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Стоимость активность существует Требуются {0} против типа активность - {1}
 apps/erpnext/erpnext/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,Курс обмена валюты
@@ -348,6 +355,7 @@
 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","Пункты, запрашиваемые которые ""Нет на месте"" с учетом всех складов на основе прогнозируемого Кол-во и Минимальное количество заказа"
+DocType: Request for Quotation,Request for Quotation,Запрос предложения
 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.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
@@ -366,7 +374,7 @@
 DocType: Purchase Invoice,Yearly,Ежегодно
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,"Пожалуйста, введите МВЗ"
 DocType: Journal Entry Account,Sales Order,Заказ клиента
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Ср. Курс продажи
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Средняя Цена Продажи
 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,% Установлено
@@ -375,8 +383,8 @@
 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,Автоматически присваивать серийные номера по возрастанию (FIFO)
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверьте Поставщик Номер счета Уникальность
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически присваивать серийные номера по принципу FIFO
+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.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
 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,Не начато
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены До
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха.
-DocType: Material Request Item,Required Date,Требуется Дата
+DocType: Request for Quotation Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,Сообщение для Поставщика
 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,Неоплачено
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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,Полученные или уплаченные
+DocType: Payment Tool,Received Or Paid,Полученные или Оплаченные
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 ,Serial No Warranty Expiry,не Серийный Нет Гарантия Срок
@@ -437,8 +446,9 @@
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Управление субподряда
+DocType: Project,Project will be accessible on the website to these users,Проект будет доступен на веб-сайте для этих пользователей
 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: Quotation,Rate at which Price list currency is converted to company's base currency,Курс по которому валюта Прайс листа конвертируется в базовую валюту компании
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Аббревиатура уже используется для другой компании
 DocType: Selling Settings,Default Customer Group,По умолчанию Группа клиентов
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,В ожидании Кол-во
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Действительно с
 DocType: Sales Invoice,Total Commission,Всего комиссия
 DocType: Pricing Rule,Sales Partner,Партнер по продажам
@@ -471,13 +481,13 @@
  Чтобы распределить бюджет с помощью этого распределения, установите ** ежемесячное распределение ** в ** МВЗ **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Финансовый / отчетного года.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Финансовый / отчетного год.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Накопленные значения
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Финансовый год Дата начала не должен быть больше, чем финансовый год Дата окончания"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Дата начала Финансового года  не может быть позже чем Дата окончания финансового года
 DocType: Warranty Claim,Resolution,Разрешение
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Поставляется: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Оплачивается аккаунт
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Приложение
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Возвраты с продаж
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (Drop кораблей)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Зарплата компоненты.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данных потенциальных клиентов.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,"Логический Склад, по которому сделаны складские записи"
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Мастеры
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Обновление банка транзакций Даты
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Обновление банка транзакций Даты
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ({6}) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Отслеживание времени
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
@@ -522,27 +532,27 @@
 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,По умолчанию Калькуляция Оценить
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,График технического обслуживания
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,График технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Чистое изменение в инвентаризации
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Цели продавца
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Пожалуйста, установите список праздников для любого сотрудника или компании"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
+DocType: Depreciation Schedule,Depreciation Amount,Амортизация основных средств Сумма
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Основные Дни
 DocType: Quotation Item,Item Balance,Показатель Остаток
 DocType: Sales Invoice,Packing List,Комплект поставки
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,"Заказы, выданные поставщикам."
+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,Потребляемая
@@ -555,12 +565,14 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
-DocType: Pricing Rule,Sales Manager,Менеджер По Продажам
+DocType: Pricing Rule,Sales Manager,Менеджер по продажам
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Группы к группе
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Мои проекты
 DocType: Journal Entry,Write Off Amount,Списание Количество
 DocType: Journal Entry,Bill No,Номер накладной
+DocType: Company,Gain/Loss Account on Asset Disposal,Прибыль / убытках по утилизации активов
 DocType: Purchase Invoice,Quarterly,Ежеквартально
-DocType: Selling Settings,Delivery Note Required,Доставка Примечание необходимое
+DocType: Selling Settings,Delivery Note Required,Необходим Документы  Отгрузки
 DocType: Sales Order Item,Basic Rate (Company Currency),Основная ставка (валюта компании)
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,С обратной промывкой Сырье материалы на основе
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +57,Please enter item details,"Пожалуйста, введите детали деталя"
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Оплата запись уже создан
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Всего счетов в этом году
 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 +529,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} не является складской позицией
 DocType: Mode of Payment Account,Default Account,По умолчанию учетная запись
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Ежемесячная выписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Существует ошибка в адресной Шаблон {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Новая учетная запись
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Новая учетная запись
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: С {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Несколько Цена Правила существует с теми же критериями, пожалуйста разрешить конфликт путем присвоения приоритета. Цена Правила: {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.,Бухгалтерские записи можно с листовыми узлами. Записи против групп не допускаются.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Несколько Цена Правила существует с теми же критериями, пожалуйста разрешить конфликт путем присвоения приоритета. Цена Правила: {0}"
+apps/erpnext/erpnext/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 +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Пункт Значение атрибута
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запись в журнале {0} связан с орденом {1}, проверить, если он должен быть подтянут, как продвинуться в этом счете."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Офис эксплуатационные расходы
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Пожалуйста, введите пункт первый"
 DocType: Account,Liability,Ответственность сторон
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
 DocType: Company,Default Cost of Goods Sold Account,По умолчанию Себестоимость проданных товаров счет
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Process Payroll,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Мои Счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Мои Счета
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Строка # {0}: Asset {1} должен быть представлен
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Сотрудник не найден
 DocType: Supplier Quotation,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Отправить Сейчас
 ,Support Analytics,Поддержка Аналитика
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Логическая ошибка: Должны найти перекрытия
 DocType: Item,Website Warehouse,Сайт Склад
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
 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 +267,C-Form records,С-форма записи
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,С-форма записи
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Заказчик и Поставщик
 DocType: Email Digest,Email Digest Settings,Email Дайджест Настройки
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддержка запросов от клиентов.
@@ -722,31 +738,31 @@
 DocType: Quotation Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,"Выберите шаблон, из которого вы хотите получить Целей"
+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,Регистрационные данные
-DocType: Item Reorder,Re-Order Qty,Re порядка Кол-во
+DocType: Item Reorder,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}
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
 DocType: Sales Team,Incentives,Стимулы
 DocType: SMS Log,Requested Numbers,Требуемые Номера
 apps/erpnext/erpnext/config/hr.py +146,Performance appraisal.,Служебная аттестация.
-DocType: Sales Invoice Item,Stock Details,Фото Детали
+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 +311,Point-of-Sale,Торговая точка
 apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Опубликовать Цены
 DocType: Notification Control,Expense Claim Rejected Message,Расходов претензии Отклонен Сообщение
-,Available Qty,Доступные Кол-во
+,Available Qty,Доступное Кол-во
 DocType: Purchase Taxes and Charges,On Previous Row Total,На предыдущей строки Всего
 DocType: Salary Slip,Working Days,В рабочие дни
 DocType: Serial No,Incoming Rate,Входящий Оценить
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Является субподряду
 DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Посмотреть Подписчики
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Покупка Получение
-,Received Items To Be Billed,Полученные товары быть выставлен счет
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Покупка Получение
+,Received Items To Be Billed,"Полученные товары, на которые нужно выписать счет"
 DocType: Employee,Ms,Госпожа
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Мастер Валютный курс.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Мастер Валютный курс.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Партнеры по сбыту и территории
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} должен быть активным
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} должен быть активным
+DocType: Journal Entry,Depreciation Entry,Износ Вход
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Перейти Корзина
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
@@ -781,11 +798,11 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опубликовать синхронизировать элементы
 DocType: Bank Reconciliation,Account Currency,Валюта счета
 apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Пожалуйста, укажите округлить счет в компании"
-DocType: Purchase Receipt,Range,температур
+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 +524,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,Постоянный адрес Является
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция выполнена На сколько готовой продукции?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Марка
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
 DocType: Employee,Exit Interview Details,Выход Интервью Подробности
 DocType: Item,Is Purchase Item,Является Покупка товара
-DocType: Journal Entry Account,Purchase Invoice,Покупка Счет
+DocType: Asset,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,Открытие Дата и Дата закрытия должна быть в пределах той же финансовый год
@@ -808,21 +825,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; Bundle, склад, серийный номер и серия № будет рассматриваться с &quot;упаковочный лист &#39;таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой &quot;продукта&quot; Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в &quot;список упаковки&quot; таблицу."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; Bundle, склад, серийный номер и серия № будет рассматриваться с &quot;упаковочный лист &#39;таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой &quot;продукта&quot; Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в &quot;список упаковки&quot; таблицу."
 DocType: Job Opening,Publish on website,Публикация на сайте
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Поставки клиентам.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,"Дата Поставщик Счет не может быть больше, чем Дата публикации"
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Выбрать пункт трансфера
 DocType: Purchase Invoice,Additional Discount Percentage,Дополнительная скидка в процентах
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Строка {0}: Счет {1} является недействительным, оно может быть отменено / не существует. \ Пожалуйста, введите правильный счет-фактуру"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
 ,Employee Holiday Attendance,Сотрудник отдыха Посещаемость
 DocType: Opportunity,Walk In,Прогулка в
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Складские Акты
 DocType: Item,Inspection Criteria,Осмотр Критерии
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Все передаваемые
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Сделать
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,Моя корзина
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Имя Список праздников
 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 +180,Qty for {0},Кол-во для {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
+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 +80,Leave Allocation Tool,Оставьте Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
@@ -861,8 +882,8 @@
 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 +547,Attribute table is mandatory,Атрибут стол является обязательным
-DocType: Production Planning Tool,Get Sales Orders,Получить заказов клиента
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Таблица атрибутов является обязательной
+DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Скидка
 DocType: Features Setup,Purchase Discounts,Покупка Скидки
@@ -876,20 +897,21 @@
 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 +69,Selling Amount,Продажа Сумма
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Журналы Время
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Журналы Время
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 DocType: Serial No,Creation Document No,Создание документа Нет
 DocType: Issue,Issue,Проблема
+DocType: Asset,Scrapped,Уничтоженный
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Счет не соответствует этой Компании
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Набор персонала
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Расходы на продажи
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Расходы на продажи
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
@@ -906,7 +928,7 @@
 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 +18,Quotations received from Suppliers.,Котировки полученных от поставщиков.
+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,обновляется через журналы Time
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Базовая валюта
 DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
 DocType: Expense Claim,From Employee,От работника
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,Ключ Площадь Производительность
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Вклад%
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,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,Глобальные умолчанию
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Сотрудничество Приглашение проекта
 DocType: Salary Slip,Deductions,Отчисления
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Это Пакетная Время Лог был объявлен.
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Ошибка Планирования Мощностей
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Ошибка Планирования Мощностей
 ,Trial Balance for Party,Пробный баланс для партии
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Прибыль
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Готовые товара {0} должен быть введен для вступления типа Производство
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Открытие бухгалтерский баланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Счет Продажи предварительный
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ничего просить
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Ничего просить
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Виды деятельности для Время листов
@@ -958,18 +981,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,"Пожалуйста, установите Email ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Пожалуйста, установите Email ID"
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} действительные серийные NOS для позиции {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/config/buying.py +33,Supplier database.,Поставщик базы данных.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Поставщик базы данных.
 DocType: Account,Balance Sheet,Балансовый отчет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Налоговые и иные отчисления заработной платы.
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Выходной
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставьте пустым, если считать для всех отраслей"
 ,Daily Time Log Summary,Дневной Резюме Время Лог
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-форма не применяется для счета: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Несогласованные Детали компенсации
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
@@ -996,19 +1020,20 @@
 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,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
 DocType: Contact,User ID,ID пользователя
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Посмотреть Леджер
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Посмотреть Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,Нераспределенная Прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Нераспределенная Прибыль
 DocType: BOM Item,Item Description,Описание позиции
 DocType: Payment Tool,Payment Mode,Режим компенсации
 DocType: Purchase Invoice,Is Recurring,Повторяется
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Временное открытие
 ,Employee Leave Balance,Сотрудник Оставить Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Сводка кредиторской задолженности
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 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 +165,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Небольшой
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Основной счет {0} создан
 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,Всего Выполнено
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
 DocType: Warehouse,Warehouse Contact Info,Склад Контактная информация
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
 DocType: Hub Settings,Seller Website,Этого продавца
 apps/erpnext/erpnext/controllers/selling_controller.py +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},Статус производственного заказа {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Для поставщиков
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Не нашли какой-либо пункт под названием {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего Исходящие
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для ""To Размер"""
 DocType: Authorization Rule,Transaction,Транзакция
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Сайт Группы товаров
 DocType: Purchase Invoice,Total (Company Currency),Всего (Компания валют)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
-DocType: Journal Entry,Journal Entry,Запись в дневнике
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
 DocType: Sales Partner,Target Distribution,Целевая Распределение
 DocType: Salary Slip,Bank Account No.,Счет №
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Это число последнего созданного сделки с этим префиксом
@@ -1095,6 +1121,7 @@
 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,Рабочая станция
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запрос на коммерческое предложение Поставщика
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Оборудование
 DocType: Sales Order,Recurring Upto,Повторяющиеся Upto
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
 DocType: Salary Slip,Earning,Зарабатывание
 DocType: Payment Tool,Party Account Currency,Партия Валюта счета
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Текущее значение после амортизации должна быть меньше или равно {0}
 ,BOM Browser,Спецификация Браузер
 DocType: Purchase Taxes and Charges,Add or Deduct,Добавить или вычесть
 DocType: Company,If Yearly Budget Exceeded (for expense account),Если годовой бюджет превышен (за счет расходов)
@@ -1119,21 +1147,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
 DocType: Project,Start and End Dates,Даты начала и окончания
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,"Операции, не может быть пустым."
-,Delivered Items To Be Billed,Поставленные товары быть выставлен счет
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Особенности установки
+DocType: Asset,Depreciation Schedules,Амортизационные Расписания
 DocType: Item,Is Service Item,Является Service Элемент
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
 DocType: Payment Request,Transaction Currency,Валюта сделки
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},С {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},С {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операция Описание
 DocType: Item,Will also apply to variants,Будут также применяться к вариантам
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Невозможно изменить финансовый год Дата начала и финансовый год Дата окончания сразу финансовый год будет сохранен.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Среднее Daily Исходящие
 DocType: Pricing Rule,Campaign,Кампания
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Чистое изменение в основных фондов
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,За компанию
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
@@ -1156,8 +1185,8 @@
 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 +472,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,"не может быть больше, чем 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Учет Вход для {0}: {1} могут быть сделаны только в валюте: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Налоговый Правило для сделок.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Налоговый Правило для сделок.
 DocType: Rename Tool,Type of document to rename.,"Вид документа, переименовать."
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Мы покупаем эту позицию
 DocType: Address,Billing,Выставление счетов
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub сборки
+DocType: Asset,Asset Name,Наименование активов
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Упаковочный лист
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Аренда площади для офиса
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки Настройка SMS Gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,"Запрос котировок может быть доступ, нажав ссылку"
+DocType: Asset,Number of Months in a Period,Количество месяцев в периоде
 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,Рабочая станция Рабочие часы
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правительство
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Всего ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Всего ({0})
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Показать закрыто
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Не записи не найдено в таблице оплаты
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Начало финансового периода
 DocType: Employee External Work History,Total Experience,Суммарный опыт
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Поток денежных средств от инвестиционной
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 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 +86,Transfer Materials for Manufacture,Передача материалов для производства
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Передача материалов для производства
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
@@ -1236,11 +1269,11 @@
 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.,"Пожалуйста, создайте новую учетную запись с Планом счетов бухгалтерского учета."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Техническое обслуживание Посетить
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Техническое обслуживание Посетить
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступные Пакетная Кол-во на складе
 DocType: Time Log Batch Detail,Time Log Batch Detail,Время входа Пакетная Подробно
 DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимость Помощь
-DocType: Purchase Invoice,Select Shipping Address,Выбор адреса доставки
+DocType: Purchase Invoice,Select Shipping Address,Выборите адрес доставки
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
 ,Accounts Receivable Summary,Сводка дебиторской задолженности
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +194,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
@@ -1250,16 +1283,15 @@
 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 +196,Brand master.,Бренд мастер.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Поставщик Тип
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Рамка
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,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,"Приемник Список пуст. Пожалуйста, создайте приемник Список"
+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 +106,Accounting Entry for {0} can only be made in currency: {1},Учет Вход для {0} могут быть сделаны только в валюте: {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +106,Accounting Entry for {0} can only be made in currency: {1},Бухгалтерская Проводка для {0} может быть сделана только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заказать орденом
 DocType: Shopping Cart Settings,Payment Success URL,Успех Оплата URL
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +131,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,Акции Обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Обязательства по запасам
 DocType: Purchase Receipt,Supplier Warehouse,Склад поставщика
 DocType: Opportunity,Contact Mobile No,Связаться Мобильный Нет
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
@@ -1287,36 +1319,37 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплаты на e-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Другие отчеты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,Приемник Список
+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,Израсходованное количество
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Просмотр
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Чистое изменение денежных средств
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Оплата Запрос уже существует {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Количество должно быть не более {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество должно быть не более {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Предыдущий финансовый год не закрыт
 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 +40,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 +38,Supplier Type master.,Тип Поставщик мастер.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Тип Поставщик мастер.
 DocType: Purchase Order Item,Supplier Part Number,Поставщик Номер детали
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 DocType: Purchase Invoice,Reference Document,Справочный документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% оплачено
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Чистое изменение кредиторской задолженности
 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',"Клиент требуется для ""Customerwise Скидка"""
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
 DocType: Quotation,Term Details,Срочные Подробнее
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} должно быть больше 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирование мощности в течение (дней)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Претензия по гарантии
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Постоянный адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платный против {0} {1} не может быть больше \, чем общий итог {2}"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Пожалуйста, выберите элемент кода"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Уменьшите вычет для отпуска без сохранения (LWP)
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),На склад (Необязательно)
@@ -1367,15 +1401,15 @@
 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,Маркетинговые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Одно устройство элемента.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть 'Представленные'
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Сделать учета запись для каждого фондовой Движения
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания"
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
@@ -1392,65 +1426,68 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,"Найти счетов, чтобы соответствовать"
+DocType: Payment Tool,Find Invoices to Match,Найти счета соответствующие
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
+DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","например ""XYZ Национальный банк """
+DocType: Asset,Depreciation Method,метод начисления износа
 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,Всего Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Корзина включена
 DocType: Job Applicant,Applicant for a Job,Заявитель на вакансию
 DocType: Production Plan Material Request,Production Plan Material Request,Производство План Материал Запрос
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,"Нет Производственные заказы, созданные"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Нет Производственные заказы, созданные"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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.,Слишком много столбцов. Экспорт отчета и распечатать его с помощью приложения электронной таблицы.
+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 +145,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Основные
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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,Фото со Примирение
+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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявитель на работу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Адреса
+apps/erpnext/erpnext/hooks.py +91,Addresses,Адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,Аттестации
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие для правила перевозки
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Деталь не разрешается иметь производственного заказа.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Деталь не разрешается иметь производственного заказа.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Чистый вес этого пакета. (Автоматический расчет суммы чистой вес деталей)
 DocType: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Журналы Время для изготовления.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} должны быть представлены
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} должны быть представлены
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Время входа для задач.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle детали на момент продажи.
 DocType: Quotation Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
+DocType: Request for Quotation Supplier,Send Email to Supplier,Отправить E-mail для Поставщика
 DocType: SMS Center,Create Receiver List,Создание приемника Список
 DocType: Packing Slip,To Package No.,Для пакета №
 DocType: Production Planning Tool,Material Requests,Материал просит
@@ -1478,8 +1516,8 @@
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 DocType: Stock Settings,Allowance Percent,Резерв Процент
 DocType: SMS Settings,Message Parameter,Параметры сообщения
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
-DocType: Serial No,Delivery Document No,Доставка документов Нет
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
+DocType: Serial No,Delivery Document No,Документы  Отгрузки №
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Получить товары от покупки расписок
 DocType: Serial No,Creation Date,Дата создания
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Пункт {0} несколько раз появляется в прайс-лист {1}
@@ -1488,11 +1526,11 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Поставщик Цитата Пункт
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,"Отключение создание временных журналов против производственных заказов. Операции, не будет отслеживаться в отношении производственного заказа"
 DocType: 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/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Нажмите на кнопку ""Создать Счет на Продажу», чтобы создать новый Счет на Продажу."
 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: Purchase Invoice,Recurring Invoice,Периодическое Счет
+DocType: Purchase Invoice,Recurring Invoice,Периодический Счет
 apps/erpnext/erpnext/config/projects.py +78,Managing Projects,Управление проектами
 DocType: Supplier,Supplier of Goods or Services.,Поставщик товаров или услуг.
 DocType: Budget Detail,Fiscal Year,Отчетный год
@@ -1510,41 +1548,43 @@
 ,Amount to Deliver,Сумма Доставка
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Продукт или сервис
 DocType: Naming Series,Current Value,Текущее значение
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} создан
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
 ,Serial No Status,Серийный номер статус
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Пункт таблице не может быть пустым
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Строка {0}: Для установки {1} периодичности, разница между от и до настоящего времени \
  должно быть больше или равно {2}"
 DocType: Pricing Rule,Selling,Продажа
 DocType: Employee,Salary Information,Информация о зарплате
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Платежный шлюз аккаунт не настроен
 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: Production Order,Material Request Item,Материал Запрос товара
+DocType: Request for Quotation Item,Material Request Item,Материал Запрос товара
 apps/erpnext/erpnext/config/stock.py +85,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,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
+DocType: Asset,Sold,Продан
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
 DocType: Installation Note,Installation Time,Время установки
 DocType: Sales Invoice,Accounting Details,Подробности ведения учета
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Удалить все транзакции этой компании
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ассигнования
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерий приемлемости
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Пожалуйста, введите Материал запросов в приведенной выше таблице"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Пожалуйста, введите Материал запросов в приведенной выше таблице"
 DocType: Item Attribute,Attribute Name,Имя атрибута
 DocType: Item Group,Show In Website,Показать на сайте
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Группа
@@ -1552,27 +1592,33 @@
 ,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, Продажи заказа, Серийный номер"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Диаграмма Ганта всех задач.
+DocType: Pricing Rule,Margin Type,Тип маржа
 DocType: Appraisal,For Employee Name,В поле Имя Сотрудника
 DocType: Holiday List,Clear Table,Очистить таблицу
 DocType: Features Setup,Brands,Бренды
-DocType: C-Form Invoice Detail,Invoice No,Счет-фактура Нет
+DocType: C-Form Invoice Detail,Invoice No,Номер Счета
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,Адреса клиентов и Контакты
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Строка # {0}: Актив является обязательным в отношении основного средства Пункт
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройка нумерации серии для посещения с помощью Setup&gt; Нумерация серии"
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Утверждающего Расходы"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Носите
+DocType: Asset,Depreciation Schedule,Амортизация Расписание
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 DocType: Item,Has Batch No,"Имеет, серия №"
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
+DocType: Asset,Purchase Date,Дата покупки
 DocType: Employee,Personal Details,Личные Данные
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},"Пожалуйста, установите &quot;активов Амортизация затрат по МВЗ&quot; в компании {0}"
 ,Maintenance Schedules,Графики технического обслуживания
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
@@ -1586,23 +1632,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Включите примириться Записи
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', так как позиция  {1} является активом"
 DocType: HR Settings,HR Settings,Настройки HR
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общий фактический
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Единица
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Пожалуйста, сформулируйте Компания"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,Расходные Претензии
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Расходные Претензии
 DocType: Issue,Support,Поддержка
 ,BOM Search,Спецификация Поиск
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закрытие (открытие + Итоги)
@@ -1611,29 +1656,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должна быть {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должна быть {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Вычет
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Цена товара добавляется для {0} в Прейскуранте {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Цена товара добавляется для {0} в Прейскуранте {1}
 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 этого менеджера по продажам"
 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 +137,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Расчетный банк себе баланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,отключенный пользователь
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Расценки
 DocType: Salary Slip,Total Deduction,Всего Вычет
 DocType: Quotation,Maintenance User,Уход за инструментом
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Стоимость Обновлено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Стоимость Обновлено
 DocType: Employee,Date of Birth,Дата рождения
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, установите сотрудников система имен в людских ресурсов&gt; HR Настройки"
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
@@ -1643,10 +1689,10 @@
 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 +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+DocType: Request for Quotation,Manufacturing Manager,Производство менеджер
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Поставки
 DocType: Purchase Order Item,To be delivered to customer,Для поставляться заказчику
@@ -1654,12 +1700,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте)
-DocType: Pricing Rule,Supplier,Поставщик
+DocType: Asset,Supplier,Поставщик
 DocType: C-Form,Quarter,Квартал
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Прочие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Компания по умолчанию
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Пользователь {0} отключен
@@ -1668,7 +1714,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Из валюты
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Заказ клиента требуется для позиции {0}
@@ -1678,11 +1724,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Строка # {0}: Кол-во должно быть 1, а элемент связан с активом"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ребенок Пункт не должен быть Bundle продукта. Пожалуйста, удалите пункт `{0}` и сохранить"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банковские операции
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Новый Центр Стоимость
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Child) типа &quot;налог&quot; и упоминают ставки налога.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Новый Центр Стоимость
 DocType: Bin,Ordered Quantity,Заказанное количество
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Quality Inspection,In Process,В процессе
@@ -1690,15 +1736,16 @@
 apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,Дерево финансовых счетов.
 DocType: Purchase Order Item,Reference Document Type,Ссылка Тип документа
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} против заказов клиентов {1}
-DocType: Account,Fixed Asset,Исправлена активами
+DocType: Account,Fixed Asset,Основное средство
 apps/erpnext/erpnext/config/stock.py +305,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,Дебиторская задолженность аккаунт
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Счет Дебиторской задолженности
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
 DocType: Quotation Item,Stock Balance,Баланс запасов
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Заказ клиента в оплату
 DocType: Expense Claim Detail,Expense Claim Detail,Расходов претензии Подробно
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Журналы Время создания:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Журналы Время создания:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Employee,Blood Group,Группа крови
@@ -1712,17 +1759,17 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Поднимите Материал запрос когда шток достигает уровня переупорядочиваем
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Полный рабочий день
 DocType: Employee,Contact Details,Контактная информация
-DocType: C-Form,Received Date,Поступило Дата
+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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Дебет требуется
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Прайс-лист
 DocType: Offer Letter Term,Offer Term,Предложение срок
 DocType: Quality Inspection,Quality Manager,Менеджер по качеству
 DocType: Job Applicant,Job Opening,Работа Открытие
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирение
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Предложение письмо
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Создать запросы Материал (ППМ) и производственных заказов.
@@ -1730,22 +1777,22 @@
 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 +103,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завершено Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Прайс-лист {0} отключена
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка Оценить
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
 DocType: Opportunity,Lost Reason,Забыли Причина
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Создание записей оплаты по заказам или счетов-фактур.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Создать Проводки Оплаты по Заказам или Счетам.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,All items have already been invoiced,На все товары уже выставлены счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Пользователи и разрешения
@@ -1754,10 +1801,11 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Серийный номер {0} не найден
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Серийный номер {0} не найден
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Ваши клиенты
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Применить сейчас
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Применить сейчас
 DocType: Sales Order,Not Delivered,Не доставлен
 ,Bank Clearance Summary,Банк уплата по счетам итого
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
@@ -1781,7 +1829,7 @@
 DocType: Employee,Employment Details,Подробности по трудоустройству
 DocType: Employee,New Workplace,Новый Место работы
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Установить как Закрыт
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Нет товара со штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Нет товара со штрих-кодом {0}
 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,"Если у вас есть отдел продаж и продажа партнеры (Channel Partners), они могут быть помечены и поддерживать их вклад в сбытовой деятельности"
 DocType: Item,Show a slideshow at the top of the page,Показ слайдов в верхней части страницы
@@ -1799,10 +1847,10 @@
 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 +608,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,О передаче материала
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Состояние {0} должен быть в продаже товара в {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
@@ -1816,12 +1864,13 @@
 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: Process Payroll,Create Salary Slip,Создание Зарплата Слип
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования (обязательства)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Сотрудник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Импорт E-mail С
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Пригласить в пользователя
 DocType: Features Setup,After Sale Installations,После продажи установок
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Пожалуйста, установите {0} в компании {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} полностью выставлен
 DocType: Workstation Working Hour,End Time,Время окончания
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Стандартные условия договора для продажи или покупки.
@@ -1830,9 +1879,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Пожалуйста, выберите BOM для пункта в строке {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Пожалуйста, выберите BOM для пункта в строке {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,Фармацевтический
@@ -1849,26 +1898,26 @@
 DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Gateway Account,Payment Account,Оплата счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
 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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Сырье не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Сырье не может быть пустым.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Быстрый журнал запись
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} не проведен
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
@@ -1877,7 +1926,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Были созданы следующие Производственные заказы:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Были созданы следующие Производственные заказы:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Рассылка список рассылки
 DocType: Delivery Note,Transporter Name,Transporter Имя
 DocType: Authorization Rule,Authorized Value,Уставный Значение
@@ -1895,21 +1944,22 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} замкнуто
 DocType: Email Digest,How frequently?,Как часто?
 DocType: Purchase Receipt,Get Current Stock,Получить Наличие на складе
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти к соответствующей группе (как правило использования средств&gt; Текущие активы&gt; Банковские счета и создать новую учетную запись (нажав на Add Child) типа &quot;Банк&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Билла материалов
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Марк Присутствует
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Фактический Дата окончания
 DocType: Authorization Rule,Applicable To (Role),Применимо к (Роль)
 DocType: Stock Entry,Purpose,Цель
+DocType: Company,Fixed Asset Depreciation Settings,Параметры амортизации основных средств
 DocType: Item,Will also apply for variants unless overrridden,"Будет также применяться для вариантов, если не overrridden"
 DocType: Purchase Invoice,Advances,Авансы
 DocType: Production Order,Manufacture against Material Request,Производство против материалов Запрос
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Утверждении покупатель не может быть такой же, как пользователь правило применимо к"
+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),Basic Rate (как в фондовой UOM)
 DocType: SMS Log,No of Requested SMS,Нет запрашиваемых SMS
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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,Имеет дочерний узел
@@ -1960,12 +2010,14 @@
  9. Рассмотрим налог или сбор для: В этом разделе вы можете указать, будет ли налог / налог на сбор только для оценки (не часть от общей суммы) или только для общей (не добавляет ценности объект) или для обоих.
  10. Добавить или вычесть: Если вы хотите, чтобы добавить или вычесть налог."
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
-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 +497,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
+DocType: Asset Category Account,Asset Category Account,Категория активов Счет
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Складской акт {0} не проведен
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Биллинг Город
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","например банк, наличные, кредитная карта"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти к соответствующей группе (как правило использования средств&gt; Текущие активы&gt; Банковские счета и создать новую учетную запись (нажав на Add Child) типа &quot;Банк&quot;
 DocType: Journal Entry,Credit Note,Кредит-нота
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Завершен Кол-во не может быть больше {0} для работы {1}
 DocType: Features Setup,Quality,Качество
@@ -1989,16 +2041,16 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мои Адреса
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Организация филиал мастер.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,По умолчанию Покупка Прайс-лист
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ни один сотрудник для выбранных критериев выше или скольжения заработной платы уже не создано
 DocType: Notification Control,Sales Order Message,Заказ клиента Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 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: Process Payroll,Select Employees,Выберите Сотрудников
 DocType: Bank Reconciliation,To Date,Чтобы Дата
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
 DocType: Purchase Invoice,Total Taxes and Charges,Всего Налоги и сборы
@@ -2007,7 +2059,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,Ledger,Регистр
 DocType: Target Detail,Target  Amount,Целевая сумма
 DocType: Shopping Cart Settings,Shopping Cart Settings,Корзина Настройки
-DocType: Journal Entry,Accounting Entries,Бухгалтерские записи
+DocType: Journal Entry,Accounting Entries,Бухгалтерские Проводки
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Копия записи. Пожалуйста, проверьте Авторизация Правило {0}"
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Глобальный профиля POS {0} уже создана для компании {1}
 DocType: Purchase Order,Ref SQ,Ссылка SQ
@@ -2018,7 +2070,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
 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}
@@ -2028,8 +2080,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка чеков товары
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Настройка формы
 DocType: Account,Income Account,Счет Доходов
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Нет адреса по умолчанию шаблона не найдено. Пожалуйста, создайте новый из Setup&gt; Печать и Брендинг&gt; Адрес шаблона."
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Ключ Ответственность Площадь
@@ -2051,21 +2104,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Все адреса.
-DocType: Company,Stock Settings,Акции Настройки
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
+DocType: Company,Stock Settings,Настройки Запасов
+apps/erpnext/erpnext/accounts/doctype/account/account.py +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Управление групповой клиентов дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Новый Центр Стоимость Имя
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
 DocType: Appraisal,HR User,HR Пользователь
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги, которые вычитаются"
-apps/erpnext/erpnext/config/support.py +7,Issues,Вопросов
+apps/erpnext/erpnext/hooks.py +90,Issues,Вопросов
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебет Для
 DocType: Delivery Note,Required only for sample item.,Требуется только для образца пункта.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валют
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Очень Большой
 ,Profit and Loss Statement,Счет прибылей и убытков
@@ -2079,10 +2133,10 @@
 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 +139,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Укажите Курс конвертировать одну валюту в другую
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общей суммой задолженности
@@ -2147,19 +2201,20 @@
 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","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
 DocType: Maintenance Visit,Purposes,Цели
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,По крайней мере один элемент должен быть введен с отрицательным количеством в обратном документа
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, сломать операции в несколько операций"
 ,Requested,Запрошено
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Нет Замечания
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,Нет Замечания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просроченный
-DocType: Account,Stock Received But Not Billed,"Фото со получен, но не Объявленный"
+DocType: Account,Stock Received But Not Billed,"Запас получен, но не выписан счет"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +83,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,Продажи и закупки
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset Деталь должен быть нескладируемых элемент
 DocType: Supplier Quotation Item,Material Request No,Материал Запрос Нет
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скорость, с которой валюта клиента превращается в базовой валюте компании"
+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/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,Управление Территория дерево.
@@ -2175,12 +2230,12 @@
 DocType: Purchase Invoice,Half-yearly,Раз в полгода
 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/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 DocType: Payment Request,Recipient and Message,Получатель и сообщение
-DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
+DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительную Скидку на
 DocType: Account,Root Type,Корневая Тип
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Сюжет
@@ -2188,10 +2243,10 @@
 DocType: BOM,Item UOM,Пункт Единица измерения
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
-DocType: Purchase Invoice,Select Supplier Address,Выбор поставщика Адрес
+DocType: Purchase Invoice,Select Supplier Address,Выборите Адрес Поставщика
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 DocType: Payment Request,Mute Email,Отключение E-mail
@@ -2213,11 +2268,12 @@
 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/config/buying.py +18,Request for quotation.,Запрос котировок.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Пожалуйста, выберите пункт, где &quot;ли со Пункт&quot; &quot;Нет&quot; и &quot;является продажа товара&quot; &quot;Да&quot;, и нет никакой другой Связка товаров"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Выберите ежемесячное распределение к неравномерно распределять цели по различным месяцам.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Дата начала проекта
@@ -2226,7 +2282,7 @@
 DocType: Installation Note Item,Against Document No,Против Документ №
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Управление партнеры по сбыту.
 DocType: Quality Inspection,Inspection Type,Инспекция Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Пожалуйста, выберите {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Немаркированных Посещаемость
@@ -2238,9 +2294,10 @@
 DocType: Employee,Exit,Выход
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,Корневая Тип является обязательным
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных форматов, таких как счета-фактуры и накладных"
+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,Реклама
+DocType: Asset Category Account,Depreciation Expense Account,Износ счет расходов
 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,Расходы утверждающим
@@ -2254,7 +2311,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Подтвердил
 DocType: Payment Gateway,Gateway,Шлюз
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Пожалуйста, введите даты снятия."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
@@ -2268,21 +2325,22 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Принимающий склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата публикации
 DocType: Item,Valuation Method,Метод оценки
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Невозможно найти обменный курс {0} до {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Невозможно найти обменный курс {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Отметить Полдня
 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 +410,[Error],[Ошибка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серийный номер {0} не существует
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Поставщик Тип
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад Клиент (Необязательно)
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
-DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладной
+DocType: Payment Reconciliation Invoice,Invoice Number,Номер Счета
 DocType: Shopping Cart Settings,Orders,Заказы
 DocType: Leave Control Panel,Employee Type,Сотрудник Тип
 DocType: Features Setup,To maintain the customer wise item code and to make them searchable based on their code use this option,Для поддержания клиентской мудрый элемент кода и сделать их доступными для поиска на основе их кода использовать эту опцию
@@ -2305,14 +2363,16 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Запросы Материал {0} создан
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Шаблон терминов или договором.
 DocType: Purchase Invoice,Address and Contact,Адрес и контактная
 DocType: Supplier,Last Day of the Next Month,Последний день следующего месяца
 DocType: Employee,Feedback,Обратная связь
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставить не могут быть выделены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
+DocType: Asset,Expected Value After Useful Life,Ожидаемое значение после срока полезного использования
 DocType: Item,Reorder level based on Warehouse,Уровень Изменение порядка на основе Склад
 DocType: Activity Cost,Billing Rate,Платежная Оценить
 ,Qty to Deliver,Кол-во для доставки
@@ -2325,12 +2385,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} отменено или закрыто
 DocType: Delivery Note,Track this Delivery Note against any Project,Подписка на Delivery Note против любого проекта
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Чистые денежные средства от инвестиционной
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Корневая учетная запись не может быть удалена
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} должен быть представлен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Управление адресов
-DocType: Pricing Rule,Item Code,Код элемента
+DocType: Asset,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
 DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
 DocType: Journal Entry,User Remark,Примечание Пользователь
@@ -2349,8 +2409,10 @@
 DocType: Production Planning Tool,Create Material Requests,Создать запросы Материал
 DocType: Employee Education,School/University,Школа / университет
 DocType: Payment Request,Reference Details,Ссылка Подробнее
-DocType: Sales Invoice Item,Available Qty at Warehouse,Доступен Кол-во на склад
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
+DocType: Sales Invoice Item,Available Qty at Warehouse,Доступное Кол-во на складе
 ,Billed Amount,Счетов выдано количество
+DocType: Asset,Double Declining Balance,Двойной баланс Отклонение
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Закрытый заказ не может быть отменен. Отменить открываться.
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получить обновления
@@ -2369,32 +2431,36 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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,Фото со Прогнозируемый Количество
+DocType: Asset,Fully Depreciated,Полностью Амортизируется
+,Stock Projected Qty,Прогнозируемое Кол-во Запасов
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Выраженное Посещаемость HTML
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Серийный номер и пакетная
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значение или Кол-во
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 ,Qty to Receive,Кол-во на получение
 DocType: Leave Block List,Leave Block List Allowed,Оставьте Черный список животных
 DocType: Sales Partner,Retailer,Розничный торговец
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
 DocType: Global Defaults,Disable In Words,Отключить в словах
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Банк овердрафтовый счет
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товара&gt; Марка
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Обеспеченные кредиты
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Пожалуйста, установите Амортизация соответствующих счетов в Asset Категория {0} или компании {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Открытие Баланс акций
 DocType: Appraisal,Appraisal,Оценка
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Электронная почта отправляется поставщику {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторяется
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Право подписи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
@@ -2402,12 +2468,12 @@
 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 +199,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,Отказаться от этой Email Дайджест
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Сообщение отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,"Счет с дочерних узлов, не может быть установлен как книгу"
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Скорость, с которой Прайс-лист валюта конвертируется в базовой валюте клиента"
+DocType: 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,Пункт Именование По
@@ -2430,6 +2496,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Общая маржа
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
 DocType: Expense Claim,Approval Status,Статус утверждения
 DocType: Hub Settings,Publish Items to Hub,Опубликовать товары в Hub
@@ -2438,30 +2505,30 @@
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Пожалуйста, выберите банковский счет"
 DocType: Newsletter,Create and Send Newsletters,Создание и отправка рассылки
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Отметить все
-DocType: Sales Order,Recurring Order,Периодическая Заказать
+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: Payment Gateway Account,Default Payment Request Message,По умолчанию Оплата Сообщение запроса
 DocType: Item Group,Check this if you want to show in website,"Проверьте это, если вы хотите показать в веб-сайт"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Банки и платежи
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Банки и платежи
 ,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),Всего Калькуляция Сумма (с помощью журналов Time)
-DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+DocType: Purchase Order Item Supplied,Stock UOM,Ед. изм.  Запасов
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,Листья и отпуск
 DocType: Sales Order,Not Billed,Не Объявленный
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,Укомплектовать для выставления счета
@@ -2477,15 +2544,17 @@
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
+DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
 DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
-DocType: Sales Invoice Item,Delivered Qty,Поставляется Кол-во
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
+DocType: Sales Invoice Item,Delivered Qty,Поставленное Кол-во
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Дата приобретения актива {0} не совпадает с датой покупки счета-фактуры
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
-DocType: Journal Entry,Stock Entry,Складская запись
+DocType: Journal Entry,Stock Entry,Складские акты
 DocType: Account,Payable,К оплате
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Должники ({0})
-DocType: Project,Margin,Разница
+DocType: Pricing Rule,Margin,Разница
 DocType: Salary Slip,Arrear Amount,Просроченной задолженности Сумма
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Новые клиенты
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Валовая Прибыль%
@@ -2493,20 +2562,23 @@
 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,"Проверьте, если вы хотите отправить ведомость расчета зарплаты в почте каждому сотруднику при подаче ведомость расчета зарплаты"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
 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 +57,Where manufacturing operations are carried.,Где производственные операции проводятся.
 DocType: Stock Entry Detail,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
 DocType: Employee,Confirmation Date,Дата подтверждения
 DocType: C-Form,Total Invoiced Amount,Всего Сумма по счетам
 DocType: Account,Sales User,Пользователь Продажи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Мин Кол-во не может быть больше, чем максимальное Кол-во"
+DocType: Account,Accumulated Depreciation,начисленной амортизации
 DocType: Stock Entry,Customer or Supplier Details,Заказчик или Поставщик Подробности
 DocType: Payment Request,Email To,E-mail Для
 DocType: Lead,Lead Owner,Ведущий Владелец
 DocType: Bin,Requested Quantity,Требуемое количество
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Семейное положение
 DocType: Stock Settings,Auto Material Request,Автоматический запрос материалов
 DocType: Time Log,Will be updated when billed.,Будет обновляться при счет.
@@ -2514,11 +2586,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% доставлено
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,То же поставщик был введен несколько раз
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Заказ товара Поставляется
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Name cannot be Company,Название компании не может быть компания
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати.
@@ -2528,13 +2601,14 @@
 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."
 DocType: Payment Request,Payment Details,Детали оплаты
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
+DocType: Asset,Journal Entry for Scrap,Запись в журнале для лома
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
 apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
 apps/erpnext/erpnext/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.","Запись всех коммуникаций типа электронной почте, телефону, в чате, посещение и т.д."
 DocType: Manufacturer,Manufacturers used in Items,Производители использовали в пунктах
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Пожалуйста, укажите округлить МВЗ в компании"
 DocType: Purchase Invoice,Terms,Термины
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Создать новый
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Создать новый
 DocType: Buying Settings,Purchase Order Required,"Покупка порядке, предусмотренном"
 ,Item-wise Sales History,Пункт мудрый История продаж
 DocType: Expense Claim,Total Sanctioned Amount,Всего Санкционированный Количество
@@ -2544,22 +2618,22 @@
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка строка #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,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,Книга учета акций
+,Stock Ledger,Книга учета Запасов
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Оценить: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата скольжения Вычет
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Выберите узел группы в первую очередь.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Выберите узел группы в первую очередь.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Сотрудник и посещаемости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Удалить ссылку на клиента, поставщика, торгового партнера и свинца, как это ваша компания адрес"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,Заполните форму и сохранить его
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,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,Отправить SMS
 DocType: Company,Default Letter Head,По умолчанию бланке
-DocType: Purchase Order,Get Items from Open Material Requests,Получить элементов из запросов Открыть материала
+DocType: Purchase Order,Get Items from Open Material Requests,Получить товары из Открыть Запросов Материала
 DocType: Time Log,Billable,Оплачиваемый
-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,Изменить порядок Кол-во
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
@@ -2569,13 +2643,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: С {1}
 DocType: Task,depends_on,зависит от
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Имя нового Пользователя. Примечание: Пожалуйста, не создавать учетные записи для клиентов и поставщиков"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Имя нового счета. Примечание: Пожалуйста, не создавайте счета для клиентов и поставщиков"
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,"Следующая дата должна быть больше, чем Дата публикации"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Показать налог распад
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# форма / Пункт / {0}) нет в наличии
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,"Следующая дата должна быть больше, чем Дата публикации"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/accounts/party.py +289,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',Если вы привлечь в производственной деятельности. Включает элемент 'производится'
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Счет Дата размещения
@@ -2590,7 +2665,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} не является допустимым Номером Партии для позиции {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Примечание: Если оплата не будет произведена в отношении какой-либо ссылки, чтобы запись журнала вручную."
@@ -2604,7 +2679,7 @@
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старение запасов
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2614,7 +2689,7 @@
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет и сведения о гарантии
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Имя продавца
@@ -2625,7 +2700,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
@@ -2634,11 +2709,12 @@
 DocType: Journal Entry,Printing Settings,Настройки печати
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
+DocType: Asset Category Account,Fixed Asset Account,Фиксированный счет актива
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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 +375,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,Стажер
@@ -2646,7 +2722,7 @@
 DocType: Stock Entry,From BOM,Из спецификации
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Перемещения по складу до {0} заморожены
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,"Чтобы Дата должна быть такой же, как С даты в течение половины дня отпуска"
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
@@ -2654,17 +2730,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Предложение Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
 DocType: Hub Settings,Access Token,Маркер доступа
 DocType: Sales Invoice Item,Serial No,Серийный номер
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
-DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 DocType: Purchase Invoice,Print Language,Язык печати
 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","Если у вас длинные форматы печати, эта функция может быть использована для разрезки страницу, которая будет напечатана на нескольких страниц со всеми верхние и нижние колонтитулы на каждой странице"
+DocType: Asset,Number of Depreciations,Количество отчислений на амортизацию
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 DocType: Fiscal Year,Year Name,Имя года
@@ -2672,13 +2748,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Связка товара
 DocType: Sales Partner,Sales Partner Name,Имя Партнера по продажам
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Запрос на предоставление предложений
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальная Сумма счета
 DocType: Purchase Invoice Item,Image View,Просмотр изображения
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенты
+DocType: Asset,Partially Depreciated,Частично Амортизируется
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты, необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
@@ -2694,13 +2772,13 @@
 DocType: Quotation,Maintenance Manager,Менеджер обслуживания
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дней с последнего Заказа"" должно быть больше или равно 0"
-DocType: C-Form,Amended From,Измененный С
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Спецификации сырья
+DocType: Asset,Amended From,Измененный С
+apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Переносить
@@ -2713,21 +2791,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,"Пожалуйста, укажите &quot;прибыль / убыток Счет по обращению с отходами актива в компании"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Соответствие Платежи с счетов-фактур
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Соответствие Платежи с счетов-фактур
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Включение / отключение валюты.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Включение / отключение валюты.
 DocType: Production Planning Tool,Get Material Request,Получить материал Запрос
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Итого Текущая
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Бухгалтерская отчетность
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Бухгалтерская отчетность
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
@@ -2735,7 +2814,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Ведущий Тип
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,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,Новая спецификация после замены
@@ -2747,15 +2826,16 @@
 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 +346,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Начальная точка-оф-продажи (POS)
 apps/erpnext/erpnext/config/support.py +32,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,Группа клиентов
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Чистое изменение в капитале
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
 ,Sales Register,Книга продаж
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
@@ -2763,12 +2843,13 @@
 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,Группа Имя клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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,Против Сертификаты Тип
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Ошибка: {0}&gt; {1}
 DocType: Item,Attributes,Атрибуты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Получить товары
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Получить товары
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последняя дата заказа
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
 DocType: C-Form,C-Form,C-образный
@@ -2780,32 +2861,32 @@
 DocType: Purchase Invoice,Mobile No,Мобильный номер
 DocType: Payment Tool,Make Journal Entry,Сделать запись журнала
 DocType: Leave Allocation,New Leaves Allocated,Новые листья Выделенные
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Коммерческий сектор
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Ошибка: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 DocType: Cost Center,Distribution Id,Распределение Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Все продукты или услуги.
 DocType: Supplier Quotation,Supplier Address,Адрес поставщика
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Из Кол-во
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
+apps/erpnext/erpnext/config/accounts.py +259,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,Финансовые услуги
 apps/erpnext/erpnext/controllers/item_variant.py +62,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 +165,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
 DocType: Tax Rule,Billing State,Государственный счетов
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Переложить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Переложить
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Благодаря Дата является обязательным
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
@@ -2814,7 +2895,7 @@
 ,Inactive Customers,Неактивные Клиенты
 DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
-DocType: Quality Inspection,Delivery Note No,Доставка Примечание Нет
+DocType: Quality Inspection,Delivery Note No,Документ  Отгрузки №
 DocType: Company,Retail,Розничная торговля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
@@ -2825,20 +2906,22 @@
 DocType: GL Entry,Remarks,Примечания
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сырье Код товара
 DocType: Journal Entry,Write Off Based On,Списание на основе
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Отправить Поставщик электронных писем
 DocType: Features Setup,POS View,POS Посмотреть
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Установка рекорд для серийный номер
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,день Дата следующего и повторить на День месяца должен быть равен
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,день Дата следующего и повторить на День месяца должен быть равен
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Пожалуйста, сформулируйте"
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Выше
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Время входа была Объявленный
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Нейминг Series для {0} через Setup&gt; Настройки&gt; Naming Series"
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Счет {0} не может быть группой
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Предварительная прибыль / убыток (Кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в обществе {1}"
@@ -2848,18 +2931,19 @@
 ,Monthly Attendance Sheet,Ежемесячная посещаемость Лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не запись не найдено
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройка нумерации серии для посещения с помощью Setup&gt; Нумерация серии"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Получить элементов из комплекта продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Получить элементов из комплекта продукта
+DocType: Asset,Straight Line,Прямая линия
+DocType: Project User,Project User,Проект Пользователь
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контактный номер
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
-DocType: Features Setup,Sales Discounts,Продажи Купоны
+DocType: Features Setup,Sales Discounts,Купоны
 DocType: Hub Settings,Seller Country,Продавец Страна
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Опубликовать товары на сайте
-DocType: Authorization Rule,Authorization Rule,Авторизация Правило
+DocType: Authorization Rule,Authorization Rule,Правило Авторизации
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,Спецификации
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажи Налоги и сборы шаблона
@@ -2867,43 +2951,44 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Номер заказа
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Баннер который будет отображаться на верхней части списка товаров.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Укажите условия для расчета суммы доставки
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Добавить дочерний
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,Значение открытия
 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,Комиссия по продажам
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Значение / Описание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Asset {1} не может быть представлено, уже {2}"
 DocType: Tax Rule,Billing Country,Страной плательщика
 ,Customers Not Buying Since Long Time,Клиенты не покупать так как долгое время
 DocType: Production Order,Expected Delivery Date,Ожидаемая дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представительские расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Представительские расходы
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Заявки на отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Судебные издержки
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Счет с существующими проводками не может быть удален
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судебные издержки
 DocType: Sales Invoice,Posting Time,Средняя Время
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Проверьте это, если вы хотите, чтобы заставить пользователя выбрать серию перед сохранением. Там не будет по умолчанию, если вы проверить это."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Нет товара с серийным № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Нет товара с серийным № {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Открытые Уведомления
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Прямые расходы
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Прямые расходы
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} является недопустимым адрес электронной почты в &quot;Уведомление \ адрес электронной почты&quot;
 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асходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
+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/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,"Авто вставка Скорость Цены, если не хватает"
@@ -2916,7 +3001,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Мы продаем эту позицию
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Поставщик Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
 DocType: Journal Entry,Cash Entry,Денежные запись
 DocType: Sales Partner,Contact Desc,Связаться Описание изделия
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листьев, как случайный, больным и т.д."
@@ -2927,11 +3012,12 @@
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Все контакты.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Поставщик актива {0} не совпадает с поставщиком в счете-фактуре
 DocType: Newsletter,Test Email Id,Тест электронный идентификатор
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Шаблоном Зарплата.
@@ -2947,12 +3033,13 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,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,Популярные Адрес для выставления счета
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Платежная валюта должна быть равна валюте либо по умолчанию comapany или payble валюте счета участника
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретарь
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Если отключить, &quot;В словах&quot; поле не будет видно в любой сделке"
@@ -2962,13 +3049,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Это Пакетная Время Лог был отменен.
 ,Reqd By Date,Логика включения по дате
 DocType: Salary Slip Earning,Salary Slip Earning,Зарплата скольжения Заработок
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Кредиторы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Кредиторы
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
@@ -2989,19 +3076,18 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Hub Settings,Name Token,Имя маркера
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} против чека {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
-DocType: Project,Project Name,Название проекта
+DocType: Request for Quotation 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,Пункт Пакетное Нос
-DocType: Stock Ledger Entry,Stock Value Difference,Фото Значение Разница
+DocType: Stock Ledger Entry,Stock Value Difference,Расхождение Стоимости Запасов
 apps/erpnext/erpnext/config/learn.py +239,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,Налоговые активы
@@ -3025,8 +3111,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,Платные и не доставляется
 DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
 DocType: Sales Invoice,End Date,Дата окончания
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,биржевые операции
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операции с Запасами
 DocType: Employee,Internal Work History,Внутренняя история Работа
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Сумма начисленной амортизации
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
@@ -3034,7 +3121,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Компания является обязательным, так как это ваша компания адрес"
 DocType: Item Attribute,From Range,От хребта
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Отправить эту производственного заказа для дальнейшей обработки.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Отправить эту производственного заказа для дальнейшей обработки.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Чтобы не применяются Цены правило в конкретной сделки, все применимые правила ценообразования должны быть отключены."
 DocType: Company,Domain,Домен
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,работы
@@ -3046,6 +3133,7 @@
 DocType: Time Log,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Уменьшите Набор для отпуска без сохранения (LWP)
@@ -3062,10 +3150,11 @@
 DocType: Sales Order,Delivery Date,Дата поставки
 DocType: Opportunity,Opportunity Date,Возможность Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Вернуться Против покупки получении
+DocType: Request for Quotation Item,Request for Quotation Item,Запрос на коммерческое предложение Пункт
 DocType: Purchase Order,To Bill,Для Билла
 DocType: Material Request,% Ordered,% заказано
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Сдельная работа
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Ср. Покупка Оценить
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Средняя Цена Покупки
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Рассылка
@@ -3076,11 +3165,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},"Пожалуйста, установите &quot;Asset Утилизация счет» в компании {0}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Временные счета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черный
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Взрыв Пункт
 DocType: Account,Auditor,Аудитор
@@ -3089,21 +3179,22 @@
 DocType: Pricing Rule,Disable,Отключить
 DocType: Project Task,Pending Review,В ожидании отзыв
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Нажмите здесь, чтобы оплатить"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не может быть утилизированы, как это уже {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Всего Заявить расходов (через Расход претензии)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Идентификатор клиента
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Марк Отсутствует
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,"Времени должен быть больше, чем от времени"
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Добавить элементы из
-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,Последний Покупка Оценить
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Добавить элементы из
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""","например ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,"Фото существовать не может Пункт {0}, так как имеет варианты"
 ,Sales Person-wise Transaction Summary,Человек мудрый продаж Общая информация по сделкам
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Склад {0} не существует
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3118,6 +3209,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"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,Управление качеством
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Пункт {0} отключена
 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,Сотрудник Внешний Работа История
@@ -3126,12 +3218,12 @@
 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/setup/doctype/company/company.js +20,Cost Centers,МВЗ
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Скорость, с которой валюта продукция превращается в базовой валюте компании"
+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,Следующая Контактные
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Настройка шлюза счета.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Настройка шлюза счета.
 DocType: Employee,Employment Type,Вид занятости
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Капитальные активы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Основные средства
 ,Cash Flow,Поток наличных денег
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be across two alocation records,Срок подачи заявлений не может быть по двум alocation записей
 DocType: Item Group,Default Expense Account,По умолчанию расходов счета
@@ -3143,7 +3235,7 @@
 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 +132,Please find attached {0} #{1},Прилагается {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Прилагается {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Банк балансовый отчет за Главную книгу
 DocType: Job Applicant,Applicant Name,Имя заявителя
 DocType: Authorization Rule,Customer / Item Name,Заказчик / Название товара
@@ -3159,19 +3251,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Пожалуйста, сформулируйте из / в диапазоне"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок.
 DocType: BOM Replace Tool,Current BOM,Текущий BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Добавить серийный номер
 apps/erpnext/erpnext/config/support.py +43,Warranty,Гарантия
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Узел Группа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Обновление Готовые изделия
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Обновление Готовые изделия
 DocType: Workstation,per hour,в час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Выплачиваемая сумма
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
@@ -3201,7 +3292,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
 DocType: Leave Block List,Applies to Company,Относится к компании
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, потому что представляется со Вступление {0} существует"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, потому что представляется со Вступление {0} существует"
 DocType: Purchase Invoice,In Words,Прописью
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Сегодня у {0} день рождения!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Запрос для Склад
@@ -3214,9 +3305,11 @@
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
+DocType: Pricing Rule,Margin Rate or Amount,Маржинальная ставка или сумма
 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,Позиция в Заказе клиента
@@ -3226,7 +3319,7 @@
 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 +782,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} уже существует
@@ -3234,19 +3327,18 @@
 DocType: Customer,Sales Team Details,Описание отдела продаж
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциальные возможности для продажи.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Неверный {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Нейминг Series для {0} через Setup&gt; Настройки&gt; Naming Series"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универмаги
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Сохранить документ в первую очередь.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Сохранить документ в первую очередь.
 DocType: Account,Chargeable,Ответственный
 DocType: Company,Change Abbreviation,Изменить Аббревиатура
 DocType: Expense Claim Detail,Expense Date,Дата расхода
 DocType: Item,Max Discount (%),Макс Скидка (%)
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последнее Сумма заказа
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последняя сумма заказа
 DocType: Company,Warn,Warn
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
 DocType: BOM,Manufacturing User,Производство пользователя
@@ -3259,14 +3351,15 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Бухгалтерская книга
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Посмотреть покупка
 DocType: Item Attribute Value,Attribute Value,Значение атрибута
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ID электронной почты должен быть уникальным, уже существует для {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ID электронной почты должен быть уникальным, уже существует для {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,"Пожалуйста, выберите {0} первый"
 DocType: Features Setup,To get Item Group in details table,Чтобы получить группу товаров в детали таблице
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Партия {0} позиций {1} просрочена
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {0}"
 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>
@@ -3298,23 +3391,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
 DocType: Item Customer Detail,Ref Code,Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Сотрудник записей.
 DocType: Payment Gateway,Payment Gateway,Платежный шлюз
 DocType: HR Settings,Payroll Settings,Настройки по заработной плате
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Разместить заказ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корневая не может иметь родителей МВЗ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Выберите бренд ...
 DocType: Sales Invoice,C-Form Applicable,C-образный Применимо
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Склад является обязательным
 DocType: Supplier,Address and Contacts,Адрес и контакты
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Решили По
@@ -3332,7 +3425,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Получать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Получать
 DocType: Maintenance Visit,Fully Completed,Полностью завершен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% завершено
 DocType: Employee,Educational Qualification,Образовательный ценз
@@ -3340,14 +3433,14 @@
 DocType: Purchase Invoice,Submit on creation,Отправить по созданию
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Мои Заказы
@@ -3368,10 +3461,10 @@
 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 +250,Point-of-Sale Profile,Точка-в-продажи профиля
+apps/erpnext/erpnext/config/accounts.py +258,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} уже выставлен
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Необеспеченных кредитов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Название учетного отдела
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланированная дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Всего выплачено Amt
@@ -3383,11 +3476,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,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/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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}. Пожалуйста, убедитесь, его статус «неактивные», чтобы продолжить."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Поставщик Part No
 DocType: Purchase Invoice,Contact,Контакты
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Получено от
 DocType: Features Setup,Exports,! Экспорт
@@ -3396,21 +3490,21 @@
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: От {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
 DocType: Issue,Content Type,Тип контента
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
-DocType: Payment Reconciliation,From Invoice Date,От Накладная Дата
+DocType: Payment Reconciliation,From Invoice Date,От Дата Счета
 DocType: Cost Center,Budgets,Бюджеты
 apps/erpnext/erpnext/public/js/setup_wizard.js +21,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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+,Average Commission Rate,Средний Уровень Комиссии
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Основной счет
@@ -3423,7 +3517,7 @@
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,Капитал запасов
@@ -3437,15 +3531,15 @@
 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 +576,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектная деятельность / задачи.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Создать зарплат Slips
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка должна быть проверена, если выбран Применимо для как {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Повторите с Днем Ежемесячно
@@ -3454,7 +3548,7 @@
 DocType: Features Setup,To track any installation or commissioning related work after sales,Чтобы отслеживать любые установки или ввода соответствующей работы после продаж
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Журнал Деталь входа Нет
 DocType: Employee External Work History,Salary,Зарплата
-DocType: Serial No,Delivery Document Type,Тип доставки документов
+DocType: Serial No,Delivery Document Type,Тип Документа  Отгрузки
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Представьте все промахи зарплаты для указанных выше выбранным критериям
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} объектов синхронизировано
 DocType: Sales Order,Partly Delivered,Небольшая Поставляются
@@ -3465,8 +3559,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,"Год дата начала или дата окончания перекрывается с {0}. Чтобы избежать пожалуйста, установите компанию"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Новый бюллетень
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### 
  Если серия установлен и Серийный номер не упоминается в сделках, то автоматическая серийный номер будет создан на основе этой серии. Если вы хотите всегда явно упомянуть заводским номером для этого элемента. оставить это поле пустым,."
@@ -3478,11 +3573,11 @@
 ,Sales Analytics,Аналитика продаж
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки Производство
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Настройка e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
-DocType: Stock Entry Detail,Stock Entry Detail,Фото Вступление Подробно
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании 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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Налоговый Правило конфликты с {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Новый Имя счета
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,Обслуживание Клиентов
@@ -3492,30 +3587,32 @@
 apps/erpnext/erpnext/config/hr.py +50,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,Суммарное количество выделенных листья более дней в периоде
+DocType: Pricing Rule,Percentage,процент
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,По умолчанию работы на складе Прогресс
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Обновление Номер серии
 DocType: Account,Equity,Ценные бумаги
-DocType: Sales Order,Printing Details,Печать Подробности
+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,Поиск Sub сборки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
 DocType: Purchase Taxes and Charges,Actual,Фактически
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Child) типа &quot;налог&quot; и упоминают ставки налога.
 DocType: Production Order,Production Order,Производственный заказ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,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,Просмотр сейчас
-DocType: BOM,Raw Material Cost,Сырье Стоимость
-DocType: Item Reorder,Re-Order Level,Re-ордера и уровней
+DocType: BOM,Raw Material Cost,Затраты на сырье
+DocType: Item Reorder,Re-Order Level,Уровень перезаказа
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
@@ -3523,22 +3620,23 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для Запаса {0} в строке {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые Ответил на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Финансовый год Дата начала и финансовый год Дата окончания уже установлены в финансовый год {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Успешно Примирение
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Где элементы хранятся.
 DocType: Tax Rule,Validity,Период действия
+DocType: Request for Quotation,Supplier Detail,Поставщик: Подробности
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сумма по счетам
 DocType: Attendance,Attendance,Посещаемость
 apps/erpnext/erpnext/config/projects.py +55,Reports,Отчеты
 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 +508,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Предмет цены
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По словам будет виден только вы сохраните заказ на поставку.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Окончание Ваучер
@@ -3548,10 +3646,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Изменение
@@ -3559,38 +3657,39 @@
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"e.g. ""My Company LLC""","например ""Моя компания ООО """
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
+DocType: Asset Category,Asset Category Name,Asset Категория Название
 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: Email Digest,Receivables / Payables,Кредиторская / Дебиторская задолженность
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,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: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Налоговый Категория не может быть ""Оценка"" или ""Оценка и Всего», как все детали, нет в наличии"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Партия
 apps/erpnext/erpnext/stock/doctype/item/item.js +20,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всего расходов претензии (с помощью расходные Претензии)
 DocType: Journal Entry,Debit Note,Дебет-нота
-DocType: Stock Entry,As per Stock UOM,По фондовой UOM
+DocType: Stock Entry,As per Stock 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 +74,Sales Person,Продавец
 DocType: Sales Invoice,Cold Calling,Холодная Вызов
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Бюджет и МВЗ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Бюджет и МВЗ
 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.,Создание правил для ограничения операций на основе значений.
@@ -3621,9 +3720,9 @@
 DocType: Purchase Common,Purchase Common,Покупка Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Поставщик Котировка {0} создано
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товара&gt; Марка
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
@@ -3631,7 +3730,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Платежи Заказчиков
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,Родитель счета
@@ -3647,7 +3746,7 @@
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
 DocType: Address,Office,Офис
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
@@ -3662,6 +3761,7 @@
 apps/erpnext/erpnext/config/stock.py +310,Batch Inventory,Пакетная Инвентарь
 DocType: Employee,Contract End Date,Конец контракта Дата
 DocType: Sales Order,Track this Sales Order against any Project,Подписка на заказ клиента против любого проекта
+DocType: Sales Invoice Item,Discount and Margin,Скидка и маржа
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Потяните заказы на продажу (в ожидании, чтобы доставить) на основе вышеуказанных критериев"
 DocType: Deduction Type,Deduction Type,Вычет Тип
 DocType: Attendance,Half Day,Полдня
@@ -3682,7 +3782,7 @@
 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}."
+apps/erpnext/erpnext/accounts/party.py +234,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,Заработная плата Зарегистрироваться
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
@@ -3690,22 +3790,23 @@
 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-профиля
 DocType: Payment Gateway Account,Payment URL Message,Оплата URL сообщения
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сумма платежа не может быть больше, чем непогашенная сумма"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Всего Неоплаченный
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Время входа не оплачиваемое
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
+DocType: Asset,Asset Category,Категория активов
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,"Пожалуйста, введите против Ваучеры вручную"
 DocType: SMS Settings,Static Parameters,Статические параметры
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Материал Поставщику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Акцизный Счет
 DocType: Expense Claim,Employees Email Id,Сотрудники Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Выраженное Посещаемость
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Текущие обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Текущие обязательства
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Фактическая Кол-во обязательно
@@ -3726,17 +3827,16 @@
 DocType: Item Attribute,Numeric Values,Числовые значения
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Прикрепить логотип
 DocType: Customer,Commission Rate,Комиссия
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Сделать Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,аналитика
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корзина Пусто
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Нет адреса по умолчанию шаблона не найдено. Пожалуйста, создайте новый из Setup&gt; Печать и Брендинг&gt; Адрес шаблона."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Вес упаковки Подробнее
 DocType: Payment Gateway Account,Payment Gateway Account,Платежный шлюз аккаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,После завершения оплаты перенаправить пользователя на выбранную страницу.
@@ -3745,20 +3845,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
+DocType: Asset,Current Value (After Depreciation),Текущее значение (после амортизации)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Ведомость материалов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ссылка Дата
@@ -3766,6 +3867,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Аккаунт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 76be304..8c076f8 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
 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 vypočítané v transakcii.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zamestnancov vymenovať systém v oblasti ľudských zdrojov&gt; Nastavenie HR
 DocType: Purchase Order,Customer Contact,Zákaznícky kontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,ukázať otvorené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Zobraziť Varianty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Účty tabuľka nemôže byť prázdne.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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ě
 DocType: Designation,Designation,Označení
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 DocType: Payment Request,Payment Request,Platba Dopyt
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Ženatý
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nepovolené pre {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Získať predmety z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
+DocType: Item,Is Fixed Asset,Je dlhodobého majetku
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Vše Kontakt
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Production Order Operation,Show Time Logs,Show Time Záznamy
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Stav instalace
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Prosím, zadejte společnost"
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Čistý peňažný tok z financovania
 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 +217,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkom Odberatelia
 ,Contact Name,Kontakt Meno
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,bankový Príspevky
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
@@ -249,8 +253,8 @@
 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 +592,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Prosím, zadejte mateřskou skupinu účtu pro sklad {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Učiť sa
+DocType: Asset,Next Depreciation Date,Vedľa Odpisy Dátum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Náklady na činnosť na jedného zamestnanca
 DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dodávateľské faktúry No existuje vo faktúre {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Správa obchodník strom.
 DocType: Job Applicant,Cover Letter,Sprievodný list
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Vynikajúci Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Zlé Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: 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."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednotiek [{1}] (# Form / bodu / {1}) bola nájdená v [{2}] (# Form / sklad / {2})
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavenie Dane
 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 +381,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Vyberte měsíc a rok
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Select Položka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,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,Meno schvaľovateľa priepustky
-,Schedule Date,Plán Datum
+DocType: Depreciation Schedule,Schedule Date,Plán Datum
 DocType: Packed Item,Packed Item,Zabalená položka
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pre zamestnancov {0} proti Typ aktivity - {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.,"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
@@ -348,6 +355,7 @@
 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í"
+DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
 DocType: Workstation,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
-DocType: Material Request Item,Required Date,Požadovaná data
+DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Správa pre dodávateľov
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
 DocType: Employee,Health Concerns,Zdravotní Obavy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Nezaplacený
@@ -418,17 +427,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -437,6 +446,7 @@
 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 +315,Managing Subcontracting,Správa Subdodávky
+DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozícii na webových stránkach k týmto užívateľom
 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 +53,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -448,7 +458,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Prírastok nemôže byť 0
 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 +86,Item {0} is not Purchase Item,Položka {0} není Nákup položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Položka {0} není Nákup položky
 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í
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Čakajúci Množstvo
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -469,13 +479,13 @@
 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 viac 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 +126,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 +230,Financial / accounting year.,Finanční / Účetní rok.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,neuhradená Hodnoty
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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í
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Dodáva: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Splatnost účtu
@@ -483,7 +493,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Sales Return
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
@@ -492,7 +502,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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."
@@ -502,7 +512,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Transakčné Data aktualizácie Bank
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Transakčné Data aktualizácie Bank
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -520,27 +530,27 @@
 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,Pomenovanie dodávateľa podľa
 DocType: Activity Type,Default Costing Rate,Predvolené kalkulácie Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Plán údržby
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Čistá Zmena stavu zásob
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založené na"" a ""Zoskupené podľa"", nemôžu byť rovnaké"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
 DocType: Production Order Operation,In minutes,V minútach
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Prosím nastavte si dovolenku zoznam buď pre zamestnancov alebo spoločnosť
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,odpisy Suma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Dodává Částka
 DocType: Supplier,Fixed Days,Pevné Dni
 DocType: Quotation Item,Item Balance,Balance položka
 DocType: Sales Invoice,Packing List,Balení Seznam
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
 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
@@ -555,8 +565,10 @@
 DocType: BOM Operation,Operation Time,Provozní doba
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Skupiny k skupine
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,moje projekty
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
+DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / straty na majetku likvidáciu
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company měny)
@@ -568,13 +580,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Vstup Platba je už vytvorili
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Celkom fakturácia tento rok
 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 +529,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -597,6 +610,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Územie
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
@@ -611,14 +625,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tam je chyba v adrese šablóne {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nový účet
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {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.,Účtovné Prihlášky možno proti koncovej uzly. Záznamy proti skupinám nie sú povolené.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -666,17 +680,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ceník není zvolen
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnenie
 DocType: Company,Default Bank Account,Prednastavený Bankový úč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ý"
@@ -684,7 +698,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Nos,Balenie
 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 +666,My Invoices,Moje Faktúry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moje Faktúry
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenájdený žiadny zamestnanec
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
@@ -693,10 +708,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Odeslat nyní
 ,Support Analytics,Podpora Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logická chyba: musí nájsť prekrývania
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form záznamy
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form záznamy
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Zákazník a Dodávateľ
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora dotazy ze strany zákazníků.
@@ -720,7 +736,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -757,14 +773,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobraziť Odberatelia
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 DocType: Employee,Ms,Paní
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Devizový kurz master.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Devizový kurz master.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Obchodní partneri a teritóriá
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} musí být aktivní
+DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto košík
 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
@@ -783,7 +800,7 @@
 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 +524,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -793,10 +810,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Přijatá faktura
+DocType: Asset,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Dátum začatia a dátumom ukončenia by malo byť v rámci rovnakého fiškálny rok
@@ -806,21 +823,24 @@
 DocType: Material Request Item,Lead Time Date,Čas a Dátum Obchodnej iniciatívy
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možno, Zmenáreň záznam nie je vytvorená pre"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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.","Pre &quot;produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo&quot; Balenie zoznam &#39;tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek &quot;Výrobok balík&quot; položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do &quot;Balenie zoznam&quot; tabuľku."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Pre &quot;produktom Bundle predmety, sklad, sériové číslo a dávkové No bude považovaná zo&quot; Balenie zoznam &#39;tabuľky. Ak Warehouse a Batch No sú rovnaké pre všetky balenia položky pre akúkoľvek &quot;Výrobok balík&quot; položky, tieto hodnoty môžu byť zapísané do hlavnej tabuľky položky, budú hodnoty skopírované do &quot;Balenie zoznam&quot; tabuľku."
 DocType: Job Opening,Publish on website,Publikovať na webových stránkach
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Zásilky zákazníkům.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Čiastka platby = dlžnej čiastky
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Odchylka
 ,Company Name,Názov spoločnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Vybrať položku pre prevod
 DocType: Purchase Invoice,Additional Discount Percentage,Ďalšie zľavy Percento
 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 videí nápovedy
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Riadok {0}: faktúra {1} je neplatná, to by mohlo byť zrušené / neexistuje. \ Zadajte platnú faktúru"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
@@ -829,14 +849,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 ,Employee Holiday Attendance,Zamestnanec Holiday Účasť
 DocType: Opportunity,Walk In,Vejít
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Sklad Príspevky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Sklad Príspevky
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Dělat
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
 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 +5,My Cart,Môj košík
@@ -846,7 +866,8 @@
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 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 +180,Qty for {0},Množství pro {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Naozaj chcete obnoviť tento vyradený aktívum?
+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 +80,Leave Allocation Tool,Nechte přidělení nástroj
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
@@ -859,7 +880,7 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostný / Bankový účet
 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 +547,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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 byť záporné
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sleva
@@ -874,20 +895,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodejní Částka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Čas Záznamy
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Čas Záznamy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,zošrotovaný
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,nábor
 DocType: BOM Operation,Operation,Operace
 DocType: Lead,Organization Name,Názov organizácie
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Prodejní náklady
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
@@ -904,7 +926,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,"Prosím, vyberte najprv názov spoločnosti"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Ponuky od Dodávateľov.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 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
@@ -913,7 +935,7 @@
 DocType: Company,Default Currency,Predvolená mena
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -921,7 +943,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Příspěvek%
@@ -930,22 +952,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globální Výchozí
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,To Batch Time Log bylo účtováno.
 DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Plánovanie kapacít Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Plánovanie kapacít Chyba
 ,Trial Balance for Party,Trial váhy pre stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Dokončené Položka {0} musí byť zadaný pre vstup typu Výroba
 apps/erpnext/erpnext/config/learn.py +92,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 +473,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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',"""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 +45,Types of activities for Time Sheets,Typy činností pro Time listy
@@ -956,18 +979,18 @@
 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"""
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Prosím nastavte e-mail ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Prosím nastavte e-mail ID
 DocType: Item,UOMs,Merné Jednotky
 apps/erpnext/erpnext/stock/utils.py +171,{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/config/buying.py +33,Supplier database.,Databáze dodavatelů.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
@@ -981,6 +1004,7 @@
 DocType: Holiday,Holiday,Dovolená
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma sa nevzťahuje na faktúre: {0}
 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
@@ -994,19 +1018,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
 DocType: Contact,User ID,User ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,View Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendy platené
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividendy platené
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Účtovné Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdiel Suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Nerozdelený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Nerozdelený zisk
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
@@ -1014,7 +1039,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Dočasné Otvorenie
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
@@ -1029,8 +1054,8 @@
 ,Accounts Payable Summary,Splatné účty Shrnutí
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,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 +165,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
@@ -1038,7 +1063,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Hlava účtu {0} vytvořil
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
@@ -1046,12 +1071,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Poľnohospodárstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Vaše Produkty alebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 apps/erpnext/erpnext/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
@@ -1061,19 +1086,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Prodejce Website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Nenašiel žiadnu položku s názvom {0}
 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
@@ -1081,10 +1107,10 @@
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
-DocType: Journal Entry,Journal Entry,Zápis do deníku
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Číslo bankového účtu
 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
@@ -1093,6 +1119,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žiadosť o cenovú ponuku dodávateľa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakujúce Až
 DocType: Attendance,HR Manager,HR Manager
@@ -1103,6 +1130,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Aktuálna hodnota po odpisoch musí byť menší ako rovná {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ak Ročný rozpočet prekročený (pre výdavkového účtu)
@@ -1117,21 +1145,22 @@
 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}
 DocType: Project,Start and End Dates,Dátum začatia a ukončenia
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účtovníctvo
 DocType: Features Setup,Features Setup,Nastavení Funkcí
+DocType: Asset,Depreciation Schedules,odpisy Plány
 DocType: Item,Is Service Item,Je Service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,transakčné mena
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operace Popis
 DocType: Item,Will also apply to variants,Bude sa vzťahovať aj na varianty
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: Pricing Rule,Campaign,Kampaň
@@ -1145,17 +1174,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
+DocType: Email Digest,For Company,Pre spoločnosť
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Nákup Částka
 DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
 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 +472,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nemôže byť väčšie ako 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1177,11 +1206,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu na premenovanie.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Táto položka sa kupuje
 DocType: Address,Billing,Fakturace
@@ -1191,12 +1220,15 @@
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Podsestavy
+DocType: Asset,Asset Name,asset Name
 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 +142,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Balení Slip
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pronájem kanceláře
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Balení Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavenie SMS brány
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Žiadosť o cenovú ponuku môže byť prístup kliknutím na nasledujúci odkaz
+DocType: Asset,Number of Months in a Period,Počet mesiacov v období
 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
@@ -1213,19 +1245,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Varianty Položky
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,show uzavretý
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Peňažný tok z investičných
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Item Group,Item Group Name,Položka Název skupiny
 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 +86,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1234,7 +1267,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Maintenance Visit
 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: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
@@ -1248,7 +1281,6 @@
 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 +196,Brand master.,Master Značky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Dodávateľ Type
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Krabica
@@ -1276,7 +1308,7 @@
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Nároky na náklady firmy.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
@@ -1285,7 +1317,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslať e-mail Payment
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Ostatné správy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1295,26 +1327,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Zobraziť
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Platba Dopyt už existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Množství nesmí být větší než {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Predchádzajúci finančný rok nie je uzavretý
 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/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Dátum OD nemôže byť väčší ako dátum 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 +38,Supplier Type master.,Dodavatel Type master.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 DocType: Purchase Invoice,Reference Document,referenčný dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% fakturované
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
@@ -1336,8 +1369,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Čistá Zmena účty záväzkov
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Overte prosím svoju e-mailovú id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 DocType: Quotation,Term Details,Termín Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí byť väčšia ako 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánovanie kapacít Pro (dni)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Záruční reklamace
@@ -1355,7 +1389,7 @@
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Vyplatená záloha proti {0} {1} nemôže byť väčšia \ než Grand Celkom {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Prosím, vyberte položku kód"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Prosím, vyberte položku kód"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Snížit Odpočet o dovolenou bez nároku na odměnu (LWP)
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (voliteľné)
@@ -1365,15 +1399,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Single jednotka položky.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1390,33 +1424,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
+DocType: Asset,Depreciation Method,odpisy Metóda
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 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 +29,Shopping Cart is enabled,Nákupný košík je povolené
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 DocType: Production Plan Material Request,Production Plan Material Request,Výroba Dopyt Plán Materiál
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Žádné výrobní zakázky vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Žádné výrobní zakázky vytvořené
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Hlavné
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1424,31 +1460,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresy
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,ocenenie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Položka nesmie mať výrobné zákazky.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Položka nesmie mať výrobné zákazky.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
 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: 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 +27,Time Logs for manufacturing.,Čas Protokoly pre výrobu.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Značka
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
@@ -1459,6 +1496,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
+DocType: Request for Quotation Supplier,Send Email to Supplier,Odoslať e-mail na dodávateľa
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Production Planning Tool,Material Requests,materiál Žiadosti
@@ -1476,7 +1514,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 DocType: Stock Settings,Allowance Percent,Allowance Procento
 DocType: SMS Settings,Message Parameter,Parametr zpráv
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Strom Nákl.stredisko finančných.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Strom Nákl.stredisko finančných.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z Příjmového listu
 DocType: Serial No,Creation Date,Datum vytvoření
@@ -1508,41 +1546,43 @@
 ,Amount to Deliver,"Suma, ktorá má dodávať"
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Produkt alebo Služba
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} vytvoril
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{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 +448,Item table can not be blank,Tabulka Položka nemůže být prázdný
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
 DocType: Pricing Rule,Selling,Predaj
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Odvody a dane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Platobná brána účet nie je nakonfigurovaný
 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: Production Order,Material Request Item,Materiál Žádost o bod
+DocType: Request for Quotation Item,Material Request Item,Materiál Žádost o bod
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Predané
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účtovné Podrobnosti
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Odstráňte všetky transakcie pre túto spoločnosť
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokácie
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: Item Group,Show In Website,Show pro webové stránky
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Skupina
@@ -1550,6 +1590,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
+DocType: Pricing Rule,Margin Type,margin Type
 DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
@@ -1557,20 +1598,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Riadok # {0}: Prostriedok je povinná proti dlhodobého majetku výtlačku
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastaviť číslovanie série pre dochádzky prostredníctvom ponuky Setup&gt; Číslovanie Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Pár
+DocType: Asset,Depreciation Schedule,plán odpisy
 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: Asset,Purchase Date,Dátum nákupu
 DocType: Employee,Personal Details,Osobní data
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové stredisko&quot; vo firme {0}
 ,Maintenance Schedules,Plány údržby
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
@@ -1584,23 +1630,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina na Non-Group
 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/public/js/setup_wizard.js +272,Unit,Jednotka
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Uveďte prosím, firmu"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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 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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
@@ -1609,29 +1654,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
 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,% splnených úloh
 DocType: Project,Gross Margin,Hrubá marža
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Vypočítaná výpis z bankového účtu zostatok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Náklady Aktualizované
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Náklady Aktualizované
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zamestnancov vymenovať systém v oblasti ľudských zdrojov&gt; Nastavenie HR
 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
@@ -1643,8 +1689,8 @@
 ,SO Qty,SO Množství
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+DocType: Request for Quotation,Manufacturing Manager,Výrobní ředitel
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Zásielky
 DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
@@ -1652,21 +1698,21 @@
 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/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,Dodávateľ
+DocType: Asset,Supplier,Dodávateľ
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Uživatel {0} je zakázána
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
-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
+DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail nebude odoslaný neaktívnym používateľom
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
@@ -1676,11 +1722,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Riadok # {0}: Množstvo musí byť jedno, pretože položka je spojená s aktívom"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dieťa Položka by nemala byť produkt Bundle. Odstráňte položku `{0}` a uložiť
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Nové Nákladové Stredisko
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Prejdite do 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ť podriadenej) typu &quot;dane&quot; a to nehovorím o sadzbu dane.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nové Nákladové Stredisko
 DocType: Bin,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Quality Inspection,In Process,V procesu
@@ -1693,10 +1739,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Čas Záznamy vytvořil:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Čas Záznamy vytvořil:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Employee,Blood Group,Krevní Skupina
@@ -1714,13 +1761,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím krajinu, k tomuto Shipping pravidlá alebo skontrolovať Celosvetová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debetné K je vyžadované
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Ponuka Term
 DocType: Quality Inspection,Quality Manager,Manažer kvality
 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 +141,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
@@ -1728,22 +1775,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/stock/get_item_details.py +272,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ž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 +123,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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í
@@ -1752,10 +1799,11 @@
 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 +175,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vaši Zákazníci
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Nainštalovať teraz
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Nainštalovať teraz
 DocType: Sales Order,Not Delivered,Nedodané
 ,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."
@@ -1779,7 +1827,7 @@
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracovisko
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastaviť ako Zatvorené
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},No Položka s čárovým kódem {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},No Položka s čárovým kódem {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 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,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
@@ -1797,10 +1845,10 @@
 DocType: Rename Tool,Rename Tool,Nástroj na premenovanie
 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 +608,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Přenos materiálu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Bod {0} musí byť Sales Položka {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
 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
@@ -1814,12 +1862,13 @@
 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: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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 +70,Invite as User,Pozvať ako Užívateľ
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Prosím nastavte {0} vo firme {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{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.
@@ -1828,9 +1877,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
 DocType: Rename Tool,File to Rename,Súbor premenovať
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
@@ -1842,30 +1891,30 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
-DocType: Buying Settings,Buying Settings,Nákup Nastavení
+DocType: Buying Settings,Buying Settings,Nastavenie nákupu
 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
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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äť."
 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 byť väčšie, ako plánované množstvo ({2}), vo Výrobnej Objednávke {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Rýchly vstup Journal
 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 +206,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} nie je odoslané
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1874,7 +1923,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter adresár
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
@@ -1892,13 +1941,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} je uzavretý
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získať aktuálny stav
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Prejdite do príslušnej skupiny (obvykle využitie prostriedkov&gt; obežných aktív&gt; bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálov
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: Authorization Rule,Applicable To (Role),Vztahující se na (Role)
 DocType: Stock Entry,Purpose,Účel
+DocType: Company,Fixed Asset Depreciation Settings,Nastavenie odpisovania dlhodobého majetku
 DocType: Item,Will also apply for variants unless overrridden,"Bude platiť aj pre varianty, pokiaľ nebude prepísané"
 DocType: Purchase Invoice,Advances,Zálohy
 DocType: Production Order,Manufacture against Material Request,Výroba proti Materiál Request
@@ -1907,6 +1956,7 @@
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1957,12 +2007,14 @@
  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: Purchase Receipt Item,Recd Quantity,Recd Množství
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategórie Account
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","napríkklad banka, hotovosť, kreditné karty"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Prejdite do príslušnej skupiny (obvykle využitie prostriedkov&gt; obežných aktív&gt; bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;Banka&quot;
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1986,9 +2038,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Žiadny zamestnanec pre vyššie zvolených kritérií alebo výplatnej páske už vytvorili
@@ -2015,7 +2067,7 @@
 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 +200,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"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Mzda
 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é"
@@ -2025,8 +2077,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prispôsobenie Formuláre
 DocType: Account,Income Account,Účet příjmů
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žiadne šablóny východisková adresa nájdený. Prosím vytvorte novú z Nastavenie&gt; Tlač a značky&gt; šablóny adresy.
 DocType: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2048,21 +2101,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Nastavenie Skladu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Názov nového nákladového strediska
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Názov nového nákladového strediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/config/support.py +7,Issues,Problémy
+apps/erpnext/erpnext/hooks.py +90,Issues,Problémy
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 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
@@ -2076,10 +2130,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
 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 +139,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
 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 +142,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
@@ -2147,13 +2201,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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í"
 ,Requested,Požadované
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Žiadne poznámky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,Žiadne 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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Asset položky musia byť non-skladová položka
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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"
@@ -2174,7 +2229,7 @@
 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ě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Payment Request,Recipient and Message,Príjemca a správ
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
@@ -2188,7 +2243,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Vybrať Dodávateľ Address
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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."
 DocType: Payment Request,Mute Email,Mute Email
@@ -2210,11 +2265,12 @@
 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/config/buying.py +18,Request for quotation.,Žiadosť o cenovú ponuku.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
 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 +294,Price List Currency not selected,Ceníková Měna není zvolena
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2223,7 +2279,7 @@
 DocType: Installation Note Item,Against Document No,Proti dokumentu č
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Prosím, vyberte {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštevnosť
@@ -2238,6 +2294,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
 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ů
@@ -2251,7 +2308,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrdené
 DocType: Payment Gateway,Gateway,Brána
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Zadejte zmírnění datum.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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ň"
@@ -2265,18 +2322,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Nepodarilo sa nájsť kurz pre {0} do {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Nepodarilo sa nájsť kurz pre {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Poldenné
 DocType: Sales Invoice,Sales Team,Prodejní tým
 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 +410,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Dodávateľ Type
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Zákazník Warehouse (voliteľne)
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
@@ -2302,14 +2360,16 @@
 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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Materiál Žádosti {0} vytvořené
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,účet oprávok
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
+DocType: Asset,Expected Value After Useful Life,Očakávaná hodnota po celú dobu životnosti
 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í
@@ -2322,12 +2382,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} je zrušený alebo zatvorené
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čistý peňažný tok z investičnej
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root účet nemůže být smazán
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} musí byť predložené
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Správa adries
-DocType: Pricing Rule,Item Code,Kód položky
+DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uživatel Poznámka
@@ -2346,8 +2406,10 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 ,Billed Amount,Fakturovaná částka
+DocType: Asset,Double Declining Balance,double degresívne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Uzavretá objednávka nemôže byť zrušený. Otvoriť zrušiť.
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získať aktualizácie
@@ -2366,6 +2428,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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"""
+DocType: Asset,Fully Depreciated,plne odpísaný
 ,Stock Projected Qty,Reklamní Plánovaná POČET
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účasť HTML
@@ -2373,25 +2436,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Poradové číslo a Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Minúta
 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
 DocType: Sales Partner,Retailer,Maloobchodník
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Zakázať v slovách
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Kontokorentní úvěr na účtu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizácia účty s ním súvisiacich v kategórii Asset {0} alebo {1} Company"
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvelé 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Počiatočný stav Equity
 DocType: Appraisal,Appraisal,Ocenění
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-mailu zaslaného na dodávateľa {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 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 +187,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
@@ -2399,7 +2465,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk import Help
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Zvolte množství
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Zvolte množství
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odhlásiť sa z tohto Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Správa bola odoslaná
@@ -2427,6 +2493,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,celková marža
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
@@ -2440,7 +2507,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Payment Gateway Account,Default Payment Request Message,Východzí Platba Request Message
 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/config/accounts.py +118,Banking and Payments,Bankovníctvo a platby
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankovníctvo a platby
 ,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
@@ -2448,17 +2515,17 @@
 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 +199,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Správa k ponuke
 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/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: Sales Order,Not Billed,Nevyúč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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
@@ -2474,15 +2541,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového strediska
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Dátum nákupu aktíva {0} nezhoduje s dátumom nákupnej faktúry
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 ,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}
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dlžníci ({0})
-DocType: Project,Margin,Marže
+DocType: Pricing Rule,Margin,Marže
 DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Hrubý Zisk %
@@ -2490,20 +2559,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
 DocType: Newsletter,Newsletter List,Zoznam Newsletterov
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Zkontrolujte, zda chcete poslat výplatní pásku za poštou na každého zaměstnance při předkládání výplatní pásku"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
 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 +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celková fakturovaná čiastka
 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: Account,Accumulated Depreciation,oprávky
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
 DocType: Payment Request,Email To,E-mail na
 DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy
 DocType: Bin,Requested Quantity,požadované množstvo
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Je potrebná Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2511,11 +2583,12 @@
 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 +115,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}% dodané
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% dodané
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Rovnaký dodávateľ bol zadaný viackrát
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2525,13 +2598,14 @@
 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."
 DocType: Payment Request,Payment Details,Platobné údaje
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Zápis do denníka do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
 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 +73,"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ď"
 DocType: Manufacturer,Manufacturers used in Items,Výrobcovia používané v bodoch
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2544,7 +2618,7 @@
 ,Stock Ledger,Reklamní Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Sadzba: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Vyberte první uzel skupinu.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zamestnancov a dochádzky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odobrať odkaz na zákazníka, dodávateľa, predajné partner a olovo, tak ako je vaša firma adresa"
@@ -2566,13 +2640,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
 DocType: Task,depends_on,záleží na
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Ďalšie Dátum musí byť väčšia ako Dátum zverejnenia
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) nie je na sklade
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Ďalšie Dátum musí byť väčšia ako Dátum zverejnenia
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +289,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í"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Faktúra Dátum zverejnenia
@@ -2587,7 +2662,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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ě."
@@ -2601,7 +2676,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
 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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2611,7 +2686,7 @@
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
@@ -2622,7 +2697,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
@@ -2631,11 +2706,12 @@
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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ý
+DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Sadzba
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
@@ -2643,7 +2719,7 @@
 DocType: Stock Entry,From BOM,Od BOM
 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 +96,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
@@ -2651,17 +2727,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Dátum Ponuky
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citácie
 DocType: Hub Settings,Access Token,Přístupový Token
 DocType: Sales Invoice Item,Serial No,Výrobní číslo
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
-DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,tlač Language
 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ě"
+DocType: Asset,Number of Depreciations,počet Odpisy
 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
@@ -2669,13 +2745,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Žiadosť o citátov
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximálna suma faktúry
 DocType: Purchase Invoice Item,Image View,Image View
 apps/erpnext/erpnext/config/selling.py +23,Customers,zákazníci
+DocType: Asset,Partially Depreciated,čiastočne odpíše
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Zo skladu
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2691,13 +2769,13 @@
 DocType: Quotation,Maintenance Manager,Správce údržby
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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í
+DocType: Asset,Amended From,Platném znění
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2710,21 +2788,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Uveďte &#39;/ STRATY zisk z aktív odstraňovaním &quot;vo firme
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Zápas platby faktúrami
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Zápas platby faktúrami
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Přidat do košíku
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Povolit / zakázat měny.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Povolit / zakázat měny.
 DocType: Production Planning Tool,Get Material Request,Získať Materiál Request
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Celkem Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,účtovná závierka
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,účtovná závierka
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2744,15 +2823,16 @@
 DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 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 +169,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 +171,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Čistá zmena vo vlastnom imaní
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
 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
@@ -2760,12 +2840,13 @@
 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
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 DocType: Item,Attributes,Atribúty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Posledná Dátum objednávky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
 DocType: C-Form,C-Form,C-Form
@@ -2777,18 +2858,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Obchodní
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Chyba: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvelé služby
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Supplier Quotation,Supplier Address,Dodavatel Address
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2799,10 +2880,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 DocType: Tax Rule,Billing State,Fakturácia State
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Převod
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Dátum splatnosti je povinné
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Dátum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
@@ -2822,20 +2903,22 @@
 DocType: GL Entry,Remarks,Poznámky
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Poslať Dodávateľ e-maily
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Log bol účtovaný
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia&gt; Nastavenia&gt; Pomenovanie Series
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
@@ -2845,12 +2928,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastaviť číslovanie série pre dochádzky prostredníctvom ponuky Setup&gt; Číslovanie Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Získať predmety z Bundle Product
+DocType: Asset,Straight Line,Priamka
+DocType: Project User,Project User,projekt Užívateľ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'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
@@ -2864,39 +2948,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Přidat dítě
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,otvorenie Value
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
 DocType: Tax Rule,Billing Country,Fakturácia Krajina
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Výdaje na reprezentaci
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Výdaje na právní služby
 DocType: Sales Invoice,Posting Time,Čas zadání
 DocType: Sales Order,% Amount Billed,% Fakturovanej čiastky
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonní Náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonní Náklady
 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.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},No Položka s Serial č {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},No Položka s Serial č {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Otvorené Oznámenie
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Přímé náklady
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Přímé náklady
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} je neplatná e-mailová adresa v &quot;Oznámenie \ &#39;e-mailovú adresu
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
@@ -2913,7 +2998,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
@@ -2924,11 +3009,12 @@
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dodávateľ aktíva {0} nezhoduje s dodávateľom na faktúre
 DocType: Newsletter,Test Email Id,Testovací Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Company Abbreviation,Skratka názvu spoločnosti
 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 +71,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plat master šablona.
@@ -2944,12 +3030,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,Fakturačná mena sa musí rovnať peňazí buď predvoleného comapany alebo payble meny účtu účastníka
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokiaľ zakázať, &quot;v slovách&quot; poli nebude viditeľný v akejkoľvek transakcie"
@@ -2959,13 +3046,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,To Batch Time Log byla zrušena.
 ,Reqd By Date,Pr p Podľa dátumu
 DocType: Salary Slip Earning,Salary Slip Earning,Plat Slip Zisk
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Věřitelé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Věřitelé
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,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
@@ -2986,15 +3073,14 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/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 +456,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Hub Settings,Name Token,Názov Tokenu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
-DocType: Project,Project Name,Název projektu
+DocType: Request for Quotation Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
@@ -3024,6 +3110,7 @@
 DocType: Sales Invoice,End Date,Datum ukončení
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,sklad Transakcia
 DocType: Employee,Internal Work History,Vnitřní práce History
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,oprávky Suma
 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
@@ -3031,7 +3118,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Spoločnosť je povinná, pretože to je vaša firma adresa"
 DocType: Item Attribute,From Range,Od Rozsah
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
 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.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Company,Domain,Doména
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,jobs
@@ -3043,6 +3130,7 @@
 DocType: Time Log,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Financial Year End Date,Dátum ukončenia finančného roku
 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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3059,6 +3147,7 @@
 DocType: Sales Order,Delivery Date,Dodávka Datum
 DocType: Opportunity,Opportunity Date,Příležitost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o kúpe
+DocType: Request for Quotation Item,Request for Quotation Item,Žiadosť o cenovú ponuku výtlačku
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% Objednané
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
@@ -3071,13 +3160,14 @@
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Customer,Tax ID,DIČ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
-DocType: Accounts Settings,Accounts Settings,Nastavení účtu
+DocType: Accounts Settings,Accounts Settings,Nastavenie účtu
 DocType: Customer,Sales Partner and Commission,Predaj Partner a Komisie
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Prosím nastavte dispozícii majetkový účet &quot;vo firme {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Továrna a strojní zařízení
 DocType: Sales Partner,Partner's Website,Partnera Website
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Dočasné Účty
 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
@@ -3086,21 +3176,22 @@
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Kliknite tu platiť
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Aktíva {0} nemôže byť vyhodený, ako je to už {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,mark Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Pridať položky z
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Pridať položky z
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","napríklad ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Sklad {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3115,6 +3206,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Item {0} bol zakázaný
 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
@@ -3126,7 +3218,7 @@
 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úci Kontakt
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Nastavenia brány účty.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Nastavenia brány účty.
 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
 ,Cash Flow,Cash Flow
@@ -3140,7 +3232,7 @@
 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ý Názov {0}
-apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Výpis z bankového účtu zostatok podľa hlavnej knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
@@ -3156,19 +3248,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte z / do rozmedzie
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Územie
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Přidat Sériové číslo
 apps/erpnext/erpnext/config/support.py +43,Warranty,záruka
 DocType: Production Order,Warehouses,Sklady
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print a Stacionární
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print a Stacionární
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Group Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Dokončení aktualizace zboží
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,nákup
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Zaplacené částky
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
@@ -3198,7 +3289,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Platí pre firmu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Purchase Invoice,In Words,Slovy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
@@ -3211,9 +3302,11 @@
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,pripojiť
 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 +564,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 +569,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Salary Slip,Salary Slip,Plat Slip
+DocType: Pricing Rule,Margin Rate or Amount,Margin sadzbou alebo pevnou sumou
 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
@@ -3223,7 +3316,7 @@
 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 +782,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3231,14 +3324,13 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia&gt; Nastavenia&gt; Pomenovanie Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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ý.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
@@ -3256,14 +3348,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Hlavná Účtovná Kniha
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Obchodné iniciatívy
 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}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"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 +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo spoločnosti {0}
 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>
@@ -3295,23 +3388,23 @@
 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í.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
 ,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
 DocType: Payment Gateway,Payment Gateway,Platobná brána
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Objednať
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root nemůže mít rodič nákladové středisko
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select Brand ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3329,7 +3422,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Mena transakcie musí byť rovnaká ako platobná brána menu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3337,14 +3430,14 @@
 DocType: Purchase Invoice,Submit on creation,Predloženie návrhu na vytvorenie
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,Add / Edit Prices,Pridať / Upraviť 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 +313,My Orders,Moje objednávky
@@ -3365,10 +3458,10 @@
 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"
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
 DocType: Maintenance Schedule Detail,Scheduled Date,Plánované datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Celkem uhrazeno Amt
@@ -3380,11 +3473,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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ápoveda 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 +141,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Vaši Dodávatelia
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Žiadny dodávateľ Part
 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
@@ -3393,12 +3487,12 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Payment Reconciliation,From Invoice Date,Z faktúry Dátum
@@ -3407,7 +3501,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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
@@ -3420,7 +3514,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné rady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
@@ -3434,15 +3528,15 @@
 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 +576,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
 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: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3462,8 +3556,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Rok dátum začatia alebo ukončenia sa prekrýva s {0}. Aby sa zabránilo nastavte firmu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 DocType: 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.","Příklad:. ABCD ##### 
  Je-li série nastavuje a pořadové číslo není uvedeno v transakcích, bude vytvořen poté automaticky sériové číslo na základě této série. Pokud chcete vždy výslovně uvést pořadová čísla pro tuto položku. ponechte prázdné."
@@ -3475,11 +3570,11 @@
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Nastavenia pre e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Zadejte prosím výchozí měnu v podniku Mistr
 DocType: Stock Entry Detail,Stock Entry Detail,Reklamní Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Denná Upomienky
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nový názov účtu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Nový názov úč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/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
@@ -3489,11 +3584,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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í
+DocType: Pricing Rule,Percentage,percento
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3501,11 +3597,12 @@
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
 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 +385,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Aktuální
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Prejdite do 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ť podriadenej) typu &quot;dane&quot; a to nehovorím o sadzbu dane.
 DocType: Production Order,Production Order,Výrobní Objednávka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
@@ -3524,18 +3621,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Platnosť
+DocType: Request for Quotation,Supplier Detail,dodávateľ Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná čiastka
 DocType: Attendance,Attendance,Účast
 apps/erpnext/erpnext/config/projects.py +55,Reports,správy
 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 +508,Posting date and posting time is mandatory,Datum a čas zadání je povinný
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,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
@@ -3545,10 +3643,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pre oznámenie"" nie sú uvedené pre odpovedanie %s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativní náklady
 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 +455,Change,Zmena
@@ -3556,6 +3654,7 @@
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset názov kategórie
 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
@@ -3567,13 +3666,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Šarže
@@ -3587,7 +3686,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodej Osoba
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS parametrů
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Rozpočet a nákladového strediska
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Rozpočet a nákladového strediska
 DocType: Maintenance Schedule Item,Half Yearly,Polročne
 DocType: Lead,Blog Subscriber,Blog Subscriber
 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.
@@ -3618,9 +3717,9 @@
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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í
@@ -3628,7 +3727,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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
@@ -3644,7 +3743,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3659,6 +3758,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Zľava a Margin
 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: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Pol deň
@@ -3679,7 +3779,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +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}."
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
@@ -3687,22 +3787,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Platba URL Message
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Celkom Neplatené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Time Log není zúčtovatelné
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
+DocType: Asset,Asset Category,asset Kategórie
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,Nákupca
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Netto plat nemôže byť záporný
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiál Dodávateľovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Spotrebný Faktúra
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštevnosť
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Krátkodobé závazky
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Krátkodobé závazky
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Skutečné Množství je povinné
@@ -3723,17 +3824,16 @@
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analytika
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žiadne šablóny východisková adresa nájdený. Prosím vytvorte novú z Nastavenie&gt; Tlač a značky&gt; šablóny adresy.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Základný kapitál
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platobná brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby presmerovať užívateľa na vybrané stránky.
@@ -3742,20 +3842,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
+DocType: Asset,Current Value (After Depreciation),Current Value (po odpise)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,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 +408,"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 +413,"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 +13,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 +409, (Half Day),(Pol dňa)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
@@ -3763,6 +3864,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 6d7ac03..ba3463b 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -3,11 +3,11 @@
 DocType: Employee,Divorced,Ločen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +81,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"
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dovoli da se artikel večkrat  doda 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/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
-DocType: Item,Customer Items,Točke strank
+DocType: Item,Customer Items,Artikli stranke
 DocType: Project,Costing and Billing,Obračunavanje stroškov in plačevanja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,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
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Trgovec
 DocType: Employee,Rented,Najemu
 DocType: POS Profile,Applicable for User,Velja za člane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Prikaži odprte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Posodobljeno Uspešno
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Prikaži Variante
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Posojili (obveznosti)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Predstavlja tabela ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Imenovanje
@@ -64,7 +66,7 @@
 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 +642,Invoice,Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Partnerji Sales Komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Kratica ne more imeti več kot 5 znakov
 DocType: Payment Request,Payment Request,Plačilo Zahteva
@@ -101,8 +103,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Employee,Married,Poročen
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ni dovoljeno za {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Dobili predmetov iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Pridobi Artikle iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 DocType: Payment Reconciliation,Reconcile,Uskladitev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
@@ -111,7 +113,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,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 Invoice Item,Sales Invoice Item,Prodaja Račun Postavka
+DocType: Sales Invoice Item,Sales Invoice Item,Artikel na računu
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Napišite Off stroškovni center
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Zaloga Poročila
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
+DocType: Item,Is Fixed Asset,Je osnovno sredstvo
 DocType: Expense Claim Detail,Claim Amount,Trditev Znesek
 DocType: Employee,Mr,gospod
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Vse Kontakt
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} je zamrznjena
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Zaloga Stroški
 DocType: Newsletter,Email Sent?,Email Sent?
 DocType: Journal Entry,Contra Entry,Contra Začetek
 DocType: Production Order Operation,Show Time Logs,Prikaži Čas Dnevniki
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Namestitev Status
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 DocType: BOM Replace Tool,New BOM,New BOM
@@ -196,7 +200,7 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%)
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,iz Vrednost
-DocType: Production Planning Tool,Sales Orders,Prodajni Naročila
+DocType: Production Planning Tool,Sales Orders,Naročila Kupcev
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
 ,Purchase Order Trends,Naročilnica Trendi
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Dodeli liste za leto.
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
 DocType: Naming Series,Series List for this Transaction,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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Vnesite Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Neto denarni tokovi pri financiranju
 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 +217,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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
 ,Contact Name,Kontaktno ime
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 DocType: Payment Tool,Reference No,Referenčna številka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,bančni vnosi
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Material Zahteva
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}"
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Nadzor obvestilo
 DocType: Lead,Suggestions,Predlogi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Postavka proračuni Skupina pametno na tem ozemlju. Lahko tudi sezonske z nastavitvijo Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vnesite matično skupino računa za skladišče {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Vnesite matično skupino računa za skladišče {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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"
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Naučite
+DocType: Asset,Next Depreciation Date,Naslednja Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Stroški dejavnost na zaposlenega
 DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Dobavitelj računa ni v računu o nakupu obstaja {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Upravljanje prodaje oseba drevo.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Neporavnani čeki in depoziti želite počistiti
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Napačno geslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici."
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enote [{1}] (# Oblika / točke / {1}) je v [{2}] (# Oblika / skladišča / {2})
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Job profila
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Poročilo o dostavi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Poročilo o dostavi
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavitev Davki
 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 +381,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Prosimo, izberite mesec in leto"
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Skupaj naročite Upoštevani
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljenih za Employee {1} za obdobje {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Izberite Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postavka Inšpekcijski parametrov kakovosti
 DocType: Leave Application,Leave Approver Name,Pustite odobritelju Name
-,Schedule Date,Urnik Datum
+DocType: Depreciation Schedule,Schedule Date,Urnik Datum
 DocType: Packed Item,Packed Item,Pakirani Postavka
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Privzete nastavitve za nakup poslov.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Privzete nastavitve za nakup poslov.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Obstaja Stroški dejavnosti za Employee {0} proti vrsti dejavnosti - {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.,"Prosimo, da ne ustvarjajo računov za kupce in dobavitelje. Ti so ustvarili neposredno od Stranka / dobavitelj mojstrov."
 DocType: Currency Exchange,Currency Exchange,Menjalnica
@@ -346,6 +353,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
 DocType: Workstation,Working Hours,Delovni čas
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščni / trenutno število zaporedno obstoječe serije.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
@@ -363,7 +371,7 @@
 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 +229,Please enter Cost Center,Vnesite stroškovni center
-DocType: Journal Entry Account,Sales Order,Prodajno naročilo
+DocType: Journal Entry Account,Sales Order,Naročilo Kupca
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Avg. Prodajni tečaj
 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
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday gospodar.
-DocType: Material Request Item,Required Date,Zahtevani Datum
+DocType: Request for Quotation 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 +770,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Sporočilo za dobavitelja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol
 DocType: Employee,Health Concerns,Zdravje Zaskrbljenost
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Neplačana
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Upravljanje Podizvajalci
+DocType: Project,Project will be accessible on the website to these users,Projekt bo na voljo na spletni strani teh uporabnikov
 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 +53,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
@@ -446,7 +456,7 @@
 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 transakcije družbe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item
 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
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Pending Kol
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Finančni / računovodstvo leto.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,nakopičene Vrednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Svinec Id
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Dobava: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Plačljivo račun
@@ -481,16 +491,16 @@
 DocType: Job Applicant,Resume Attachment,Nadaljuj Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Prodaja Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Prodaja Return
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,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
+DocType: Authorization Rule,Customer or Item,Stranka ali Artikel
 apps/erpnext/erpnext/config/crm.py +22,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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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."
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Update banka transakcijske Termini
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Update banka transakcijske Termini
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,sledenje čas
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Prosimo, da najprej vnesete Potrdilo o nakupu"
 DocType: Buying Settings,Supplier Naming By,Dobavitelj Imenovanje Z
 DocType: Activity Type,Default Costing Rate,Privzeto Costing Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Vzdrževanje Urnik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Neto sprememba v popisu
 DocType: Employee,Passport Number,Številka potnega lista
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Nastavite Počitniška seznam za bodisi Employee ali družba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Znesek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Pretvarjanje skupini
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Delivered Znesek
 DocType: Supplier,Fixed Days,Fiksni dnevi
 DocType: Quotation Item,Item Balance,Bilančne postavke
 DocType: Sales Invoice,Packing List,Seznam pakiranja
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Naročila dati dobaviteljev.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Naročila dati dobaviteljev.
 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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operacija čas
 DocType: Pricing Rule,Sales Manager,Vodja prodaje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Skupina za skupine
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Moji projekti
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
 DocType: Journal Entry,Bill No,Bill Ne
+DocType: Company,Gain/Loss Account on Asset Disposal,Dobiček / izguba račun o odlaganju sredstev
 DocType: Purchase Invoice,Quarterly,Četrtletno
 DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno
 DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (družba Valuta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Začetek Plačilo je že ustvarjena
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Skupaj obračun letos
 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 +529,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas
 ,Sales Person Target Variance Item Group-Wise,Prodaja Oseba Target Varianca Postavka Group-Wise
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
 DocType: Item Group,Website Specifications,Spletna Specifikacije
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Prišlo je do napake v vašem Naslov predlogo {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nov račun
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nov račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {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.,Vknjižbe se lahko izvede pred listnimi vozlišč. Vpisi zoper skupin niso dovoljeni.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Cenik ni izbrana
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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,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"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Moji računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Moji računi
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Najdenih ni delavec
 DocType: Supplier Quotation,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Pošlji Zdaj
 ,Support Analytics,Podpora Analytics
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Logična napaka: Mora najti prekrivanje
 DocType: Item,Website Warehouse,Spletna stran Skladišče
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manjša od ali enaka 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Zapisi C-Form
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Zapisi C-Form
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kupec in dobavitelj
 DocType: Email Digest,Email Digest Settings,E-pošta Digest Nastavitve
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora poizvedbe strank.
@@ -697,9 +713,9 @@
 DocType: Shopping Cart Settings,Enable Checkout,Omogoči Checkout
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Nakup naročila do plačila
 DocType: Quotation Item,Projected Qty,Predvidoma Kol
-DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum
+DocType: Sales Invoice,Payment Due Date,Datum zapadlosti
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Je v podizvajanje
 DocType: Item Attribute,Item Attribute Values,Postavka Lastnost Vrednote
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Poglej Naročniki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Potrdilo o nakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
 DocType: Employee,Ms,gospa
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Prodajni partnerji in ozemelj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} mora biti aktiven
+DocType: Journal Entry,Depreciation Entry,Amortizacija Začetek
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Košarica
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Nakup Račun
+DocType: Asset,Purchase Invoice,Nakup Račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detail Ne
 DocType: Stock Entry,Total Outgoing Value,Skupaj Odhodni Vrednost
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Pričetek in rok bi moral biti v istem proračunskem letu
@@ -785,38 +802,41 @@
 DocType: Material Request Item,Lead Time Date,Lead Time Datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je obvezna. Mogoče je Menjalni zapis ni ustvarjen za
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Za &quot;izdelek Bundle &#39;predmetov, skladišče, serijska številka in serijska se ne šteje od&quot; seznam vsebine &quot;mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli &quot;izdelek Bundle &#39;postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na&quot; seznam vsebine &quot;mizo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Za &quot;izdelek Bundle &#39;predmetov, skladišče, serijska številka in serijska se ne šteje od&quot; seznam vsebine &quot;mizo. Če so skladišča in serija ni enaka za vso embalažo postavke za kakršno koli &quot;izdelek Bundle &#39;postavko, lahko te vrednosti je treba vnesti v glavnem Element tabele, bodo vrednosti, ki se kopira na&quot; seznam vsebine &quot;mizo."
 DocType: Job Opening,Publish on website,Objavi na spletni strani
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Pošiljke strankam.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Posredna Prihodki
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Nastavite Znesek plačila = neporavnanega zneska
 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 +672,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Izberite Postavka za prenos
 DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Odstotek
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Vrstica {0}: Račun {1} ni veljavna, se lahko prekliče / ne obstaja. \ Vnesite veljaven račun"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 DocType: Workstation,Electricity Cost,Stroški električne energije
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov
 ,Employee Holiday Attendance,Zaposleni Holiday Udeležba
 DocType: Opportunity,Walk In,Vstopiti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Zaloga Vnosi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Zaloga Vnosi
 DocType: Item,Inspection Criteria,Merila Inšpekcijske
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenese
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Poskrbite
-DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Poskrbite
+DocType: Journal Entry,Total Amount in Words,Skupni znesek z besedo
 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 +5,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}
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
 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 +180,Qty for {0},Količina za {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Ali res želite obnoviti ta izločeni sredstva?
+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 +80,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
 DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
 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 +547,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Popust
@@ -853,25 +874,26 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Potrdilo o nakupu Postavka
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodajni Znesek
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Čas Dnevniki
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Čas Dnevniki
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,izločeni
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,zaposlovanje
 DocType: BOM Operation,Operation,Delovanje
 DocType: Lead,Organization Name,Organization Name
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Prodajna Stroški
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,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}
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Naročilo Kupca {0} je {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +300,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
@@ -883,7 +905,7 @@
 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 +18,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Za {0} | {1} {2}
 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
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Privzeta valuta
 DocType: Contact,Enter designation of this Contact,Vnesite poimenovanje te Kontakt
 DocType: Expense Claim,From Employee,Od zaposlenega
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Prispevek%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Projekt Sodelovanje Vabilo
 DocType: Salary Slip,Deductions,Odbitki
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Serija je bila zaračunavajo.
 DocType: Salary Slip,Leave Without Pay,Leave brez plačila
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
 ,Trial Balance for Party,Trial Balance za stranke
 DocType: Lead,Consultant,Svetovalec
 DocType: Salary Slip,Earnings,Zaslužek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Odpiranje Računovodstvo Bilanca
-DocType: Sales Invoice Advance,Sales Invoice Advance,Prodaja Račun Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Nič zahtevati
+DocType: Sales Invoice Advance,Sales Invoice Advance,Avansni račun
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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',"""Dejanski datum začetka"" ne more biti večji od ""dejanskega končnega datuma"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vodstvo
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Vrste dejavnosti za delo in odhodov
@@ -935,18 +958,18 @@
 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;
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Prosim, nastavite e-ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Prosim, nastavite e-ID"
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za 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} ž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/config/buying.py +33,Supplier database.,Dobavitelj baze podatkov.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavitelj baze podatkov.
 DocType: Account,Balance Sheet,Bilanca stanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Davčna in drugi odbitki plače.
 DocType: Lead,Lead,Svinec
 DocType: Email Digest,Payables,Obveznosti
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Počitnice
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-oblika ne velja za računa: {0}
 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
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
 DocType: Contact,User ID,Uporabniško ime
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Ogled Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Ogled Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Plačane dividende
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Plačane dividende
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Znesek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Preneseni čisti poslovni izid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Preneseni čisti poslovni izid
 DocType: BOM Item,Item Description,Postavka Opis
 DocType: Payment Tool,Payment Mode,Način Plačilo
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Začasna Otvoritev
 ,Employee Leave Balance,Zaposleni Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
@@ -1003,13 +1028,13 @@
 DocType: Item,Default Buying Cost Center,Privzeto Center nakupovanje Stroški
 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.","Da bi dobili najboljše iz ERPNext, vam priporočamo, da si vzamete nekaj časa in gledam te posnetke pomoč."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +33,Item {0} must be Sales Item,Postavka {0} mora biti Sales postavka
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,da
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,do
 DocType: Item,Lead Time in days,Svinec čas v dnevih
 ,Accounts Payable Summary,Računi plačljivo Povzetek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Naročilo Kupca {0} ni veljavno
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Majhno
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Glava račun {0} ustvaril
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Skupaj Doseženi
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 apps/erpnext/erpnext/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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Prodajalec Spletna stran
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status proizvodnja Sklep je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status proizvodnja Sklep je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},Ni našla nobenega elementa z imenom {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Spletna stran Element Skupine
 DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
-DocType: Journal Entry,Journal Entry,Vnos v dnevnik
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahteva za ponudbo dobavitelja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema
 DocType: Sales Order,Recurring Upto,Ponavljajoči Upto
 DocType: Attendance,HR Manager,HR Manager
@@ -1082,6 +1109,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Trenutna vrednost po amortizaciji sme biti manjša od enako {0}
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodajte ali odštejemo
 DocType: Company,If Yearly Budget Exceeded (for expense account),Če Letni proračun Presežena (za odhodek račun)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Začetni in končni datum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operacije ne sme ostati prazen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Povprečen Popust
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značilnosti Setup
+DocType: Asset,Depreciation Schedules,Amortizacija Urniki
 DocType: Item,Is Service Item,Je Service Postavka
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija Valuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
 DocType: Item,Will also apply to variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen."
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen."
 DocType: Quotation,Shopping Cart,Nakupovalni voziček
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odhodni
 DocType: Pricing Rule,Campaign,Kampanja
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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 podjetje
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
@@ -1133,8 +1162,8 @@
 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 +472,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ne more biti večja kot 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Davčna pravilo za transakcije.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Davčna pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta preimenovati.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Kupimo ta artikel
 DocType: Address,Billing,Zaračunavanje
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sklope
+DocType: Asset,Asset Name,Ime sredstvo
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Pakiranje listek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Urad za najem
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Pakiranje listek
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Nastavitve Setup SMS gateway
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Zahteva za ponudbo lahko dostopa s klikom na spodnjo povezavo
+DocType: Asset,Number of Months in a Period,Število mesecev v obdobju
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Skupaj ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Skupaj ({0})
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
 DocType: Sales Invoice,Source,Vir
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Prikaži zaprto
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Proračunsko leto Start Date
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Denarni tokovi iz naložbenja
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Item Group,Item Group Name,Item Name Group
 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 +86,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
 DocType: Pricing Rule,For Price List,Za cenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1212,7 +1245,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Vzdrževanje obisk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Vzdrževanje obisk
 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: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Brand gospodar.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Škatla
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Terjatve za račun družbe.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Receipt,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
@@ -1263,36 +1295,37 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno pošlji plačila Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Druga poročila
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
-DocType: Payment Tool Detail,Payment Amount,Plačilo Znesek
+DocType: Payment Tool Detail,Payment Amount,Znesek Plačila
 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 +520,{0} View,{0} Pogled
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto sprememba v gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Plačilo Zahteva že obstaja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Količina ne sme biti več kot {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Prejšnja Proračunsko leto ni zaprt
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Dobavitelj Type gospodar.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Dobavitelj Type gospodar.
 DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
 DocType: Purchase Invoice,Reference Document,referenčni dokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavljen
 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 +203,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% zaračunali
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Neto sprememba obveznosti do dobaviteljev
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Prosimo, preverite svoj email id"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Stranka zahteva za &quot;Customerwise popust&quot;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
 DocType: Quotation,Term Details,Izraz Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večja od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapaciteta Načrtovanje Za (dnevi)
 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.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garancija zahtevek
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,stalni naslov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Izplačano predplačilo proti {0} {1} ne more biti večja \ kot Grand Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Prosimo, izberite postavko kodo"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Prosimo, izberite postavko kodo"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Zmanjšajte Odbitek za dopust brez plačila (md)
 DocType: Territory,Territory Manager,Ozemlje Manager
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (po želji)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Enotni enota točke.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",npr &quot;XYZ National Bank&quot;
+DocType: Asset,Depreciation Method,Metoda amortiziranja
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
 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 +29,Shopping Cart is enabled,Košarica je omogočena
 DocType: Job Applicant,Applicant for a Job,Kandidat za službo
 DocType: Production Plan Material Request,Production Plan Material Request,Proizvodnja Zahteva načrt Material
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Ni Proizvodne Naročila ustvarjena
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ni Proizvodne Naročila ustvarjena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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,Uskladitev JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: 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 +145,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Uskladitev zalog
 DocType: Territory,Territory Name,Territory Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Naslovi
+apps/erpnext/erpnext/hooks.py +91,Addresses,Naslovi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,cenitve
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
 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: 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 +27,Time Logs for manufacturing.,Čas Hlodi za proizvodnjo.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Čas Prijava za naloge.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Plačilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Bundle predmeti v času prodaje.
 DocType: Quotation Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
+DocType: Request for Quotation Supplier,Send Email to Supplier,Pošlji e-pošto na dobavitelja
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 DocType: Packing Slip,To Package No.,Če želite Paket No.
 DocType: Production Planning Tool,Material Requests,Material Zahteve
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče
 DocType: Stock Settings,Allowance Percent,Nadomestilo Odstotek
 DocType: SMS Settings,Message Parameter,Sporočilo Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Drevo centrov finančnih stroškov.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Drevo centrov finančnih stroškov.
 DocType: Serial No,Delivery Document No,Dostava dokument št
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dobili predmetov iz nakupa Prejemki
 DocType: Serial No,Creation Date,Datum nastanka
@@ -1464,7 +1502,7 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavitelj Kotacija Postavka
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda
 DocType: 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/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Za kreiranje Računa kliknite na gumb ""Naredi Račun"""
 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"
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,"Znesek, Deliver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} ustvaril
-DocType: Delivery Note Item,Against Sales Order,Proti Sales Order
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ustvaril
+DocType: Delivery Note Item,Against Sales Order,Za Naročilo Kupca
 ,Serial No Status,Serijska Status Ne
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Postavka miza ne more biti prazno
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Vrstica {0}: nastavi {1} periodičnost, razlika med od do sedaj \ mora biti večja od ali enaka {2}"
 DocType: Pricing Rule,Selling,Prodajanje
 DocType: Employee,Salary Information,Plača Informacije
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Dajatve in davki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Vnesite Referenčni datum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Plačilo Gateway račun ni nastavljen
 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: Production Order,Material Request Item,Material Zahteva Postavka
+DocType: Request for Quotation Item,Material Request Item,Material Zahteva Postavka
 apps/erpnext/erpnext/config/stock.py +85,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
+DocType: Asset,Sold,Prodano
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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 +66,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 +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,dodelitve
 DocType: Quality Inspection Reading,Acceptance Criteria,Merila sprejemljivosti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: Item Group,Show In Website,Pokaži V Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Skupina
@@ -1527,6 +1567,7 @@
 ,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"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Ganttov diagram vseh nalog.
+DocType: Pricing Rule,Margin Type,Margin Type
 DocType: Appraisal,For Employee Name,Za imena zaposlenih
 DocType: Holiday List,Clear Table,Jasno Tabela
 DocType: Features Setup,Brands,Blagovne znamke
@@ -1534,21 +1575,26 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Sredstvo je obvezen pred osnovno sredstvo postavki
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja serije za Udeležba preko Nastavitve&gt; oštevilčevanje Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Par
+DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 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: Asset,Purchase Date,Datum nakupa
 DocType: Employee,Personal Details,Osebne podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Prosim nastavite &quot;Asset Center Amortizacija stroškov&quot; v družbi {0}
 ,Maintenance Schedules,Vzdrževanje Urniki
 ,Quotation Trends,Narekovaj Trendi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
-DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
+DocType: Shipping Rule Condition,Shipping Amount,Znesek Dostave
 ,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
 DocType: Purchase Order,Delivered,Dostavljeno
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Vključi usklajene vnose
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina Non-Group
 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/public/js/setup_wizard.js +272,Unit,Enota
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Prosimo, navedite Company"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Iskanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 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
 DocType: Territory,Classification of Customers by region,Razvrstitev stranke po regijah
 DocType: Project,% Tasks Completed,% Naloge Dopolnil
 DocType: Project,Gross Margin,Gross Margin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Izračunan Izjava bilance banke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogočena uporabnik
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Kotacija
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 DocType: Quotation,Maintenance User,Vzdrževanje Uporabnik
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Stroškovno Posodobljeno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Stroškovno Posodobljeno
 DocType: Employee,Date of Birth,Datum rojstva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Kol
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
+DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Pošiljke
 DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Razni stroški
 DocType: Global Defaults,Default Company,Privzeto Podjetje
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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"
+apps/erpnext/erpnext/controllers/accounts_controller.py +363,"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 +139,User {0} is disabled,Uporabnik {0} je onemogočena
@@ -1643,7 +1689,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Currency Exchange,From Currency,Iz valute
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Sales Order potreben za postavko {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Kol mora biti 1, ko je element povezan s finančnim premoženjem"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Otrok točka ne bi smela biti izdelka Bundle. Odstranite element &#39;{0}&#39; in shranite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bančništvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,New Center Stroški
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pojdite v ustrezno skupino (običajno Vir skladov&gt; kratkoročnimi obveznostmi&gt; davkov in dajatev ter ustvariti nov račun (s klikom na Dodaj otroka) tipa &quot;davek&quot; in ne omenja davčna stopnja.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,New Center Stroški
 DocType: Bin,Ordered Quantity,Naročeno Količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
 DocType: Quality Inspection,In Process,V postopku
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Čas Dnevniki ustvaril:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Čas Dnevniki ustvaril:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
 DocType: Employee,Blood Group,Blood Group
@@ -1691,13 +1738,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu"
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Bremenitev je potrebno
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
 DocType: Offer Letter Term,Offer Term,Ponudba Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Job Otvoritev
 DocType: Payment Reconciliation,Payment Reconciliation,Uskladitev plačil
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponujamo Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo.
@@ -1705,22 +1752,22 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Seznam Cena {0} je onemogočena
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Seznam Cena {0} je onemogočena
 DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Trenutni tečaj Vrednotenje
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
 DocType: Opportunity,Lost Reason,Lost Razlog
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ne plača slip najti za mesec:
 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 +175,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Vaše stranke
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Prijavi se zdaj
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Prijavi se zdaj
 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."
@@ -1746,7 +1794,7 @@
 DocType: SMS Log,Sender Name,Sender Name
 DocType: POS Profile,[Select],[Izberite]
 DocType: SMS Log,Sent To,Poslano
-DocType: Payment Request,Make Sales Invoice,Naredite prodajni fakturi
+DocType: Payment Request,Make Sales Invoice,Naredi račun
 DocType: Company,For Reference Only.,Samo za referenco.
 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
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Podatki o zaposlitvi
 DocType: Employee,New Workplace,Novo delovno mesto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Nastavi kot Zaprto
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ne Postavka s črtno kodo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ne Postavka s črtno kodo {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Primer št ne more biti 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,"Če imate prodajno ekipo in prodaja Partners (kanal partnerji), se jih lahko označili in vzdržuje svoj prispevek v dejavnosti prodaje"
 DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Prenos Material
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Postavka {0} mora biti Sales postavka v {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Uvoz Email Od
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Povabi kot uporabnik
 DocType: Features Setup,After Sale Installations,Po prodajo naprav
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},"Prosim, nastavite {0} v družbi {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} je v celoti zaračunali
 DocType: Workstation Working Hour,End Time,Končni čas
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni pogodbeni pogoji za prodajo ali nakup.
@@ -1805,14 +1854,14 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/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/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Vrednost kupljenih artiklov
+DocType: Selling Settings,Sales Order Required,Zahtevano je Naročilo Kupca
 DocType: Purchase Invoice,Credit To,Kredit
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Aktivne vodi / Stranke
 DocType: Employee Education,Post Graduate,Post Graduate
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Plačilo računa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,Accepted,Sprejeto
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"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."
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Surovine ne more biti prazno.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Hitro Journal Entry
 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čino
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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 +214,{0} {1} is not submitted,{0} {1} ni predložena
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} je zaprt
 DocType: Email Digest,How frequently?,Kako pogosto?
 DocType: Purchase Receipt,Get Current Stock,Pridobite trenutne zaloge
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdite v ustrezno skupino (običajno uporabo sredstev&gt; obratnih sredstev&gt; bančnih računov in ustvariti nov račun (s klikom na Dodaj otroka) tipa &quot;banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drevo Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
 DocType: Production Order,Actual End Date,Dejanski končni datum
 DocType: Authorization Rule,Applicable To (Role),Ki se uporabljajo za (vloga)
 DocType: Stock Entry,Purpose,Namen
+DocType: Company,Fixed Asset Depreciation Settings,Osnovno sredstvo Nastavitve amortizacije
 DocType: Item,Will also apply for variants unless overrridden,Bo veljalo tudi za variante razen overrridden
 DocType: Purchase Invoice,Advances,Predplačila
 DocType: Production Order,Manufacture against Material Request,Izdelava proti Material zahtevo
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
 DocType: Campaign,Campaign-.####,Akcija -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Količina
-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}
+DocType: Asset Category Account,Asset Category Account,Sredstvo Kategorija račun
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","npr Bank, gotovini, Kreditna kartica"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdite v ustrezno skupino (običajno uporabo sredstev&gt; obratnih sredstev&gt; bančnih računov in ustvariti nov račun (s klikom na Dodaj otroka) tipa &quot;banka&quot;
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moji Naslovi
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organizacija podružnica gospodar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Noben zaposleni za zgoraj izbranih kriterijih ALI plačilnega lista že ustvarili
@@ -1972,7 +2024,7 @@
 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 +200,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;"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,izplačane plače
 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"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci
 DocType: Account,Income Account,Prihodki račun
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Zamudne Naslov Predloga našel. Ustvarite novo od Setup&gt; Printing in Branding&gt; Naslov predlogo.
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Upravljanje skupine kupcev drevo.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,New Stroški Center Ime
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
 DocType: Appraisal,HR User,HR Uporabnik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Davki in dajatve Odbitek
-apps/erpnext/erpnext/config/support.py +7,Issues,Vprašanja
+apps/erpnext/erpnext/hooks.py +90,Issues,Vprašanja
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti eden od {0}
 DocType: Sales Invoice,Debit To,Bremenitev
 DocType: Delivery Note,Required only for sample item.,Zahteva le za točko vzorca.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} je onemogočena
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Izkaz poslovnega izida
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
 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 +139,Please mention no of visits required,Navedite ni obiskov zahtevanih
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
 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 +142,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
@@ -2077,7 +2131,7 @@
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
 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)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Zaračunavanje (Račun)
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Neporavnani znesek
 DocType: Project Task,Working,Delovna
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
@@ -2092,20 +2146,21 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Zahteval
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Ni Opombe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,"Osnovno sredstvo točka mora biti postavka, non-stock"
 DocType: Supplier Quotation Item,Material Request No,Material Zahteva Ne
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,Upravljanje Territory drevo.
-DocType: Journal Entry Account,Sales Invoice,Prodaja Račun
+DocType: Journal Entry Account,Sales Invoice,Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Sales Invoice Item,Time Log Batch,Čas Log Serija
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +442,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
@@ -2119,7 +2174,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
 DocType: Payment Request,Recipient and Message,Prejemnika in sporočilo
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Zahteva za ponudbo.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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: 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 +294,Price List Currency not selected,Cenik Valuta ni izbran
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Proti dokument št
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Upravljanje prodajne partnerje.
 DocType: Quality Inspection,Inspection Type,Inšpekcijski Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Prosimo, izberite {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,neoznačena in postrežbo
@@ -2183,6 +2239,7 @@
 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
+DocType: Asset Category Account,Depreciation Expense Account,Amortizacija račun
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potrjen
 DocType: Payment Gateway,Gateway,Gateway
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Vnesite lajšanje datum.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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"
@@ -2210,18 +2267,19 @@
 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 +91,Unable to find exchange rate for {0} to {1},Ne morejo najti menjalni tečaj za {0} do {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Ne morejo najti menjalni tečaj za {0} do {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Day Half
 DocType: Sales Invoice,Sales Team,Sales Team
 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 +410,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serijska št {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Skladišče stranka (po želji)
 DocType: Pricing Rule,Discount Percentage,Popust Odstotek
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
@@ -2247,14 +2305,16 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla
 DocType: GL Entry,Voucher No,Voucher ni
 DocType: Leave Allocation,Leave Allocation,Pustite Dodelitev
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Material Zahteve {0} ustvarjene
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Material Zahteve {0} ustvarjene
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Predloga izrazov ali pogodbe.
 DocType: Purchase Invoice,Address and Contact,Naslov in Stik
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Bilančni Amortizacija račun
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
+DocType: Asset,Expected Value After Useful Life,Pričakovana vrednost Po Koristne življenja
 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
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} je odpovedan ali zaprt
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Čisti denarni tok iz naložbenja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root račun ni mogoče izbrisati
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Sredstvo {0} je treba predložiti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Upravljanje naslovov
-DocType: Pricing Rule,Item Code,Oznaka
+DocType: Asset,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve
 DocType: Employee Education,School/University,Šola / univerza
 DocType: Payment Request,Reference Details,Referenčna Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
 DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse
 ,Billed Amount,Zaračunavajo Znesek
+DocType: Asset,Double Declining Balance,Double Upadanje Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,Zaprta naročila ni mogoče preklicati. Unclose za preklic.
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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',"""Od datuma"" mora biti kasnejši od 'Do Datum '"
+DocType: Asset,Fully Depreciated,celoti amortizirana
 ,Stock Projected Qty,Stock Predvidena Količina
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markirana Udeležba HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Serijska številka in serije
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Retailer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Onemogoči V besed
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Bančnem računu računa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Secured Posojila
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosim, nastavite račune, povezane Amortizacija v sredstvih kategoriji {0} ali družbe {1}"
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Otvoritev Balance Equity
 DocType: Appraisal,Appraisal,Cenitev
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},E-pošta poslana dobavitelju {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponovi
 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 +187,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
@@ -2344,7 +2410,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk Import Pomoč
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Izberite Količina
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Izberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Odobritvi vloge ne more biti enaka kot vloga je pravilo, ki veljajo za"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sporočilo je bilo poslano
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Skupaj Margin
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
 DocType: Expense Claim,Approval Status,Stanje odobritve
 DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka
 DocType: Payment Gateway Account,Default Payment Request Message,Privzeto Plačilo Zahteva Sporočilo
 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/config/accounts.py +118,Banking and Payments,Bančništvo in plačila
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bančništvo in plačila
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Issue,Opening Date,Otvoritev Datum
 DocType: Journal Entry,Remark,Pripomba
 DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Listi in Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek
 DocType: Time Log,Batched for Billing,Posodi za plačevanja
@@ -2419,15 +2486,17 @@
 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 +53,"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"
-DocType: Sales Order Item,Sales Order Date,Sales Order Date
+DocType: Company,Asset Depreciation Cost Center,Asset Center Amortizacija Stroški
+DocType: Sales Order Item,Sales Order Date,Datum Naročila Kupca
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Nakup Datum sredstva {0} ne ujema z datumom nakupa računa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Začetek
 DocType: Account,Payable,Plačljivo
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Dolžniki ({0})
-DocType: Project,Margin,Margin
+DocType: Pricing Rule,Margin,Margin
 DocType: Salary Slip,Arrear Amount,Arrear Znesek
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto dobiček %
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum
 DocType: Newsletter,Newsletter List,Newsletter Seznam
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Preverite, če želite poslati plačilni list v pošti na vsakega zaposlenega, medtem ko predložitev plačilni list"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
 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 +57,Where manufacturing operations are carried.,Kjer so proizvodni postopki.
 DocType: Stock Entry Detail,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
 DocType: Employee,Confirmation Date,Potrditev Datum
 DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek
 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: Account,Accumulated Depreciation,Bilančni Amortizacija
 DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
 DocType: Payment Request,Email To,E-mail:
 DocType: Lead,Lead Owner,Svinec lastnika
 DocType: Bin,Requested Quantity,Zahtevana količina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Je potrebno skladišče
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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."
@@ -2456,11 +2528,12 @@
 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 +115,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/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Delivered
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Enako dobavitelj je bila vpisana večkrat
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nakup Sklep Postavka Priložena
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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."
 DocType: Payment Request,Payment Details,Podatki o plačilu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+DocType: Asset,Journal Entry for Scrap,Journal Entry za pretep
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Evidenca vseh komunikacij tipa elektronski pošti, telefonu, klepet, obisk, itd"
 DocType: Manufacturer,Manufacturers used in Items,"Proizvajalci, ki se uporabljajo v postavkah"
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Ustvari novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Stopnja: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plača Slip Odbitek
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Izberite skupino vozlišče prvi.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Izberite skupino vozlišče prvi.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenih in postrežbo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Cilj mora biti eden od {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odstrani sklic dobavitelj, prodajni partner in svinca, saj je vaše podjetje naslov"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Od {1}
 DocType: Task,depends_on,odvisno od
 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 +207,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"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Naslednji datum mora biti večja od Napotitev Datum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Prikaži davek break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ni na zalogi
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Naslednji datum mora biti večja od Napotitev Datum
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/accounts/party.py +289,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz in izvoz podatkov
 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
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
@@ -2566,7 +2641,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
@@ -2575,19 +2650,20 @@
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
+DocType: Asset Category Account,Fixed Asset Account,Fiksna račun premoženja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bančništvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
-DocType: Purchase Invoice Item,Rate,Stopnja
+DocType: Purchase Invoice Item,Rate,Vrednost
 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/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Plača Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
 DocType: Hub Settings,Access Token,Dostopni žeton
 DocType: Sales Invoice Item,Serial No,Zaporedna številka
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
-DocType: Item,Is Fixed Asset Item,Je osnovno sredstvo Item
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,Tiskanje jezik
 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"
+DocType: Asset,Number of Depreciations,Število amortizacije
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Zahteva za Citati
 DocType: Payment Reconciliation,Maximum Invoice Amount,Največja Znesek računa
 DocType: Purchase Invoice Item,Image View,Image View
 apps/erpnext/erpnext/config/selling.py +23,Customers,stranke
+DocType: Asset,Partially Depreciated,delno amortiziranih
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Vzdrževanje Manager
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Skupaj ne more biti nič
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dnevi od zadnjega naročila"" mora biti večji ali enak nič"
-DocType: C-Form,Amended From,Spremenjeni Od
+DocType: Asset,Amended From,Spremenjeni Od
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2654,28 +2732,29 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Navedite &quot;dobiček / izguba račun pri odtujitvi sredstev&quot; v družbi
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match plačila z računov
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match plačila z računov
 DocType: Journal Entry,Bank Entry,Banka Začetek
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Dodaj v voziček
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Skupina S
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Omogoči / onemogoči valute.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Omogoči / onemogoči valute.
 DocType: Production Planning Tool,Get Material Request,Get Zahteva material
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Poštni stroški
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Skupaj Present
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,računovodski izkazi
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,računovodski izkazi
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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/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/hr/doctype/leave_application/leave_application.py +112,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 +353,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,All these items have already been invoiced,Vsi ti artikli so že bili obračunani
 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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Job Naslov
 DocType: Features Setup,Item Groups in Details,Postavka Skupine v Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Začetek Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic.
 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 +169,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 +171,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: Item,Website Description,Spletna stran Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Neto sprememba v kapitalu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
 ,Sales Register,Prodaja Register
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Napaka: {0}&gt; {1}
 DocType: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Pridobite Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Vnesite Napišite Off račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Pridobi Artikle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Vnesite Napišite Off račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnja Datum naročila
 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: C-Form,C-Form,C-Form
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Naredite Journal Entry
 DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Commercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Napaka: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Vse izdelke ali storitve.
 DocType: Supplier Quotation,Supplier Address,Dobavitelj Naslov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
 DocType: Tax Rule,Billing State,Država za zaračunavanje
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Prenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Prenos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Datum zapadlosti je obvezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Setup Series
@@ -2765,20 +2846,22 @@
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Pošlji Dobavitelj e-pošte
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Namestitev rekord Serial No.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Čas Prijava je bila zaračunali
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Poimenovanje Series za {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series"
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Začasna dobiček / izguba (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Prosim, nastavite privzeto vrednost {0} v družbi {1}"
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja serije za Udeležba preko Nastavitve&gt; oštevilčevanje Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+DocType: Asset,Straight Line,Ravna črta
+DocType: Project User,Project User,projekt Uporabnik
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'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: Features Setup,Sales Discounts,Prodajna Popusti
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Dodaj Child
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Otvoritev Vrednost
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisija za prodajo
 DocType: Offer Letter Term,Value / Description,Vrednost / Opis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
 DocType: Tax Rule,Billing Country,Zaračunavanje Država
 ,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 +127,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/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 +189,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Stroški
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Račun {0} je potrebno preklicati pred preklicom tega prodajnega naročila
 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 +60,Applications for leave.,Vloge za dopust.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Pravni stroški
 DocType: Sales Invoice,Posting Time,Napotitev čas
 DocType: Sales Order,% Amount Billed,% Zaračunani znesek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefonske Stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefonske Stroški
 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.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ne Postavka s serijsko št {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ne Postavka s serijsko št {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Odprte Obvestila
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Neposredni stroški
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Neposredni stroški
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} je neveljaven e-poštni naslov v &quot;Obvestilo \ e-poštni naslov&quot;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Prodamo ta artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavitelj Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Količina mora biti večja od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Količina mora biti večja od 0
 DocType: Journal Entry,Cash Entry,Cash Začetek
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Vrsta listov kot priložnostno, bolni itd"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Dobavitelj sredstva {0} ne ujema z dobaviteljem pri nakupu računa
 DocType: Newsletter,Test Email Id,Testna Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Plača predlogo gospodar.
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,valuta za zaračunavanje mora biti enaka valuti vsake od privzetega comapany je ali payble valuto računa stranke
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Če onemogočiti, &quot;z besedami&quot; polja ne bo vidna v vsakem poslu"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Serija je bila preklicana.
 ,Reqd By Date,Reqd po Datum
 DocType: Salary Slip Earning,Salary Slip Earning,Plača Slip zaslužka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Upniki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Upniki
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Vrstica # {0}: Zaporedna številka je obvezna
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna Detail
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Iz svinca
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
-DocType: Project,Project Name,Ime projekta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} za račun {1}
+DocType: Request for Quotation Item,Project Name,Ime projekta
 DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
 DocType: Features Setup,Item Batch Nos,Postavka Serija Nos
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,Končni datum
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Zaloga Transakcije
 DocType: Employee,Internal Work History,Notranji Delo Zgodovina
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Bilančni Amortizacija Znesek
 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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Podjetje je obvezna, saj je vaše podjetje naslov"
 DocType: Item Attribute,From Range,Od Območje
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Postavka {0} prezrta, ker ne gre za element parka"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo.
 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.","Da ne uporabljajo Cenovno pravilo v posameznem poslu, bi morali vsi, ki se uporabljajo pravila za oblikovanje cen so onemogočeni."
 DocType: Company,Domain,Domena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Datum dostave
 DocType: Opportunity,Opportunity Date,Priložnost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vrni Proti Potrdilo o nakupu
+DocType: Request for Quotation Item,Request for Quotation Item,Zahteva za ponudbo točki
 DocType: Purchase Order,To Bill,Billu
 DocType: Material Request,% Ordered,% Ž
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akord
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno
 DocType: Accounts Settings,Accounts Settings,Računi Nastavitve
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Prosim nastavite &quot;Račun Odstranjevanje sredstev&quot; v družbi {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Naprav in strojev
 DocType: Sales Partner,Partner's Website,Spletna stran partnerja
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Začasni računi
 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
@@ -3027,22 +3117,23 @@
 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/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,"Kliknite tukaj, za plačilo"
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Za plačilo kliknite tukaj
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Sredstvo {0} ne more biti izločeni, saj je že {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsoten
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Sales Order {0} ni predložila
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Dodaj predmetov iz
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Naročilo Kupca {0} ni predloženo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Dodaj artikle iz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2}
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Naloga ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",npr &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladišče {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3051,12 +3142,13 @@
 DocType: Project,Customer Details,Podrobnosti strank
 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
+DocType: Sales Invoice,Paid Amount,Znesek Plačila
 ,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 +16,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 +113,"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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,Točka {0} je bila onemogočena
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Gateway račune.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Gateway račune.
 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
 ,Cash Flow,Denarni tok
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
 DocType: Authorization Rule,Customer / Item Name,Stranka / Item Name
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Prosimo, navedite iz / v razponu"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj Serijska št
 apps/erpnext/erpnext/config/support.py +43,Warranty,garancija
 DocType: Production Order,Warehouses,Skladišča
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print in Stacionarna
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print in Stacionarna
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Skupina Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,"Posodobitev končnih izdelkov,"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,"Posodobitev končnih izdelkov,"
 DocType: Workstation,per hour,na uro
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 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."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Plačani znesek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Velja za podjetja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
 DocType: Purchase Invoice,In Words,V besedi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Danes je {0} &#39;s rojstni dan!
 DocType: Production Planning Tool,Material Request For Warehouse,Material Zahteva za skladišča
@@ -3153,19 +3244,21 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,pridruži se
 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 +564,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Salary Slip,Salary Slip,Plača listek
+DocType: Pricing Rule,Margin Rate or Amount,Razlika v stopnji ali količini
 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: Sales Invoice Item,Sales Order Item,Naročilo Kupca Artikel
 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
 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 +782,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencialne možnosti za prodajo.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Neveljavna {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Poimenovanje Series za {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Veleblagovnice
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
 DocType: Company,Change Abbreviation,Spremeni Kratica
 DocType: Expense Claim Detail,Expense Date,Expense Datum
@@ -3198,14 +3290,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Glavna knjiga
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Poglej Interesenti
 DocType: Item Attribute Value,Attribute Value,Vrednosti atributa
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id mora biti edinstven, že obstaja za {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email id mora biti edinstven, že obstaja za {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {0}
 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>
@@ -3226,23 +3319,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
 ,Project wise Stock Tracking,Projekt pametno Stock Tracking
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Dejanska Količina (pri viru / cilju)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidence zaposlenih.
 DocType: Payment Gateway,Payment Gateway,Plačilo Gateway
 DocType: HR Settings,Payroll Settings,Nastavitve plače
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Naročiti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root ne more imeti matična stroškovno mesto v
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Izberi znamko ...
 DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Skladišče je obvezna
 DocType: Supplier,Address and Contacts,Naslov in kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transakcijski valuta mora biti enaka kot vplačilo valuto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Prejeti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Predloži na ustvarjanje
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 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 +137,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Moja naročila
@@ -3288,7 +3381,7 @@
 DocType: Industry Type,Industry Type,Industrija Type
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Nekaj je šlo narobe!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,Račun {0} je že bil predložen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Poslovno leto {0} ne obstaja
 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)
@@ -3296,10 +3389,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale profila
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Nezavarovana posojila
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
 DocType: Maintenance Schedule Detail,Scheduled Date,Načrtovano Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Total Paid Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Vaše Dobavitelji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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."
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Šifra dela dobavitelj
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Od {0} za {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite neusklajene vnose
 DocType: Payment Reconciliation,From Invoice Date,Od Datum računa
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Projektna dejavnost / naloga.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ustvarjajo plače kombineže
 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: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,"Leto datum začetka oziroma prenehanja se prekrivajo z {0}. Da bi se izognili prosim, da podjetje"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0}
 DocType: 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.","Primer:. ABCD ##### Če je serija nastavljen in serijska številka ni navedena v transakcijah, se bo ustvaril nato samodejno serijska številka, ki temelji na tej seriji. Če ste si vedno želeli izrecno omeniti Serial številk za to postavko. pustite prazno."
 DocType: Upload Attendance,Upload Attendance,Naloži Udeležba
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Prodajna Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Postavitev Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Vnesite privzeto valuto v podjetju Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Začetek Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dnevni opomniki
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Ime računa
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,odstotek
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Postavka {0} mora biti Sales postavka
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 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 +385,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Proti Expense račun
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pojdite v ustrezno skupino (običajno Vir skladov&gt; kratkoročnimi obveznostmi&gt; davkov in dajatev ter ustvariti nov račun (s klikom na Dodaj otroka) tipa &quot;davek&quot; in ne omenja davčna stopnja.
 DocType: Production Order,Production Order,Proizvodnja naročilo
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
 DocType: Quotation Item,Against Docname,Proti Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Uspešno usklajeno
 DocType: Production Order,Planned End Date,Načrtovan End Date
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Če so predmeti shranjeni.
 DocType: Tax Rule,Validity,Veljavnost
+DocType: Request for Quotation,Supplier Detail,Dobavitelj Podrobnosti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Obračunani znesek
 DocType: Attendance,Attendance,Udeležba
 apps/erpnext/erpnext/config/projects.py +55,Reports,poročila
 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 +508,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Davčna predlogo za nakup transakcij.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Davčna predlogo za nakup transakcij.
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativni stroški
 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 +455,Change,Spremeni
@@ -3486,24 +3584,25 @@
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Sredstvo Kategorija Ime
 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
+DocType: Delivery Note Item,Against Sales Invoice,Za račun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,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 +559,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Serija
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Prodaja oseba
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Proračun in Center Stroški
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Proračun in Center Stroški
 DocType: Maintenance Schedule Item,Half Yearly,Polletne
 DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Ustvarite pravila za omejitev transakcije, ki temeljijo na vrednotah."
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Nakup Splošno
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Računi zbrana strankam.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Matično račun
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
 DocType: Address,Office,Pisarna
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Popust in Margin
 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: Deduction Type,Deduction Type,Vrsta Odbitka
 DocType: Attendance,Half Day,Poldnevni
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
 DocType: BOM Operation,BOM Operation,BOM Delovanje
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Plačilo URL Sporočilo
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Skupaj Neplačana
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Čas Log ni plačljivih
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
+DocType: Asset,Asset Category,sredstvo Kategorija
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material za dobavitelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Trošarina Račun
 DocType: Expense Claim,Employees Email Id,Zaposleni Email Id
 DocType: Employee Attendance Tool,Marked Attendance,markirana Udeležba
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kratkoročne obveznosti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kratkoročne obveznosti
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Dejanska Količina je obvezna
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Priložite Logo
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacije blok dopustu oddelka.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je Prazna
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Zamudne Naslov Predloga našel. Ustvarite novo od Setup&gt; Printing in Branding&gt; Naslov predlogo.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Osnovni kapital
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Plačilo Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po zaključku plačila preusmeri uporabnika na izbrano stran.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
+DocType: Asset,Current Value (After Depreciation),Trenutna vrednost (po amortizaciji)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}"
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Dobili predmetov iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,Get Items from BOM,Pridobi Artikle iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Kosovnica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Račun {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Račun {0} ne obstaja
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 133b131..32139d0 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Tregtar
 DocType: Employee,Rented,Me qira
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi të setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
 DocType: Purchase Order,Customer Contact,Customer Contact
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Trego të hapur
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Përditësuar sukses
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,New Pushimi Aplikimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Shfaq Variantet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Sasi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredi (obligimeve)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Llogaritë tabelë nuk mund të jetë bosh.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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ë
 DocType: Designation,Designation,Përcaktim
@@ -64,7 +66,7 @@
 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 +642,Invoice,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Shitjet Partnerët Komisioni
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Shkurtesa nuk mund të ketë më shumë se 5 karaktere
 DocType: Payment Request,Payment Request,Kërkesë Pagesa
@@ -102,7 +104,7 @@
 DocType: Employee,Married,I martuar
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nuk lejohet për {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Të marrë sendet nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Identifikohu Aktiviteti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutike
+DocType: Item,Is Fixed Asset,Është i aseteve fikse
 DocType: Expense Claim Detail,Claim Amount,Shuma Claim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
@@ -156,7 +159,8 @@
 DocType: SMS Center,All Contact,Të gjitha Kontakt
 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
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} është e ngrirë
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Shpenzimet
 DocType: Newsletter,Email Sent?,Email dërguar?
 DocType: Journal Entry,Contra Entry,Contra Hyrja
 DocType: Production Order Operation,Show Time Logs,Shfaq Koha Shkrime
@@ -164,12 +168,12 @@
 DocType: Delivery Note,Installation Status,Instalimi Statusi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Item {0} duhet të jetë një Item Blerje
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Bom i ri
@@ -208,11 +212,11 @@
 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 +79,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Ju lutemi shkruani Company
@@ -221,7 +225,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Paraja neto nga Financimi
 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 +217,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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
 ,Contact Name,Kontakt Emri
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Krijon shqip pagave për kriteret e përmendura më sipër.
@@ -235,8 +239,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 DocType: Payment Tool,Reference No,Referenca Asnjë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Banka Entries
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
@@ -248,8 +252,8 @@
 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 +592,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +268,7 @@
 DocType: Notification Control,Notification Control,Kontrolli Njoftim
 DocType: Lead,Suggestions,Sugjerime
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item buxhetet Grupi-i mençur në këtë territor. Ju gjithashtu mund të përfshijë sezonalitetin duke vendosur të Shpërndarjes.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ju lutemi shkruani grup llogari prind për depo {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Ju lutemi shkruani grup llogari prind për depo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
@@ -275,29 +279,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,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
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Mëso
+DocType: Asset,Next Depreciation Date,Zhvlerësimi Data Next
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteti Kosto për punonjës
 DocType: Accounts Settings,Settings for Accounts,Cilësimet për Llogaritë
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Furnizuesi Fatura Nuk ekziston në Blerje Faturë {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Manage shitjes person Tree.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Çeqet e papaguara dhe Depozitat për të pastruar
 DocType: Item,Synced With Hub,Synced Me Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Gabuar Fjalëkalimi
 DocType: Item,Variant Of,Variant i
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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: 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.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} njësitë e [{1}] (# Forma / Item / {1}) gjenden në [{2}] (# Forma / Magazina / {2})
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profile Job
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Ofrimit Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Ofrimit Shënim
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ngritja Tatimet
 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 +381,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
@@ -308,12 +315,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Rendit Gjithsej konsideruar
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Zgjidh Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
@@ -335,9 +342,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Cilësia Inspektimi Parametri
 DocType: Leave Application,Leave Approver Name,Lini Emri aprovuesi
-,Schedule Date,Orari Data
+DocType: Depreciation Schedule,Schedule Date,Orari Data
 DocType: Packed Item,Packed Item,Item mbushur
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Default settings për blerjen e transaksioneve.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Default settings për blerjen e transaksioneve.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Kosto Aktiviteti ekziston për punonjësit {0} kundër Aktivizimi Tipi - {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.,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
@@ -346,6 +353,7 @@
 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"
+DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
 DocType: Workstation,Working Hours,Orari i punës
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
@@ -386,15 +394,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
-DocType: Material Request Item,Required Date,Data e nevojshme
+DocType: Request for Quotation Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
+DocType: Request for Quotation,Message for Supplier,Mesazh për Furnizuesin
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gjithsej Qty
 DocType: Employee,Health Concerns,Shqetësimet shëndetësore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,I papaguar
@@ -416,17 +425,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -435,6 +444,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Menaxhimi Nënkontraktimi
+DocType: Project,Project will be accessible on the website to these users,Projekti do të jetë në dispozicion në faqen e internetit të këtyre përdoruesve
 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 +53,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
@@ -446,7 +456,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Rritja nuk mund të jetë 0
 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 +86,Item {0} is not Purchase Item,Item {0} nuk është Blerje Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Item {0} nuk është Blerje Item
 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ë
@@ -457,7 +467,7 @@
 DocType: Production Plan Item,Pending Qty,Në pritje Qty
 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 +126,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 +127,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
@@ -467,13 +477,13 @@
 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 +126,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 +230,Financial / accounting year.,Financiare / vit kontabilitetit.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Vlerat e akumuluara
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Dorëzuar: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Llogaria e pagueshme
@@ -481,7 +491,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Shitjet Kthehu
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,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.
@@ -490,7 +500,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +510,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Datat e transaksionit Update Banka
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Datat e transaksionit Update Banka
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Koha Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
@@ -518,27 +528,27 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Ju lutemi shkruani vërtetim Blerje parë
 DocType: Buying Settings,Supplier Naming By,Furnizuesi Emërtimi By
 DocType: Activity Type,Default Costing Rate,Default kushton Vlerësoni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Mirëmbajtja Orari
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Ndryshimi neto në Inventarin
 DocType: Employee,Passport Number,Pasaporta Numri
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menaxher
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Ju lutemi të vendosur një Listë pushime për ose punonjësit ose kompanisë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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
+DocType: Depreciation Schedule,Depreciation Amount,Amortizimi Shuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Convert të Grupit
 DocType: Activity Cost,Activity Type,Aktiviteti Type
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Shuma Dorëzuar
 DocType: Supplier,Fixed Days,Ditët fikse
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Lista paketim
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Blerje Urdhërat jepet Furnizuesit.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Blerje Urdhërat jepet Furnizuesit.
 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
@@ -553,8 +563,10 @@
 DocType: BOM Operation,Operation Time,Operacioni Koha
 DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Grupi në grup
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Projektet e mia
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
 DocType: Journal Entry,Bill No,Bill Asnjë
+DocType: Company,Gain/Loss Account on Asset Disposal,Llogaria Gain / Humbja në hedhjen e Aseteve
 DocType: Purchase Invoice,Quarterly,Tremujor
 DocType: Selling Settings,Delivery Note Required,Ofrimit Shënim kërkuar
 DocType: Sales Order Item,Basic Rate (Company Currency),Norma bazë (Kompania Valuta)
@@ -566,13 +578,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Pagesa Hyrja është krijuar tashmë
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Gjithsej faturimit këtë vit
 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 +529,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -595,6 +608,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{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 +155,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: Production Order Operation,Planned End Time,Planifikuar Fundi Koha
 ,Sales Person Target Variance Item Group-Wise,Sales Person i synuar Varianca Item Grupi i urti
@@ -609,14 +623,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Deklarata mujore e pagave.
 DocType: Item Group,Website Specifications,Specifikimet Website
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Ka një gabim në Stampa tuaj Adresa {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Llogaria e Re
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Llogaria e Re
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {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.,Hyrjet e kontabilitetit mund të bëhet kundër nyjet fletë. Entries kundër grupeve nuk janë të lejuara.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -645,17 +659,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Lista e Çmimeve nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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ë"
@@ -663,7 +677,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Faturat e mia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Faturat e mia
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Asnjë punonjës gjetur
 DocType: Supplier Quotation,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
@@ -672,10 +687,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Ngarko ekuilibër aksioneve nëpërmjet CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Dërgo Tani
 ,Support Analytics,Analytics Mbështetje
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,gabim logjik: Duhet të gjeni mbivendosje
 DocType: Item,Website Warehouse,Website Magazina
 DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultati duhet të jetë më pak se ose e barabartë me 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Të dhënat C-Forma
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Të dhënat C-Forma
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Customer dhe Furnizues
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Mbështetje pyetje nga konsumatorët.
@@ -699,7 +715,7 @@
 DocType: Quotation 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 +240,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 +227,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
@@ -736,14 +752,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Është nënkontraktuar
 DocType: Item Attribute,Item Attribute Values,Vlerat Item ia atribuojnë
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Shiko Subscribers
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Pranimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Sales Partners dhe Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+DocType: Journal Entry,Depreciation Entry,Zhvlerësimi Hyrja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Shporta
 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
@@ -762,7 +779,7 @@
 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 +524,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +789,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Blerje Faturë
+DocType: Asset,Purchase Invoice,Blerje Faturë
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Asnjë
 DocType: Stock Entry,Total Outgoing Value,Vlera Totale largohet
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Hapja Data dhe Data e mbylljes duhet të jetë brenda të njëjtit vit fiskal
@@ -785,21 +802,24 @@
 DocType: Material Request Item,Lead Time Date,Lead Data Koha
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Për sendet e &#39;Produkt Bundle&#39;, depo, pa serial dhe Serisë Nuk do të konsiderohet nga &#39;Paketimi listë&#39; tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send &#39;produkt Bundle&#39;, këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në &#39;Paketimi listë&#39; tryezë."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Për sendet e &#39;Produkt Bundle&#39;, depo, pa serial dhe Serisë Nuk do të konsiderohet nga &#39;Paketimi listë&#39; tryezë. Nëse Magazina dhe Serisë Nuk janë të njëjta për të gjitha sendet e paketimit për çdo send &#39;produkt Bundle&#39;, këto vlera mund të futen në tabelën kryesore Item, vlerat do të kopjohet në &#39;Paketimi listë&#39; tryezë."
 DocType: Job Opening,Publish on website,Publikojë në faqen e internetit
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Dërgesat për klientët.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Furnizuesi Data e faturës nuk mund të jetë më i madh se mbi postimet Data
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Të ardhurat indirekte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Shuma e pagesës = shumën e papaguar
 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 +672,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Përzgjidh Item për transferimin
 DocType: Purchase Invoice,Additional Discount Percentage,Përqindja shtesë Discount
 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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Row {0}: Fatura {1} është i pavlefshëm, ajo mund të anulohet / nuk ekziston. \ Ju lutem shkruani një faturë e vlefshme"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +681,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
@@ -808,14 +828,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonjës Ditëlindja Përkujtesat
 ,Employee Holiday Attendance,Punonjës Festa Pjesëmarrja
 DocType: Opportunity,Walk In,Ecni Në
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Entries
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock Entries
 DocType: Item,Inspection Criteria,Kriteret e Inspektimit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferuar
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Bëj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Bëj
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
 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 +5,My Cart,Shporta ime
@@ -825,7 +845,8 @@
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 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 +180,Qty for {0},Qty për {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,A jeni të vërtetë doni për të rivendosur këtë pasuri braktiset?
+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 +80,Leave Allocation Tool,Lini Alokimi Tool
 DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
@@ -838,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
 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 +547,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Zbritje
@@ -853,20 +874,21 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Blerje Pranimi i artikullit
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Shuma Shitja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Koha Shkrime
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Koha Shkrime
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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
+DocType: Asset,Scrapped,braktiset
 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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,rekrutim
 DocType: BOM Operation,Operation,Operacion
 DocType: Lead,Organization Name,Emri i Organizatës
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Shitjet Shpenzimet
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
@@ -883,7 +905,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Për {0} | {1} {2}
 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ë
@@ -892,7 +914,7 @@
 DocType: Company,Default Currency,Gabim Valuta
 DocType: Contact,Enter designation of this Contact,Shkruani përcaktimin e këtij Kontakt
 DocType: Expense Claim,From Employee,Nga punonjësi
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +922,7 @@
 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 +130,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 +131,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 +42,Contribution %,Kontributi%
@@ -909,22 +931,23 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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ë.
 DocType: Global Defaults,Global Defaults,Defaults Global
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Bashkëpunimi Project Ftesë
 DocType: Salary Slip,Deductions,Zbritjet
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Kjo Serisë Koha Identifikohu është faturuar.
 DocType: Salary Slip,Leave Without Pay,Lini pa pagesë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapaciteti Planifikimi Gabim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapaciteti Planifikimi Gabim
 ,Trial Balance for Party,Bilanci gjyqi për Partinë
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Fitim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Mbaroi Item {0} duhet të jetë hyrë në për hyrje të tipit Prodhimi
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Hapja Bilanci Kontabilitet
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Asgjë për të kërkuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Drejtuesit
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Llojet e aktiviteteve për kohën Sheets
@@ -935,18 +958,18 @@
 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;
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Ju lutem plotësoni Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ju lutem plotësoni Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kodi artikull nuk mund të ndryshohet për të Serial Nr
 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/config/buying.py +33,Supplier database.,Bazës së të dhënave Furnizuesi.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Bazës së të dhënave Furnizuesi.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Tatimore dhe zbritjet e tjera të pagave.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
@@ -960,6 +983,7 @@
 DocType: Holiday,Holiday,Festë
 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
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formë nuk është i zbatueshëm për Faturë: {0}
 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
@@ -973,19 +997,20 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
 DocType: Contact,User ID,User ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Shiko Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Shiko Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividentët e paguar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Dividentët e paguar
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Ledger Kontabilitet
 DocType: Stock Reconciliation,Difference Amount,Shuma Diferenca
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Fitime të mbajtura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Fitime të mbajtura
 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
@@ -993,7 +1018,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Hapja e përkohshme
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
@@ -1008,8 +1033,8 @@
 ,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,I vogël
@@ -1017,7 +1042,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Kreu i llogarisë {0} krijuar
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gjithsej Arritur
@@ -1025,12 +1050,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 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
@@ -1040,19 +1065,20 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/stock/get_item_details.py +142,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ë."
 DocType: Hub Settings,Seller Website,Shitës Faqja
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Statusi Rendit Prodhimi është {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Statusi Rendit Prodhimi është {0}
 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 +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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/utilities/bot.py +39,Did not find any item called {0},A nuk gjeni ndonjë artikull të quajtur {0}
 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
@@ -1060,10 +1086,10 @@
 DocType: Item,Website Item Groups,Faqja kryesore Item Grupet
 DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
-DocType: Journal Entry,Journal Entry,Journal Hyrja
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
 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
@@ -1072,6 +1098,7 @@
 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
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Kërkesë për Kuotim Furnizuesit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,përsëritur upto
 DocType: Attendance,HR Manager,Menaxher HR
@@ -1082,6 +1109,7 @@
 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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Vlera aktuale Pas Zhvlerësimi duhet të jetë më pak se e barabartë me {0}
 ,BOM Browser,Bom Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Shto ose Zbres
 DocType: Company,If Yearly Budget Exceeded (for expense account),Në qoftë se buxheti vjetor Tejkaluar (për llogari shpenzim)
@@ -1096,21 +1124,22 @@
 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}
 DocType: Project,Start and End Dates,Filloni dhe Fundi Datat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Discount mesatar
 DocType: Address,Utilities,Shërbime komunale
 DocType: Purchase Invoice Item,Accounting,Llogaritje
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Asset,Depreciation Schedules,Oraret e amortizimit
 DocType: Item,Is Service Item,Është Shërbimi i artikullit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 DocType: Payment Request,Transaction Currency,Transaction Valuta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Nga {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Nga {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacioni Përshkrim
 DocType: Item,Will also apply to variants,Gjithashtu do të zbatohet për variante
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nuk mund të ndryshojë fiskale Viti Fillimit Data dhe viti fiskal End Date herë Viti fiskal është ruajtur.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nuk mund të ndryshojë fiskale Viti Fillimit Data dhe viti fiskal End Date herë Viti fiskal është ruajtur.
 DocType: Quotation,Shopping Cart,Karrocat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily largohet
 DocType: Pricing Rule,Campaign,Fushatë
@@ -1124,8 +1153,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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ë
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
@@ -1133,8 +1162,8 @@
 DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
 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 +472,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,nuk mund të jetë më i madh se 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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ë
@@ -1155,11 +1184,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Rregulla taksë për transaksionet.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Ne blerë këtë artikull
 DocType: Address,Billing,Faturimi
@@ -1169,12 +1198,15 @@
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Kuvendet Nën
+DocType: Asset,Asset Name,Emri i Aseteve
 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 +142,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Shqip Paketimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Zyra Qira
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Shqip Paketimi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS settings portë
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Kërkesa për kuotim mund të jetë qasje duke klikuar linkun e mëposhtëm
+DocType: Asset,Number of Months in a Period,Numri i muajve në një periudhë
 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
@@ -1191,19 +1223,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Qeveri
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
 DocType: Sales Invoice,Source,Burim
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,Shfaq të mbyllura
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,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 +39,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: Employee External Work History,Total Experience,Përvoja Total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Cash Flow nga Investimi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Item Group,Item Group Name,Item Emri i Grupit
 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 +86,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1212,7 +1245,7 @@
 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/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.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Mirëmbajtja Vizitoni
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Mirëmbajtja Vizitoni
 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: Landed Cost Voucher,Landed Cost Help,Zbarkoi Kosto Ndihmë
@@ -1226,7 +1259,6 @@
 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 +196,Brand master.,Mjeshtër markë.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Kuti
@@ -1254,7 +1286,7 @@
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Receipt,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
@@ -1263,7 +1295,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ridergo Pagesa Email
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Raportet tjera
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1305,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Shiko
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
+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/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Previous Viti financiar nuk është e mbyllur
 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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Furnizuesi Lloji mjeshtër.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Furnizuesi Lloji mjeshtër.
 DocType: Purchase Order Item,Supplier Part Number,Furnizuesi Pjesa Numër
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
 DocType: Purchase Invoice,Reference Document,Dokumenti Referenca
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% faturuar
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
@@ -1314,8 +1347,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Ndryshimi neto në llogaritë e pagueshme
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Ju lutem verifikoni id tuaj e-mail
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Customer kërkohet për &#39;Customerwise Discount &quot;
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
 DocType: Quotation,Term Details,Detajet Term
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} duhet të jetë më i madh se 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planifikimi i kapaciteteve për (ditë)
 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ë.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Garanci Claim
@@ -1333,7 +1367,7 @@
 DocType: Employee,Permanent Address,Adresa e përhershme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance paguar kundër {0} {1} nuk mund të jetë më e madhe \ se Grand Total {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Ju lutemi zgjidhni kodin pika
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Ju lutemi zgjidhni kodin pika
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ulja e zbritjes për pushim pa pagesë (LWP)
 DocType: Territory,Territory Manager,Territori Menaxher
 DocType: Packed Item,To Warehouse (Optional),Për Magazina (Fakultativ)
@@ -1343,15 +1377,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Njësi e vetme e një artikulli.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,33 +1402,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
+DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""",p.sh. &quot;XYZ Banka Kombëtare&quot;
+DocType: Asset,Depreciation Method,Metoda e amortizimit
 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/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Target Total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Shporta është aktivizuar
 DocType: Job Applicant,Applicant for a Job,Aplikuesi për një punë
 DocType: Production Plan Material Request,Production Plan Material Request,Prodhimi Plan Material Request
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Kryesor
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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ë
@@ -1402,31 +1438,32 @@
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
 DocType: Territory,Territory Name,Territori Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresat
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,vlerësime
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Item nuk i lejohet të ketë Rendit prodhimit.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item nuk i lejohet të ketë Rendit prodhimit.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
 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: 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 +27,Time Logs for manufacturing.,Koha Shkrime për prodhimin.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Koha Identifikohu për detyra.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Pagesa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Markë
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
 DocType: Quotation Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
@@ -1437,6 +1474,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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/setup_wizard/install_fixtures.py +87,Associate,Koleg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
+DocType: Request for Quotation Supplier,Send Email to Supplier,Dërgo Email të Furnizuesit
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 DocType: Packing Slip,To Package No.,Për paketën Nr
 DocType: Production Planning Tool,Material Requests,Kërkesat materiale
@@ -1454,7 +1492,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Ofrimit Magazina
 DocType: Stock Settings,Allowance Percent,Allowance Përqindja
 DocType: SMS Settings,Message Parameter,Mesazh Parametri
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Pema e Qendrave te Kostos financiare.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Pema e Qendrave te Kostos financiare.
 DocType: Serial No,Delivery Document No,Ofrimit Dokumenti Asnjë
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Të marrë sendet nga Pranimeve Blerje
 DocType: Serial No,Creation Date,Krijimi Data
@@ -1486,40 +1524,42 @@
 ,Amount to Deliver,Shuma për të Ofruar
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} krijuar
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} krijuar
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
 ,Serial No Status,Serial Asnjë Statusi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Tabela artikull nuk mund të jetë bosh
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Për të vendosur {1} periodiciteti, dallimi në mes të dhe në datën \ duhet të jetë më e madhe se ose e barabartë me {2}"
 DocType: Pricing Rule,Selling,Shitja
 DocType: Employee,Salary Information,Informacione paga
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Detyrat dhe Taksat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Ju lutem shkruani datën Reference
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Pagesa Gateway Llogaria nuk është i konfiguruar
 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: Production Order,Material Request Item,Materiali Kërkesë Item
+DocType: Request for Quotation Item,Material Request Item,Materiali Kërkesë Item
 apps/erpnext/erpnext/config/stock.py +85,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"
+DocType: Asset,Sold,i shitur
 ,Item-wise Purchase History,Historia Blerje pika-mençur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,I kuq
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Instalimi Koha
 DocType: Sales Invoice,Accounting Details,Detajet Kontabilitet
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Fshij gjitha transaksionet për këtë kompani
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokimet
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteret e pranimit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
 DocType: Item Attribute,Attribute Name,Atribut Emri
 DocType: Item Group,Show In Website,Shfaq Në Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grup
@@ -1527,6 +1567,7 @@
 ,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ë"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Grafiku Gantt e të gjitha detyrave.
+DocType: Pricing Rule,Margin Type,margin Lloji
 DocType: Appraisal,For Employee Name,Për Emri punonjës
 DocType: Holiday List,Clear Table,Tabela e qartë
 DocType: Features Setup,Brands,Markat
@@ -1534,20 +1575,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Row # {0}: Asset është i detyrueshëm kundër një Item aseteve fikse
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi instalimit numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numeracionit Series
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,Palë
+DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 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: Asset,Purchase Date,Blerje Date
 DocType: Employee,Personal Details,Detajet personale
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Qendra Amortizimi Kosto&#39; në Kompaninë {0}
 ,Maintenance Schedules,Mirëmbajtja Oraret
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
@@ -1561,23 +1607,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Përfshini gjitha pajtuar
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup për jo-Group
 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/public/js/setup_wizard.js +272,Unit,Njësi
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Ju lutem specifikoni Company
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
 ,BOM Search,Bom Kërko
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
@@ -1586,29 +1631,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
 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
 DocType: Territory,Classification of Customers by region,Klasifikimi i Konsumatorëve sipas rajonit
 DocType: Project,% Tasks Completed,Detyrat% Kompletuar
 DocType: Project,Gross Margin,Marzhi bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Llogaritur Banka bilanci Deklarata
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,përdorues me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Zbritje Total
 DocType: Quotation,Maintenance User,Mirëmbajtja User
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kosto Përditësuar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kosto Përditësuar
 DocType: Employee,Date of Birth,Data e lindjes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi të setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
 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
@@ -1620,8 +1666,8 @@
 ,SO Qty,SO Qty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
+DocType: Request for Quotation,Manufacturing Manager,Prodhim Menaxher
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Dërgesat
 DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
@@ -1629,12 +1675,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Shpenzimet Ndryshme
 DocType: Global Defaults,Default Company,Gabim i kompanisë
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Përdoruesi {0} është me aftësi të kufizuara
@@ -1643,7 +1689,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Currency Exchange,From Currency,Nga Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
@@ -1653,11 +1699,11 @@
 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/erpnext/erpnext/controllers/accounts_controller.py +478,"Row #{0}: Qty must be 1, as item is linked to an asset","Row # {0}: Qty duhet të jetë 1, pasi pika është e lidhur me një aktiv"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item nuk duhet të jetë një Bundle Product. Ju lutemi të heq arikullin &#39;{0}&#39; dhe për të shpëtuar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Qendra e re e kostos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Burimi i Fondeve&gt; detyrime rrjedhëse&gt; taksave dhe tatimeve dhe për të krijuar një llogari të re (duke klikuar në Të dhëna Child) të tipit &quot;Tatimet&quot; dhe të bëjë përmendur normën tatimore.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Qendra e re e kostos
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
 DocType: Quality Inspection,In Process,Në Procesin
@@ -1670,10 +1716,11 @@
 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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
 DocType: Quotation Item,Stock Balance,Stock Bilanci
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Koha Shkrime krijuar:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Koha Shkrime krijuar:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Item,Weight UOM,Pesha UOM
 DocType: Employee,Blood Group,Grup gjaku
@@ -1691,13 +1738,13 @@
 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ë."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ju lutem specifikoni një vend për këtë Rregull Shipping ose kontrolloni anijeve në botë
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debi Për të është e nevojshme
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
 DocType: Offer Letter Term,Offer Term,Term Oferta
 DocType: Quality Inspection,Quality Manager,Menaxheri Cilësia
 DocType: Job Applicant,Job Opening,Hapja Job
 DocType: Payment Reconciliation,Payment Reconciliation,Pajtimi Pagesa
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Letër
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generate Kërkesat materiale (MRP) dhe urdhërat e prodhimit.
@@ -1705,22 +1752,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
 DocType: Manufacturing Settings,Allow Overtime,Lejo jashtë orarit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Shkalla aktuale Vlerësimi
 DocType: Item,Customer Item Codes,Kodet Customer Item
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Krijo Entries pagesës ndaj urdhrave ose faturave.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Krijo Entries pagesës ndaj urdhrave ose faturave.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1776,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Nuk shqip Paga gjetur për muajin:
 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 +175,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Konsumatorët tuaj
+apps/erpnext/erpnext/projects/doctype/project/project.py +131,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
 DocType: Leave Block List Date,Block Date,Data bllok
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Apliko tani
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Apliko tani
 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."
@@ -1756,7 +1804,7 @@
 DocType: Employee,Employment Details,Detajet e punësimit
 DocType: Employee,New Workplace,New Workplace
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Bëje si Mbyllur
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Nuk ka artikull me Barkodi {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Nuk ka artikull me Barkodi {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Rast No. nuk mund të jetë 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,"Nëse keni shitjet e ekipit dhe shitje Partnerët (Channel Partnerët), ato mund të jenë të etiketuar dhe të mbajnë kontributin e tyre në aktivitetin e shitjes"
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
@@ -1774,10 +1822,10 @@
 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 +608,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Material Transferimi
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Item {0} duhet të jetë një artikull Sales në {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
 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
@@ -1791,12 +1839,13 @@
 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: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Nga
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +70,Invite as User,Fto si Përdorues
 DocType: Features Setup,After Sale Installations,Pas Instalimeve Shitje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +111,Please set {0} in Company {1},Ju lutemi të vendosur {0} në kompaninë {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 DocType: Workstation Working Hour,End Time,Fundi Koha
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Kushtet e kontratës standarde për shitje ose blerje.
@@ -1805,9 +1854,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Sales Invoice,Mass Mailing,Mailing Mass
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
@@ -1824,25 +1873,25 @@
 DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Gateway Account,Payment Account,Llogaria e pagesës
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,Accepted,Pranuar
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick Journal Hyrja
 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 +206,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
 apps/erpnext/erpnext/config/stock.py +27,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ë.
@@ -1851,7 +1900,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Emri
 DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
@@ -1869,13 +1918,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} është i mbyllur
 DocType: Email Digest,How frequently?,Sa shpesh?
 DocType: Purchase Receipt,Get Current Stock,Get Stock aktual
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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; Pasurive aktuale&gt; Llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar në Të dhëna Child) të tipit &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Pema e Bill e materialeve
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark pranishëm
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
 DocType: Production Order,Actual End Date,Aktuale End Date
 DocType: Authorization Rule,Applicable To (Role),Për të zbatueshme (Roli)
 DocType: Stock Entry,Purpose,Qëllim
+DocType: Company,Fixed Asset Depreciation Settings,Fixed Asset Settings zhvlerësimit
 DocType: Item,Will also apply for variants unless overrridden,Gjithashtu do të aplikojë për variantet nëse overrridden
 DocType: Purchase Invoice,Advances,Përparimet
 DocType: Production Order,Manufacture against Material Request,Prodhimi kundër kërkesës materiale
@@ -1884,6 +1933,7 @@
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
 DocType: Campaign,Campaign-.####,Fushata -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +593,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,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
@@ -1914,12 +1964,14 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Sasia
-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}
+DocType: Asset Category Account,Asset Category Account,Asset Kategoria Llogaria
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","psh Banka, Cash, Credit Card"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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; Pasurive aktuale&gt; Llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar në Të dhëna Child) të tipit &quot;Banka&quot;
 DocType: Journal Entry,Credit Note,Credit Shënim
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1995,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Adresat e mia
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Mjeshtër degë organizatë.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Nuk ka punonjës me kriteret e zgjedhura sipër apo rrogës pip krijuar tashmë
@@ -1972,7 +2024,7 @@
 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 +200,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;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Payroll
 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"
@@ -1982,8 +2034,9 @@
 DocType: Landed Cost Voucher,Purchase Receipt Items,Items Receipt Blerje
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Format customizing
 DocType: Account,Income Account,Llogaria ardhurat
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No parazgjedhur Adresa Template gjetur. Ju lutem të krijuar një të ri nga Setup&gt; Printime dhe quajtur&gt; Adresa Stampa.
 DocType: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,21 +2058,22 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Qendra Kosto New Emri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taksat dhe Tarifat zbritet
-apps/erpnext/erpnext/config/support.py +7,Issues,Çështjet
+apps/erpnext/erpnext/hooks.py +90,Issues,Çështjet
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusi duhet të jetë një nga {0}
 DocType: Sales Invoice,Debit To,Debi Për
 DocType: Delivery Note,Required only for sample item.,Kërkohet vetëm për pika të mostrës.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
+apps/erpnext/erpnext/accounts/party.py +322,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Shumë i madh
 ,Profit and Loss Statement,Fitimi dhe Humbja Deklarata
@@ -2033,10 +2087,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
 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 +139,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
 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 +142,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
@@ -2092,13 +2146,14 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Kërkuar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Asnjë Vërejtje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Fixed Asset Item must be a non-stock item,Fixed Item Aseteve duhet të jetë një element jo-aksioneve
 DocType: Supplier Quotation Item,Material Request No,Materiali Kërkesë Asnjë
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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ë
@@ -2119,7 +2174,7 @@
 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ë
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 DocType: Payment Request,Recipient and Message,Marrësi dhe Mesazh
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
@@ -2133,7 +2188,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Zgjidh Furnizuesi Adresa
 DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2155,11 +2210,12 @@
 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/config/buying.py +18,Request for quotation.,Kërkesa për kuotim.
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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: 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 +294,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2224,7 @@
 DocType: Installation Note Item,Against Document No,Kundër Dokumentin Nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Manage Shitje Partnerët.
 DocType: Quality Inspection,Inspection Type,Inspektimi Type
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Ju lutem, përzgjidhni {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Pjesëmarrja pashënuar
@@ -2183,6 +2239,7 @@
 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ë
+DocType: Asset Category Account,Depreciation Expense Account,Llogaria Zhvlerësimi Shpenzimet
 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
@@ -2196,7 +2253,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,I konfirmuar
 DocType: Payment Gateway,Gateway,Portë
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Sasia
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Sasia
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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ë
@@ -2210,18 +2267,19 @@
 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 +91,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}
+apps/erpnext/erpnext/setup/utils.py +93,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}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Gjysma Dita
 DocType: Sales Invoice,Sales Team,Sales Ekipi
 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 +410,[Error],[Gabim]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/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 +49,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazina Customer (Fakultativ)
 DocType: Pricing Rule,Discount Percentage,Përqindja Discount
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
@@ -2247,14 +2305,16 @@
 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ë
 DocType: Leave Allocation,Leave Allocation,Lini Alokimi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Kërkesat Materiale {0} krijuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Kërkesat Materiale {0} krijuar
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Template i termave apo kontrate.
 DocType: Purchase Invoice,Address and Contact,Adresa dhe Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
+apps/erpnext/erpnext/accounts/party.py +286,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)
+DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
+DocType: Asset,Expected Value After Useful Life,Vlera e pritshme pas së dobishme
 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ë
@@ -2267,12 +2327,12 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} është anuluar apo të mbyllura
 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/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Paraja neto nga Investimi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +99,Asset {0} must be submitted,Asset {0} duhet të dorëzohet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Manage Adresat
-DocType: Pricing Rule,Item Code,Kodi i artikullit
+DocType: Asset,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
@@ -2291,8 +2351,10 @@
 DocType: Production Planning Tool,Create Material Requests,Krijo Kërkesat materiale
 DocType: Employee Education,School/University,Shkolla / Universiteti
 DocType: Payment Request,Reference Details,Referenca Detajet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty në dispozicion në magazinë
 ,Billed Amount,Shuma e faturuar
+DocType: Asset,Double Declining Balance,Dyfishtë rënie Balance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,mënyrë të mbyllura nuk mund të anulohet. Hap për të anulluar.
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
@@ -2311,6 +2373,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"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 +131,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;
+DocType: Asset,Fully Depreciated,amortizuar plotësisht
 ,Stock Projected Qty,Stock Projektuar Qty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pjesëmarrja e shënuar HTML
@@ -2318,25 +2381,28 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Pa serial dhe Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Shitës me pakicë
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Disable Në fjalë
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Llogaria Overdraft Banka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 apps/erpnext/erpnext/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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Kredi të siguruara
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +89,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ju lutemi të vendosur Llogaritë zhvlerësimit lidhur në Kategorinë Aseteve {0} ose kompanisë {1}
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Hapja Bilanci ekuitetit
 DocType: Appraisal,Appraisal,Vlerësim
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +102,Email sent to supplier {0},Email dërguar për furnizuesit {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data përsëritet
 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 +187,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
@@ -2344,7 +2410,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk Import Ndihmë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Zgjidh Sasia
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Zgjidh Sasia
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Miratimi Rolit nuk mund të jetë i njëjtë si rolin rregulli është i zbatueshëm për
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Çabonoheni nga ky Dërgoje Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesazh dërguar
@@ -2372,6 +2438,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +328,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: Sales Invoice Item,Total Margin,Margin Total
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
 DocType: Expense Claim,Approval Status,Miratimi Statusi
 DocType: Hub Settings,Publish Items to Hub,Botojë artikuj për Hub
@@ -2385,7 +2452,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupi Customer / Customer
 DocType: Payment Gateway Account,Default Payment Request Message,Default kërkojë pagesën mesazh
 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/config/accounts.py +118,Banking and Payments,Bankar dhe i Pagesave
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankar dhe i Pagesave
 ,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
@@ -2393,17 +2460,17 @@
 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 +199,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
 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/config/hr.py +55,Leaves and Holiday,Lë dhe Festa
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kosto zbarkoi Voucher Shuma
 DocType: Time Log,Batched for Billing,Batched për faturim
@@ -2419,15 +2486,17 @@
 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 +53,"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"
+DocType: Company,Asset Depreciation Cost Center,Asset Center Zhvlerësimi Kostoja
 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/doctype/purchase_invoice/purchase_invoice.py +266,Purchase Date of asset {0} does not match with Purchase Invoice date,Blerja Data e asetit {0} nuk përputhet me datën e blerjes Faturë
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Magazina {0}: Kompania është e detyrueshme
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Hyrja
 DocType: Account,Payable,Për t&#39;u paguar
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Debitorët ({0})
-DocType: Project,Margin,diferencë
+DocType: Pricing Rule,Margin,diferencë
 DocType: Salary Slip,Arrear Amount,Shuma arrear
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Klientët e Rinj
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruto% Fitimi
@@ -2435,20 +2504,23 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Pastrimi Data
 DocType: Newsletter,Newsletter List,Lista Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontrolloni në qoftë se ju dëshironi të dërgoni pagave gabim në postë për çdo punonjës, ndërsa paraqitjen e pagave shqip"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
 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 +57,Where manufacturing operations are carried.,Ku operacionet prodhuese janë kryer.
 DocType: Stock Entry Detail,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
+apps/erpnext/erpnext/controllers/accounts_controller.py +469,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
 DocType: Employee,Confirmation Date,Konfirmimi Data
 DocType: C-Form,Total Invoiced Amount,Shuma totale e faturuar
 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: Account,Accumulated Depreciation,Zhvlerësimi i akumuluar
 DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
 DocType: Payment Request,Email To,Email To
 DocType: Lead,Lead Owner,Lead Owner
 DocType: Bin,Requested Quantity,kërkohet Sasia
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Magazina është e nevojshme
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2456,11 +2528,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dorëzuar
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Dorëzuar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +25,Same supplier has been entered multiple times,Same furnizuesi është lidhur shumë herë
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Blerje Rendit Item furnizuar
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,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.
@@ -2470,13 +2543,14 @@
 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.
 DocType: Payment Request,Payment Details,Detajet e pagesës
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
+DocType: Asset,Journal Entry for Scrap,Journal Hyrja për skrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
 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 +73,"Record of all communications of type email, phone, chat, visit, etc.","Rekord të të gjitha komunikimeve të tipit mail, telefon, chat, vizita, etj"
 DocType: Manufacturer,Manufacturers used in Items,Prodhuesit e përdorura në artikujt
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Krijo ri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2563,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Shkalla: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Paga Shqip Zbritje
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Zgjidh një nyje grupi i parë.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Zgjidh një nyje grupi i parë.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Punonjës dhe Pjesëmarrja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Hiq referencën e klientit, furnitorit, partner shitjes dhe plumbi, pasi ajo është adresa kompania juaj"
@@ -2511,13 +2585,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nga {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Data e ardhshme duhet të jetë më i madh se mbi postimet Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Trego taksave break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Item / {0}) është nga të aksioneve
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Data e ardhshme duhet të jetë më i madh se mbi postimet Data
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Posting Data
@@ -2532,7 +2607,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,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 +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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ë."
@@ -2546,7 +2621,7 @@
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2630,7 @@
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
@@ -2566,7 +2641,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
@@ -2575,11 +2650,12 @@
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,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
+DocType: Asset Category Account,Fixed Asset Account,Llogaria Fixed Asset
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,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/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Normë
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
@@ -2587,7 +2663,7 @@
 DocType: Stock Entry,From BOM,Nga bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
@@ -2595,17 +2671,17 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Struktura e pagave
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Materiali çështje
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citate
 DocType: Hub Settings,Access Token,Qasja Token
 DocType: Sales Invoice Item,Serial No,Serial Asnjë
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
-DocType: Item,Is Fixed Asset Item,Është pika fikse të aseteve
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
 DocType: Purchase Invoice,Print Language,Print Gjuha
 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"
+DocType: Asset,Number of Depreciations,Numri i nënçmime
 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
@@ -2613,13 +2689,15 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,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
+apps/erpnext/erpnext/hooks.py +86,Request for Quotations,Kërkesën për kuotimin
 DocType: Payment Reconciliation,Maximum Invoice Amount,Shuma maksimale Faturë
 DocType: Purchase Invoice Item,Image View,Image Shiko
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klientët
+DocType: Asset,Partially Depreciated,amortizuar pjesërisht
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
@@ -2635,13 +2713,13 @@
 DocType: Quotation,Maintenance Manager,Mirëmbajtja Menaxher
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Gjithsej nuk mund të jetë zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,Ndryshuar Nga
+DocType: Asset,Amended From,Ndryshuar Nga
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,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 +325,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
@@ -2654,21 +2732,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +143,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/public/js/setup_wizard.js +191,"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/accounts/doctype/sales_invoice/sales_invoice.py +460,Please mention 'Gain/Loss Account on Asset Disposal' in Company,Ju lutemi të përmendim &#39;Gain llogari / humbje neto nga shitja e Aseteve &quot;në Kompaninë
 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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Pagesat ndeshje me faturat
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Pagesat ndeshje me faturat
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Futeni në kosh
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupi Nga
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Enable / disable monedhave.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Enable / disable monedhave.
 DocType: Production Planning Tool,Get Material Request,Get materiale Kërkesë
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Shpenzimet postare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Shpenzimet postare
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,I pranishëm Total
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Deklaratat e kontabilitetit
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Deklaratat e kontabilitetit
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,15 +2766,16 @@
 DocType: C-Form,Invoices,Faturat
 DocType: Job Opening,Job Title,Titulli Job
 DocType: Features Setup,Item Groups in Details,Grupet pika në detaje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Fillimi Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Vizitoni raport për thirrjen e mirëmbajtjes.
 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 +169,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 +171,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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Ndryshimi neto në ekuitetit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +94,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
 ,Sales Register,Shitjet Regjistrohu
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
@@ -2703,12 +2783,13 @@
 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
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,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
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +666,Error: {0} &gt; {1},Gabim: {0}&gt; {1}
 DocType: Item,Attributes,Atributet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Rendit fundit Date
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
 DocType: C-Form,C-Form,C-Forma
@@ -2720,18 +2801,18 @@
 DocType: Purchase Invoice,Mobile No,Mobile Asnjë
 DocType: Payment Tool,Make Journal Entry,Bëni Journal Hyrja
 DocType: Leave Allocation,New Leaves Allocated,Gjethet e reja të alokuar
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Komercial
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Gabim: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Të gjitha prodhimet ose shërbimet.
 DocType: Supplier Quotation,Supplier Address,Furnizuesi Adresa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +505,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Nga Qty
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2823,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
 DocType: Tax Rule,Billing State,Shteti Faturimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transferim
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transferim
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Për shkak Data është e detyrueshme
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
@@ -2765,20 +2846,22 @@
 DocType: GL Entry,Remarks,Vërejtje
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +602,Send Supplier Emails,Dërgo email furnizuesi
 DocType: Features Setup,POS View,POS Shiko
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Koha Log është faturuar
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Fitimi / Humbja e Përkohshme (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Ju lutemi të vendosur vlera e parazgjedhur {0} në Kompaninë {1}
@@ -2788,12 +2871,13 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi instalimit numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numeracionit Series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+DocType: Asset,Straight Line,Vijë e drejtë
+DocType: Project User,Project User,User Project
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'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: Features Setup,Sales Discounts,Shitjet Zbritje
@@ -2807,39 +2891,40 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Shto Fëmija
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Vlera e hapjes
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Komisioni për Shitje
 DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
 DocType: Tax Rule,Billing Country,Faturimi Vendi
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Shpenzimet Argëtim
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Shpenzimet Argëtim
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Aplikimet për leje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Shpenzimet ligjore
 DocType: Sales Invoice,Posting Time,Posting Koha
 DocType: Sales Order,% Amount Billed,% Shuma faturuar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Shpenzimet telefonike
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Shpenzimet telefonike
 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.,Kontrolloni këtë në qoftë se ju doni për të detyruar përdoruesit për të zgjedhur një seri përpara se të kryeni. Nuk do të ketë parazgjedhur në qoftë se ju kontrolloni këtë.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Nuk ka artikull me Serial Nr {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Njoftimet Hapur
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Shpenzimet direkte
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Shpenzimet direkte
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} është një adresë e pavlefshme email në &#39;Njoftimi \ Email Adresa &quot;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
@@ -2856,7 +2941,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Ne shesim këtë artikull
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizuesi Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Lloji i lë si rastësor, të sëmurë etj"
@@ -2867,11 +2952,12 @@
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +270,Supplier of asset {0} does not match with the supplier in the Purchase Invoice,Furnizuesi i pasuri {0} nuk përputhet me furnizuesin në Faturë Blerje
 DocType: Newsletter,Test Email Id,Test Email Id
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Lëndë e parë nuk mund të jetë i njëjtë si pika kryesore
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Mjeshtër paga template.
@@ -2887,12 +2973,13 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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
+apps/erpnext/erpnext/accounts/party.py +238,Billing currency must be equal to either default comapany's currency or party's payble account currency,monedhë faturimit duhet të jetë e barabartë me monedhën secilës parazgjedhur comapany ose monedhën e llogarisë payble partisë
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Nëse disable, &quot;me fjalë&quot; fushë nuk do të jetë i dukshëm në çdo transaksion"
@@ -2902,13 +2989,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Kjo Serisë Koha Identifikohu është anuluar.
 ,Reqd By Date,Reqd By Date
 DocType: Salary Slip Earning,Salary Slip Earning,Shqip Paga Fituar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorët
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Kreditorët
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Asnjë Serial është i detyrueshëm
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Tatimore urti Detail
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +3015,14 @@
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
-DocType: Project,Project Name,Emri i Projektit
+DocType: Request for Quotation Item,Project Name,Emri i Projektit
 DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
 DocType: Features Setup,Item Batch Nos,Item Serisë Nos
@@ -2966,6 +3052,7 @@
 DocType: Sales Invoice,End Date,End Date
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transaksionet e aksioneve
 DocType: Employee,Internal Work History,Historia e brendshme
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akumuluar Shuma Zhvlerësimi
 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
@@ -2973,7 +3060,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Kompania është e detyrueshme, pasi ajo është adresa kompania juaj"
 DocType: Item Attribute,From Range,Nga Varg
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Item {0} injoruar pasi ajo nuk është një artikull të aksioneve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Submit Kjo mënyrë e prodhimit për përpunim të mëtejshëm.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Submit Kjo mënyrë e prodhimit për përpunim të mëtejshëm.
 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.","Për të nuk zbatohet Rregulla e Çmimeve në një transaksion të caktuar, të gjitha rregullat e aplikueshme çmimeve duhet të jetë me aftësi të kufizuara."
 DocType: Company,Domain,Fushë
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
@@ -2985,6 +3072,7 @@
 DocType: Time Log,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3001,6 +3089,7 @@
 DocType: Sales Order,Delivery Date,Ofrimit Data
 DocType: Opportunity,Opportunity Date,Mundësi Data
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kthehu përkundrejt marrjes Blerje
+DocType: Request for Quotation Item,Request for Quotation Item,Kërkesë për Kuotim Item
 DocType: Purchase Order,To Bill,Për Bill
 DocType: Material Request,% Ordered,% Urdhërohet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Punë me copë
@@ -3015,11 +3104,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} nuk është setup për Serial Nr. Kolona duhet të jetë bosh
 DocType: Accounts Settings,Accounts Settings,Llogaritë Settings
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +168,Please set 'Asset Disposal Account' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Shkatërrimi Llogari&#39; në kompaninë {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Bimore dhe makineri
 DocType: Sales Partner,Partner's Website,Faqja partnerit
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Llogaritë e përkohshme
 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
@@ -3028,21 +3118,22 @@
 DocType: Pricing Rule,Disable,Disable
 DocType: Project Task,Pending Review,Në pritje Rishikimi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,Kliko këtu për të paguar
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nuk mund të braktiset, pasi ajo është tashmë {1}"
 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
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Mungon
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Shto artikuj nga
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Shto artikuj nga
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
 DocType: Project Task,Task ID,Detyra ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",p.sh. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazina {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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ë
@@ -3057,6 +3148,7 @@
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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ë
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +31,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
 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
@@ -3068,7 +3160,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Llogaritë Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Llogaritë Gateway.
 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
 ,Cash Flow,Cash Flow
@@ -3082,7 +3174,7 @@
 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 +132,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Balanca Deklarata Banka sipas Librit Kryesor
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
 DocType: Authorization Rule,Customer / Item Name,Customer / Item Emri
@@ -3098,19 +3190,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ju lutemi specifikoni nga / në varg
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
 DocType: BOM Replace Tool,Current BOM,Bom aktuale
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Shto Jo Serial
 apps/erpnext/erpnext/config/support.py +43,Warranty,garanci
 DocType: Production Order,Warehouses,Depot
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print dhe stacionare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Print dhe stacionare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nyja grup
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Update Mbaroi Mallrat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Update Mbaroi Mallrat
 DocType: Workstation,per hour,në orë
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,blerje
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Shuma e paguar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
@@ -3140,7 +3231,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Zbatohet për Kompaninë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
 DocType: Purchase Invoice,In Words,Me fjalë të
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Sot është {0} &#39;s ditëlindjen!
 DocType: Production Planning Tool,Material Request For Warehouse,Kërkesë material Për Magazina
@@ -3153,9 +3244,11 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
+apps/erpnext/erpnext/projects/doctype/project/project.py +133,Join,bashkohem
 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 +564,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Salary Slip,Salary Slip,Shqip paga
+DocType: Pricing Rule,Margin Rate or Amount,Margin Vlerësoni ose Shuma
 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
@@ -3165,7 +3258,7 @@
 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 +782,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 +793,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ë
@@ -3173,14 +3266,13 @@
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mundësi potenciale për të shitur.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Dyqane
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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ë.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
@@ -3198,14 +3290,15 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Përgjithshëm Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Shiko kryeson
 DocType: Item Attribute Value,Attribute Value,Atribut Vlera
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID duhet të jetë unike, tashmë ekziston për {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Email ID duhet të jetë unike, tashmë ekziston për {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +114,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {0},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {0}
 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>
@@ -3226,23 +3319,23 @@
 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ë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
 ,Project wise Stock Tracking,Projekti Ndjekja mençur Stock
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Mirëmbajtja Orari {0} ekziston kundër {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Mirëmbajtja Orari {0} ekziston kundër {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Sasia aktuale (në burim / objektiv)
 DocType: Item Customer Detail,Ref Code,Kodi ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Të dhënat punonjës.
 DocType: Payment Gateway,Payment Gateway,Gateway Pagesa
 DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Vendi Renditja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Rrënjë nuk mund të ketë një qendër me kosto prind
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Zgjidh Markë ...
 DocType: Sales Invoice,C-Form Applicable,C-Formulari i zbatueshëm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Magazina është e detyrueshme
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3353,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Monedha transaksion duhet të jetë i njëjtë si pagesë Gateway valutë
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Merre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3361,14 @@
 DocType: Purchase Invoice,Submit on creation,Submit në krijimin
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Urdhërat e mia
@@ -3296,10 +3389,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale Profilin
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Kredi pasiguruar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
 DocType: Maintenance Schedule Detail,Scheduled Date,Data e planifikuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Totale e paguar Amt
@@ -3311,11 +3404,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Furnizuesit tuaj
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
+apps/erpnext/erpnext/templates/includes/rfq/rfq_macros.html +16,Supplier Part No,Furnizuesi Part No
 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
@@ -3324,12 +3418,12 @@
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Nga {0} për {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,Nga Faturë Data
@@ -3338,7 +3432,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3445,7 @@
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
@@ -3365,15 +3459,15 @@
 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 +576,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Aktiviteti i projekt / detyra.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generate paga rrëshqet
 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: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3393,8 +3487,9 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +73,Year start date or end date is overlapping with {0}. To avoid please set company,Viti data e fillimit ose data fundi mbivendosje me {0}. Për të shmangur ju lutem kompaninë vendosur
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {0}
 DocType: 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.","Shembull:. ABCD ##### Nëse seri është vendosur dhe nuk Serial nuk është përmendur në transaksione, numri atëherë automatike serial do të krijohet në bazë të kësaj serie. Nëse ju gjithmonë doni të në mënyrë eksplicite përmend Serial Nos për këtë artikull. lënë bosh këtë."
 DocType: Upload Attendance,Upload Attendance,Ngarko Pjesëmarrja
@@ -3405,11 +3500,11 @@
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Prodhim Cilësimet
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ngritja me e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Ju lutem shkruani monedhën parazgjedhje në kompaninë Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Ju lutem shkruani monedhën parazgjedhje në kompaninë Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Hyrja Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Harroni të Përditshëm
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,New Emri i llogarisë
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Shërbimi ndaj klientit
@@ -3419,11 +3514,12 @@
 apps/erpnext/erpnext/config/hr.py +50,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
+DocType: Pricing Rule,Percentage,përqindje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,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 +225,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Item {0} duhet të jetë një Sales Item
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,11 +3527,12 @@
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
 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 +385,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
 DocType: Sales Partner,Partner Type,Lloji Partner
 DocType: Purchase Taxes and Charges,Actual,Aktual
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Kundër Llogaria shpenzimeve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Burimi i Fondeve&gt; detyrime rrjedhëse&gt; taksave dhe tatimeve dhe për të krijuar një llogari të re (duke klikuar në Të dhëna Child) të tipit &quot;Tatimet&quot; dhe të bëjë përmendur normën tatimore.
 DocType: Production Order,Production Order,Rendit prodhimit
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +248,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
 DocType: Quotation Item,Against Docname,Kundër Docname
@@ -3454,18 +3551,19 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Harmonizuar me sukses
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Tax Rule,Validity,Vlefshmëri
+DocType: Request for Quotation,Supplier Detail,furnizuesi Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Shuma e faturuar
 DocType: Attendance,Attendance,Pjesëmarrje
 apps/erpnext/erpnext/config/projects.py +55,Reports,raportet
 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 +508,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
 ,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
@@ -3475,10 +3573,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'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/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Shpenzimet administrative
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Shpenzimet administrative
 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 +455,Change,Ndryshim
@@ -3486,6 +3584,7 @@
 DocType: Appraisal Goal,Score Earned,Vota fituara
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,"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: Asset Category,Asset Category Name,Asset Category Emri
 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
@@ -3497,13 +3596,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Grumbull
@@ -3517,7 +3616,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Sales Person
 DocType: Sales Invoice,Cold Calling,Thirrje të ftohtë
 DocType: SMS Parameter,SMS Parameter,SMS Parametri
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Buxheti dhe Qendra Kosto
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Buxheti dhe Qendra Kosto
 DocType: Maintenance Schedule Item,Half Yearly,Gjysma vjetore
 DocType: Lead,Blog Subscriber,Blog Subscriber
 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.
@@ -3548,9 +3647,9 @@
 DocType: Purchase Common,Purchase Common,Blerje përbashkët
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{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/buying/doctype/request_for_quotation/request_for_quotation.py +165,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
 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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3657,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Llogaria prind
@@ -3574,7 +3673,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
 DocType: Address,Office,Zyrë
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
@@ -3589,6 +3688,7 @@
 apps/erpnext/erpnext/config/stock.py +310,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: Sales Invoice Item,Discount and Margin,Discount dhe Margin
 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: Deduction Type,Deduction Type,Zbritja Type
 DocType: Attendance,Half Day,Gjysma Dita
@@ -3609,7 +3709,7 @@
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
-apps/erpnext/erpnext/accounts/party.py +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}."
+apps/erpnext/erpnext/accounts/party.py +234,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
 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
@@ -3617,22 +3717,23 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Pagesa URL Mesazh
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Gjithsej papaguar
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Koha Identifikohu nuk është billable
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
+DocType: Asset,Asset Category,Asset Category
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Materiale për Furnizuesin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Akciza Faturë
 DocType: Expense Claim,Employees Email Id,Punonjësit Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Pjesëmarrja e shënuar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Detyrimet e tanishme
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Detyrimet e tanishme
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
@@ -3653,17 +3754,16 @@
 DocType: Item Attribute,Numeric Values,Vlerat numerike
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Bashkangjit Logo
 DocType: Customer,Commission Rate,Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,analitikë
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Shporta është bosh
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No parazgjedhur Adresa Template gjetur. Ju lutem të krijuar një të ri nga Setup&gt; Printime dhe quajtur&gt; Adresa Stampa.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
 DocType: Payment Gateway Account,Payment Gateway Account,Pagesa Llogaria Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pas përfundimit të pagesës përcjellëse përdorues në faqen e zgjedhur.
@@ -3672,20 +3772,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
+DocType: Asset,Current Value (After Depreciation),Vlera aktuale (Pas Zhvlerësimi)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill e materialeve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
@@ -3693,6 +3794,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Llogaria {0} nuk ekziston
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index ff547b5..495b4b1 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Трговац
 DocType: Employee,Rented,Изнајмљени
 DocType: POS Profile,Applicable for User,Важи за кориснике
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Да ли заиста желите да укине ову имовину?
 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.,* Биће обрачунато у овој трансакцији.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
@@ -41,20 +41,22 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,схов отворен
 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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Нова апликација одсуство
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Схов Варијанте
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Количина
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты ( обязательства)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,На складишту
 DocType: Designation,Designation,Ознака
@@ -64,7 +66,7 @@
 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 +642,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
@@ -81,7 +83,7 @@
 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 +131,New {0}: #{1},Нови {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Нови {0}: # {1}
 ,Sales Partners Commission,Продаја Партнери Комисија
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 DocType: Payment Request,Payment Request,Плаћање Упит
@@ -102,7 +104,7 @@
 DocType: Employee,Married,Ожењен
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Гет ставке из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
@@ -140,10 +142,11 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Активност Пријављивање :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
+DocType: Item,Is Fixed Asset,Је основних средстава
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
@@ -156,7 +159,8 @@
 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,Акции Расходы
+apps/erpnext/erpnext/accounts/party.py +326,{0} {1} is frozen,{0} {1} је замрзнут
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Емаил Сент?
 DocType: Journal Entry,Contra Entry,Цонтра Ступање
 DocType: Production Order Operation,Show Time Logs,Схов Тиме Протоколи
@@ -164,13 +168,13 @@
 DocType: Delivery Note,Installation Status,Инсталација статус
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 DocType: BOM Replace Tool,New BOM,Нови БОМ
@@ -209,11 +213,11 @@
 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 +79,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Унесите фирму
@@ -222,7 +226,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Нето готовина из финансирања
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
 DocType: Newsletter List,Total Subscribers,Укупно Претплатници
 ,Contact Name,Контакт Име
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
@@ -236,8 +240,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Банк unosi
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
@@ -249,8 +253,8 @@
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +269,7 @@
 DocType: Notification Control,Notification Control,Обавештење Контрола
 DocType: Lead,Suggestions,Предлози
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Сет тачка Групе мудрих буџете на овој територији. Такође можете укључити сезонски постављањем дистрибуције.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Молимо вас да унесете родитељску групу рачуна за складиште {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Молимо вас да унесете родитељску групу рачуна за складиште {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
@@ -276,29 +280,32 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,Макс 5 знакова
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 apps/erpnext/erpnext/config/desktop.py +83,Learn,Научити
+DocType: Asset,Next Depreciation Date,Следећа Амортизација Датум
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Активност Трошкови по запосленом
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Supplier Invoice No exists in Purchase Invoice {0},Добављач Фактура Не постоји у фактури {0}
 apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,Управление менеджера по продажам дерево .
 DocType: Job Applicant,Cover Letter,Пропратно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,Изузетне чекова и депозити до знања
 DocType: Item,Synced With Hub,Синхронизују са Хуб
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери.
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} јединице [{1}] (# Форм / итем / {1}) у [{2}] (# Форм / Варехоусе / {2})
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: 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,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Обавештење о пријему пошиљке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Обавештење о пријему пошиљке
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Изаберите месец и годину
@@ -309,12 +316,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Укупно Ордер Сматра
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
@@ -337,9 +344,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ставка Провера квалитета Параметар
 DocType: Leave Application,Leave Approver Name,Оставите одобраватељ Име
-,Schedule Date,Распоред Датум
+DocType: Depreciation Schedule,Schedule Date,Распоред Датум
 DocType: Packed Item,Packed Item,Испорука Напомена Паковање јединице
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Настройки по умолчанию для покупки сделок .
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Настройки по умолчанию для покупки сделок .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Активност Трошкови постоји за запосленог {0} против Ацтивити типе - {1}
 apps/erpnext/erpnext/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,Мењачница
@@ -348,6 +355,7 @@
 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; с обзиром на све магацине засноване на пројектованом Кти и Минимална количина за поручивање
+DocType: Request for Quotation,Request for Quotation,Захтев за понуду
 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.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
@@ -388,15 +396,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
-DocType: Material Request Item,Required Date,Потребан датум
+DocType: Request for Quotation Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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: Request for Quotation,Message for Supplier,Порука за добављача
 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,Неплаћен
@@ -418,17 +427,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 ,Serial No Warranty Expiry,Серијски Нема гаранције истека
@@ -437,6 +446,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,Управљање Подуговарање
+DocType: Project,Project will be accessible on the website to these users,Пројекат ће бити доступни на сајту ових корисника
 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 +53,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
@@ -448,7 +458,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
@@ -459,7 +469,7 @@
 DocType: Production Plan Item,Pending Qty,Кол чекању
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Важи од
 DocType: Sales Invoice,Total Commission,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
@@ -471,13 +481,13 @@
  Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Финансовый / отчетного года .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,акумулиране вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Датум почетка не би требало да буде већа од Фискална година Датум завршетка
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Датум почетка не би требало да буде већа од Фискална година Датум завршетка
 DocType: Warranty Claim,Resolution,Резолуција
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Достављено: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Плаћа се рачуна
@@ -485,7 +495,7 @@
 DocType: Job Applicant,Resume Attachment,ресуме Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Продаја Ретурн
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Плата компоненте.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База потенцијалних купаца.
@@ -494,7 +504,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,Логичан Магацин против које уноси хартије су направљени.
@@ -504,7 +514,7 @@
 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/config/accounts.py +70,Masters,Мајстори
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Упдате Банк трансакције Датуми
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Упдате Банк трансакције Датуми
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ( {6} ) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,time Трацкинг
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
@@ -522,27 +532,27 @@
 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,Уобичајено Кошта курс
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Одржавање Распоред
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Одржавање Распоред
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Нето промена у инвентару
 DocType: Employee,Passport Number,Пасош Број
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,менаџер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Исто аукција је ушао више пута.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Продаја Персон Мете
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Молимо подесите Холидаи Лист ни за запосленог или Друштва
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
+DocType: Depreciation Schedule,Depreciation Amount,Амортизација Износ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,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: Supplier,Fixed Days,Фиксни дана
 DocType: Quotation Item,Item Balance,итем Стање
 DocType: Sales Invoice,Packing List,Паковање Лист
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Куповина наређења према добављачима.
+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,Цонсумед
@@ -557,8 +567,10 @@
 DocType: BOM Operation,Operation Time,Операција време
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Group,Група у групу
+apps/erpnext/erpnext/projects/doctype/project/project.py +164,My Projects,Моји пројекти
 DocType: Journal Entry,Write Off Amount,Отпис Износ
 DocType: Journal Entry,Bill No,Бил Нема
+DocType: Company,Gain/Loss Account on Asset Disposal,Добитак / губитак налог на средства одлагању
 DocType: Purchase Invoice,Quarterly,Тромесечни
 DocType: Selling Settings,Delivery Note Required,Испорука Напомена Обавезно
 DocType: Sales Order Item,Basic Rate (Company Currency),Основни курс (Друштво валута)
@@ -570,13 +582,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,Плаћање Ступање је већ направљена
 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/controllers/accounts_controller.py +473,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +67,Total billing this year,Укупно наплате ове године
 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 +529,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -599,6 +612,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +91,{0} is not a stock Item,{0} не является акционерным Пункт
 DocType: Mode of Payment Account,Default Account,Уобичајено Рачун
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Цустомер&gt; купац Група&gt; Територија
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -613,14 +627,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечна плата изјава.
 DocType: Item Group,Website Specifications,Сајт Спецификације
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Постоји грешка у вашем Адреса Темплате {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Нови налог
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Нови налог
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Од {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правила постоји са истим критеријумима, молимо вас да решавају конфликте са приоритетом. Цена Правила: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правила постоји са истим критеријумима, молимо вас да решавају конфликте са приоритетом. Цена Правила: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +682,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Јоурнал Ентри {0} је повезан против Реда {1}, проверите да ли треба издвајали као унапред у овом рачуну."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Офис эксплуатационные расходы
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
 DocType: Company,Default Cost of Goods Sold Account,Уобичајено Набавна вредност продате робе рачуна
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Прайс-лист не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Process Payroll,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","Филтрирање на основу партије, изаберите партија Типе први"
@@ -686,7 +700,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Моји рачуни
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Моји рачуни
+apps/erpnext/erpnext/controllers/accounts_controller.py +476,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Supplier Quotation,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
@@ -695,10 +710,11 @@
 apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,Уплоад равнотежу берзе преко ЦСВ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Пошаљи сада
 ,Support Analytics,Подршка Аналитика
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +196,Logical error: Must find overlapping,Логичка грешка: Мора наћи преклапање
 DocType: Item,Website Warehouse,Сајт Магацин
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
 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 +267,C-Form records,Ц - Форма евиденција
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Ц - Форма евиденција
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Купаца и добављача
 DocType: Email Digest,Email Digest Settings,Е-маил подешавања Дигест
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Подршка упите од купаца.
@@ -722,7 +738,7 @@
 DocType: Quotation Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,расходы
@@ -759,14 +775,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Да ли подизвођење
 DocType: Item Attribute,Item Attribute Values,Итем Особина Вредности
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Погледај Претплатници
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Куповина Пријем
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
 DocType: Employee,Ms,Мс
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Мастер Валютный курс .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Мастер Валютный курс .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Продајних партнера и Регија
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,БОМ {0} мора бити активна
+DocType: Journal Entry,Depreciation Entry,Амортизација Ступање
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Иди Корпа
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
@@ -785,7 +802,7 @@
 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 +524,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
@@ -795,10 +812,10 @@
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
-DocType: Journal Entry Account,Purchase Invoice,Фактури
+DocType: Asset,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,Датум отварања и затварања Дате треба да буде у истој фискалној години
@@ -808,21 +825,24 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; Бундле предмета, Магацин, редни број и серијски бр ће се сматрати из &quot;листе паковања &#39;табели. Ако Складиште и серијски бр су исти за све ставке паковање за било коју &#39;производ&#39; Бундле ставке, те вредности се могу уносити у главном табели тачка, вредности ће бити копирана у &#39;Паковање лист&#39; сто."
 DocType: Job Opening,Publish on website,Објави на сајту
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Испоруке купцима.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +463,Supplier Invoice Date cannot be greater than Posting Date,Добављач Фактура Датум не може бити већи од датума када је послата
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Избор тачка за трансфер
 DocType: Purchase Invoice,Additional Discount Percentage,Додатни попуст Проценат
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice","Ред {0}: Фактура {1} није исправан, може бити поништен / не постоји. \ Унесите исправну фактуру"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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 +681,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
@@ -831,14 +851,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
 ,Employee Holiday Attendance,Запослени Холидаи Присуство
 DocType: Opportunity,Walk In,Шетња у
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Сток Записи
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Правити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моја Корпа
@@ -848,7 +868,8 @@
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 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 +180,Qty for {0},Количина за {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +49,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
+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 +80,Leave Allocation Tool,Оставите Тоол доделе
 DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
@@ -861,7 +882,7 @@
 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 +547,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Попуст
@@ -876,20 +897,21 @@
 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 +69,Selling Amount,Продаја Износ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Тиме трупци
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Тиме трупци
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Issue,Issue,Емисија
+DocType: Asset,Scrapped,одбачен
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Рачун не одговара Цомпани
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,регрутовање
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Коммерческие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Коммерческие расходы
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
@@ -906,7 +928,7 @@
 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 +18,Quotations received from Suppliers.,Цитати од добављача.
+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,Просек година
@@ -915,7 +937,7 @@
 DocType: Company,Default Currency,Уобичајено валута
 DocType: Contact,Enter designation of this Contact,Унесите назив овог контакта
 DocType: Expense Claim,From Employee,Од запосленог
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,Кључна Перформансе Област
@@ -923,7 +945,7 @@
 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 +130,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Допринос%
@@ -932,22 +954,23 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,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,Глобални Дефаултс
+apps/erpnext/erpnext/projects/doctype/project/project.py +144,Project Collaboration Invitation,Пројекат Сарадња Позив
 DocType: Salary Slip,Deductions,Одбици
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ово време Пријава Групно је наплаћена.
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Капацитет Планирање Грешка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Капацитет Планирање Грешка
 ,Trial Balance for Party,Претресно Разлика за странке
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Зарада
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отварање рачуноводства Стање
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ништа се захтевати
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,управљање
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Врсте активности за време Схеетс
@@ -958,18 +981,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,Молимо поставите Емаил ИД
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Молимо поставите Емаил ИД
 DocType: Item,UOMs,УОМс
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {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},ПОС профил {0} већ створена за корисника: {1} и компанија {2}
 DocType: Purchase Order Item,UOM Conversion Factor,УОМ конверзије фактор
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Снабдевач базе података.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Порески и други плата одбитака.
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
@@ -983,6 +1006,7 @@
 DocType: Holiday,Holiday,Празник
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставите празно ако се сматра за све гране
 ,Daily Time Log Summary,Дневни Време Лог Преглед
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Ц облик није применљив за фактуре: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусаглашена Детаљи плаћања
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
@@ -996,19 +1020,20 @@
 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,Наведите бар један атрибут у табели Атрибутима
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +33,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
 DocType: Contact,User ID,Кориснички ИД
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Погледај Леџер
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Погледај Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Исплаћене дивиденде
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,Нераспоређене добити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Нераспоређене добити
 DocType: BOM Item,Item Description,Ставка Опис
 DocType: Payment Tool,Payment Mode,Режим плаћања
 DocType: Purchase Invoice,Is Recurring,Је се понавља
@@ -1016,7 +1041,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Привремени Отварање
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Процена курс потребно за предмета на ред {0}
@@ -1031,8 +1056,8 @@
 ,Accounts Payable Summary,Обавезе према добављачима Преглед
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 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 +165,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
@@ -1040,7 +1065,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Глава счета {0} создан
 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,Укупно Постигнута
@@ -1048,12 +1073,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
@@ -1063,19 +1088,20 @@
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
 DocType: Hub Settings,Seller Website,Продавац Сајт
 apps/erpnext/erpnext/controllers/selling_controller.py +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},Статус производственного заказа {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,За добављача
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Нису пронашли било који предмет под називом {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Укупно Одлазећи
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для "" To Размер """
 DocType: Authorization Rule,Transaction,Трансакција
@@ -1083,10 +1109,10 @@
 DocType: Item,Website Item Groups,Сајт Итем Групе
 DocType: Purchase Invoice,Total (Company Currency),Укупно (Фирма валута)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
-DocType: Journal Entry,Journal Entry,Јоурнал Ентри
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
 DocType: Naming Series,This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом
@@ -1095,6 +1121,7 @@
 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,Воркстатион
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Захтев за понуду добављача
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
 DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Attendance,HR Manager,ХР Менаџер
@@ -1105,6 +1132,7 @@
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Гол
 DocType: Salary Slip,Earning,Стицање
 DocType: Payment Tool,Party Account Currency,Странка Рачун Валута
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +46,Current Value After Depreciation must be less than equal to {0},Тренутна вредност После амортизације мора бити мањи од једнак {0}
 ,BOM Browser,БОМ Бровсер
 DocType: Purchase Taxes and Charges,Add or Deduct,Додавање или Одузмите
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако Годишњи буџет Прекорачено (за расход рачун)
@@ -1119,21 +1147,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
 DocType: Project,Start and End Dates,Почетни и завршни датуми
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Операције не може остати празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Функције за подешавање
+DocType: Asset,Depreciation Schedules,Амортизација Распоред
 DocType: Item,Is Service Item,Да ли је услуга шифра
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
 DocType: Payment Request,Transaction Currency,трансакција Валута
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Од {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операција Опис
 DocType: Item,Will also apply to variants,Важиће и за варијанте
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не можете променити фискалну годину и датум почетка фискалне године Датум завршетка једном Фискална година је сачувана.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Кампања
@@ -1147,8 +1176,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Нето промена у основном средству
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},Мак: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,За компаније
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација дневник.
@@ -1156,8 +1185,8 @@
 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 +472,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,не може бити већи од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1179,11 +1208,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Пореска Правило за трансакције.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Пореска Правило за трансакције.
 DocType: Rename Tool,Type of document to rename.,Врста документа да преименујете.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Купујемо ову ставку
 DocType: Address,Billing,Обрачун
@@ -1193,12 +1222,15 @@
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Sub Assemblies,Sub сборки
+DocType: Asset,Asset Name,Назив дела
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Supplier,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Паковање Слип
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,аренда площади для офиса
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Захтев за понуду може бити приступ кликом на следећи линк
+DocType: Asset,Number of Months in a Period,Број месеци у периоду
 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,Воркстатион радни сат
@@ -1215,19 +1247,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,правительство
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Укупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
+apps/erpnext/erpnext/templates/pages/projects.html +57,Show closed,схов затворено
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Нема резултата у табели плаћања записи
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Новчани ток од Инвестирање
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 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 +86,Transfer Materials for Manufacture,Трансфер материјал за производњу
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
@@ -1236,7 +1269,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 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.,Молимо креирајте нови налог из контном оквиру .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Одржавање посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Одржавање посета
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступно партије Кол у складишту
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Лог Групно Детаљ
 DocType: Landed Cost Voucher,Landed Cost Help,Слетео Трошкови Помоћ
@@ -1250,7 +1283,6 @@
 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 +196,Brand master.,Бренд господар.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,коробка
@@ -1278,7 +1310,7 @@
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +131,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,Акции Обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Акции Обязательства
 DocType: Purchase Receipt,Supplier Warehouse,Снабдевач Магацин
 DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
@@ -1287,7 +1319,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Поново плаћања Емаил
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Остали извештаји
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,Стани Рођендан Подсетници
@@ -1297,26 +1329,27 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Погледај
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нето промена на пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Количина не сме бити више од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количина не сме бити више од {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +72,Previous Financial Year is not closed,Претходној финансијској години није затворена
 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 +40,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 +38,Supplier Type master.,Тип Поставщик мастер .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 DocType: Purchase Invoice,Reference Document,Ознака документа
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
@@ -1338,8 +1371,9 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Нето промена у потрашивањима
 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',"Клиент требуется для "" Customerwise Скидка """
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
+apps/erpnext/erpnext/config/accounts.py +137,Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
 DocType: Quotation,Term Details,Орочена Детаљи
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора бити већи од 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Капацитет планирање за (дана)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,Warranty Claim,Гаранција Цлаим
@@ -1357,7 +1391,7 @@
 DocType: Employee,Permanent Address,Стална адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Унапред платио против {0} {1} не може бити већи \ од ГРАНД Укупно {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Пожалуйста, выберите элемент кода"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Смањите одбитка за дозволу без плате (ЛВП)
 DocType: Territory,Territory Manager,Територија Менаџер
 DocType: Packed Item,To Warehouse (Optional),До складишта (опционо)
@@ -1367,15 +1401,15 @@
 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,Маркетинговые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Једна јединица једне тачке.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
@@ -1392,33 +1426,35 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,Предмет продаје-мудре Регистрација
+DocType: Asset,Gross Purchase Amount,Бруто Куповина Количина
 apps/erpnext/erpnext/public/js/setup_wizard.js +24,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
+DocType: Asset,Depreciation Method,Амортизација Метод
 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 +29,Shopping Cart is enabled,Корпа је омогућено
 DocType: Job Applicant,Applicant for a Job,Подносилац захтева за посао
 DocType: Production Plan Material Request,Production Plan Material Request,Производња план Материјал Упит
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,"Нет Производственные заказы , созданные"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Нет Производственные заказы , созданные"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,основной
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
@@ -1426,31 +1462,32 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносилац захтева за посао.
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Адресе
+apps/erpnext/erpnext/hooks.py +91,Addresses,Адресе
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,аппраисалс
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Тачка није дозвољено да имају Продуцтион Ордер.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Тачка није дозвољено да имају Продуцтион Ордер.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето тежина овог пакета. (Израчунава аутоматски као збир нето тежине предмета)
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Тиме Протоколи за производњу.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Време Пријава за задатке.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Плаћање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
 apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,Бундле ставке у време продаје.
 DocType: Quotation Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
@@ -1461,6 +1498,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py +66,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 +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
+DocType: Request for Quotation Supplier,Send Email to Supplier,Сенд Емаил за добављача
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 DocType: Packing Slip,To Package No.,За Пакет број
 DocType: Production Planning Tool,Material Requests,materijal Захтеви
@@ -1478,7 +1516,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Испорука Складиште
 DocType: Stock Settings,Allowance Percent,Исправка Проценат
 DocType: SMS Settings,Message Parameter,Порука Параметар
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Дрво центара финансијске трошкове.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Дрво центара финансијске трошкове.
 DocType: Serial No,Delivery Document No,Достава докумената Нема
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Гет ставки од куповине Примања
 DocType: Serial No,Creation Date,Датум регистрације
@@ -1510,40 +1548,42 @@
 ,Amount to Deliver,Износ на Избави
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Продукт или сервис
 DocType: Naming Series,Current Value,Тренутна вредност
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} создан
+apps/erpnext/erpnext/controllers/accounts_controller.py +226,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против продаје налога
 ,Serial No Status,Серијски број статус
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Ставка сто не сме да буде празно
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ров {0}: За подешавање {1} периодичност, разлика између од и до данас \ мора бити већи или једнак {2}"
 DocType: Pricing Rule,Selling,Продаја
 DocType: Employee,Salary Information,Плата Информација
 DocType: Sales Person,Name and Employee ID,Име и број запослених
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Паимент Гатеваи налог није конфигурисан
 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: Production Order,Material Request Item,Материјал Захтев шифра
+DocType: Request for Quotation Item,Material Request Item,Материјал Захтев шифра
 apps/erpnext/erpnext/config/stock.py +85,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,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
+DocType: Asset,Sold,Продат
 ,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 +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Књиговодство Детаљи
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Обриши све трансакције за ову компанију
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,инвестиции
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,издвајања
 DocType: Quality Inspection Reading,Acceptance Criteria,Критеријуми за пријем
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Унесите Материјални захтеве у горњој табели
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Унесите Материјални захтеве у горњој табели
 DocType: Item Attribute,Attribute Name,Назив атрибута
 DocType: Item Group,Show In Website,Схов у сајт
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Група
@@ -1551,6 +1591,7 @@
 ,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","Да бисте пратили бренд име у следећим документима испоруци, прилика, материјалној Захтев тачка, нарудзбенице, купите ваучер, Наручилац пријему, цитат, Продаја фактура, Производ Бундле, Салес Ордер, Сериал Но"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Гантов графикон свих задатака.
+DocType: Pricing Rule,Margin Type,маргин Тип
 DocType: Appraisal,For Employee Name,За запосленог Име
 DocType: Holiday List,Clear Table,Слободан Табела
 DocType: Features Setup,Brands,Брендови
@@ -1558,20 +1599,25 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"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,Кориснички Адресе и контакти
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +259,Row #{0}: Asset is mandatory against a Fixed Asset Item,Ред # {0}: амбалажа је обавезан против основних средстава тачке
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање броји серију за учешће преко Сетуп&gt; нумерације серија
 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/hr/doctype/expense_claim/expense_claim.py +49,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Pair,пара
+DocType: Asset,Depreciation Schedule,Амортизација Распоред
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
+DocType: Asset,Purchase Date,Датум куповине
 DocType: Employee,Personal Details,Лични детаљи
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +170,Please set 'Asset Depreciation Cost Center' in Company {0},Молимо поставите &#39;Ассет Амортизација Набавна центар &quot;у компанији {0}
 ,Maintenance Schedules,Планове одржавања
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
@@ -1585,23 +1631,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Укупно Стварна
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,блок
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Молимо наведите фирму
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,Расходи Потраживања
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
 ,BOM Search,БОМ Тражи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затварање (Опенинг + износи)
@@ -1610,29 +1655,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,материал_рекуест_итем
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Одузимање
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 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 +137,Please enter Production Item first,Молимо унесите прво Производња пункт
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Молимо унесите прво Производња пункт
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Обрачуната банка Биланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,искључени корисник
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Понуда
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 DocType: Quotation,Maintenance User,Одржавање Корисник
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Трошкови ажурирано
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Трошкови ажурирано
 DocType: Employee,Date of Birth,Датум рођења
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,Одбити
@@ -1644,8 +1689,8 @@
 ,SO Qty,ТАКО Кол
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+DocType: Request for Quotation,Manufacturing Manager,Производња директор
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Пошиљке
 DocType: Purchase Order Item,To be delivered to customer,Који ће бити достављен купца
@@ -1653,12 +1698,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ров #
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
-DocType: Pricing Rule,Supplier,Добављач
+DocType: Asset,Supplier,Добављач
 DocType: C-Form,Quarter,Четврт
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Прочие расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Уобичајено Компанија
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Пользователь {0} отключена
@@ -1667,7 +1712,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Од валутног
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
@@ -1680,8 +1725,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Дете артикла не би требало да буде Бундле производа. Молимо Вас да уклоните ставку `{0} &#39;и сачувати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Нови Трошкови Центар
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; и помињу пореска стопа.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Нови Трошкови Центар
 DocType: Bin,Ordered Quantity,Наручено Количина
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Quality Inspection,In Process,У процесу
@@ -1697,7 +1741,7 @@
 DocType: Quotation Item,Stock Balance,Берза Биланс
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Продаја Налог за плаћања
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Време трупци цреатед:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Време трупци цреатед:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Employee,Blood Group,Крв Група
@@ -1715,13 +1759,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Дебитна Да је потребно
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Руководилац квалитета
 DocType: Job Applicant,Job Opening,Посао Отварање
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Понуда Леттер
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генеришите Захтеви материјал (МРП) и производних налога.
@@ -1729,22 +1773,22 @@
 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 +103,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завршен Кол
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Прайс-лист {0} отключена
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Тренутни Процена курс
 DocType: Item,Customer Item Codes,Кориснички кодова
 DocType: Opportunity,Lost Reason,Лост Разлог
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Корисници и дозволе
@@ -1753,10 +1797,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Серијски број {0} није пронађен
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Серијски број {0} није пронађен
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Ваши Купци
 DocType: Leave Block List Date,Block Date,Блоцк Дате
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Пријавите се
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Пријавите се
 DocType: Sales Order,Not Delivered,Није Испоручено
 ,Bank Clearance Summary,Банка Чишћење Резиме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
@@ -1780,7 +1824,7 @@
 DocType: Employee,Employment Details,Детаљи за запошљавање
 DocType: Employee,New Workplace,Новом радном месту
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Постави као Цлосед
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Нет товара со штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Нет товара со штрих-кодом {0}
 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,Приказивање слајдова на врху странице
@@ -1798,10 +1842,10 @@
 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 +608,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Пренос материјала
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Итем {0} мора бити продаје предмета на {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Молимо поставите понављају након снимања
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -1815,7 +1859,7 @@
 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: Process Payroll,Create Salary Slip,Направи Слип платама
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования ( обязательства)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Запосленик
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Увоз е-маил Од
@@ -1829,9 +1873,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,фармацевтический
@@ -1848,25 +1892,25 @@
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Gateway Account,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Наведите компанија наставити
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Нето Промена Потраживања
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неважећи референца {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Сировине не може бити празан.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Брзо Јоурнал Ентри
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} не представлено
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
@@ -1875,7 +1919,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Следећи производних налога су створени:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Следећи производних налога су створени:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Билтен Маилинг листа
 DocType: Delivery Note,Transporter Name,Транспортер Име
 DocType: Authorization Rule,Authorized Value,Овлашћени Вредност
@@ -1893,10 +1937,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} је затворен
 DocType: Email Digest,How frequently?,Колико често?
 DocType: Purchase Receipt,Get Current Stock,Гет тренутним залихама
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Иди на одговарајуће групе (обично Примена средстава&gt; обртна имовина&gt; банковне рачуне и креирати нови налог (кликом на Адд Цхилд) типа &quot;Банка&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дрво Билл оф Материалс
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Марко Садашња
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Сунце Датум завршетка
 DocType: Authorization Rule,Applicable To (Role),Важећи Да (улога)
 DocType: Stock Entry,Purpose,Намена
@@ -1958,12 +2001,12 @@
  9. Размислите порез или накнада за: У овом одељку можете да изаберете порески / наплаћује само за вредновање (не дио укупног) или само за укупно (не додају вредност ставке) или за обоје.
  10. Додајте или Одузети: Било да желите да додате или одбије порез."
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","нпр банка, Готовина, кредитна картица"
 DocType: Journal Entry,Credit Note,Кредитни Напомена
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Завршен ком не може бити више од {0} за рад {1}
 DocType: Features Setup,Quality,Квалитет
@@ -1987,9 +2030,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Моје адресе
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,Уобичајено Куповина Ценовник
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ни један запослени за горе одабране критеријуме или листић плата већ креирана
@@ -2016,7 +2059,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платни списак
 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} морају бити укључени"
@@ -2027,7 +2070,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Прилагођавање Облици
 DocType: Account,Income Account,Приходи рачуна
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Кључна Одговорност Површина
@@ -2049,16 +2092,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Управление групповой клиентов дерево .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Нови Трошкови Центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
 DocType: Appraisal,HR User,ХР Корисник
 DocType: Purchase Invoice,Taxes and Charges Deducted,Порези и накнаде одузима
-apps/erpnext/erpnext/config/support.py +7,Issues,Питања
+apps/erpnext/erpnext/hooks.py +90,Issues,Питања
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебитна Да
 DocType: Delivery Note,Required only for sample item.,Потребно само за узорак ставку.
@@ -2077,10 +2120,10 @@
 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 +139,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Преостали дио кредита
@@ -2148,7 +2191,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, разбити операцију у више операција"
 ,Requested,Тражени
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Но Примедбе
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Корен Рачун мора бити група
@@ -2175,7 +2218,7 @@
 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,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 DocType: Payment Request,Recipient and Message,Прималац и порука
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
@@ -2189,7 +2232,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Избор добављача Адреса
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
@@ -2212,10 +2255,10 @@
 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; и нема другог производа Бундле
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Прайс-лист Обмен не выбран
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Пројекат Датум почетка
@@ -2224,7 +2267,7 @@
 DocType: Installation Note Item,Against Document No,Против документу Нема
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Управљање продајних партнера.
 DocType: Quality Inspection,Inspection Type,Инспекција Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Пожалуйста, выберите {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
 DocType: Employee Attendance Tool,Unmarked Attendance,Необележен Присуство
@@ -2252,7 +2295,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврђен
 DocType: Payment Gateway,Gateway,Пролаз
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Амт
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Амт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
@@ -2266,12 +2309,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Прихваћено Магацин
 DocType: Bank Reconciliation Detail,Posting Date,Постављање Дате
 DocType: Item,Valuation Method,Процена Метод
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Није могуће пронаћи курс за {0} до {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Није могуће пронаћи курс за {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Марка Пола дан
 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 +410,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,Вентуре Цапитал
@@ -2303,13 +2346,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Запросы Материал {0} создан
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Предложак термина или уговору.
 DocType: Purchase Invoice,Address and Contact,Адреса и контакт
 DocType: Supplier,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Employee,Feedback,Повратна веза
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Item,Reorder level based on Warehouse,Промени редослед ниво на основу Варехоусе
 DocType: Activity Cost,Billing Rate,Обрачун курс
@@ -2323,12 +2366,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} отказан или затворен
 DocType: Delivery Note,Track this Delivery Note against any Project,Прати ову напомену Испорука против било ког пројекта
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Нето готовина из Инвестирање
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Корневая учетная запись не может быть удалена
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Управљање адресе
-DocType: Pricing Rule,Item Code,Шифра
+DocType: Asset,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
 DocType: Journal Entry,User Remark,Корисник Напомена
@@ -2374,24 +2416,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Серијски број и партије
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,минут
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 ,Qty to Receive,Количина за примање
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
 DocType: Sales Partner,Retailer,Продавац на мало
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
 DocType: Global Defaults,Disable In Words,Онемогућити У Вордс
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Банк Овердрафт счета
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,Почетно стање Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Почетно стање Капитал
 DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се понавља
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овлашћени потписник
@@ -2400,7 +2442,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Порука је послата
@@ -2441,7 +2483,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
 DocType: Payment Gateway Account,Default Payment Request Message,Уобичајено Плаћање Упит Порука
 DocType: Item Group,Check this if you want to show in website,Проверите ово ако желите да прикажете у Веб
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Банкарство и плаћања
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Банкарство и плаћања
 ,Welcome to ERPNext,Добродошли у ЕРПНект
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Детаљ Број
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Олово и цитата
@@ -2449,17 +2491,17 @@
 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 +199,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,Лишће и одмор
 DocType: Sales Order,Not Billed,Није Изграђена
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Магацин мора припадати истој компанији
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,Дозирана за наплату
@@ -2477,13 +2519,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Магацин {0}: Фирма је обавезна
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Account,Payable,к оплате
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Дужници ({0})
-DocType: Project,Margin,Маржа
+DocType: Pricing Rule,Margin,Маржа
 DocType: Salary Slip,Arrear Amount,Заостатак Износ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нове Купци
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Бруто добит%
@@ -2504,7 +2546,7 @@
 DocType: Payment Request,Email To,Е-маил Да
 DocType: Lead,Lead Owner,Олово Власник
 DocType: Bin,Requested Quantity,Тражени Количина
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Је потребно Складиште
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Је потребно Складиште
 DocType: Employee,Marital Status,Брачни статус
 DocType: Stock Settings,Auto Material Request,Ауто Материјал Захтев
 DocType: Time Log,Will be updated when billed.,Да ли ће се ажурирати када наплаћени.
@@ -2512,7 +2554,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% Испоручено
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 DocType: Territory,Territory Targets,Територија Мете
@@ -2532,7 +2574,7 @@
 DocType: Manufacturer,Manufacturers used in Items,Произвођачи користе у ставке
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Молимо да наведете заокружују трошка у компанији
 DocType: Purchase Invoice,Terms,услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Цреате Нев
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Цреате Нев
 DocType: Buying Settings,Purchase Order Required,Наруџбенице Обавезно
 ,Item-wise Sales History,Тачка-мудар Продаја Историја
 DocType: Expense Claim,Total Sanctioned Amount,Укупан износ санкционисан
@@ -2545,7 +2587,7 @@
 ,Stock Ledger,Берза Леџер
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Оцени: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата Слип Одбитак
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Изаберите групу чвор прво.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Изаберите групу чвор прво.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Запослени и Присуство
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Уклонити референцу купца, добављача, продаје партнера и олова, као што је ваша адреса компаније"
@@ -2567,13 +2609,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Од {1}
 DocType: Task,depends_on,депендс_он
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Следећа Датум мора бити већи од датума када је послата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Покажи пореза распада
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Следећа Датум мора бити већи од датума када је послата
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/accounts/party.py +289,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',Если вы привлечь в производственной деятельности. Включает элемент ' производится '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Фактура датум постања
@@ -2588,7 +2630,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Напомена: Ако се плаћање не врши против било референце, чине Јоурнал Ентри ручно."
@@ -2602,7 +2644,7 @@
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2611,7 +2653,7 @@
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
@@ -2622,7 +2664,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
@@ -2635,7 +2677,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,стажиста
@@ -2643,7 +2685,7 @@
 DocType: Stock Entry,From BOM,Од БОМ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
@@ -2651,14 +2693,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Плата Структура
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 DocType: Hub Settings,Access Token,Приступ токен
 DocType: Sales Invoice Item,Serial No,Серијски број
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
-DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 DocType: Purchase Invoice,Print Language,принт Језик
 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","Ако сте дуго штампање формата, ова функција може да се користи да подели страница на којој се штампа на више страница са свим заглавља и подножја на свакој страници"
@@ -2675,7 +2716,7 @@
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
@@ -2691,13 +2732,13 @@
 DocType: Quotation,Maintenance Manager,Менаџер Одржавање
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дана од последње поруџбине"" мора бити веће или једнако нули"
-DocType: C-Form,Amended From,Измењена од
+DocType: Asset,Amended From,Измењена од
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Пренети
@@ -2711,20 +2752,20 @@
 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/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа пореске главе (нпр ПДВ, царине, итд, они треба да имају јединствена имена) и њихове стандардне цене. Ово ће створити стандардни модел, који можете уредити и додати још касније."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Утакмица плаћања са фактурама
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Утакмица плаћања са фактурама
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Добавить в корзину
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група По
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Включение / отключение валюты.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Включение / отключение валюты.
 DocType: Production Planning Tool,Get Material Request,Гет Материал захтев
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Укупно Поклон
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,рачуноводствених исказа
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,рачуноводствених исказа
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
@@ -2744,13 +2785,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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 +32,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,Кориснички Група
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Вебсајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Нето промена у капиталу
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
@@ -2760,12 +2801,12 @@
 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,Кориснички Назив групе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
 DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
 DocType: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Гет ставке
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Гет ставке
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последњи Низ Датум
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
 DocType: C-Form,C-Form,Ц-Форм
@@ -2777,18 +2818,17 @@
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Payment Tool,Make Journal Entry,Маке Јоурнал Ентри
 DocType: Leave Allocation,New Leaves Allocated,Нови Леавес Издвојена
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,коммерческий
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 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 +52,All Products or Services.,Сви производи или услуге.
 DocType: Supplier Quotation,Supplier Address,Снабдевач Адреса
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
+apps/erpnext/erpnext/config/accounts.py +259,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,Финансијске услуге
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
@@ -2799,10 +2839,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Пренос
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Пренос
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Дуе Дате обавезна
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
@@ -2824,18 +2864,18 @@
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 DocType: Features Setup,POS View,ПОС Погледај
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Инсталација рекорд за серијским бр
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Следећи датум је дан и поновите на дан месеца морају бити једнаки
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Следећи датум је дан и поновите на дан месеца морају бити једнаки
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Наведите
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Време се је Приходована
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Счет {0} не может быть группа
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Привремени Добитак / Губитак (кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Молимо поставите подразумевану вредност {0} у компанији {1}
@@ -2845,12 +2885,11 @@
 ,Monthly Attendance Sheet,Гледалаца Месечни лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Нема података фоунд
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање броји серију за учешће преко Сетуп&gt; нумерације серија
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Гет ставки из производа Бундле
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
 DocType: Features Setup,Sales Discounts,Продаја Попусти
@@ -2864,39 +2903,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Број Реда
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ХТМЛ / банер који ће се појавити на врху листе производа.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведите услове да може да израчуна испоруку износ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Додај Цхилд
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,Отварање Вредност
 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,Комиссия по продажам
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
 DocType: Tax Rule,Billing Country,Zemlja naplate
 ,Customers Not Buying Since Long Time,Купци не купују јер дуго времена
 DocType: Production Order,Expected Delivery Date,Очекивани Датум испоруке
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,представительские расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,представительские расходы
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Пријаве за одмор.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,судебные издержки
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,судебные издержки
 DocType: Sales Invoice,Posting Time,Постављање Време
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Телефон Расходы
 DocType: Sales Partner,Logo,Лого
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Проверите ово ако желите да натера кориснику да одабере серију пре чувања. Неће бити подразумевано ако проверите ово.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Нет товара с серийным № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Нет товара с серийным № {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Отворене Обавештења
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,прямые расходы
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,прямые расходы
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} је неважећа е-маил адреса у &quot;Обавештење \ Емаил Аддресс &#39;
 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,Командировочные расходы
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
@@ -2913,7 +2952,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Ми продајемо ову ставку
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Добављач Ид
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Количину треба већи од 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Количину треба већи од 0
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 DocType: Sales Partner,Contact Desc,Контакт Десц
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листова као што су повремене, болесне итд"
@@ -2928,7 +2967,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Шаблоном Зарплата .
@@ -2944,7 +2983,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
@@ -2959,13 +2998,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ово време Пријава серија је отказана.
 ,Reqd By Date,Рекд по датуму
 DocType: Salary Slip Earning,Salary Slip Earning,Плата Слип Зарада
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Повериоци
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Повериоци
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Ред # {0}: Серијски број је обавезан
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
@@ -2986,15 +3025,14 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
-DocType: Project,Project Name,Назив пројекта
+DocType: Request for Quotation 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,Итем Батцх Нос
@@ -3031,7 +3069,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Компанија је обавезна, као што је ваша адреса компаније"
 DocType: Item Attribute,From Range,Од Ранге
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Пошаљите ова производња би за даљу обраду .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Пошаљите ова производња би за даљу обраду .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не примењује Правилник о ценама у одређеном трансакцијом, све важеће Цене Правила би требало да буде онемогућен."
 DocType: Company,Domain,Домен
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Послови
@@ -3043,6 +3081,7 @@
 DocType: Time Log,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
@@ -3077,7 +3116,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Привремене рачуни
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
@@ -3091,16 +3130,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,марк Одсутан
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,Да Време мора бити већи од Фром Тиме
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Адд ставке из
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Адд ставке из
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task ID,Задатак ИД
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","например ""МС """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Магацин {0} не постоји
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,Изабрана опција не може имати Батцх
@@ -3126,7 +3165,7 @@
 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,Следећа Контакт
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Сетуп Гатеваи рачуни.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Сетуп Гатеваи рачуни.
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,капитальные активы
 ,Cash Flow,Protok novca
@@ -3140,7 +3179,7 @@
 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 +132,Please find attached {0} #{1},У прилогу {0} {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},У прилогу {0} {1} #
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Банка Биланс по Главној књизи
 DocType: Job Applicant,Applicant Name,Подносилац захтева Име
 DocType: Authorization Rule,Customer / Item Name,Кориснички / Назив
@@ -3156,19 +3195,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Наведите из / у распону
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Цустомер&gt; купац Група&gt; Територија
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок .
 DocType: BOM Replace Tool,Current BOM,Тренутни БОМ
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додај сериал но
 apps/erpnext/erpnext/config/support.py +43,Warranty,гаранција
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Печать и стационарное
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Група Ноде
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Ажурирање готове робе
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Ажурирање готове робе
 DocType: Workstation,per hour,на сат
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Куповина
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Износ Плаћени
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
@@ -3198,7 +3236,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
 DocType: Leave Block List,Applies to Company,Примењује се на предузећа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
 DocType: Purchase Invoice,In Words,У Вордс
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Захтев за магацине
@@ -3212,7 +3250,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
 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.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
@@ -3223,7 +3261,7 @@
 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 +782,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} уже получил
@@ -3231,14 +3269,13 @@
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалне могућности за продају.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Неважећи {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Први Сачувајте документ.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
 DocType: Company,Change Abbreviation,Промена скраћеница
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
@@ -3256,10 +3293,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Главна књига
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Погледај Леадс
 DocType: Item Attribute Value,Attribute Value,Вредност атрибута
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Удостоверение личности электронной почты должен быть уникальным , уже существует для {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Удостоверение личности электронной почты должен быть уникальным , уже существует для {0}"
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,Изаберите {0} први
 DocType: Features Setup,To get Item Group in details table,Да бисте добили групу ставка у табели детаљније
@@ -3295,23 +3332,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Стварни Кол (на извору / циљне)
 DocType: Item Customer Detail,Ref Code,Реф Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Запослених евиденција.
 DocType: Payment Gateway,Payment Gateway,Паимент Гатеваи
 DocType: HR Settings,Payroll Settings,Платне Подешавања
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Извршите поруџбину
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корен не може имати центар родитеља трошкова
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Изабери Марка ...
 DocType: Sales Invoice,C-Form Applicable,Ц-примењује
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Складиште је обавезно
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Решен
@@ -3329,7 +3366,7 @@
 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,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Трансакција валуте мора бити исти као паимент гатеваи валуте
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Пријем
 DocType: Maintenance Visit,Fully Completed,Потпуно Завршено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Комплетна
 DocType: Employee,Educational Qualification,Образовни Квалификације
@@ -3337,14 +3374,14 @@
 DocType: Purchase Invoice,Submit on creation,Пошаљи на стварању
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Purchase Receipt Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Ми Ордерс
@@ -3365,10 +3402,10 @@
 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 +250,Point-of-Sale Profile,Поинт-оф-Сале Профиле
+apps/erpnext/erpnext/config/accounts.py +258,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} већ наплаћено
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,необеспеченных кредитов
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
 DocType: Maintenance Schedule Detail,Scheduled Date,Планиран датум
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Укупно Плаћени Амт
@@ -3380,7 +3417,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
@@ -3393,12 +3430,12 @@
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Од {0} {1} за
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
 DocType: Issue,Content Type,Тип садржаја
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
@@ -3407,7 +3444,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Рачун шеф
@@ -3420,7 +3457,7 @@
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,фондовые активы
@@ -3434,15 +3471,15 @@
 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 +576,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Пројекат активност / задатак.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Генериши стаје ПЛАТА
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Куповина се мора проверити, ако је применљиво Јер је изабрана као {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Поновите на дан у месецу
@@ -3463,7 +3500,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. АБЦД ##### 
  Ако Радња је смештена и серијски број се не помиње у трансакцијама, онда аутоматски серијски број ће бити креирана на основу ове серије. Ако сте одувек желели да помиње експлицитно Сериал Нос за ову ставку. оставите празно."
@@ -3475,11 +3512,11 @@
 ,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 +91,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании Master"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Пожалуйста, введите валюту по умолчанию в компании 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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Сукоби Пореска Правило са {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Нови налог Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,Кориснички сервис
@@ -3491,9 +3528,9 @@
 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 +72,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Уобичајено Ворк Ин Прогресс Варехоусе
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Упдате Број
 DocType: Account,Equity,капитал
 DocType: Sales Order,Printing Details,Штампање Детаљи
@@ -3501,7 +3538,7 @@
 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,Тражи Суб скупштине
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
 DocType: Purchase Taxes and Charges,Actual,Стваран
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
@@ -3524,7 +3561,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Успешно помирили
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Где ставке су ускладиштене.
@@ -3535,7 +3572,7 @@
 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 +508,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Налоговый шаблон для покупки сделок.
 ,Item Prices,Итем Цене
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,У речи ће бити видљив када сачувате поруџбеницу.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Затварање ваучера
@@ -3545,10 +3582,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Промена
@@ -3567,13 +3604,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Серија
@@ -3587,7 +3624,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Продаја Особа
 DocType: Sales Invoice,Cold Calling,Хладна Позивање
 DocType: SMS Parameter,SMS Parameter,СМС Параметар
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Буџет и трошкова центар
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Буџет и трошкова центар
 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.,Создание правил для ограничения операций на основе значений .
@@ -3620,7 +3657,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
@@ -3628,7 +3664,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Рачуни подигао купцима.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,Родитељ рачуна
@@ -3644,7 +3680,7 @@
 DocType: Employee,Education,образовање
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
 DocType: Address,Office,Канцеларија
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
@@ -3679,7 +3715,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,Месечна плата Регистрација
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
@@ -3687,22 +3723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
 DocType: POS Profile,POS Profile,ПОС Профил
 DocType: Payment Gateway Account,Payment URL Message,Плаћање УРЛ адреса Порука
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ров {0}: Плаћање Износ не може бити већи од преосталог износа
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Укупно Неплаћено
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Време Пријави се не наплаћују
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
 DocType: SMS Settings,Static Parameters,Статички параметри
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Материјал за добављача
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Акцизе фактура
 DocType: Expense Claim,Employees Email Id,Запослени Емаил ИД
 DocType: Employee Attendance Tool,Marked Attendance,Приметан Присуство
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Текущие обязательства
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Текущие обязательства
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Стварна ком је обавезна
@@ -3723,17 +3759,16 @@
 DocType: Item Attribute,Numeric Values,Нумеричке вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок оставите апликације по одељењу.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,аналитика
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корпа је празна
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Подразумевани Адреса Шаблон фоунд. Креирајте нови из Подешавања&gt; Штампа и брендирање&gt; Адреса Темплате.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Капитал Сток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Капитал Сток
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
 DocType: Payment Gateway Account,Payment Gateway Account,Паимент Гатеваи налог
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Након завршетка уплате преусмерава корисника на одабране стране.
@@ -3745,17 +3780,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Саставница
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Реф Датум
@@ -3763,6 +3798,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Счет {0} не существует
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 07c9159..7cc7db1 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -18,10 +18,10 @@
 DocType: Sales Partner,Dealer,Återförsäljare
 DocType: Employee,Rented,Hyrda
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/accounts/doctype/asset/asset.js +35,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
 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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen installations anställd namngivningssystem i Human Resource&gt; HR Inställningar
 DocType: Purchase Order,Customer Contact,Kundkontakt
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Trä
 DocType: Job Applicant,Job Applicant,Arbetssökande
@@ -41,20 +41,21 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +176,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
+apps/erpnext/erpnext/templates/pages/projects.js +81,Show open,Visa öppna
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie uppdaterats
 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/projects/doctype/project/project.py +44,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 +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 +229,New Leave Application,Ny Ledighets ansökningan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Visar varianter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Kvantitet
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (skulder)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Beteckning
@@ -64,7 +65,7 @@
 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 +642,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
@@ -81,7 +82,7 @@
 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 +131,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Försäljning Partners kommissionen
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Förkortning kan inte ha mer än 5 tecken
 DocType: Payment Request,Payment Request,Betalningsbegäran
@@ -102,7 +103,7 @@
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ej tillåtet för {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Få objekt från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
@@ -140,7 +141,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitets Logg:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,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/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Läkemedel
@@ -156,7 +157,7 @@
 DocType: SMS Center,All Contact,Alla Kontakter
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stock Kostnader
 DocType: Newsletter,Email Sent?,E-post Skickat?
 DocType: Journal Entry,Contra Entry,Konteringsanteckning
 DocType: Production Order Operation,Show Time Logs,Visa Time Loggar
@@ -164,12 +165,12 @@
 DocType: Delivery Note,Installation Status,Installationsstatus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Produkt {0} måste vara en beställningsprodukt
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: BOM Replace Tool,New BOM,Ny BOM
@@ -208,11 +209,11 @@
 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 +79,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Ange Företag
@@ -221,7 +222,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettokassaflöde från finansiering
 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 +217,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Medlemmar
 ,Contact Name,Kontaktnamn
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
@@ -235,8 +236,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 DocType: Payment Tool,Reference No,Referensnummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,bankAnteckningar
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
@@ -248,8 +249,8 @@
 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 +592,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}"
@@ -264,7 +265,7 @@
 DocType: Notification Control,Notification Control,Anmälningskontroll
 DocType: Lead,Suggestions,Förslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ange artikelgrupp visa budgetar på detta område. Du kan även inkludera säsongs genom att ställa in Distribution.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Ange huvudkontogrupp för lager {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Ange huvudkontogrupp för lager {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
@@ -283,7 +284,7 @@
 DocType: Item,Synced With Hub,Synkroniserad med Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Fel Lösenord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
 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
@@ -294,10 +295,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Följesedel
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ställa in skatter
 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 +381,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,Välj månad och år
@@ -308,12 +309,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Den totala order Anses
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Välj Punkt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
@@ -335,9 +336,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Produktkvalitetskontroll Parameter
 DocType: Leave Application,Leave Approver Name,Ledighetsgodkännare Namn
-,Schedule Date,Schema Datum
+DocType: Depreciation Schedule,Schedule Date,Schema Datum
 DocType: Packed Item,Packed Item,Packad artikel
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Standardinställningar för att inköps transaktioner.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardinställningar för att inköps transaktioner.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitetskostnad existerar för anställd {0} mot Aktivitetstyp - {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.,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
@@ -386,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
-DocType: Material Request Item,Required Date,Obligatorisk Datum
+DocType: Request for Quotation Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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
@@ -416,17 +417,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -446,7 +447,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Inkrement kan inte vara 0
 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 +86,Item {0} is not Purchase Item,Produkt {0} är inte ett beställningsobjekt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Produkt {0} är inte ett beställningsobjekt
 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
@@ -457,7 +458,7 @@
 DocType: Production Plan Item,Pending Qty,Väntar Antal
 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 +126,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 +127,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
@@ -467,13 +468,13 @@
 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 +126,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 +230,Financial / accounting year.,Budget / räkenskapsåret.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ackumulerade värden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Levereras: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betalningskonto
@@ -481,7 +482,7 @@
 DocType: Job Applicant,Resume Attachment,CV Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Sales Return
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Lönedelar.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databas för potentiella kunder.
@@ -490,7 +491,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -500,7 +501,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Uppdatera banköverföring Datum
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Uppdatera banköverföring Datum
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
@@ -518,19 +519,18 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Ange inköpskvitto först
 DocType: Buying Settings,Supplier Naming By,Leverantör Naming Genom
 DocType: Activity Type,Default Costing Rate,Standardkalkyl betyg
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Underhållsschema
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettoförändring i Inventory
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chef
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Ställ en Holiday lista för antingen anställd eller Bolaget
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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/cost_center/cost_center.js +69,Convert to Group,Konvertera till gruppen
 DocType: Activity Cost,Activity Type,Aktivitetstyp
@@ -538,7 +538,7 @@
 DocType: Supplier,Fixed Days,Fasta Dagar
 DocType: Quotation Item,Item Balance,punkt Balans
 DocType: Sales Invoice,Packing List,Packlista
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Inköprsorder som ges till leverantörer.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inköprsorder som ges till leverantörer.
 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
@@ -572,7 +572,7 @@
 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 +529,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -609,14 +609,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månadslön uttalande.
 DocType: Item Group,Website Specifications,Webbplats Specifikationer
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Det finns ett fel i adressmallen {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Nytt Konto
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Nytt Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {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.,Bokföringsposter kan göras mot huvudnoder. Inlägg mot grupper är inte tillåtna.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -645,17 +645,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Kontor underhållskostnader
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standardkostnad Konto Sålda Varor
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prislista inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -663,7 +663,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Mina Fakturor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,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: Supplier Quotation,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
@@ -675,7 +675,7 @@
 DocType: Item,Website Warehouse,Webbplatslager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Betyg måste vara mindre än eller lika med 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form arkiv
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form arkiv
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Kunder och leverantör
 DocType: Email Digest,Email Digest Settings,E-postutskick Inställningar
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support frågor från kunder.
@@ -699,7 +699,7 @@
 DocType: Quotation 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 +240,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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
@@ -736,14 +736,14 @@
 DocType: Supplier Quotation,Is Subcontracted,Är utlagt
 DocType: Item Attribute,Item Attribute Values,Produkt Attribut Värden
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Medlemmar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Inköpskvitto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
 DocType: Employee,Ms,Fröken
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Valutakurs mästare.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Valutakurs mästare.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Säljpartners och Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,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 +36,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto kundvagn
 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
@@ -762,7 +762,7 @@
 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 +524,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -772,10 +772,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Inköpsfaktura
+DocType: Asset,Purchase Invoice,Inköpsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Rabatt Detalj nr
 DocType: Stock Entry,Total Outgoing Value,Totalt Utgående Värde
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Öppningsdatum och Slutdatum bör ligga inom samma räkenskapsår
@@ -785,16 +785,16 @@
 DocType: Material Request Item,Lead Time Date,Ledtid datum
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,är obligatoriskt. Kanske Valutaväxling posten inte skapas för
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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 ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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 ""Produktgrupper"" poster, Lager, Serienummer och Batch kommer  att övervägas från ""Packlistan"". Om Lager och Batch inte är samma för alla förpacknings objekt för alla ""Produktgrupper"" , kan dessa värden skrivas in i huvud produkten, kommer värden kopieras till ""Packlistan""."
 DocType: Job Opening,Publish on website,Publicera på webbplats
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Transporter till kunder.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Indirekt inkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ställ Betalningsbelopp = utestående belopp
 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 +672,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Välj föremål för Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ytterligare rabatt Procent
 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."
@@ -808,14 +808,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
 ,Employee Holiday Attendance,Anställd Semester Närvaro
 DocType: Opportunity,Walk In,Gå In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock Inlägg
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock Inlägg
 DocType: Item,Inspection Criteria,Inspektionskriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Överfört
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Göra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Göra
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
 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 +5,My Cart,Min kundvagn
@@ -825,7 +825,7 @@
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 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 +180,Qty for {0},Antal för {0}
+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 +80,Leave Allocation Tool,Ledighet Tilldelningsverktyget
 DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
@@ -838,7 +838,7 @@
 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.,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 +547,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -853,20 +853,20 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Inköpskvitto Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Försäljningsbelopp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Tid loggar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Tid loggar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrytering
 DocType: BOM Operation,Operation,Funktion
 DocType: Lead,Organization Name,Organisationsnamn
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Försäljnings Kostnader
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standard handla
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
@@ -883,7 +883,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Till {0} | {1} {2}
 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
@@ -892,7 +892,7 @@
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Ange beteckning för denna Kontakt
 DocType: Expense Claim,From Employee,Från anställd
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -900,7 +900,7 @@
 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 +130,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 +131,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 +42,Contribution %,Bidrag%
@@ -909,7 +909,7 @@
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
@@ -917,14 +917,14 @@
 DocType: Salary Slip,Deductions,Avdrag
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch har fakturerats.
 DocType: Salary Slip,Leave Without Pay,Lämna utan lön
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapacitetsplanering Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapacitetsplanering Error
 ,Trial Balance for Party,Trial Balance för Party
 DocType: Lead,Consultant,Konsult
 DocType: Salary Slip,Earnings,Vinster
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Ingående redovisning Balans
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,Ingenting att begära
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Ledning
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Olika typer av aktiviteter för tidrapporter
@@ -935,18 +935,18 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Ställ in e-ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ställ in e-ID
 DocType: Item,UOMs,UOM
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Produkt kod kan inte ändras för serienummer
 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/config/buying.py +33,Supplier database.,Leverantörsdatabas.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverantörsdatabas.
 DocType: Account,Balance Sheet,Balansräkning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Skatt och andra löneavdrag.
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
@@ -974,18 +974,18 @@
 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
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Se journal
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Se journal
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Lämnad utdelning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Lämnad utdelning
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Redovisning Ledger
 DocType: Stock Reconciliation,Difference Amount,Differensbelopp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Balanserade vinstmedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Balanserade vinstmedel
 DocType: BOM Item,Item Description,Produktbeskrivning
 DocType: Payment Tool,Payment Mode,Betalningsläget
 DocType: Purchase Invoice,Is Recurring,Är återkommande
@@ -993,7 +993,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Tillfällig Öppning
 ,Employee Leave Balance,Anställd Avgångskostnad
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
@@ -1008,8 +1008,8 @@
 ,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Kundorder {0} är inte giltig
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
@@ -1017,7 +1017,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Konto huvudet {0} skapades
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totalt Uppnått
@@ -1025,12 +1025,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 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
@@ -1040,17 +1040,17 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Säljare Webbplatsen
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsorderstatus är {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produktionsorderstatus är {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,För Leverantör
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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
@@ -1060,10 +1060,10 @@
 DocType: Item,Website Item Groups,Webbplats artikelgrupper
 DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
-DocType: Journal Entry,Journal Entry,Journalanteckning
+DocType: Depreciation Schedule,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 +433,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 +442,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
 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
@@ -1096,7 +1096,7 @@
 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}
 DocType: Project,Start and End Dates,Start- och slutdatum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Genomsnittlig rabatt
@@ -1107,10 +1107,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 DocType: Payment Request,Transaction Currency,transaktionsvaluta
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Från {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Från {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Drift Beskrivning
 DocType: Item,Will also apply to variants,Kommer även gälla för varianter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Det går inte att ändra räkenskapsårets Startdatum och Räkenskapsårets Slutdatum när verksamhetsåret sparas.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Det går inte att ändra räkenskapsårets Startdatum och Räkenskapsårets Slutdatum när verksamhetsåret sparas.
 DocType: Quotation,Shopping Cart,Kundvagn
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daglig Utgång
 DocType: Pricing Rule,Campaign,Kampanj
@@ -1124,8 +1124,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
@@ -1133,8 +1133,8 @@
 DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
 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 +472,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,kan inte vara större än 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1155,11 +1155,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Skatte Regel för transaktioner.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Vi köper detta objekt
 DocType: Address,Billing,Fakturering
@@ -1172,8 +1172,8 @@
 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 +142,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Följesedel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorshyra
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Följesedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 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.
@@ -1191,7 +1191,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Totalt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,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
@@ -1200,10 +1200,10 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Följesedlar avbryts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Kassaflöde från investeringsverksamheten
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
 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 +86,Transfer Materials for Manufacture,Överför Material Tillverkning
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Överför Material Tillverkning
 DocType: Pricing Rule,For Price List,För prislista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1212,7 +1212,7 @@
 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/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Skapa nytt konto från kontoplan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Servicebesök
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Servicebesök
 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: Landed Cost Voucher,Landed Cost Help,Landad kostnad Hjälp
@@ -1226,7 +1226,6 @@
 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 +196,Brand master.,Huvudmärke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; leverantör Type
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Låda
@@ -1254,7 +1253,7 @@
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Anspråk på företagets bekostnad.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stock Skulder
 DocType: Purchase Receipt,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
@@ -1263,7 +1262,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Skicka om Betalning E
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,andra rapporter
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1273,26 +1272,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Visa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettoförändring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Antal får inte vara mer än {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Leverantör Typ mästare.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverantör Typ mästare.
 DocType: Purchase Order Item,Supplier Part Number,Leverantör Artikelnummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
 DocType: Purchase Invoice,Reference Document,referensdokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturerad
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
@@ -1314,7 +1313,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Netto Förändring av leverantörsskulder
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Kontrollera din e-post id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunder krävs för ""Kundrabatt"""
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Uppdatera bankbetalningsdagar med tidskrifter.
+apps/erpnext/erpnext/config/accounts.py +137,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 +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.
@@ -1333,7 +1332,7 @@
 DocType: Employee,Permanent Address,Permanent Adress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Förskott som betalats mot {0} {1} kan inte vara större \ än Totalsumma {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Välj artikelkod
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Välj artikelkod
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Minska Avdrag för ledighet utan lön (LWP)
 DocType: Territory,Territory Manager,Territorium manager
 DocType: Packed Item,To Warehouse (Optional),Till Warehouse (tillval)
@@ -1343,15 +1342,15 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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 +181,"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 +53,Single unit of an Item.,Enda enhet av ett objekt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1368,8 +1367,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
@@ -1380,21 +1379,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Varukorgen är aktiverad
 DocType: Job Applicant,Applicant for a Job,Sökande för ett jobb
 DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplanen Material Begäran
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Inga produktionsorder skapas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Inga produktionsorder skapas
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Huvud
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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
@@ -1402,26 +1401,26 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
 DocType: Territory,Territory Name,Territorium Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresser
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresser
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,bedömningar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Produkten är inte tillåten att ha produktionsorder.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Produkten är inte tillåten att ha produktionsorder.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
 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: 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 +27,Time Logs for manufacturing.,Time Loggar för tillverkning.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Tid Log för uppgifter.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Betalning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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
@@ -1454,7 +1453,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Leverans Lager
 DocType: Stock Settings,Allowance Percent,Ersättningsprocent
 DocType: SMS Settings,Message Parameter,Meddelande Parameter
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Träd av finansiella kostnadsställen.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Träd av finansiella kostnadsställen.
 DocType: Serial No,Delivery Document No,Leverans Dokument nr
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hämta objekt från kvitton
 DocType: Serial No,Creation Date,Skapelsedagen
@@ -1486,40 +1485,40 @@
 ,Amount to Deliver,Belopp att leverera
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} skapad
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} skapad
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
 ,Serial No Status,Serial No Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Produkt tabellen kan inte vara tomt
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Om du vill ställa {1} periodicitet, tidsskillnad mellan från och till dags datum \ måste vara större än eller lika med {2}"
 DocType: Pricing Rule,Selling,Försäljnings
 DocType: Employee,Salary Information,Lön Information
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Tullar och skatter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Ange Referensdatum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Betalning Gateway konto har inte konfigurerats
 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: Production Order,Material Request Item,Material Begäran Produkt
+DocType: Request for Quotation Item,Material Request Item,Material Begäran Produkt
 apps/erpnext/erpnext/config/stock.py +85,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/setup_wizard/install_fixtures.py +152,Red,Röd
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Installationstid
 DocType: Sales Invoice,Accounting Details,Redovisning Detaljer
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Ta bort alla transaktioner för detta företag
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,anslag
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptanskriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
 DocType: Item Attribute,Attribute Name,Attribut Namn
 DocType: Item Group,Show In Website,Visa i Webbsida
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grupp
@@ -1547,7 +1546,7 @@
 ,Maintenance Schedules,Underhålls scheman
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
@@ -1561,23 +1560,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkludera avstämnignsanteckningar
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupp till icke-Group
 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/public/js/setup_wizard.js +272,Unit,Enhet
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Ange Företag
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
 ,BOM Search,BOM Sök
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Stänger (Öppna + Totals)
@@ -1586,29 +1584,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
 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
 DocType: Territory,Classification of Customers by region,Klassificering av kunder per region
 DocType: Project,% Tasks Completed,% Uppgifter Avslutade
 DocType: Project,Gross Margin,Bruttomarginal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Ange Produktionsartikel först
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Ange Produktionsartikel först
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Beräknat Kontoutdrag balans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,inaktiverad användare
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Offert
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 DocType: Quotation,Maintenance User,Serviceanvändare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Kostnad Uppdaterad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Kostnad Uppdaterad
 DocType: Employee,Date of Birth,Födelsedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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
@@ -1620,8 +1618,8 @@
 ,SO Qty,SO Antal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
+DocType: Request for Quotation,Manufacturing Manager,Tillverkningsansvarig
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Split följesedel i paket.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Transporter
 DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
@@ -1629,12 +1627,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Diverse Utgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Användare {0} är inaktiverad
@@ -1643,7 +1641,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Currency Exchange,From Currency,Från Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Kundorder krävs för punkt {0}
@@ -1656,8 +1654,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Objekt bör inte vara en produkt Bundle. Ta bort objektet `{0}` och spara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bank
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Nytt kostnadsställe
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 Källa fonder&gt; kortfristiga skulder&gt; skatter och avgifter och skapa ett nytt konto (genom att klicka på Lägg till barn) av typen &quot;skatt&quot; och nämner skattesatsen.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Nytt kostnadsställe
 DocType: Bin,Ordered Quantity,Beställd kvantitet
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
 DocType: Quality Inspection,In Process,Pågående
@@ -1673,7 +1670,7 @@
 DocType: Quotation Item,Stock Balance,Lagersaldo
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Tid Loggar skapat:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Tid Loggar skapat:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Välj rätt konto
 DocType: Item,Weight UOM,Vikt UOM
 DocType: Employee,Blood Group,Blodgrupp
@@ -1691,13 +1688,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ange ett land för frakt regel eller kontrollera Världsomspännande sändnings
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Debitering krävs
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
 DocType: Offer Letter Term,Offer Term,Erbjudandet Villkor
 DocType: Quality Inspection,Quality Manager,Kvalitetsansvarig
 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 +141,Please select Incharge Person's name,Välj Ansvariges namn
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Välj Ansvariges namn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknik
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Erbjudande Brev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generera Material Begäran (GMB) och produktionsorder.
@@ -1705,22 +1702,22 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Prislista {0} är inaktiverad
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prislista {0} är inaktiverad
 DocType: Manufacturing Settings,Allow Overtime,Tillåt övertid
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nuvarande värderingensomsättning
 DocType: Item,Customer Item Codes,Kund artikelnummer
 DocType: Opportunity,Lost Reason,Förlorad Anledning
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Skapa Betalnings inlägg mot Order eller Fakturor.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Skapa Betalnings inlägg mot Order eller Fakturor.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1729,10 +1726,10 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Inga lönebesked hittades för månad:
 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 +175,Serial No {0} not found,Löpnummer {0} hittades inte
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Löpnummer {0} hittades inte
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Dina kunder
 DocType: Leave Block List Date,Block Date,Block Datum
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Ansök nu
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Ansök nu
 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."
@@ -1756,7 +1753,7 @@
 DocType: Employee,Employment Details,Personaldetaljer
 DocType: Employee,New Workplace,Ny Arbetsplats
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ange som Stängt
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Ingen produkt med streckkod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ingen produkt med streckkod {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ärendenr kan inte vara 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,Om du har säljteam och Försäljning Partners (Channel Partners) kan märkas och behålla sitt bidrag i försäljningsaktiviteten
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
@@ -1774,10 +1771,10 @@
 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 +608,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfermaterial
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Punkt {0} måste vara ett försäljnings objekt i {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Ställ återkommande efter att ha sparat
 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
@@ -1791,7 +1788,7 @@
 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: Process Payroll,Create Salary Slip,Skapa lönebeskedet
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importera e-post från
@@ -1805,9 +1802,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Sales Invoice,Mass Mailing,Massutskick
 DocType: Rename Tool,File to Rename,Fil att byta namn på
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
@@ -1824,25 +1821,25 @@
 DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Gateway Account,Payment Account,Betalningskonto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Ange vilket bolag för att fortsätta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,Accepted,Godkända
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Quick Journal Entry
 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 +206,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} inte lämnad
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1851,7 +1848,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Följande produktionsorder skapades:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Följande produktionsorder skapades:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Nyhetsbrev e-postlista
 DocType: Delivery Note,Transporter Name,Transportör Namn
 DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
@@ -1869,10 +1866,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} är stängd
 DocType: Email Digest,How frequently?,Hur ofta?
 DocType: Purchase Receipt,Get Current Stock,Få Nuvarande lager
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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&gt; Omsättningstillgångar&gt; bankkonton och skapa ett nytt konto (genom att klicka på Lägg till barn) av typen &quot;Bank&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Närvarande
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
 DocType: Production Order,Actual End Date,Faktiskt Slutdatum
 DocType: Authorization Rule,Applicable To (Role),Är tillämpligt för (Roll)
 DocType: Stock Entry,Purpose,Syfte
@@ -1914,12 +1910,12 @@
 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: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
-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/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","t.ex. bank, kontanter, kreditkort"
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1943,9 +1939,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mina adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Organisation gren ledare.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Ingen anställd för ovan valda kriterier eller lönebeskedet redan skapat
@@ -1972,7 +1968,7 @@
 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 +200,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 '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Löner
 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"
@@ -1983,7 +1979,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Anpassa formulären
 DocType: Account,Income Account,Inkomst konto
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2005,16 +2001,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Spår leder med Industry Type.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Hantera Kundgruppsträd.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Nytt kostnadsställe Namn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
 DocType: Appraisal,HR User,HR-Konto
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter och avgifter Avdragen
-apps/erpnext/erpnext/config/support.py +7,Issues,Frågor
+apps/erpnext/erpnext/hooks.py +90,Issues,Frågor
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status måste vara en av {0}
 DocType: Sales Invoice,Debit To,Debitering
 DocType: Delivery Note,Required only for sample item.,Krävs endast för provobjekt.
@@ -2033,10 +2029,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
 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 +139,Please mention no of visits required,Ange antal besökare (krävs)
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
 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 +142,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
@@ -2092,7 +2088,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Begärd
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Anmärkningar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Root Hänsyn måste vara en grupp
@@ -2119,7 +2115,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 DocType: Payment Request,Recipient and Message,Mottagare och Meddelande
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
@@ -2133,7 +2129,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Välj Leverantör Adress
 DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute E
@@ -2156,10 +2152,10 @@
 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"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
 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 +294,Price List Currency not selected,Prislista Valuta inte valt
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2168,7 +2164,7 @@
 DocType: Installation Note Item,Against Document No,Mot Dokument nr
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Hantera Försäljning Partners.
 DocType: Quality Inspection,Inspection Type,Inspektionstyp
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},Välj {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
 DocType: Employee Attendance Tool,Unmarked Attendance,omärkt Närvaro
@@ -2196,7 +2192,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekräftat
 DocType: Payment Gateway,Gateway,Inkörsport
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Ange avlösningsdatum.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Ant
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Ant
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2210,12 +2206,12 @@
 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 +91,Unable to find exchange rate for {0} to {1},Det går inte att hitta växelkursen för {0} till {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Det går inte att hitta växelkursen för {0} till {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Halvdag
 DocType: Sales Invoice,Sales Team,Sales Team
 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 +410,[Error],[Fel]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
@@ -2247,13 +2243,13 @@
 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
 DocType: Leave Allocation,Leave Allocation,Ledighet tilldelad
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Material Begäran {0} skapades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Material Begäran {0} skapades
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Mall av termer eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adress och Kontakt
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
+apps/erpnext/erpnext/accounts/party.py +286,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)
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
 DocType: Item,Reorder level based on Warehouse,Beställningsnivå baserat på Warehouse
 DocType: Activity Cost,Billing Rate,Faktureringsfrekvens
@@ -2267,12 +2263,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} avbryts eller stängs
 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/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettokassaflöde från Investera
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Root-kontot kan inte tas bort
 ,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 +324,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Hantera Adresser
-DocType: Pricing Rule,Item Code,Produktkod
+DocType: Asset,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
@@ -2318,24 +2313,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Löpnummer och Batch
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Återförsäljare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Inaktivera uttrycker in
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Checkräknings konto
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Säkrade lån
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Ingående balans kapital
 DocType: Appraisal,Appraisal,Värdering
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum upprepas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmatecknare
@@ -2344,7 +2339,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Workstation Working Hour,Start Time,Starttid
 DocType: Item Price,Bulk Import Help,Bulk Import Hjälp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Välj antal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Välj antal
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkännande Roll kan inte vara samma som roll regel är tillämplig på
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Avbeställa Facebook Twitter Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Meddelande Skickat
@@ -2385,7 +2380,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundgrupp / Kunder
 DocType: Payment Gateway Account,Default Payment Request Message,Standardbetalnings Request Message
 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/config/accounts.py +118,Banking and Payments,Bank- och betalnings
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bank- och betalnings
 ,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
@@ -2393,17 +2388,17 @@
 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 +199,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Issue,Opening Date,Öppningsdatum
 DocType: Journal Entry,Remark,Anmärkning
 DocType: Purchase Receipt Item,Rate and Amount,Andel och Belopp
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blad och Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landad Kostnad rabattmängd
 DocType: Time Log,Batched for Billing,Batchad för fakturering
@@ -2421,13 +2416,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"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"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Lager {0}: Företaget är obligatoriskt
 ,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}
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betalning sker
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Gäldenär ({0})
-DocType: Project,Margin,Marginal
+DocType: Pricing Rule,Margin,Marginal
 DocType: Salary Slip,Arrear Amount,Efterskott Mängd
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nya kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Bruttovinst%
@@ -2448,7 +2443,7 @@
 DocType: Payment Request,Email To,E-post till
 DocType: Lead,Lead Owner,Prospekt ägaren
 DocType: Bin,Requested Quantity,begärda Kvantitet
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Lager krävs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2456,7 +2451,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Levererad
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Levererad
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt  {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 DocType: Territory,Territory Targets,Territorium Mål
@@ -2476,7 +2471,7 @@
 DocType: Manufacturer,Manufacturers used in Items,Tillverkare som används i artiklar
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Skapa Ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2489,7 +2484,7 @@
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Betyg: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lön Slip Avdrag
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Välj en grupp nod först.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Välj en grupp nod först.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Anställd och närvaro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Syfte måste vara en av {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Ta bort hänvisning till kund, leverantör, försäljningspartner och bly, eftersom det är företagets adress"
@@ -2511,13 +2506,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Från {1}
 DocType: Task,depends_on,beror på
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Nästa datum måste vara större än Publiceringsdatum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Visa skatte uppbrott
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Nästa datum måste vara större än Publiceringsdatum
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/accounts/party.py +289,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"""
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fakturabokningsdatum
@@ -2532,7 +2527,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2546,7 +2541,7 @@
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2550,7 @@
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
@@ -2566,7 +2561,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
@@ -2579,7 +2574,7 @@
 DocType: Time Log,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Betygsätt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
@@ -2587,7 +2582,7 @@
 DocType: Stock Entry,From BOM,Från BOM
 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 +96,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
@@ -2595,14 +2590,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Lönestruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Problem Material
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citat
 DocType: Hub Settings,Access Token,Tillträde token
 DocType: Sales Invoice Item,Serial No,Serienummer
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Ange servicedetaljer först
-DocType: Item,Is Fixed Asset Item,Är Fast tillgångspost
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Ange servicedetaljer först
 DocType: Purchase Invoice,Print Language,print Språk
 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"
@@ -2619,7 +2613,7 @@
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
@@ -2635,13 +2629,13 @@
 DocType: Quotation,Maintenance Manager,Underhållschef
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan inte vara noll
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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"
-DocType: C-Form,Amended From,Ändrat Från
+DocType: Asset,Amended From,Ändrat Från
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2655,20 +2649,20 @@
 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/public/js/setup_wizard.js +191,"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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Match Betalningar med fakturor
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Match Betalningar med fakturor
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Lägg till i kundvagn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppera efter
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Aktivera / inaktivera valutor.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Aktivera / inaktivera valutor.
 DocType: Production Planning Tool,Get Material Request,Få Material Request
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Post Kostnader
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Totalt Närvarande
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,räkenskaper
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,räkenskaper
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
@@ -2687,13 +2681,13 @@
 DocType: C-Form,Invoices,Fakturor
 DocType: Job Opening,Job Title,Jobbtitel
 DocType: Features Setup,Item Groups in Details,Produktgrupper i Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 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 +32,Visit report for maintenance call.,Besöksrapport för service samtal.
 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 +169,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: Item,Website Description,Webbplats Beskrivning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettoförändringen i eget kapital
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
@@ -2703,12 +2697,12 @@
 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
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Item,Attributes,Attributer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Hämta artiklar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Ange avskrivningskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Hämta artiklar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sista beställningsdatum
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
 DocType: C-Form,C-Form,C-Form
@@ -2720,18 +2714,17 @@
 DocType: Purchase Invoice,Mobile No,Mobilnummer
 DocType: Payment Tool,Make Journal Entry,Skapa journalanteckning
 DocType: Leave Allocation,New Leaves Allocated,Nya Ledigheter Avsatta
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Kommersiell
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Fel: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Alla produkter eller tjänster.
 DocType: Supplier Quotation,Supplier Address,Leverantör Adress
 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 +251,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2742,10 +2735,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
 DocType: Tax Rule,Billing State,Faktureringsstaten
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Överföring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Överföring
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Förfallodatum är obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
@@ -2767,18 +2760,18 @@
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 DocType: Features Setup,POS View,POS Vy
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Installationsinfo för ett serienummer
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Time Log har fakturerats
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Preliminär vinst / förlust (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Ställ in standardvärdet {0} i bolaget {1}
@@ -2788,12 +2781,11 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen inställning nummerserie för Närvaro via Inställningar&gt; nummerserie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Få artiklar från produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
 DocType: Features Setup,Sales Discounts,Försäljnings Rabatter
@@ -2807,39 +2799,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Lägg till underval
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,öppnings Värde
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Försäljningsprovision
 DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
 DocType: Tax Rule,Billing Country,Faktureringsland
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representationskostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Representationskostnader
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Ansökan om ledighet.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Rättsskydds
 DocType: Sales Invoice,Posting Time,Boknings Tid
 DocType: Sales Order,% Amount Billed,% Belopp fakturerat
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefon Kostnader
 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.,Markera det här om du vill tvinga användaren att välja en serie innan du sparar. Det blir ingen standard om du kontrollera detta.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen produkt med Löpnummer {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Öppna Meddelanden
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkta kostnader
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Direkta kostnader
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} är en ogiltig e-postadress i &quot;Notification \ e-postadress&quot;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
@@ -2856,7 +2848,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Kvantitet bör vara större än 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Kvantitet bör vara större än 0
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ av löv som tillfällig, sjuka etc."
@@ -2871,7 +2863,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Råvaror kan inte vara samma som huvudartikel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Lön mall mästare.
@@ -2887,7 +2879,7 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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)
@@ -2902,13 +2894,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch har avbrutits.
 ,Reqd By Date,Reqd Efter datum
 DocType: Salary Slip Earning,Salary Slip Earning,Lön Slip Tjänar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Borgenärer
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Borgenärer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Rad # {0}: Löpnummer är obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Produktvis Skatte Detalj
 ,Item-wise Price List Rate,Produktvis Prislistavärde
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -2928,15 +2920,14 @@
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} mot faktura {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Ange standardmåttenhet
-DocType: Project,Project Name,Projektnamn
+DocType: Request for Quotation Item,Project Name,Projektnamn
 DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
 DocType: Features Setup,Item Batch Nos,Produkt Sats nr
@@ -2973,7 +2964,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Företaget är obligatorisk, eftersom det är företagets adress"
 DocType: Item Attribute,From Range,Från räckvidd
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Punkt {0} ignoreras eftersom det inte är en lagervara
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Skicka det här produktionsorder för ytterligare behandling.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Skicka det här produktionsorder för ytterligare behandling.
 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.","För att inte tillämpa prissättning regel i en viss transaktion, bör alla tillämpliga prissättning regler inaktiveras."
 DocType: Company,Domain,Domän
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,jobb
@@ -2985,6 +2976,7 @@
 DocType: Time Log,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3019,7 +3011,7 @@
 DocType: Sales Partner,Partner's Website,Partner hemsida
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Tillfälliga konton
 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
@@ -3033,16 +3025,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Frånvarande
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Lägga till objekt från
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Lägga till objekt från
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
 DocType: Project Task,Task ID,Aktivitets-ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",t.ex. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Lager {0} existerar inte
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3068,7 +3060,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Setup Gateway konton.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Setup Gateway konton.
 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
 ,Cash Flow,Pengaflöde
@@ -3082,7 +3074,7 @@
 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 +132,Please find attached {0} #{1},Härmed bifogas {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Härmed bifogas {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Kontoutdrag balans per huvudbok
 DocType: Job Applicant,Applicant Name,Sökandes Namn
 DocType: Authorization Rule,Customer / Item Name,Kund / artikelnamn
@@ -3098,19 +3090,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ange från / till intervallet
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Customer Group&gt; Territory
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
 DocType: BOM Replace Tool,Current BOM,Aktuell BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Lägg till Serienr
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garanti
 DocType: Production Order,Warehouses,Lager
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Skriv ut
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Skriv ut
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grupp Nod
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Uppdatera färdiga varor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Uppdatera färdiga varor
 DocType: Workstation,per hour,per timme
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Köp av
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Betald Summa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
@@ -3140,7 +3131,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Gäller Företag
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
 DocType: Purchase Invoice,In Words,I Ord
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Idag är {0} s födelsedag!
 DocType: Production Planning Tool,Material Request For Warehouse,Material Begäran För Lager
@@ -3154,7 +3145,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
 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/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,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/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."
@@ -3165,7 +3156,7 @@
 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 +782,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3173,14 +3164,13 @@
 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 +17,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Ogiltigt {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ställ Naming serien för {0} via Inställningar&gt; Inställningar&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varuhus
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Ändra Förkortning
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
@@ -3198,10 +3188,10 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Allmän huvudbok
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se prospekts
 DocType: Item Attribute Value,Attribute Value,Attribut Värde
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-post ID måste vara unikt, finns redan för {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-post ID måste vara unikt, finns redan för {0}"
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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
@@ -3226,23 +3216,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
 ,Project wise Stock Tracking,Projektvis lager Spårning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Underhållsschema {0} finns mot {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Underhållsschema {0} finns mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiska Antal (vid källa/mål)
 DocType: Item Customer Detail,Ref Code,Referenskod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Personaldokument.
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,Sociala Inställningar
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Beställa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan inte ha en överordnat kostnadsställe
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Välj märke ...
 DocType: Sales Invoice,C-Form Applicable,C-Form Tillämplig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse är obligatoriskt
 DocType: Supplier,Address and Contacts,Adress och kontakter
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3260,7 +3250,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Transaktions valutan måste vara samma som Payment Gateway valuta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Receive
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3268,14 +3258,14 @@
 DocType: Purchase Invoice,Submit on creation,Lämna in en skapelse
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 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 +137,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Mina beställningar
@@ -3296,10 +3286,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Butikförsäljnings profil
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Lån utan säkerhet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
 DocType: Maintenance Schedule Detail,Scheduled Date,Planerat datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Totalt betalade Amt
@@ -3311,7 +3301,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Dina Leverantörer
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
@@ -3324,12 +3314,12 @@
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Från {0} för {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
 DocType: Payment Reconciliation,From Invoice Date,Från fakturadatum
@@ -3338,7 +3328,7 @@
 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 +351,'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 +356,'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
@@ -3351,7 +3341,7 @@
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
@@ -3365,15 +3355,15 @@
 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 +576,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Projektverksamhet / uppgift.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generera lönebesked
 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: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3394,7 +3384,7 @@
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Receipt Item,Rejected Serial No,Avvisat Serienummer
 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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Exempel:. ABCD ##### Om serien är inställd och Löpnummer inte nämns i transaktioner, skapas automatiska serienummer  utifrån denna serie. Om du alltid vill ange serienumren för denna artikel. lämna det tomt."
 DocType: Upload Attendance,Upload Attendance,Ladda upp Närvaro
@@ -3405,11 +3395,11 @@
 ,Sales Analytics,Försäljnings Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tillverknings Inställningar
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Ställa in e-post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Ange standardvaluta i Bolaget
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Ange standardvaluta i Bolaget
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detalj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Dagliga påminnelser
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Nytt kontonamn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Kundtjänst
@@ -3421,9 +3411,9 @@
 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 +72,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 +225,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Produkt {0} måste vara ett försäljningsprodukt
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3431,7 +3421,7 @@
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
 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 +385,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
 DocType: Sales Partner,Partner Type,Partner Typ
 DocType: Purchase Taxes and Charges,Actual,Faktisk
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
@@ -3454,7 +3444,7 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Production Order,Planned End Date,Planerat Slutdatum
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Där artiklar lagras.
@@ -3465,7 +3455,7 @@
 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 +508,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
 ,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
@@ -3475,10 +3465,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativa kostnader
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Administrativa kostnader
 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 +455,Change,Byta
@@ -3497,13 +3487,13 @@
 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 +559,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Batch
@@ -3517,7 +3507,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Försäljnings person
 DocType: Sales Invoice,Cold Calling,Kall produkt
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Budget och kostnadsställe
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Budget och kostnadsställe
 DocType: Maintenance Schedule Item,Half Yearly,Halvår
 DocType: Lead,Blog Subscriber,Blogg Abonnent
 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.
@@ -3550,7 +3540,6 @@
 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/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
 DocType: Sales Invoice,Is POS,Är POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artnr&gt; Post Group&gt; Brand
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3558,7 +3547,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fakturor till kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Moderbolaget konto
@@ -3574,7 +3563,7 @@
 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 +219,"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 +222,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
 DocType: Address,Office,Kontors
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
@@ -3609,7 +3598,7 @@
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
 DocType: BOM Operation,BOM Operation,BOM Drift
@@ -3617,22 +3606,22 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Betalning URL meddelande
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
+apps/erpnext/erpnext/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Totalt Obetald
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Tid Log är inte debiterbar
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"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/public/js/setup_wizard.js +178,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 +109,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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Material till leverantören
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Punkt Faktura
 DocType: Expense Claim,Employees Email Id,Anställdas E-post Id
 DocType: Employee Attendance Tool,Marked Attendance,Marked Närvaro
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Nuvarande Åtaganden
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Nuvarande Åtaganden
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Faktiska Antal är obligatorisk
@@ -3653,17 +3642,16 @@
 DocType: Item Attribute,Numeric Values,Numeriska värden
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Fäst Logo
 DocType: Customer,Commission Rate,Provisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Kundvagnen är tom
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Inget standard Adress Mall hittades. Skapa en ny från Inställningar&gt; Tryck och Branding&gt; Address Template.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Kapital Lager
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betalning Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betalning avslutad omdirigera användare till valda sidan.
@@ -3675,17 +3663,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +413,"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 +13,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 +409, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
@@ -3693,6 +3681,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Kontot {0} existerar inte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Kontot {0} existerar inte
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 55cd5b0..04aefdc 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,வாணிகம் செய்பவர்
 DocType: Employee,Rented,வாடகைக்கு
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
 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.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள கணினி பெயரிடும்&gt; மனிதவள அமைப்புகள்
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} மரம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,காட்டு மாறிகள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,அளவு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),கடன்கள் ( கடன்)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,பங்கு
 DocType: Designation,Designation,பதவி
@@ -64,7 +63,7 @@
 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 +642,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},புதிய {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},புதிய {0}: # {1}
 ,Sales Partners Commission,விற்பனை பங்குதாரர்கள் ஆணையம்
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,சுருக்கமான விட 5 எழுத்துக்கள் முடியாது
 DocType: Payment Request,Payment Request,பணம் கோரிக்கை
@@ -102,7 +101,7 @@
 DocType: Employee,Married,திருமணம்
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதிக்கப்பட்ட {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,இருந்து பொருட்களை பெற
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,இலக்கு
 DocType: BOM,Total Cost,மொத்த செலவு
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,செயல்பாடு : புகுபதிகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
@@ -156,7 +155,7 @@
 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,பங்கு செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,பங்கு செலவுகள்
 DocType: Newsletter,Email Sent?,அனுப்பிய மின்னஞ்சல்?
 DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
 DocType: Production Order Operation,Show Time Logs,காட்டு நேரத்தில் பதிவுகள்
@@ -164,13 +163,13 @@
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,பொருள் {0} ஒரு கொள்முதல் பொருள் இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: BOM Replace Tool,New BOM,புதிய BOM
@@ -209,11 +208,11 @@
 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 +79,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,நிறுவனத்தின் உள்ளிடவும்
@@ -222,7 +221,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,கடன் இருந்து நிகர பண
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
 DocType: Newsletter List,Total Subscribers,மொத்த சந்தாதாரர்கள்
 ,Contact Name,பெயர் தொடர்பு
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
@@ -236,8 +235,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,வங்கி பதிவுகள்
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
@@ -249,8 +248,8 @@
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +264,7 @@
 DocType: Notification Control,Notification Control,அறிவிப்பு கட்டுப்பாடு
 DocType: Lead,Suggestions,பரிந்துரைகள்
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,இந்த மண்டலம் உருப்படி பிரிவு வாரியான வரவு செலவு திட்டம் அமைக்க. நீங்கள் விநியோகம் அமைக்க பருவகாலம் சேர்க்க முடியும்.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},கிடங்கு பெற்றோர் கணக்கு குழு உள்ளிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},கிடங்கு பெற்றோர் கணக்கு குழு உள்ளிடவும் {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
 DocType: Supplier,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
@@ -284,7 +283,7 @@
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,வட்ட குறிப்பு பிழை
@@ -295,10 +294,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,டெலிவரி குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,டெலிவரி குறிப்பு
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -309,12 +308,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
@@ -337,9 +336,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},தொடர் இல {0} டெலிவரி குறிப்பு அல்ல {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,உருப்படியை தர ஆய்வு அளவுரு
 DocType: Leave Application,Leave Approver Name,தரப்பில் சாட்சி பெயர் விடவும்
-,Schedule Date,அட்டவணை தேதி
+DocType: Depreciation Schedule,Schedule Date,அட்டவணை தேதி
 DocType: Packed Item,Packed Item,டெலிவரி குறிப்பு தடைக்காப்பு பொருள்
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,பரிவர்த்தனைகள் வாங்கும் இயல்புநிலை அமைப்புகளை.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,பரிவர்த்தனைகள் வாங்கும் இயல்புநிலை அமைப்புகளை.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},நடவடிக்கை செலவு நடவடிக்கை வகை எதிராக பணியாளர் {0} ஏற்கனவே உள்ளது - {1}
 apps/erpnext/erpnext/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,நாணய பரிவர்த்தனை
@@ -388,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,கணக்குகள் வரை உறை
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
-DocType: Material Request Item,Required Date,தேவையான தேதி
+DocType: Request for Quotation Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,மொத்த அளவு
@@ -418,17 +417,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 ,Serial No Warranty Expiry,தொடர் இல்லை உத்தரவாதத்தை காலாவதியாகும்
@@ -448,7 +447,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,பொருள் {0} பொருள் கொள்முதல் இல்லை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,பொருள் {0} பொருள் கொள்முதல் இல்லை
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
@@ -459,7 +458,7 @@
 DocType: Production Plan Item,Pending Qty,நிலுவையில் அளவு
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
 DocType: Pricing Rule,Valid From,செல்லுபடியான
 DocType: Sales Invoice,Total Commission,மொத்த ஆணையம்
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
@@ -471,13 +470,13 @@
 , இந்த விநியோக பயன்படுத்தி ஒரு பட்ஜெட் விநியோகிக்க ** விலை மையத்தில் ** இந்த ** மாதந்திர விநியோகம் அமைக்க **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,திரட்டப்பட்ட கலாச்சாரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,நிதி ஆண்டு தொடக்கம் தேதி நிதி ஆண்டு இறுதியில் தேதி விட அதிகமாக இருக்க கூடாது
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,நிதி ஆண்டு தொடக்கம் தேதி நிதி ஆண்டு இறுதியில் தேதி விட அதிகமாக இருக்க கூடாது
 DocType: Warranty Claim,Resolution,தீர்மானம்
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},வழங்கப்படுகிறது {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,செலுத்த வேண்டிய கணக்கு
@@ -485,7 +484,7 @@
 DocType: Job Applicant,Resume Attachment,துவைக்கும் இயந்திரம் இணைப்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,விற்பனை Return
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,சம்பளம் கூறுகள்.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,வாடிக்கையாளர்கள் பற்றிய தகவல்.
@@ -494,7 +493,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
@@ -504,7 +503,7 @@
 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/config/accounts.py +70,Masters,முதுநிலை
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,புதுப்பிக்கப்பட்டது வங்கி பரிவர்த்தனை தினங்கள்
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,புதுப்பிக்கப்பட்டது வங்கி பரிவர்த்தனை தினங்கள்
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},எதிர்மறை பங்கு பிழை ( {6} ) உருப்படி {0} கிடங்கு உள்ள {1} ம் {2} {3} ல் {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,நேரம் கண்காணிப்பு
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
@@ -522,19 +521,18 @@
 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,இயல்புநிலை செலவு மதிப்பீடு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,பராமரிப்பு அட்டவணை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,பராமரிப்பு அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,சரக்கு நிகர மாற்றம்
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,விற்பனை நபர் இலக்குகள்
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,பணியாளர் அல்லது நிறுவனம் ஒன்று ஒரு விடுமுறை பட்டியல் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,குழு மாற்ற
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
@@ -542,7 +540,7 @@
 DocType: Supplier,Fixed Days,நிலையான நாட்கள்
 DocType: Quotation Item,Item Balance,பொருள் இருப்பு
 DocType: Sales Invoice,Packing List,பட்டியல் பொதி
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,விநியோகஸ்தர்கள் கொடுக்கப்பட்ட ஆணைகள் வாங்க.
+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,உட்கொள்ளுகிறது
@@ -576,7 +574,7 @@
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால ஆஃபர்
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,மரம் வகை
@@ -613,14 +611,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
 DocType: Item Group,Website Specifications,இணையத்தளம் விருப்பம்
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},உங்கள் முகவரி டெம்ப்ளேட் பிழை உள்ளது {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,புதிய கணக்கு
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,புதிய கணக்கு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","பல விலை விதிகள் அளவுகோல் கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் மோதலை தீர்க்க தயவு செய்து. விலை விதிகள்: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","பல விலை விதிகள் அளவுகோல் கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் மோதலை தீர்க்க தயவு செய்து. விலை விதிகள்: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +666,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","பத்திரிகை நுழைவு {0} இந்த விலைப்பட்டியல் முன்கூட்டியே என இழுக்கப்பட்டு வேண்டும் என்றால் {1}, பார்க்கலாம் ஒழுங்குக்கு எதிரான இணைக்கப்பட்டுள்ளது."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,அலுவலகம் பராமரிப்பு செலவுகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Account,Liability,கடமை
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
 DocType: Company,Default Cost of Goods Sold Account,பொருட்களை விற்பனை கணக்கு இயல்பான செலவு
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,விலை பட்டியல் தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Process Payroll,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -686,7 +684,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,என் பொருள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,என் பொருள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,எதுவும் ஊழியர்
 DocType: Supplier Quotation,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
@@ -698,7 +696,7 @@
 DocType: Item,Website Warehouse,இணைய கிடங்கு
 DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
 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 +267,C-Form records,சி படிவம் பதிவுகள்
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,சி படிவம் பதிவுகள்
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,வாடிக்கையாளர் மற்றும் சப்ளையர்
 DocType: Email Digest,Email Digest Settings,மின்னஞ்சல் டைஜஸ்ட் அமைப்புகள்
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,வாடிக்கையாளர்கள் கேள்விகளுக்கு ஆதரவு.
@@ -722,7 +720,7 @@
 DocType: Quotation Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,செலவுகள்
@@ -759,14 +757,14 @@
 DocType: Supplier Quotation,Is Subcontracted,உள்குத்தகை
 DocType: Item Attribute,Item Attribute Values,பொருள் பண்புக்கூறு கலாச்சாரம்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,பார்வை சந்தாதாரர்கள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ரசீது வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,செல் வண்டியில்
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
@@ -785,7 +783,7 @@
 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 +524,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
@@ -795,10 +793,10 @@
 DocType: Employee,Permanent Address Is,நிரந்தர முகவரி
 DocType: Production Order Operation,Operation completed for how many finished goods?,ஆபரேஷன் எத்தனை முடிக்கப்பட்ட பொருட்கள் நிறைவு?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,பிராண்ட்
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
 DocType: Employee,Exit Interview Details,பேட்டி விவரம் வெளியேற
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
-DocType: Journal Entry Account,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
+DocType: Asset,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,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
@@ -808,16 +806,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;&#39; பட்டியல் பொதி &#39;நகலெடுக்கப்படும்."
 DocType: Job Opening,Publish on website,வலைத்தளத்தில் வெளியிடு
 apps/erpnext/erpnext/config/stock.py +17,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,மறைமுக வருமானம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
 DocType: Purchase Invoice,Additional Discount Percentage,கூடுதல் தள்ளுபடி சதவீதம்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
@@ -831,14 +829,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
 ,Employee Holiday Attendance,பணியாளர் விடுமுறை வருகை
 DocType: Opportunity,Walk In,ல் நடக்க
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,பங்கு பதிவுகள்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,பங்கு பதிவுகள்
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,மாற்றப்பட்டால்
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,செய்ய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,என் வண்டியில்
@@ -848,7 +846,7 @@
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 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 +180,Qty for {0},ஐந்து அளவு {0}
+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 +80,Leave Allocation Tool,ஒதுக்கீடு கருவி விட்டு
 DocType: Leave Block List,Leave Block List Dates,பிளாக் பட்டியல் தினங்கள் விட்டு
@@ -861,7 +859,7 @@
 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 +547,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,தள்ளுபடி
@@ -876,20 +874,20 @@
 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 +69,Selling Amount,விற்பனை தொகை
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,நேரம் பதிவுகள்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,நேரம் பதிவுகள்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,கணக்கு நிறுவனத்தின் பொருந்தவில்லை
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ஆட்சேர்ப்பு
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,விற்பனை செலவு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,விற்பனை செலவு
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
@@ -906,7 +904,7 @@
 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 +18,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
+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,சராசரி வயது
@@ -915,7 +913,7 @@
 DocType: Company,Default Currency,முன்னிருப்பு நாணயத்தின்
 DocType: Contact,Enter designation of this Contact,இந்த தொடர்பு பதவி உள்ளிடவும்
 DocType: Expense Claim,From Employee,பணியாளர் இருந்து
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,முக்கிய செயல்திறன் பகுதி
@@ -923,7 +921,7 @@
 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 +130,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,பங்களிப்பு%
@@ -932,7 +930,7 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,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.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -940,14 +938,14 @@
 DocType: Salary Slip,Deductions,கழிவுகளுக்கு
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,இந்த நேரம் புகுபதிகை தொகுதி படியாக.
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
 ,Trial Balance for Party,கட்சி சோதனை இருப்பு
 DocType: Lead,Consultant,பிறர் அறிவுரை வேண்டுபவர்
 DocType: Salary Slip,Earnings,வருவாய்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,கேட்டு எதுவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,கேட்டு எதுவும்
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி ' விட முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,மேலாண்மை
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,நேரம் தாள்கள் செயல்பாடுகளை வகைகள்
@@ -958,18 +956,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,மின்னஞ்சல் ஐடி அமைக்கவும்
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,மின்னஞ்சல் ஐடி அமைக்கவும்
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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},பிஓஎஸ் சுயவிவரம் {0} ஏற்கனவே பயனர் உருவாக்கப்பட்டது: {1} நிறுவனத்தின் {2}
 DocType: Purchase Order Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
 DocType: Stock Settings,Default Item Group,முன்னிருப்பு உருப்படி குழு
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,வழங்குபவர் தரவுத்தள.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,வழங்குபவர் தரவுத்தள.
 DocType: Account,Balance Sheet,ஐந்தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,வரி மற்றும் பிற சம்பளம் கழிவுகள்.
 DocType: Lead,Lead,தலைமை
 DocType: Email Digest,Payables,Payables
@@ -997,18 +995,18 @@
 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/page/accounts_browser/accounts_browser.js +128,View Ledger,காட்சி லெட்ஜர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,காட்சி லெட்ஜர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,பங்கிலாபங்களைப்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,தக்க வருவாய்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,தக்க வருவாய்
 DocType: BOM Item,Item Description,உருப்படி விளக்கம்
 DocType: Payment Tool,Payment Mode,பணம் செலுத்தும் முறை
 DocType: Purchase Invoice,Is Recurring,மீண்டும் மீண்டும்
@@ -1016,7 +1014,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,தற்காலிக திறப்பு
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},மதிப்பீட்டு மதிப்பீடு வரிசையில் பொருள் தேவையான {0}
@@ -1031,8 +1029,8 @@
 ,Accounts Payable Summary,செலுத்தத்தக்க கணக்குகள் சுருக்கம்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 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 +165,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,சிறிய
@@ -1040,7 +1038,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,கணக்கு தலையில் {0} உருவாக்கப்பட்டது
 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,மொத்த Achieved
@@ -1048,12 +1046,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 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,சேமிப்பு கிடங்கு தொடர்பு தகவல்
@@ -1063,17 +1061,17 @@
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
 DocType: Hub Settings,Seller Website,விற்பனையாளர் வலைத்தளம்
 apps/erpnext/erpnext/controllers/selling_controller.py +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},உற்பத்தி ஒழுங்கு நிலை ஆகிறது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,மொத்த வெளிச்செல்லும்
@@ -1083,10 +1081,10 @@
 DocType: Item,Website Item Groups,இணைய தகவல்கள் குழுக்கள்
 DocType: Purchase Invoice,Total (Company Currency),மொத்த (நிறுவனத்தின் நாணயம்)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,சீரியல் எண்ணை {0} க்கும் மேற்பட்ட முறை உள்ளிட்ட
-DocType: Journal Entry,Journal Entry,பத்திரிகை நுழைவு
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
 DocType: Salary Slip,Bank Account No.,வங்கி கணக்கு எண்
 DocType: Naming Series,This is the number of the last created transaction with this prefix,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை
@@ -1119,7 +1117,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
 DocType: Project,Start and End Dates,தொடக்கம் மற்றும் தேதிகள் End
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,சராசரி தள்ளுபடி
@@ -1130,10 +1128,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
 DocType: Payment Request,Transaction Currency,பரிவர்த்தனை நாணய
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},இருந்து {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},இருந்து {0} | {1} {2}
 DocType: BOM Operation,Operation Description,அறுவை சிகிச்சை விளக்கம்
 DocType: Item,Will also apply to variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,நிதியாண்டு தொடக்க தேதி மற்றும் நிதியாண்டு சேமிக்கப்படும் முறை நிதி ஆண்டு இறுதியில் தேதி மாற்ற முடியாது.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Avg: டெய்லி வெளிச்செல்லும்
 DocType: Pricing Rule,Campaign,பிரச்சாரம்
@@ -1147,8 +1145,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},அதிகபட்சம்: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,நிறுவனத்தின்
 apps/erpnext/erpnext/config/support.py +17,Communication log.,தகவல் பதிவு.
@@ -1156,8 +1154,8 @@
 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 +472,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1179,11 +1177,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
 DocType: Rename Tool,Type of document to rename.,மறுபெயர் ஆவணம் வகை.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,நாம் இந்த பொருள் வாங்க
 DocType: Address,Billing,பட்டியலிடல்
@@ -1196,8 +1194,8 @@
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Supplier,Stock Manager,பங்கு மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,ஸ்லிப் பொதி
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,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.,இல்லை முகவரி இன்னும் கூறினார்.
@@ -1215,7 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),மொத்த ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),மொத்த ({0})
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
@@ -1224,10 +1222,10 @@
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 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 +86,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
@@ -1236,7 +1234,7 @@
 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.,கணக்கு பட்டியலில் இருந்து புதிய கணக்கை உருவாக்கு .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,பராமரிப்பு வருகை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,பராமரிப்பு வருகை
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,கிடங்கு உள்ள கிடைக்கும் தொகுதி அளவு
 DocType: Time Log Batch Detail,Time Log Batch Detail,நேரம் புகுபதிகை தொகுப்பு விரிவாக
 DocType: Landed Cost Voucher,Landed Cost Help,Landed செலவு உதவி
@@ -1250,7 +1248,6 @@
 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 +196,Brand master.,பிராண்ட் மாஸ்டர்.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,பெட்டி
@@ -1278,7 +1275,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +131,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,பங்கு பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,பங்கு பொறுப்புகள்
 DocType: Purchase Receipt,Supplier Warehouse,வழங்குபவர் கிடங்கு
 DocType: Opportunity,Contact Mobile No,இல்லை மொபைல் தொடர்பு
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
@@ -1287,7 +1284,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,பிற அறிக்கைகள்
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,நிறுத்து நினைவூட்டல்கள்
@@ -1297,26 +1294,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} காண்க
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
 DocType: Purchase Invoice,Reference Document,குறிப்பு ஆவண
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% கூறப்பட்டு
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
@@ -1338,7 +1335,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,செலுத்தத்தக்க கணக்குகள் நிகர மாற்றம்
 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',' Customerwise தள்ளுபடி ' தேவையான வாடிக்கையாளர்
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,மேம்படுத்தல் வங்கி பணம் பத்திரிகைகள் மூலம் செல்கிறது.
+apps/erpnext/erpnext/config/accounts.py +137,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.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
@@ -1357,7 +1354,7 @@
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",மொத்தம் விட \ {0} {1} அதிகமாக இருக்க முடியும் எதிராக பணம் முன்கூட்டியே {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),சம்பளமில்லா விடுப்பு க்கான பொருத்தியறிதல் குறைக்க (LWP)
 DocType: Territory,Territory Manager,மண்டலம் மேலாளர்
 DocType: Packed Item,To Warehouse (Optional),கிடங்கில் (கட்டாயமில்லை)
@@ -1367,15 +1364,15 @@
 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,மார்க்கெட்டிங் செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
@@ -1392,8 +1389,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,போட்டி வேண்டும் பொருள் காணவும்
@@ -1404,21 +1401,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,வண்டியில் செயல்படுத்தப்படும்
 DocType: Job Applicant,Applicant for a Job,ஒரு வேலை விண்ணப்பதாரர்
 DocType: Production Plan Material Request,Production Plan Material Request,உற்பத்தித் திட்டத்தைத் பொருள் வேண்டுகோள்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,முதன்மை
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,செய்ய கொள்முதல் ஆணை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,செய்ய கொள்முதல் ஆணை
 DocType: SMS Center,Send To,அனுப்பு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
@@ -1426,26 +1423,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ஒரு வேலை விண்ணப்பதாரர்.
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,முகவரிகள்
+apps/erpnext/erpnext/hooks.py +91,Addresses,முகவரிகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,மதிப்பீடுகளில்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,பொருள் உத்தரவு அனுமதி இல்லை.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,பொருள் உத்தரவு அனுமதி இல்லை.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),இந்த தொகுப்பு நிகர எடை. (பொருட்களை நிகர எடை கூடுதல் போன்ற தானாக கணக்கிடப்படுகிறது)
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,உற்பத்தி நேரம் மற்றும் பதிவுகள்.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,பணிகளை நேரம் புகுபதிகை.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,வணக்கம் தெரிவித்தல்
@@ -1478,7 +1475,7 @@
 DocType: Sales Order Item,Delivery Warehouse,டெலிவரி கிடங்கு
 DocType: Stock Settings,Allowance Percent,கொடுப்பனவு விகிதம்
 DocType: SMS Settings,Message Parameter,செய்தி அளவுரு
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,நிதி செலவு மையங்கள் மரம்.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,நிதி செலவு மையங்கள் மரம்.
 DocType: Serial No,Delivery Document No,டெலிவரி ஆவண இல்லை
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,கொள்முதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்
 DocType: Serial No,Creation Date,உருவாக்கிய தேதி
@@ -1510,41 +1507,41 @@
 ,Amount to Deliver,அளவு வழங்க வேண்டும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ஒரு பொருள் அல்லது சேவை
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} உருவாக்கப்பட்டது
 DocType: Delivery Note Item,Against Sales Order,விற்னையாளர் எதிராக
 ,Serial No Status,தொடர் இல்லை நிலைமை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,பொருள் அட்டவணை காலியாக இருக்க முடியாது
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ரோ {0}: அமைக்க {1} காலகட்டம், இருந்து மற்றும் தேதி \
  இடையே வேறுபாடு அதிகமாக அல்லது சமமாக இருக்க வேண்டும், {2}"
 DocType: Pricing Rule,Selling,விற்பனை
 DocType: Employee,Salary Information,சம்பளம் தகவல்
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,கடமைகள் மற்றும் வரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,பணம் நுழைவாயில் கணக்கு கட்டமைக்கப்பட்ட இல்லை
 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: Production Order,Material Request Item,பொருள் கோரிக்கை பொருள்
+DocType: Request for Quotation Item,Material Request Item,பொருள் கோரிக்கை பொருள்
 apps/erpnext/erpnext/config/stock.py +85,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,ரெட்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
 DocType: Sales Invoice,Accounting Details,கணக்கு விவரங்கள்
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்கு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,முதலீடுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ஒதுக்கீடுகள்
 DocType: Quality Inspection Reading,Acceptance Criteria,ஏற்று வரையறைகள்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் பொருள் கோரிக்கைகள் நுழைய
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் பொருள் கோரிக்கைகள் நுழைய
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 DocType: Item Group,Show In Website,இணையத்தளம் காண்பி
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,தொகுதி
@@ -1572,7 +1569,7 @@
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
@@ -1586,23 +1583,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,ஆர தழுவி பதிவுகள் சேர்க்கிறது
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும்
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,உண்மையான மொத்த
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,அலகு
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,செலவு சட்டக்கோரல்கள்
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,செலவு சட்டக்கோரல்கள்
 DocType: Issue,Support,ஆதரவு
 ,BOM Search,"BOM, தேடல்"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
@@ -1611,29 +1607,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},இசைவு தேதி வரிசையில் காசோலை தேதி முன் இருக்க முடியாது {0}
 DocType: Salary Slip,Deduction,கழித்தல்
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல் உள்ள {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல் உள்ள {1}
 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,Gross Margin,கிராஸ் மார்ஜின்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,கணக்கிடப்படுகிறது வங்கி அறிக்கை சமநிலை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ஊனமுற்ற பயனர்
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,மேற்கோள்
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 DocType: Quotation,Maintenance User,பராமரிப்பு பயனர்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Employee,Date of Birth,பிறந்த நாள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,தள்ளு
@@ -1645,8 +1641,8 @@
 ,SO Qty,எனவே அளவு
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
+DocType: Request for Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
 apps/erpnext/erpnext/hooks.py +71,Shipments,படுவதற்கு
 DocType: Purchase Order Item,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
@@ -1654,12 +1650,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ரோ #
 DocType: Purchase Invoice,In Words (Company Currency),வேர்ட்ஸ் (நிறுவனத்தின் கரன்சி)
-DocType: Pricing Rule,Supplier,கொடுப்பவர்
+DocType: Asset,Supplier,கொடுப்பவர்
 DocType: C-Form,Quarter,காலாண்டு
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,இதர செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,இதர செலவுகள்
 DocType: Global Defaults,Default Company,முன்னிருப்பு நிறுவனத்தின்
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,பயனர் {0} முடக்கப்பட்டுள்ளது
@@ -1668,7 +1664,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
@@ -1681,8 +1677,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,குழந்தை பொருள் ஒரு தயாரிப்பு மூட்டை இருக்க கூடாது. உருப்படியை நீக்க: {0}: மற்றும் காப்பாற்றுங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,வங்கி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,புதிய செலவு மையம்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; குழந்தை சேர் கிளிக் செய்து) மூலம் ஒரு புதிய கணக்கை உருவாக்க (மற்றும் செய்ய வரி விகிதம் பற்றி.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,புதிய செலவு மையம்
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Quality Inspection,In Process,செயல்முறை உள்ள
@@ -1698,7 +1693,7 @@
 DocType: Quotation Item,Stock Balance,பங்கு இருப்பு
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
 DocType: Expense Claim Detail,Expense Claim Detail,இழப்பில் உரிமைகோரல் விவரம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,நேரம் பதிவுகள் உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,நேரம் பதிவுகள் உருவாக்கப்பட்ட:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Employee,Blood Group,குருதி பகுப்பினம்
@@ -1716,13 +1711,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,பற்று தேவைப்படுகிறது
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
 DocType: Offer Letter Term,Offer Term,ஆஃபர் கால
 DocType: Quality Inspection,Quality Manager,தர மேலாளர்
 DocType: Job Applicant,Job Opening,வேலை திறக்கிறது
 DocType: Payment Reconciliation,Payment Reconciliation,கொடுப்பனவு நல்லிணக்க
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,கடிதம் ஆஃபர்
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,பொருள் கோரிக்கைகள் (எம்ஆர்பி) மற்றும் உற்பத்தி ஆணைகள் உருவாக்க.
@@ -1730,22 +1725,22 @@
 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 +103,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
 DocType: Production Order Operation,Completed Qty,நிறைவு அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,தற்போதைய மதிப்பீட்டு விகிதம்
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,ஆணைகள் அல்லது பொருள் எதிரான கொடுப்பனவு பதிவுகள் உருவாக்கவும்.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ஆணைகள் அல்லது பொருள் எதிரான கொடுப்பனவு பதிவுகள் உருவாக்கவும்.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,பயனர்கள் மற்றும் அனுமதிகள்
@@ -1754,10 +1749,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,இல்லை தொ.இல. {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,இல்லை தொ.இல. {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,உங்கள் வாடிக்கையாளர்கள்
 DocType: Leave Block List Date,Block Date,தேதி தடை
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
 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 நிர்வகிக்க ."
@@ -1781,7 +1776,7 @@
 DocType: Employee,Employment Details,வேலை விவரம்
 DocType: Employee,New Workplace,புதிய பணியிடத்தை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,மூடப்பட்ட அமை
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},பார்கோடு கூடிய உருப்படி {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},பார்கோடு கூடிய உருப்படி {0}
 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,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
@@ -1799,10 +1794,10 @@
 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 +608,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,மாற்றம் பொருள்
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},பொருள் {0} ஒரு விற்பனை பொருள் இருக்க வேண்டும் {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -1816,7 +1811,7 @@
 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: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),நிதி ஆதாரம் ( கடன்)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,ஊழியர்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,இருந்து இறக்குமதி மின்னஞ்சல்
@@ -1830,9 +1825,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,மருந்து
@@ -1849,25 +1844,25 @@
 DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Gateway Account,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
@@ -1876,7 +1871,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,செய்திமடல் மடலாடற்
 DocType: Delivery Note,Transporter Name,இடமாற்றி பெயர்
 DocType: Authorization Rule,Authorized Value,அங்கீகரிக்கப்பட்ட மதிப்பு
@@ -1894,10 +1889,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} மூடப்பட்டது
 DocType: Email Digest,How frequently?,எப்படி அடிக்கடி?
 DocType: Purchase Receipt,Get Current Stock,தற்போதைய பங்கு கிடைக்கும்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",அதற்கான குழு (வழக்கமாக நிதிகளின் விண்ணப்ப&gt; தற்போதைய சொத்துக்கள்&gt; வங்கிக் கணக்குகள் சென்று வகை குழந்தை சேர்) என்பதை கிளிக் செய்வதன் மூலம் ஒரு புதிய கணக்கை உருவாக்க ( &quot;வங்கி&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,பொருட்களின் பில் ட்ரீ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,மார்க் தற்போதைய
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},"பராமரிப்பு தொடக்க தேதி சீரியல் இல்லை , விநியோகம் தேதி முன் இருக்க முடியாது {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,நோக்கம்
@@ -1959,12 +1953,12 @@
  9. வரி அல்லது கட்டணம் கவனியுங்கள்: வரி / கட்டணம் மதிப்பீட்டு மட்டும் தான் (மொத்தம் ஒரு பகுதி) அல்லது மட்டுமே (உருப்படியை மதிப்பு சேர்க்க இல்லை) மொத்தம் அல்லது இரண்டு என்றால் இந்த பகுதியில் நீங்கள் குறிப்பிட முடியும்.
  10. சேர் அல்லது கழித்து: நீங்கள் சேர்க்க அல்லது வரி கழித்து வேண்டும் என்பதை."
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","உதாரணமாக வங்கி, பண, கடன் அட்டை"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","உதாரணமாக வங்கி, பண, கடன் அட்டை"
 DocType: Journal Entry,Credit Note,வரவுக்குறிப்பு
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},நிறைவு அளவு அதிகமாக இருக்க முடியாது {0} அறுவை சிகிச்சை {1}
 DocType: Features Setup,Quality,பண்பு
@@ -1988,9 +1982,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,என்னுடைய ஒரு முகவரிக்கு
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,இயல்புநிலை கொள்முதல் விலை பட்டியல்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,மேலே தேர்ந்தெடுக்கப்பட்ட வரையறையில் அல்லது சம்பளம் சீட்டு இல்லை ஊழியர் ஏற்கனவே உருவாக்கப்பட்ட
@@ -2017,7 +2011,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/config/hr.py +93,Payroll,சம்பளப்பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/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} சேர்த்துக்கொள்ள வேண்டும்"
@@ -2028,7 +2022,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,தனிப்பயனாக்குதலில் படிவங்கள்
 DocType: Account,Income Account,வருமான கணக்கு
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,டெலிவரி
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,முக்கிய பொறுப்பு பகுதி
@@ -2050,16 +2044,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
 DocType: Item Supplier,Item Supplier,உருப்படியை சப்ளையர்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,புதிய செலவு மையம் பெயர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
 DocType: Appraisal,HR User,அலுவலக பயனர்
 DocType: Purchase Invoice,Taxes and Charges Deducted,கழிக்கப்படும் வரி மற்றும் கட்டணங்கள்
-apps/erpnext/erpnext/config/support.py +7,Issues,சிக்கல்கள்
+apps/erpnext/erpnext/hooks.py +90,Issues,சிக்கல்கள்
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},நிலைமை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Sales Invoice,Debit To,செய்ய பற்று
 DocType: Delivery Note,Required only for sample item.,ஒரே மாதிரி உருப்படியை தேவைப்படுகிறது.
@@ -2078,10 +2072,10 @@
 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 +139,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,நாணயமாற்று வீத மற்றொரு வகையில் ஒரு நாணயத்தை மாற்ற குறிப்பிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,மொத்த நிலுவை தொகை
@@ -2149,7 +2143,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
 ,Requested,கோரப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,எந்த கருத்துக்கள்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
@@ -2176,7 +2170,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 DocType: Payment Request,Recipient and Message,பெறுநர் மற்றும் செய்தி
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
@@ -2190,7 +2184,7 @@
 DocType: Purchase Invoice,Select Supplier Address,சப்ளையர் முகவரி தேர்வு
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
@@ -2213,10 +2207,10 @@
 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; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,திட்ட தொடக்க தேதி
@@ -2225,7 +2219,7 @@
 DocType: Installation Note Item,Against Document No,ஆவண எதிராக இல்லை
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,விற்னையாளர் பங்குதாரர்கள் நிர்வகி.
 DocType: Quality Inspection,Inspection Type,ஆய்வு அமைப்பு
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},தேர்வு செய்க {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,இல்லை சி படிவம்
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,குறியகற்றப்பட்டது வருகை
@@ -2253,7 +2247,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,உறுதிப்படுத்தப்பட்டுள்ளதாகவும்
 DocType: Payment Gateway,Gateway,நுழைவாயில்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,விவரங்கள்
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,விவரங்கள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
@@ -2267,12 +2261,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,ஏற்று கிடங்கு
 DocType: Bank Reconciliation Detail,Posting Date,தேதி தகவல்களுக்கு
 DocType: Item,Valuation Method,மதிப்பீட்டு முறை
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} க்கான மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} க்கான மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,மார்க் அரை நாள்
 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 +410,[Error],[பிழை]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,துணிகர முதலீடு
@@ -2304,13 +2298,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,சொற்கள் அல்லது ஒப்பந்த வார்ப்புரு.
 DocType: Purchase Invoice,Address and Contact,முகவரி மற்றும் தொடர்பு
 DocType: Supplier,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Employee,Feedback,கருத்து
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","முன் ஒதுக்கீடு செய்யப்படும் {0}, விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு பதிவில் இருந்து வருகிறது {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
 DocType: Item,Reorder level based on Warehouse,கிடங்கில் அடிப்படையில் மறுவரிசைப்படுத்துக நிலை
 DocType: Activity Cost,Billing Rate,பில்லிங் விகிதம்
@@ -2324,12 +2318,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ரத்து அல்லது மூடப்பட்டுள்ளது
 DocType: Delivery Note,Track this Delivery Note against any Project,எந்த திட்டம் எதிரான இந்த டெலிவரி குறிப்பு கண்காணிக்க
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,முதலீடு இருந்து நிகர பண
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
-DocType: Pricing Rule,Item Code,உருப்படியை கோட்
+DocType: Asset,Item Code,உருப்படியை கோட்
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
@@ -2375,24 +2368,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,தொ.எ. மற்றும் தொகுதி
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,மதிப்பு அல்லது அளவு
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,நிமிஷம்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 ,Qty to Receive,மதுரையில் அளவு
 DocType: Leave Block List,Leave Block List Allowed,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
 DocType: Sales Partner,Retailer,சில்லறை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
 DocType: Global Defaults,Disable In Words,சொற்கள் முடக்கு
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,திறப்பு இருப்பு ஈக்விட்டி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,தேதி மீண்டும்
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
@@ -2401,7 +2394,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,செய்தி அனுப்பப்பட்டது
@@ -2442,7 +2435,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
 DocType: Payment Gateway Account,Default Payment Request Message,இயல்புநிலை பணம் கோரிக்கை செய்தி
 DocType: Item Group,Check this if you want to show in website,நீங்கள் இணையதளத்தில் காட்ட வேண்டும் என்றால் இந்த சோதனை
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,வங்கி மற்றும் கொடுப்பனவுகள்
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,வங்கி மற்றும் கொடுப்பனவுகள்
 ,Welcome to ERPNext,ERPNext வரவேற்கிறோம்
 DocType: Payment Reconciliation Payment,Voucher Detail Number,வவுச்சர் விரிவாக எண்
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,மேற்கோள் லீட்
@@ -2450,17 +2443,17 @@
 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 +199,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,இலைகள் மற்றும் விடுமுறை
 DocType: Sales Order,Not Billed,கட்டணம்
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,Landed செலவு ரசீது தொகை
 DocType: Time Log,Batched for Billing,பில்லிங் Batched
@@ -2478,13 +2471,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,கிடங்கு {0}: நிறுவனத்தின் கட்டாய ஆகிறது
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},காணாமல் செலாவணி விகிதங்கள் {0}
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Account,Payable,செலுத்த வேண்டிய
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
-DocType: Project,Margin,விளிம்பு
+DocType: Pricing Rule,Margin,விளிம்பு
 DocType: Salary Slip,Arrear Amount,நிலுவை தொகை
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,புதிய வாடிக்கையாளர்கள்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,மொத்த லாபம்%
@@ -2505,7 +2498,7 @@
 DocType: Payment Request,Email To,மின்னஞ்சல்
 DocType: Lead,Lead Owner,உரிமையாளர் இட்டு
 DocType: Bin,Requested Quantity,கோரப்பட்ட அளவு
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,கிடங்கு தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,கிடங்கு தேவைப்படுகிறது
 DocType: Employee,Marital Status,திருமண தகுதி
 DocType: Stock Settings,Auto Material Request,கார் பொருள் கோரிக்கை
 DocType: Time Log,Will be updated when billed.,கணக்கில் போது புதுப்பிக்கப்படும்.
@@ -2513,7 +2506,7 @@
 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 +115,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 +84,{0}% Delivered,{0}% வழங்கப்படுகிறது
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
@@ -2533,7 +2526,7 @@
 DocType: Manufacturer,Manufacturers used in Items,பொருட்கள் பயன்படுத்தப்படும் உற்பத்தியாளர்கள்
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,நிறுவனத்தின் வட்ட இனிய விலை மையம் குறிப்பிடவும்
 DocType: Purchase Invoice,Terms,விதிமுறைகள்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,புதிய உருவாக்கவும்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,புதிய உருவாக்கவும்
 DocType: Buying Settings,Purchase Order Required,தேவையான கொள்முதல் ஆணை
 ,Item-wise Sales History,உருப்படியை வாரியான விற்பனை வரலாறு
 DocType: Expense Claim,Total Sanctioned Amount,மொத்த ஒப்புதல் தொகை
@@ -2546,7 +2539,7 @@
 ,Stock Ledger,பங்கு லெட்ஜர்
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},மதிப்பீடு: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,சம்பளம் ஸ்லிப் பொருத்தியறிதல்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,முதல் ஒரு குழு முனை தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,முதல் ஒரு குழு முனை தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,பணியாளர் மற்றும் வருகை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","அது உங்கள் நிறுவனத்தின் முகவரி போன்ற, வாடிக்கையாளர், சப்ளையர், விற்பனை பங்குதாரர் மற்றும் முன்னணி குறிப்பு நீக்க"
@@ -2568,13 +2561,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} இருந்து: {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
 DocType: BOM Replace Tool,BOM Replace Tool,BOM பதிலாக கருவி
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,அடுத்த நாள் பதிவுசெய்ய தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,அடுத்த நாள் பதிவுசெய்ய தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/accounts/party.py +289,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',நீங்கள் உற்பத்தி துறையில் உள்ளடக்கியது என்றால் . பொருள் இயக்கும் ' உற்பத்தி செய்யப்படுகிறது '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,விலைப்பட்டியல் பதிவுசெய்ய தேதி
@@ -2589,7 +2582,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","குறிப்பு: பணம் எந்த குறிப்பு எதிராக செய்த எனில், கைமுறையாக பத்திரிகை பதிவு செய்ய."
@@ -2603,7 +2596,7 @@
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2606,7 @@
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
@@ -2624,7 +2617,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
@@ -2637,7 +2630,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,நடமாட்டத்தை கட்டுபடுத்து
@@ -2645,7 +2638,7 @@
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,தேதி அரை நாள் விடுப்பு வரம்பு தேதி அதே இருக்க வேண்டும்
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
@@ -2653,14 +2646,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,சம்பளம் அமைப்பு
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,சேமிப்பு
 DocType: Employee,Offer Date,ஆஃபர் தேதி
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,மேற்கோள்கள்
 DocType: Hub Settings,Access Token,அணுகல் டோக்கன்
 DocType: Sales Invoice Item,Serial No,இல்லை தொடர்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
-DocType: Item,Is Fixed Asset Item,நிலையான சொத்து பொருள் ஆகிறது
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
 DocType: Purchase Invoice,Print Language,அச்சு மொழி
 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","நீங்கள் நீண்ட வடிவங்கள் அச்சிட வேண்டும் என்றால், இந்த அம்சம் பக்கம் ஒவ்வொரு பக்கத்தில் அனைத்து தலைப்புகள் மற்றும் அடிக்குறிப்புகளும் பல பக்கங்களில் அச்சிடப்பட்ட வேண்டும் பிரித்து பயன்படுத்தலாம்"
@@ -2677,7 +2669,7 @@
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
@@ -2693,13 +2685,13 @@
 DocType: Quotation,Maintenance Manager,பராமரிப்பு மேலாளர்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,மொத்த பூஜ்ஜியமாக இருக்க முடியாது
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,' கடைசி ஆர்டர் நாட்களில் ' அதிகமாக அல்லது பூஜ்ஜியத்திற்கு சமமாக இருக்க வேண்டும்
-DocType: C-Form,Amended From,முதல் திருத்தப்பட்ட
+DocType: Asset,Amended From,முதல் திருத்தப்பட்ட
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,முன்னெடுத்து செல்
@@ -2713,20 +2705,20 @@
 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/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","உங்கள் வரி தலைகள் பட்டியல் (எ.கா. வரி, சுங்க போன்றவை; அவர்கள் தனிப்பட்ட பெயர்கள் இருக்க வேண்டும்) மற்றும் அவர்களது தரத்தை விகிதங்கள். இந்த நீங்கள் திருத்தலாம் மற்றும் மேலும் பின்னர் சேர்க்க நிலைப்படுத்தப்பட்ட டெம்ப்ளேட், உருவாக்கும்."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},தொடராக பொருள் தொடர் இலக்கங்கள் தேவையான {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,பொருள் கொண்ட போட்டி கொடுப்பனவு
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,பொருள் கொண்ட போட்டி கொடுப்பனவு
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,வணிக வண்டியில் சேர்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,குழு மூலம்
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
 DocType: Production Planning Tool,Get Material Request,பொருள் வேண்டுகோள் பெற
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,தபால் செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,தபால் செலவுகள்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம் (விவரங்கள்)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Quality Inspection,Item Serial No,உருப்படி இல்லை தொடர்
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,மொத்த தற்போதைய
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,கணக்கு அறிக்கைகள்
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,கணக்கு அறிக்கைகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,மணி
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
@@ -2746,13 +2738,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),தொடக்க புள்ளி (POS) த்தில்
 apps/erpnext/erpnext/config/support.py +32,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,வாடிக்கையாளர் பிரிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: Item,Website Description,இணையதளத்தில் விளக்கம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
@@ -2762,12 +2754,12 @@
 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,வாடிக்கையாளர் குழு பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
 DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
 DocType: Item,Attributes,கற்பிதங்கள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,பொருட்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,பொருட்கள் கிடைக்கும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
 DocType: C-Form,C-Form,சி படிவம்
@@ -2779,18 +2771,17 @@
 DocType: Purchase Invoice,Mobile No,இல்லை மொபைல்
 DocType: Payment Tool,Make Journal Entry,பத்திரிகை பதிவு செய்ய
 DocType: Leave Allocation,New Leaves Allocated,புதிய ஒதுக்கப்பட்ட இலைகள்
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,வர்த்தகம்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},பிழை: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 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 +52,All Products or Services.,அனைத்து தயாரிப்புகள் அல்லது சேவைகள்.
 DocType: Supplier Quotation,Supplier Address,வழங்குபவர் முகவரி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
+apps/erpnext/erpnext/config/accounts.py +259,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,நிதி சேவைகள்
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} கற்பிதம் மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3}
@@ -2801,10 +2792,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,பரிமாற்றம்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
@@ -2826,18 +2817,18 @@
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 DocType: Features Setup,POS View,பிஓஎஸ் பார்வையிடு
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,அடுத்து தேதி நாள் மற்றும் மாதம் நாளில் மீண்டும் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,அடுத்து தேதி நாள் மற்றும் மாதம் நாளில் மீண்டும் சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,குறிப்பிடவும் ஒரு
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,மேலே
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,நேரம் பதிவு Billed
 DocType: Salary Slip,Earning & Deduction,சம்பளம் மற்றும் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழு இருக்க முடியாது
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),இடைக்கால லாபம் / நஷ்டம் (கடன்)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},நிறுவனத்தின் இயல்புநிலை மதிப்பு {0} அமைக்க தயவு செய்து {1}
@@ -2847,12 +2838,11 @@
 ,Monthly Attendance Sheet,மாதாந்திர பங்கேற்கும் தாள்
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,எந்த பதிவும் இல்லை
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் கட்டாய {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடர் எண்ணிக்கையில்&gt; எண் தொடர்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
 DocType: Sales Team,Contact No.,இல்லை தொடர்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
 DocType: Features Setup,Sales Discounts,விற்பனை தள்ளுபடி
@@ -2866,39 +2856,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ஆணை எண்
 DocType: Item Group,HTML / Banner that will show on the top of product list.,தயாரிப்பு பட்டியலில் காண்பிக்கும் என்று HTML / பதாகை.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,கப்பல் அளவு கணக்கிட நிலைமைகளை குறிப்பிடவும்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,குழந்தை சேர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,திறப்பு மதிப்பு
 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,விற்பனையில் கமிஷன்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,விடுமுறை விண்ணப்பங்கள்.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,சட்ட செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,சட்ட செலவுகள்
 DocType: Sales Invoice,Posting Time,நேரம் தகவல்களுக்கு
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,தொலைபேசி செலவுகள்
 DocType: Sales Partner,Logo,லோகோ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,நீங்கள் பயனர் சேமிப்பு முன்பு ஒரு தொடர் தேர்ந்தெடுக்க கட்டாயப்படுத்தும் விரும்பினால் இந்த சோதனை. இந்த சோதனை என்றால் இல்லை இயல்பாக இருக்கும்.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},சீரியல் இல்லை இல்லை பொருள் {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},சீரியல் இல்லை இல்லை பொருள் {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,திறந்த அறிவிப்புகள்
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,நேரடி செலவுகள்
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,நேரடி செலவுகள்
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;அறிவித்தல் \ மின்னஞ்சல் முகவரி&#39; உள்ள ஒரு தவறான மின்னஞ்சல் முகவரி
 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,போக்குவரத்து செலவுகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
@@ -2915,7 +2905,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,நாம் இந்த பொருளை விற்க
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,வழங்குபவர் அடையாளம்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
 DocType: Journal Entry,Cash Entry,பண நுழைவு
 DocType: Sales Partner,Contact Desc,தொடர்பு DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","சாதாரண, உடம்பு போன்ற இலைகள் வகை"
@@ -2930,7 +2920,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,மூலப்பொருள் முக்கிய பொருள் அதே இருக்க முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,சம்பளம் வார்ப்புரு மாஸ்டர் .
@@ -2946,7 +2936,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
@@ -2961,13 +2951,13 @@
 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,பற்றாளர்களின்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,பற்றாளர்களின்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,ரோ # {0}: தொடர் எந்த கட்டாய ஆகிறது
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வாரியாக வரி விரிவாக
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
@@ -2988,15 +2978,14 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
-DocType: Project,Project Name,திட்டம் பெயர்
+DocType: Request for Quotation 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,உருப்படியை தொகுப்பு இலக்கங்கள்
@@ -3033,7 +3022,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","அது உங்கள் நிறுவனத்தின் முகவரி போன்ற நிறுவனம், கட்டாயமாகும்"
 DocType: Item Attribute,From Range,வரம்பில் இருந்து
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,அது ஒரு பங்கு உருப்படியை இல்லை என்பதால் பொருள் {0} அலட்சியம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,மேலும் செயலாக்க இந்த உற்பத்தி ஆர்டர் .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,மேலும் செயலாக்க இந்த உற்பத்தி ஆர்டர் .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ஒரு குறிப்பிட்ட பரிமாற்றத்தில் விலை விதி பொருந்தும் இல்லை, அனைத்து பொருந்தும் விலை விதிகள் முடக்கப்பட்டுள்ளது."
 DocType: Company,Domain,டொமைன்
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,வேலைகள்
@@ -3045,6 +3034,7 @@
 DocType: Time Log,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),சம்பளம் (LWP) இல்லாமல் விடுமுறை ஆதாயம் குறைக்க
@@ -3079,7 +3069,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,தற்காலிக கணக்குகளை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,கருப்பு
 DocType: BOM Explosion Item,BOM Explosion Item,BOM வெடிப்பு பொருள்
 DocType: Account,Auditor,ஆடிட்டர்
@@ -3093,16 +3083,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,மார்க் இருக்காது
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,நேரம் இருந்து விட பெரியதாக இருக்க வேண்டும் வேண்டும்
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,இருந்து பொருட்களை சேர்க்கவும்
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,இருந்து பொருட்களை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,பணி ஐடி
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","உதாரணமாக, ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,பொருள் இருக்க முடியாது பங்கு {0} என்பதால் வகைகள் உண்டு
 ,Sales Person-wise Transaction Summary,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
@@ -3128,7 +3118,7 @@
 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,அடுத்த தொடர்பு
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,அமைப்பு நுழைவாயில் கணக்குகள்.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,அமைப்பு நுழைவாயில் கணக்குகள்.
 DocType: Employee,Employment Type,வேலை வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,நிலையான சொத்துக்கள்
 ,Cash Flow,பண பரிமாற்ற
@@ -3142,7 +3132,7 @@
 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 +132,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,பொது லெட்ஜர் படி வங்கி அறிக்கை சமநிலை
 DocType: Job Applicant,Applicant Name,விண்ணப்பதாரர் பெயர்
 DocType: Authorization Rule,Customer / Item Name,வாடிக்கையாளர் / உருப்படி பெயர்
@@ -3158,19 +3148,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,பரிவர்த்தனைகள் விற்பனை இயல்புநிலை அமைப்புகளை.
 DocType: BOM Replace Tool,Current BOM,தற்போதைய BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,சீரியல் இல்லை சேர்
 apps/erpnext/erpnext/config/support.py +43,Warranty,உத்தரவாதத்தை
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,அச்சு மற்றும் நிலையான
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,குழு முனை
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,புதுப்பி முடிந்தது பொருட்கள்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,புதுப்பி முடிந்தது பொருட்கள்
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,வாங்கும்
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,கட்டண தொகை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
@@ -3200,7 +3189,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் ஹிப்ரு பராமரிக்க முடியும்"
 DocType: Leave Block List,Applies to Company,நிறுவனத்தின் பொருந்தும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
 DocType: Purchase Invoice,In Words,வேர்ட்ஸ்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
 DocType: Production Planning Tool,Material Request For Warehouse,கிடங்கு பொருள் கோரிக்கை
@@ -3214,7 +3203,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
@@ -3225,7 +3214,7 @@
 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 +782,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ஏற்கனவே பெற்றுள்ளது
@@ -3233,14 +3222,13 @@
 DocType: Customer,Sales Team Details,விற்பனை குழு விவரம்
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},தவறான {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
 DocType: Account,Chargeable,குற்றம் சாட்டப்பட தக்க
 DocType: Company,Change Abbreviation,மாற்றம் சுருக்கமான
 DocType: Expense Claim Detail,Expense Date,இழப்பில் தேதி
@@ -3258,10 +3246,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,பொது லெட்ஜர்
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,காண்க லீட்ஸ்
 DocType: Item Attribute Value,Attribute Value,மதிப்பு பண்பு
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","மின்னஞ்சல் அடையாள தனிப்பட்ட இருக்க வேண்டும் , ஏற்கனவே உள்ளது {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","மின்னஞ்சல் அடையாள தனிப்பட்ட இருக்க வேண்டும் , ஏற்கனவே உள்ளது {0}"
 ,Itemwise Recommended Reorder Level,இனவாரியாக நிலை மறுவரிசைப்படுத்துக பரிந்துரைக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,முதல் {0} தேர்வு செய்க
 DocType: Features Setup,To get Item Group in details table,விவரங்கள் அட்டவணையில் உருப்படி குழு பெற
@@ -3297,23 +3285,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},பராமரிப்பு அட்டவணை {0} எதிராக இருக்கிறது {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},பராமரிப்பு அட்டவணை {0} எதிராக இருக்கிறது {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),உண்மையான அளவு (ஆதாரம் / இலக்கு)
 DocType: Item Customer Detail,Ref Code,Ref கோட்
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ஊழியர் பதிவுகள்.
 DocType: Payment Gateway,Payment Gateway,பணம் நுழைவாயில்
 DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல் அமைப்புகள்
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ஸ்நாக்ஸ்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ரூட் ஒரு பெற்றோர் செலவு சென்டர் முடியாது
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,தேர்வு பிராண்ட் ...
 DocType: Sales Invoice,C-Form Applicable,பொருந்தாது சி படிவம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,கிடங்கு கட்டாயமாகும்
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,மூலம் தீர்க்கப்பட
@@ -3331,7 +3319,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,பரிவர்த்தனை நாணய பணம் நுழைவாயில் நாணய அதே இருக்க வேண்டும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,பெறவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,பெறவும்
 DocType: Maintenance Visit,Fully Completed,முழுமையாக பூர்த்தி
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% முழுமையான
 DocType: Employee,Educational Qualification,கல்வி தகுதி
@@ -3339,14 +3327,14 @@
 DocType: Purchase Invoice,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,என்னுடைய கட்டளைகள்
@@ -3367,10 +3355,10 @@
 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,அனுப்புவதற்கு முன் செய்தி உள்ளிடவும்
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,பிணையற்ற கடன்கள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,பிணையற்ற கடன்கள்
 DocType: Cost Center,Cost Center Name,மையம் பெயர் செலவு
 DocType: Maintenance Schedule Detail,Scheduled Date,திட்டமிடப்பட்ட தேதி
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,மொத்த பணம் விவரங்கள்
@@ -3382,7 +3370,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
@@ -3395,12 +3383,12 @@
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கம்ப்யூட்டர்
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
@@ -3409,7 +3397,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
@@ -3422,7 +3410,7 @@
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,பங்கு சொத்துக்கள்
@@ -3436,15 +3424,15 @@
 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 +576,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,திட்ட செயல்பாடு / பணி.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,சம்பளம் தவறிவிடும் உருவாக்க
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் வாங்குதல், சரிபார்க்கப்பட வேண்டும் {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,மாதம் ஒரு நாள் மீண்டும்
@@ -3465,7 +3453,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","உதாரணம்:. தொடர் அமைக்க மற்றும் சீரியல் பரிமாற்றங்கள் குறிப்பிடப்பட்டுள்ளது இல்லை என்றால் ABCD, ##### 
 , பின்னர் தானாக வரிசை எண் இந்த தொடரை அடிப்படையாக கொண்டு உருவாக்கப்பட்டது. நீங்கள் எப்போதும் வெளிப்படையாக இந்த உருப்படியை தொடர் இல குறிப்பிட வேண்டும் என்றால். இதை நிரப்புவதில்லை."
@@ -3477,11 +3465,11 @@
 ,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 +91,Please enter default currency in Company Master,நிறுவனத்தின் முதன்மை இயல்புநிலை நாணய உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},வரி விதிமுறை முரண்படுகிறது {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,புதிய கணக்கு பெயர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,வாடிக்கையாளர் சேவை
@@ -3493,9 +3481,9 @@
 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 +72,Item {0} must be a stock Item,பொருள் {0} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,முன்னேற்றம் கிடங்கில் இயல்புநிலை வேலை
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,பொருள் {0} ஒரு விற்பனை பொருளாக இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,பொருள் {0} ஒரு விற்பனை பொருளாக இருக்க வேண்டும்
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
 DocType: Account,Equity,ஈக்விட்டி
 DocType: Sales Order,Printing Details,அச்சிடுதல் விபரங்கள்
@@ -3503,7 +3491,7 @@
 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,தேடல் துணை கூட்டங்கள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 தள்ளுபடி
@@ -3526,7 +3514,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
@@ -3537,7 +3525,7 @@
 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 +508,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,பரிவர்த்தனைகள் வாங்கும் வரி வார்ப்புரு .
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,பரிவர்த்தனைகள் வாங்கும் வரி வார்ப்புரு .
 ,Item Prices,உருப்படியை விலைகள்
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 DocType: Period Closing Voucher,Period Closing Voucher,காலம் முடிவுறும் வவுச்சர்
@@ -3547,10 +3535,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம் உள்ள
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,மாற்றம்
@@ -3569,13 +3557,13 @@
 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 +559,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,வரி பகுப்பு ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' அனைத்து பொருட்களை அல்லாத பங்கு பொருட்களை இருக்க முடியாது
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,கூட்டம்
@@ -3589,7 +3577,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,விற்பனை நபர்
 DocType: Sales Invoice,Cold Calling,குளிர் காலிங்
 DocType: SMS Parameter,SMS Parameter,எஸ்எம்எஸ் அளவுரு
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
 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.,மதிப்புகள் அடிப்படையில் நடவடிக்கைகளை கட்டுப்படுத்த விதிகளை உருவாக்க .
@@ -3622,7 +3610,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,ஏற்று அளவு
@@ -3630,7 +3617,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,பெற்றோர் கணக்கு
@@ -3646,7 +3633,7 @@
 DocType: Employee,Education,கல்வி
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
 DocType: Address,Office,அலுவலகம்
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
@@ -3681,7 +3668,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,மாத சம்பளம் பதிவு
 DocType: Warranty Claim,If different than customer address,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
@@ -3689,22 +3676,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,குறைந்தது ஒரு வரிசையில் செலுத்தும் தொகை உள்ளிடவும்
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 DocType: Payment Gateway Account,Payment URL Message,கொடுப்பனவு URL ஐ செய்தி
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ரோ {0}: பணம் அளவு நிலுவை தொகை விட அதிகமாக இருக்க முடியாது
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,செலுத்தப்படாத மொத்த
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,நேரம் பதிவு பில் இல்லை
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,கைமுறையாக எதிராக உறுதி சீட்டு உள்ளிடவும்
 DocType: SMS Settings,Static Parameters,நிலையான அளவுருக்களை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,உருப்படியை வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,சப்ளையர் பொருள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,கலால் விலைப்பட்டியல்
 DocType: Expense Claim,Employees Email Id,ஊழியர்கள் மின்னஞ்சல் விலாசம்
 DocType: Employee Attendance Tool,Marked Attendance,அடையாளமிட்ட வருகை
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,நடப்பு பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,நடப்பு பொறுப்புகள்
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
@@ -3725,17 +3712,16 @@
 DocType: Item Attribute,Numeric Values,எண்மதிப்பையும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,லோகோ இணைக்கவும்
 DocType: Customer,Commission Rate,கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படும். அமைப்பு&gt; அச்சிடுதல் மற்றும் பிராண்டிங்&gt; முகவரி டெம்ப்ளேட் இருந்து ஒரு புதிய ஒன்றை உருவாக்க கொள்ளவும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,மூலதன கையிருப்பு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,மூலதன கையிருப்பு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
 DocType: Payment Gateway Account,Payment Gateway Account,பணம் நுழைவாயில் கணக்கு
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,கட்டணம் முடிந்த பிறகு தேர்ந்தெடுக்கப்பட்ட பக்கம் பயனர் திருப்பி.
@@ -3747,17 +3733,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,பொருட்களின் பில்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref தேதி
@@ -3765,6 +3751,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,கணக்கு {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index bde313f..f66f299 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,డీలర్
 DocType: Employee,Rented,అద్దెకు
 DocType: POS Profile,Applicable for User,వాడుకరి వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},కరెన్సీ ధర జాబితా కోసం అవసరం {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* లావాదేవీ లెక్కించబడతాయి.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 DocType: Purchase Order,Customer Contact,కస్టమర్ సంప్రదించండి
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ట్రీ
 DocType: Job Applicant,Job Applicant,ఉద్యోగం అభ్యర్థి
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,రో # {0}: రేటు అదే ఉండాలి {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,న్యూ లీవ్ అప్లికేషన్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,షో రకరకాలు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,పరిమాణం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
 DocType: Employee Education,Year of Passing,తరలింపు ఇయర్
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,అందుబాటులో ఉంది
 DocType: Designation,Designation,హోదా
@@ -64,7 +63,7 @@
 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 +642,Invoice,వాయిస్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,వాయిస్
 DocType: Maintenance Schedule Item,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,రక్షణ
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},న్యూ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},న్యూ {0}: # {1}
 ,Sales Partners Commission,సేల్స్ భాగస్వాములు కమిషన్
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,కంటే ఎక్కువ 5 అక్షరాలు కాదు సంక్షిప్తీకరణ
 DocType: Payment Request,Payment Request,చెల్లింపు అభ్యర్థన
@@ -102,7 +101,7 @@
 DocType: Employee,Married,వివాహితులు
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},కోసం అనుమతి లేదు {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,నుండి అంశాలను పొందండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 DocType: Payment Reconciliation,Reconcile,పునరుద్దరించటానికి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,కిరాణా
 DocType: Quality Inspection Reading,Reading 1,1 పఠనం
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ఆన్ టార్గెట్
 DocType: BOM,Total Cost,మొత్తం వ్యయం
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,కార్యాచరణ లోనికి ప్రవేశించండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} అంశం వ్యవస్థ ఉనికిలో లేదు లేదా గడువు ముగిసింది
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ఫార్మాస్యూటికల్స్
@@ -156,7 +155,7 @@
 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,స్టాక్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,స్టాక్ ఖర్చులు
 DocType: Newsletter,Email Sent?,ఇమెయిల్ పంపబడింది?
 DocType: Journal Entry,Contra Entry,పద్దు
 DocType: Production Order Operation,Show Time Logs,షో టైమ్ దినచర్య
@@ -164,12 +163,12 @@
 DocType: Delivery Note,Installation Status,సంస్థాపన స్థితి
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,అంశం {0} కొనుగోలు అంశం ఉండాలి
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: BOM Replace Tool,New BOM,న్యూ BOM
@@ -208,11 +207,11 @@
 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 +79,Account {0} does not belong to Company {1},ఖాతా {0} కంపెనీకి చెందినది కాదు {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,కంపెనీ నమోదు చేయండి
@@ -221,7 +220,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
 DocType: Lead,Address & Contact,చిరునామా &amp; సంప్రదింపు
 DocType: Leave Allocation,Add unused leaves from previous allocations,మునుపటి కేటాయింపులు నుండి ఉపయోగించని ఆకులు జోడించండి
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},తదుపరి పునరావృత {0} లో రూపొందే {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},తదుపరి పునరావృత {0} లో రూపొందే {1}
 DocType: Newsletter List,Total Subscribers,మొత్తం చందాదార్లు
 ,Contact Name,సంప్రదింపు పేరు
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,పైన పేర్కొన్న ప్రమాణాలను కోసం జీతం స్లిప్ సృష్టిస్తుంది.
@@ -235,8 +234,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
 DocType: Payment Tool,Reference No,ప్రస్తావన
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Leave నిరోధిత
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,బ్యాంక్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
@@ -248,8 +247,8 @@
 DocType: Pricing Rule,Supplier Type,సరఫరాదారు టైప్
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +263,7 @@
 DocType: Notification Control,Notification Control,నోటిఫికేషన్ కంట్రోల్
 DocType: Lead,Suggestions,సలహాలు
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ఈ ప్రాంతములో సెట్ అంశం గ్రూప్ వారీగా బడ్జెట్లు. మీరు కూడా పంపిణీ అమర్చుట ద్వారా కాలికోద్యోగం చేర్చవచ్చు.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},గిడ్డంగి మాతృ గ్రూప్ ఖాతాలు నమోదు చేయండి {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},గిడ్డంగి మాతృ గ్రూప్ ఖాతాలు నమోదు చేయండి {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},వ్యతిరేకంగా చెల్లింపు {0} {1} అసాధారణ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {2}
 DocType: Supplier,Address HTML,చిరునామా HTML
 DocType: Lead,Mobile No.,మొబైల్ నం
@@ -283,7 +282,7 @@
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
 DocType: Period Closing Voucher,Closing Account Head,ఖాతా తల ముగింపు
 DocType: Employee,External Work History,బాహ్య వర్క్ చరిత్ర
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,సర్క్యులర్ సూచన లోపం
@@ -294,10 +293,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Payment Reconciliation Invoice,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,డెలివరీ గమనిక
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,నెల మరియు సంవత్సరం దయచేసి ఎంచుకోండి
@@ -308,12 +307,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,భావించబడుతున్నది మొత్తం ఆర్డర్
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,నమోదు రంగంలో విలువ &#39;డే ఆఫ్ ది మంత్ రిపీట్&#39; దయచేసి
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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","బిఒఎం, డెలివరీ గమనిక, కొనుగోలు వాయిస్, ప్రొడక్షన్ ఆర్డర్, పర్చేజ్ ఆర్డర్, కొనుగోలు రసీదులు, సేల్స్ వాయిస్, అమ్మకాల ఉత్తర్వు, స్టాక్ ఎంట్రీ, timesheet అందుబాటులో"
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
@@ -335,9 +334,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},సీరియల్ లేవు {0} డెలివరీ గమనిక చెందినది కాదు {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,అంశం నాణ్యత తనిఖీ పారామిత
 DocType: Leave Application,Leave Approver Name,అప్రూవర్గా వదిలి పేరు
-,Schedule Date,షెడ్యూల్ తేదీ
+DocType: Depreciation Schedule,Schedule Date,షెడ్యూల్ తేదీ
 DocType: Packed Item,Packed Item,ప్యాక్ అంశం
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,లావాదేవీలు కొనుగోలు కోసం డిఫాల్ట్ సెట్టింగులను.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,లావాదేవీలు కొనుగోలు కోసం డిఫాల్ట్ సెట్టింగులను.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},కార్యాచరణ ఖర్చు కార్యాచరణ పద్ధతి వ్యతిరేకంగా ఉద్యోగి {0} అవసరమయ్యారు - {1}
 apps/erpnext/erpnext/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,కరెన్సీ ఎక్స్ఛేంజ్
@@ -386,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,అన్ని తయారీ ప్రక్రియలకు గ్లోబల్ సెట్టింగులు.
 DocType: Accounts Settings,Accounts Frozen Upto,ఘనీభవించిన వరకు అకౌంట్స్
 DocType: SMS Log,Sent On,న పంపిన
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,హాలిడే మాస్టర్.
-DocType: Material Request Item,Required Date,అవసరం తేదీ
+DocType: Request for Quotation Item,Required Date,అవసరం తేదీ
 DocType: Delivery Note,Billing Address,రశీదు చిరునామా
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,అంశం కోడ్ను నమోదు చేయండి.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,మొత్తం ప్యాక్ చేసిన అంశాల
@@ -416,17 +415,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;ఉనికి లేదు
 DocType: Pricing Rule,Valid Upto,చెల్లుబాటు అయ్యే వరకు
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
 DocType: Shipping Rule,Net Weight,నికర బరువు
 DocType: Employee,Emergency Phone,అత్యవసర ఫోన్
 ,Serial No Warranty Expiry,సీరియల్ తోబుట్టువుల సంఖ్య వారంటీ గడువు
@@ -446,7 +445,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,అంశం {0} కొనుగోలు లేదు అంశం
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,అంశం {0} కొనుగోలు లేదు అంశం
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ మార్చు పన్నులు మరియు ఆరోపణలు జోడించండి
 DocType: Purchase Invoice,Supplier Invoice No,సరఫరాదారు వాయిస్ లేవు
 DocType: Territory,For reference,సూచన కోసం
@@ -457,7 +456,7 @@
 DocType: Production Plan Item,Pending Qty,పెండింగ్ ప్యాక్ చేసిన అంశాల
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ఉప-ఒప్పంద కొనుగోలు రసీదులు తప్పనిసరి సరఫరాదారు వేర్హౌస్
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ఉప-ఒప్పంద కొనుగోలు రసీదులు తప్పనిసరి సరఫరాదారు వేర్హౌస్
 DocType: Pricing Rule,Valid From,నుండి వరకు చెల్లుతుంది
 DocType: Sales Invoice,Total Commission,మొత్తం కమిషన్
 DocType: Pricing Rule,Sales Partner,సేల్స్ భాగస్వామి
@@ -467,13 +466,13 @@
 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 +126,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 +230,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,పోగుచేసిన విలువలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ ఫిస్కల్ ఇయర్ ఎండ్ తేదీ కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ ఫిస్కల్ ఇయర్ ఎండ్ తేదీ కంటే ఎక్కువ ఉండకూడదు
 DocType: Warranty Claim,Resolution,రిజల్యూషన్
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},పంపిణీ: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,చెల్లించవలసిన ఖాతా
@@ -481,7 +480,7 @@
 DocType: Job Applicant,Resume Attachment,పునఃప్రారంభం జోడింపు
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,పునరావృత
 DocType: Leave Control Panel,Allocate,కేటాయించాల్సిన
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,సేల్స్ చూపించు
 DocType: Item,Delivered by Supplier (Drop Ship),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,జీతం భాగాలు.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,సంభావ్య వినియోగదారులు డేటాబేస్.
@@ -490,7 +489,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,స్టాక్ ఎంట్రీలు తయారు చేస్తారు ఇది వ్యతిరేకంగా ఒక తార్కిక వేర్హౌస్.
@@ -500,7 +499,7 @@
 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/config/accounts.py +70,Masters,మాస్టర్స్
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,నవీకరణ బ్యాంక్ ట్రాన్సాక్షన్ తేదీలు
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,నవీకరణ బ్యాంక్ ట్రాన్సాక్షన్ తేదీలు
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ప్రతికూల స్టాక్ లోపం ({6}) అంశం కోసం {0} గిడ్డంగిలో {1} లో {2} {3} లో {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,సమయం ట్రాకింగ్
 DocType: Fiscal Year Company,Fiscal Year Company,ఫిస్కల్ ఇయర్ కంపెనీ
@@ -518,19 +517,18 @@
 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,డిఫాల్ట్ వ్యయంతో రేటు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,నిర్వహణ షెడ్యూల్
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,నిర్వహణ షెడ్యూల్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","అప్పుడు ధర నిబంధనలకు మొదలైనవి కస్టమర్, కస్టమర్ గ్రూప్, భూభాగం, సరఫరాదారు, సరఫరాదారు పద్ధతి, ప్రచారం, అమ్మకపు భాగస్వామిగా ఆధారంగా వడకట్టేస్తుంది"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,ఇన్వెంటరీ నికర మార్పును
 DocType: Employee,Passport Number,పాస్పోర్ట్ సంఖ్య
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,మేనేజర్
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చెయ్యబడింది.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,సేల్స్ పర్సన్ టార్గెట్స్
 DocType: Production Order Operation,In minutes,నిమిషాల్లో
 DocType: Issue,Resolution Date,రిజల్యూషన్ తేదీ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,ఉద్యోగి లేదా కంపెనీని కోసం ఒక హాలిడే జాబితా సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
 DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,గ్రూప్ మార్చు
 DocType: Activity Cost,Activity Type,కార్యాచరణ టైప్
@@ -538,7 +536,7 @@
 DocType: Supplier,Fixed Days,స్థిర డేస్
 DocType: Quotation Item,Item Balance,అంశం సంతులనం
 DocType: Sales Invoice,Packing List,ప్యాకింగ్ జాబితా
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,కొనుగోలు ఉత్తర్వులు సరఫరా ఇచ్చిన.
+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,సేవించాలి
@@ -572,7 +570,7 @@
 DocType: Hub Settings,Seller City,అమ్మకాల సిటీ
 DocType: Email Digest,Next email will be sent on:,తదుపరి ఇమెయిల్ పంపబడుతుంది:
 DocType: Offer Letter Term,Offer Letter Term,లెటర్ టర్మ్ ఆఫర్
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,అంశం రకాల్లో.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ట్రీ టైప్
@@ -609,14 +607,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
 DocType: Item Group,Website Specifications,వెబ్సైట్ లక్షణాలు
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},మీ చిరునామా మూస లోపం ఉంది {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,కొత్త ఖాతా
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,కొత్త ఖాతా
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","అదే ప్రమాణాల బహుళ ధర రూల్స్ ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి వివాద పరిష్కారం దయచేసి. ధర నియమాలు: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","అదే ప్రమాణాల బహుళ ధర రూల్స్ ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి వివాద పరిష్కారం దయచేసి. ధర నియమాలు: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
 DocType: Opportunity,Maintenance,నిర్వహణ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},అంశం అవసరం కొనుగోలు రసీదులు సంఖ్య {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},అంశం అవసరం కొనుగోలు రసీదులు సంఖ్య {0}
 DocType: Item Attribute Value,Item Attribute Value,అంశం విలువను ఆపాదించే
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +643,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","జర్నల్ ఎంట్రీ {0} అది ఈ వాయిస్ లో అడ్వాన్సుగా తీసుకున్నాడు చేయాలి ఉంటే {1}, తనిఖీ ఉత్తర్వు మీద ముడిపడి ఉంది."
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ఆఫీసు నిర్వహణ ఖర్చులు
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,మొదటి అంశం నమోదు చేయండి
 DocType: Account,Liability,బాధ్యత
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.
 DocType: Company,Default Cost of Goods Sold Account,గూడ్స్ సోల్డ్ ఖాతా యొక్క డిఫాల్ట్ ఖర్చు
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,ధర జాబితా ఎంచుకోలేదు
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Process Payroll,Send Email,ఇమెయిల్ పంపండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
@@ -663,7 +661,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,నా రసీదులు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,నా రసీదులు
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ఏ ఉద్యోగి దొరకలేదు
 DocType: Supplier Quotation,Stopped,ఆగిపోయింది
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
@@ -675,7 +673,7 @@
 DocType: Item,Website Warehouse,వెబ్సైట్ వేర్హౌస్
 DocType: Payment Reconciliation,Minimum Invoice Amount,కనీస ఇన్వాయిస్ మొత్తం
 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 +267,C-Form records,సి ఫారం రికార్డులు
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,సి ఫారం రికార్డులు
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,కస్టమర్ మరియు సరఫరాదారు
 DocType: Email Digest,Email Digest Settings,ఇమెయిల్ డైజెస్ట్ సెట్టింగ్స్
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,వినియోగదారుల నుండి మద్దతు ప్రశ్నలు.
@@ -699,7 +697,7 @@
 DocType: Quotation Item,Projected Qty,ప్రొజెక్టెడ్ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
 DocType: Newsletter,Newsletter Manager,వార్తా మేనేజర్
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,ఖర్చులు
@@ -736,14 +734,14 @@
 DocType: Supplier Quotation,Is Subcontracted,"బహుకరించింది, మరలా ఉంది"
 DocType: Item Attribute,Item Attribute Values,అంశం లక్షణం విలువలు
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,చూడండి చందాదార్లు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,కొనుగోలు రసీదులు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,కొనుగోలు రసీదులు
 ,Received Items To Be Billed,స్వీకరించిన అంశాలు బిల్ టు
 DocType: Employee,Ms,కుమారి
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,కరెన్సీ మార్పిడి రేటు మాస్టర్.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,కరెన్సీ మార్పిడి రేటు మాస్టర్.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
 DocType: Production Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,మొదటి డాక్యుమెంట్ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,గోటో కార్ట్
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ఈ నిర్వహణ సందర్శించండి రద్దు ముందు రద్దు మెటీరియల్ సందర్శనల {0}
@@ -762,7 +760,7 @@
 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 +524,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
 DocType: Address,Shop,షాప్
@@ -772,10 +770,10 @@
 DocType: Employee,Permanent Address Is,శాశ్వత చిరునామా
 DocType: Production Order Operation,Operation completed for how many finished goods?,ఆపరేషన్ ఎన్ని తయారైన వస్తువులు పూర్తిచేయాలని?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,బ్రాండ్
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} అంశం కోసం దాటింది over- కోసం భత్యం {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} అంశం కోసం దాటింది over- కోసం భత్యం {1}.
 DocType: Employee,Exit Interview Details,ఇంటర్వ్యూ నిష్క్రమించు వివరాలు
 DocType: Item,Is Purchase Item,కొనుగోలు అంశం
-DocType: Journal Entry Account,Purchase Invoice,కొనుగోలు వాయిస్
+DocType: Asset,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,తేదీ మరియు ముగింపు తేదీ తెరవడం అదే ఫిస్కల్ ఇయర్ లోపల ఉండాలి
@@ -785,16 +783,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},రో # {0}: అంశం కోసం ఏ సీరియల్ రాయండి {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;జాబితా ప్యాకింగ్&#39; కాపీ అవుతుంది."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;జాబితా ప్యాకింగ్&#39; కాపీ అవుతుంది."
 DocType: Job Opening,Publish on website,వెబ్ సైట్ ప్రచురించు
 apps/erpnext/erpnext/config/stock.py +17,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,పరోక్ష ఆదాయం
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),మొత్తం సందేశం (లు)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
 DocType: Purchase Invoice,Additional Discount Percentage,అదనపు డిస్కౌంట్ శాతం
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,అన్ని సహాయ వీడియోలను జాబితాను వీక్షించండి
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,చెక్ జమ జరిగినది ఎక్కడ బ్యాంకు ఖాతాను ఎంచుకోండి తల.
@@ -808,14 +806,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్మదిన రిమైండర్లు పంపవద్దు
 ,Employee Holiday Attendance,Employee హాలిడే హాజరు
 DocType: Opportunity,Walk In,లో వల్క్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,స్టాక్ ఎంట్రీలు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,స్టాక్ ఎంట్రీలు
 DocType: Item,Inspection Criteria,ఇన్స్పెక్షన్ ప్రమాణం
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,బదిలీ
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,నా కార్ట్
@@ -825,7 +823,7 @@
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 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 +180,Qty for {0},కోసం చేసిన అంశాల {0}
+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 +80,Leave Allocation Tool,కేటాయింపు టూల్ వదిలి
 DocType: Leave Block List,Leave Block List Dates,బ్లాక్ జాబితా తేదీలు వదిలి
@@ -838,7 +836,7 @@
 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 +547,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,డిస్కౌంట్
@@ -853,20 +851,20 @@
 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 +69,Selling Amount,సెల్లింగ్ మొత్తం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,సమయం దినచర్య
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,సమయం దినచర్య
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,ఖాతా కంపెనీతో సరిపోలడం లేదు
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,నియామక
 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,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,సేల్స్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,సేల్స్ ఖర్చులు
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,ప్రామాణిక కొనుగోలు
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
@@ -883,7 +881,7 @@
 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 +18,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
+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,సగటు వయసు
@@ -892,7 +890,7 @@
 DocType: Company,Default Currency,డిఫాల్ట్ కరెన్సీ
 DocType: Contact,Enter designation of this Contact,ఈ సంప్రదించండి హోదా ఎంటర్
 DocType: Expense Claim,From Employee,Employee నుండి
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,కీ పనితీరు ఏరియా
@@ -900,7 +898,7 @@
 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 +130,Please select BOM in BOM field for Item {0},అంశం కోసం BOM రంగంలో BOM దయచేసి ఎంచుకోండి {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,కాంట్రిబ్యూషన్%
@@ -909,7 +907,7 @@
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,ఉత్పత్తి ఆర్డర్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
 ,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.,సమయం దినచర్య ఎంచుకోండి మరియు ఒక కొత్త సేల్స్ వాయిస్ సృష్టించడానికి సమర్పించండి.
@@ -917,14 +915,14 @@
 DocType: Salary Slip,Deductions,తగ్గింపులకు
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,ఈ సమయం లాగిన్ బ్యాచ్ బిల్ చెయ్యబడింది.
 DocType: Salary Slip,Leave Without Pay,పే లేకుండా వదిలి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
 ,Trial Balance for Party,పార్టీ కోసం ట్రయల్ బ్యాలెన్స్
 DocType: Lead,Consultant,కన్సల్టెంట్
 DocType: Salary Slip,Earnings,సంపాదన
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,పూర్తయ్యింది అంశం {0} తయారీ రకం ప్రవేశానికి ఎంటర్ చెయ్యాలి
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,తెరవడం అకౌంటింగ్ సంతులనం
 DocType: Sales Invoice Advance,Sales Invoice Advance,సేల్స్ వాయిస్ అడ్వాన్స్
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,మేనేజ్మెంట్
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,సమయం షీట్లు కోసం చర్యలు రకాల
@@ -935,18 +933,18 @@
 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; రకం నోడ్స్ కింద రూపొందించినవారు చేయవచ్చు
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ఇమెయిల్ ID సెట్ చెయ్యండి
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ఇమెయిల్ ID సెట్ చెయ్యండి
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item కోడ్ సీరియల్ నం కోసం మారలేదు
 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/config/buying.py +33,Supplier database.,సరఫరాదారు డేటాబేస్.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,సరఫరాదారు డేటాబేస్.
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,పన్ను మరియు ఇతర జీతం తగ్గింపులకు.
 DocType: Lead,Lead,లీడ్
 DocType: Email Digest,Payables,Payables
@@ -974,18 +972,18 @@
 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/page/accounts_browser/accounts_browser.js +128,View Ledger,చూడండి లెడ్జర్
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,చూడండి లెడ్జర్
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
 ,Budget Variance Report,బడ్జెట్ విస్తృతి నివేదిక
 DocType: Salary Slip,Gross Pay,స్థూల పే
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,డివిడెండ్ చెల్లించిన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,అలాగే సంపాదన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,అలాగే సంపాదన
 DocType: BOM Item,Item Description,వస్తువు వివరణ
 DocType: Payment Tool,Payment Mode,చెల్లింపు రకం
 DocType: Purchase Invoice,Is Recurring,పునరావృత ఉంది
@@ -993,7 +991,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,తాత్కాలిక ప్రారంభోత్సవం
 ,Employee Leave Balance,ఉద్యోగి సెలవు సంతులనం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},వరుసగా అంశం అవసరం వాల్యువేషన్ రేటు {0}
@@ -1008,8 +1006,8 @@
 ,Accounts Payable Summary,చెల్లించవలసిన ఖాతాలు సారాంశం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
 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 +165,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,చిన్న
@@ -1017,7 +1015,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,ఖాతా తల {0} రూపొందించినవారు
 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,మొత్తం ఆర్జిత
@@ -1025,12 +1023,12 @@
 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 +493,UOM coversion factor required for UOM: {0} in Item: {1},UoM అవసరం UoM coversion ఫ్యాక్టర్: {0} Item లో: {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,పరోక్ష ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,పరోక్ష ఖర్చులు
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,రో {0}: Qty తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,వ్యవసాయం
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 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,వేర్హౌస్ సంప్రదింపు సమాచారం
@@ -1040,17 +1038,17 @@
 DocType: Serial No,Serial No Details,సీరియల్ సంఖ్య వివరాలు
 DocType: Purchase Invoice Item,Item Tax Rate,అంశం పన్ను రేటు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +142,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;."
 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},ఉత్పత్తి ఆర్డర్ స్థితి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,ఊహించినది డెలివరీ తేదీ అనుకున్న తేదీ ప్రారంభించండి కంటే తక్కువ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,సరఫరాదారు కోసం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,ఊహించినది డెలివరీ తేదీ అనుకున్న తేదీ ప్రారంభించండి కంటే తక్కువ.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,మొత్తం అవుట్గోయింగ్
@@ -1060,10 +1058,10 @@
 DocType: Item,Website Item Groups,వెబ్సైట్ అంశం గుంపులు
 DocType: Purchase Invoice,Total (Company Currency),మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} క్రమ సంఖ్య ఒకసారి కంటే ఎక్కువ ప్రవేశించింది
-DocType: Journal Entry,Journal Entry,జర్నల్ ఎంట్రీ
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
 DocType: Sales Partner,Target Distribution,టార్గెట్ పంపిణీ
 DocType: Salary Slip,Bank Account No.,బ్యాంక్ ఖాతా నంబర్
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ఈ ఉపసర్గ గత రూపొందించినవారు లావాదేవీ సంఖ్య
@@ -1096,7 +1094,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},మూసివేయబడిన ఖాతా కరెన్సీ ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},అన్ని గోల్స్ కోసం పాయింట్లు మొత్తానికి ఇది 100 ఉండాలి {0}
 DocType: Project,Start and End Dates,ప్రారంభం మరియు తేదీలు ఎండ్
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,ఆపరేషన్స్ ఖాళీగా సాధ్యం కాదు.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,సగటు డిస్కౌంట్
@@ -1107,10 +1105,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
 DocType: Activity Cost,Projects,ప్రాజెక్ట్స్
 DocType: Payment Request,Transaction Currency,లావాదేవీ కరెన్సీ
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},నుండి {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},నుండి {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ఆపరేషన్ వివరణ
 DocType: Item,Will also apply to variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ఫిస్కల్ ఇయర్ సేవ్ ఒకసారి ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ మార్చలేరు.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,ప్రచారం
@@ -1124,8 +1122,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,ఇప్పటికే ఉత్పత్తి ఆర్డర్ రూపొందించినవారు స్టాక్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,స్థిర ఆస్తి నికర మార్పును
 DocType: Leave Control Panel,Leave blank if considered for all designations,అన్ని వివరణలకు భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},మాక్స్: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,కంపెనీ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,కమ్యూనికేషన్ లాగ్.
@@ -1133,8 +1131,8 @@
 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 +472,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
@@ -1155,11 +1153,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ఖాతా ఘనీభవించిన ఉంటే ప్రవేశాలు పరిమితం వినియోగదారులు అనుమతించబడతాయి.
 DocType: Email Digest,Bank Balance,బ్యాంకు బ్యాలెన్స్
-apps/erpnext/erpnext/controllers/accounts_controller.py +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
 DocType: Rename Tool,Type of document to rename.,పత్రం రకం రీనేమ్.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,మేము ఈ అంశం కొనుగోలు
 DocType: Address,Billing,బిల్లింగ్
@@ -1172,8 +1170,8 @@
 DocType: Shipping Rule Condition,To Value,విలువ
 DocType: Supplier,Stock Manager,స్టాక్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,ప్యాకింగ్ స్లిప్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ఆఫీసు రెంట్
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,ఆఫీసు రెంట్
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
 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.,ఏ చిరునామా ఇంకా జోడించారు.
@@ -1191,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ప్రభుత్వం
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,అంశం రకరకాలు
 DocType: Company,Services,సర్వీసులు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),మొత్తం ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),మొత్తం ({0})
 DocType: Cost Center,Parent Cost Center,మాతృ ఖర్చు సెంటర్
 DocType: Sales Invoice,Source,మూల
 DocType: Leave Type,Is Leave Without Pay,పే లేకుండా వదిలి ఉంటుంది
@@ -1200,10 +1198,10 @@
 DocType: Employee External Work History,Total Experience,మొత్తం ఎక్స్పీరియన్స్
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,రద్దు ప్యాకింగ్ స్లిప్ (లు)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు
 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 +86,Transfer Materials for Manufacture,తయారీకి ట్రాన్స్ఫర్ మెటీరియల్స్
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,తయారీకి ట్రాన్స్ఫర్ మెటీరియల్స్
 DocType: Pricing Rule,For Price List,ధర జాబితా కోసం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ఎగ్జిక్యూటివ్ శోధన
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} దొరకలేదు, అకౌంటింగ్ ఎంట్రీ (ఖర్చు) బుక్ అవసరమయ్యే. ఒక కొనుగోలు ధర జాబితా వ్యతిరేకంగా అంశం ధర చెప్పలేదు దయచేసి."
@@ -1212,7 +1210,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,బిఒఎం వివరాలు లేవు
 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.,ఖాతాల చార్ట్ నుండి కొత్త ఖాతాను సృష్టించండి.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,నిర్వహణ సందర్శించండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,నిర్వహణ సందర్శించండి
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Warehouse వద్ద అందుబాటులో బ్యాచ్ ప్యాక్ చేసిన అంశాల
 DocType: Time Log Batch Detail,Time Log Batch Detail,సమయం లాగిన్ బ్యాచ్ వివరాలు
 DocType: Landed Cost Voucher,Landed Cost Help,అడుగుపెట్టాయి ఖర్చు సహాయము
@@ -1226,7 +1224,6 @@
 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 +196,Brand master.,బ్రాండ్ మాస్టర్.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 DocType: Sales Invoice Item,Brand Name,బ్రాండ్ పేరు
 DocType: Purchase Receipt,Transporter Details,ట్రాన్స్పోర్టర్ వివరాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,బాక్స్
@@ -1254,7 +1251,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 పఠనం
 apps/erpnext/erpnext/config/hr.py +131,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,స్టాక్ బాధ్యతలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,స్టాక్ బాధ్యతలు
 DocType: Purchase Receipt,Supplier Warehouse,సరఫరాదారు వేర్హౌస్
 DocType: Opportunity,Contact Mobile No,సంప్రదించండి మొబైల్ లేవు
 ,Material Requests for which Supplier Quotations are not created,సరఫరాదారు కొటేషన్స్ రూపొందించినవారు లేని పదార్థం అభ్యర్థనలు
@@ -1263,7 +1260,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,ఇతర నివేదికలు
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,ఆపు జన్మదిన రిమైండర్లు
@@ -1273,26 +1270,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} చూడండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,నగదు నికర మార్పు
 DocType: Salary Structure Deduction,Salary Structure Deduction,జీతం నిర్మాణం తీసివేత
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,జారీచేయబడింది వస్తువుల ధర
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,సరఫరాదారు టైప్ మాస్టర్.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,సరఫరాదారు టైప్ మాస్టర్.
 DocType: Purchase Order Item,Supplier Part Number,సరఫరాదారు పార్ట్ సంఖ్య
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,మార్పిడి రేటు 0 లేదా 1 ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,మార్పిడి రేటు 0 లేదా 1 ఉండకూడదు
 DocType: Purchase Invoice,Reference Document,రిఫరెన్స్ డాక్యుమెంట్
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,కొనుగోలు రసీదులు {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% కస్టమర్లకు
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","ఇటువంటి షిప్పింగ్ నియమాలు, ధర జాబితా మొదలైనవి ఆన్లైన్ షాపింగ్ కార్ట్ కోసం సెట్టింగులు"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,మానవ వనరులు
@@ -1314,7 +1311,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,చెల్లించవలసిన అకౌంట్స్ నికర మార్పును
 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 డిస్కౌంట్&#39; అవసరం కస్టమర్
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,పత్రికలు బ్యాంకు చెల్లింపు తేదీలు నవీకరించండి.
+apps/erpnext/erpnext/config/accounts.py +137,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.,అంశాలను ఎవరూ పరిమాణం లేదా విలువ ఏ మార్పు ఉండదు.
@@ -1333,7 +1330,7 @@
 DocType: Employee,Permanent Address,శాశ్వత చిరునామా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",గ్రాండ్ మొత్తం కంటే \ {0} {1} ఎక్కువ ఉండకూడదు వ్యతిరేకంగా చెల్లించిన అడ్వాన్స్ {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,అంశం కోడ్ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,అంశం కోడ్ దయచేసి ఎంచుకోండి
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),పే లేకుండా వదిలి తీసివేత తగ్గించండి (LWP)
 DocType: Territory,Territory Manager,భూభాగం మేనేజర్
 DocType: Packed Item,To Warehouse (Optional),గిడ్డంగి (ఆప్షనల్)
@@ -1343,15 +1340,15 @@
 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,మార్కెటింగ్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,ఒక అంశం యొక్క సింగిల్ యూనిట్.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',సమయం లాగిన్ బ్యాచ్ {0} &#39;Submitted&#39; తప్పక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,Time Log Batch {0} must be 'Submitted',సమయం లాగిన్ బ్యాచ్ {0} &#39;Submitted&#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 +392,Warehouse required at Row No {0},రో లేవు అవసరం వేర్హౌస్ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},రో లేవు అవసరం వేర్హౌస్ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,చెల్లుబాటు అయ్యే ఆర్థిక సంవత్సరం ప్రారంభ మరియు ముగింపు తేదీలను ఎంటర్ చేయండి
 DocType: Employee,Date Of Retirement,రిటైర్మెంట్ డేట్ అఫ్
 DocType: Upload Attendance,Get Template,మూస పొందండి
@@ -1368,8 +1365,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},వరుసగా అంశం {0} కోసం అవసరం పరిమాణం {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,మ్యాచ్ రసీదులు వెతుకుము
@@ -1380,21 +1377,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,షాపింగ్ కార్ట్ ప్రారంభించబడితే
 DocType: Job Applicant,Applicant for a Job,ఒక Job కొరకు అభ్యర్ధించే
 DocType: Production Plan Material Request,Production Plan Material Request,ఉత్పత్తి ప్రణాళిక మెటీరియల్ అభ్యర్థన
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,సృష్టించలేదు ఉత్పత్తి ఆర్డర్స్
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,సృష్టించలేదు ఉత్పత్తి ఆర్డర్స్
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,ప్రధాన
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,ప్రధాన
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
 DocType: Employee,Leave Encashed?,Encashed వదిలి?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ఫీల్డ్ నుండి అవకాశం తప్పనిసరి
 DocType: Item,Variants,రకరకాలు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
@@ -1402,26 +1399,26 @@
 DocType: Sales Invoice Item,Customer's Item Code,కస్టమర్ యొక్క Item కోడ్
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ఒక 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 +37,Addresses,చిరునామాలు
+apps/erpnext/erpnext/hooks.py +91,Addresses,చిరునామాలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,అంచనాలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},సీరియల్ అంశం ఏదీ ప్రవేశించింది నకిలీ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ఒక షిప్పింగ్ రూల్ ఒక పరిస్థితి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,అంశం ఉత్పత్తి ఆర్డర్ కలిగి అనుమతి లేదు.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,అంశం ఉత్పత్తి ఆర్డర్ కలిగి అనుమతి లేదు.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ఈ ప్యాకేజీ యొక్క నికర బరువు. (అంశాలను నికర బరువు మొత్తంగా స్వయంచాలకంగా లెక్కించిన)
 DocType: Sales Order,To Deliver and Bill,బట్వాడా మరియు బిల్
 DocType: GL Entry,Credit Amount in Account Currency,ఖాతా కరెన్సీ లో క్రెడిట్ మొత్తం
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,తయారీ కోసం సమయం దినచర్య.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,పనులు కోసం సమయం లాగిన్.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,చెల్లింపు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,సెల్యుటేషన్
@@ -1454,7 +1451,7 @@
 DocType: Sales Order Item,Delivery Warehouse,డెలివరీ వేర్హౌస్
 DocType: Stock Settings,Allowance Percent,భత్యం శాతం
 DocType: SMS Settings,Message Parameter,సందేశం పారామిత
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,ఆర్థిక వ్యయం సెంటర్స్ చెట్టు.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,ఆర్థిక వ్యయం సెంటర్స్ చెట్టు.
 DocType: Serial No,Delivery Document No,డెలివరీ డాక్యుమెంట్ లేవు
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,కొనుగోలు రసీదులు నుండి అంశాలను పొందండి
 DocType: Serial No,Creation Date,సృష్టి తేదీ
@@ -1486,40 +1483,40 @@
 ,Amount to Deliver,మొత్తం అందించేందుకు
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ఒక ఉత్పత్తి లేదా సేవ
 DocType: Naming Series,Current Value,కరెంట్ వేల్యూ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} రూపొందించినవారు
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} రూపొందించినవారు
 DocType: Delivery Note Item,Against Sales Order,అమ్మకాల ఆర్డర్ వ్యతిరేకంగా
 ,Serial No Status,సీరియల్ ఏ స్థితి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,అంశం పట్టిక ఖాళీగా ఉండరాదు
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",రో {0}: సెట్ చేసేందుకు {1} ఆవర్తకత నుండి మరియు తేదీ \ మధ్య తేడా కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {2}
 DocType: Pricing Rule,Selling,సెల్లింగ్
 DocType: Employee,Salary Information,జీతం ఇన్ఫర్మేషన్
 DocType: Sales Person,Name and Employee ID,పేరు మరియు Employee ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,సుంకాలు మరియు పన్నుల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,చెల్లింపు గేట్వే ఖాతా కాన్ఫిగర్
 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: Production Order,Material Request Item,మెటీరియల్ అభ్యర్థన అంశం
+DocType: Request for Quotation Item,Material Request Item,మెటీరియల్ అభ్యర్థన అంశం
 apps/erpnext/erpnext/config/stock.py +85,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,రెడ్
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
 DocType: Account,Frozen,ఘనీభవించిన
 ,Open Production Orders,ఓపెన్ ఉత్పత్తి ఆర్డర్స్
 DocType: Installation Note,Installation Time,సంస్థాపన సమయం
 DocType: Sales Invoice,Accounting Details,అకౌంటింగ్ వివరాలు
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ఈ కంపెనీ కోసం అన్ని లావాదేవీలు తొలగించు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,ఇన్వెస్ట్మెంట్స్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,ఇన్వెస్ట్మెంట్స్
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,కేటాయింపులు
 DocType: Quality Inspection Reading,Acceptance Criteria,అంగీకారం ప్రమాణం
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,పైన ఇచ్చిన పట్టికలో మెటీరియల్ అభ్యర్థనలు నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,పైన ఇచ్చిన పట్టికలో మెటీరియల్ అభ్యర్థనలు నమోదు చేయండి
 DocType: Item Attribute,Attribute Name,పేరు లక్షణం
 DocType: Item Group,Show In Website,వెబ్సైట్ షో
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,గ్రూప్
@@ -1547,7 +1544,7 @@
 ,Maintenance Schedules,నిర్వహణ షెడ్యూల్స్
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 DocType: Shipping Rule Condition,Shipping Amount,షిప్పింగ్ మొత్తం
 ,Pending Amount,పెండింగ్ మొత్తం
 DocType: Purchase Invoice Item,Conversion Factor,మార్పిడి ఫాక్టర్
@@ -1561,23 +1558,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,అనుకూలీకరించబడిన ఎంట్రీలు చేర్చండి
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,క్రీడలు
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,యదార్థమైన మొత్తం
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,యూనిట్
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,కంపెనీ రాయండి
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ఖర్చు వాదనలు
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ఖర్చు వాదనలు
 DocType: Issue,Support,మద్దతు
 ,BOM Search,బిఒఎం శోధన
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),మూసివేయడం (+ మొత్తాలు తెరవడం)
@@ -1586,29 +1582,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},బ్యాచ్ లో స్టాక్ సంతులనం {0} అవుతుంది ప్రతికూల {1} Warehouse వద్ద అంశం {2} కోసం {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","మొదలైనవి సీరియల్ సంఖ్యలు, POS వంటి చూపు / దాచు లక్షణాలు"
 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 +249,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},క్లియరెన్స్ తేదీ వరుసగా చెక్ తేదీ ముందు ఉండకూడదు {0}
 DocType: Salary Slip,Deduction,తీసివేత
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
 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,Gross Margin,స్థూల సరిహద్దు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,గణించిన బ్యాంక్ స్టేట్మెంట్ సంతులనం
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,వికలాంగ యూజర్
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,కొటేషన్
 DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
 DocType: Quotation,Maintenance User,నిర్వహణ వాడుకరి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ధర నవీకరించబడింది
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ధర నవీకరించబడింది
 DocType: Employee,Date of Birth,పుట్టిన తేది
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,తీసివేయు
@@ -1620,8 +1616,8 @@
 ,SO Qty,SO ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
+DocType: Request for Quotation,Manufacturing Manager,తయారీ మేనేజర్
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,ప్యాకేజీలు స్ప్లిట్ డెలివరీ గమనించండి.
 apps/erpnext/erpnext/hooks.py +71,Shipments,ప్యాకేజీల
 DocType: Purchase Order Item,To be delivered to customer,కస్టమర్ పంపిణీ ఉంటుంది
@@ -1629,12 +1625,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,సీరియల్ లేవు {0} ఏదైనా వేర్హౌస్ చెందినది కాదు
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,రో #
 DocType: Purchase Invoice,In Words (Company Currency),వర్డ్స్ (కంపెనీ కరెన్సీ)
-DocType: Pricing Rule,Supplier,సరఫరాదారు
+DocType: Asset,Supplier,సరఫరాదారు
 DocType: C-Form,Quarter,క్వార్టర్
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ఇతరాలు ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,ఇతరాలు ఖర్చులు
 DocType: Global Defaults,Default Company,డిఫాల్ట్ కంపెనీ
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ఖర్చుల లేదా తక్షణ ఖాతా అంశం {0} వంటి ప్రభావితం మొత్తం మీద స్టాక్ విలువ తప్పనిసరి
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,వాడుకరి {0} నిలిపివేయబడింది
@@ -1643,7 +1639,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
 DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","కనీసం ఒక వరుసలో కేటాయించిన మొత్తం, వాయిస్ పద్ధతి మరియు వాయిస్ సంఖ్య దయచేసి ఎంచుకోండి"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},అంశం అవసరం అమ్మకాల ఉత్తర్వు {0}
@@ -1656,8 +1652,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,చైల్డ్ అంశం ఉత్పత్తి కట్ట ఉండకూడదు. దయచేసి అంశాన్ని తీసివేసి `{0}` మరియు సేవ్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,బ్యాంకింగ్
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,షెడ్యూల్ పొందడానికి &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,కొత్త ఖర్చు సెంటర్
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; చైల్డ్ జోడించండి పై క్లిక్) ఒక కొత్త ఖాతాను సృష్టించండి మరియు చేయండి పన్ను రేటు చెప్పలేదు.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,కొత్త ఖర్చు సెంటర్
 DocType: Bin,Ordered Quantity,క్రమ పరిమాణం
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",ఉదా &quot;బిల్డర్ల కోసం టూల్స్ బిల్డ్&quot;
 DocType: Quality Inspection,In Process,ప్రక్రియ లో
@@ -1673,7 +1668,7 @@
 DocType: Quotation Item,Stock Balance,స్టాక్ సంతులనం
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,చెల్లింపు కు అమ్మకాల ఆర్డర్
 DocType: Expense Claim Detail,Expense Claim Detail,ఖర్చు చెప్పడం వివరాలు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,సమయం దినచర్య రూపొందించినవారు:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,సమయం దినచర్య రూపొందించినవారు:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
 DocType: Item,Weight UOM,బరువు UoM
 DocType: Employee,Blood Group,రక్తం గ్రూపు
@@ -1691,13 +1686,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,డెబిట్ అవసరం ఉంది
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
 DocType: Offer Letter Term,Offer Term,ఆఫర్ టర్మ్
 DocType: Quality Inspection,Quality Manager,క్వాలిటీ మేనేజర్
 DocType: Job Applicant,Job Opening,ఉద్యోగ అవకాశాల
 DocType: Payment Reconciliation,Payment Reconciliation,చెల్లింపు సయోధ్య
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,ఏసిపి వ్యక్తి యొక్క పేరు ఎంచుకోండి
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,ఏసిపి వ్యక్తి యొక్క పేరు ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,టెక్నాలజీ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,లెటర్ ఆఫర్
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,మెటీరియల్ అభ్యర్థనలు (MRP) మరియు ఉత్పత్తి ఆర్డర్స్ ఉత్పత్తి.
@@ -1705,22 +1700,22 @@
 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 +103,Credit To account must be a Payable account,ఖాతాకు క్రెడిట్ ఒక చెల్లించవలసిన ఖాతా ఉండాలి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},బిఒఎం సూత్రం: {0} యొక్క పేరెంట్ లేదా బాల ఉండకూడదు {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,ఖాతాకు క్రెడిట్ ఒక చెల్లించవలసిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, మాత్రమే డెబిట్ ఖాతాల మరో క్రెడిట్ ప్రవేశానికి వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ధర జాబితా {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,ప్రస్తుత లెక్కింపు రేటు
 DocType: Item,Customer Item Codes,కస్టమర్ Item కోడులు
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,ఆర్డర్స్ లేదా రసీదులు వ్యతిరేకంగా చెల్లింపు ఎంట్రీలు సృష్టించు.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,ఆర్డర్స్ లేదా రసీదులు వ్యతిరేకంగా చెల్లింపు ఎంట్రీలు సృష్టించు.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,వినియోగదారులు మరియు అనుమతులు
@@ -1729,10 +1724,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,మీ కస్టమర్స్
 DocType: Leave Block List Date,Block Date,బ్లాక్ తేదీ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,ఇప్పుడు వర్తించు
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,ఇప్పుడు వర్తించు
 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 నిర్వహించండి.
@@ -1756,7 +1751,7 @@
 DocType: Employee,Employment Details,ఉపాధి వివరాలు
 DocType: Employee,New Workplace,కొత్త కార్యాలయంలో
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ముగించబడినది గా సెట్
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},బార్కోడ్ ఐటెమ్ను {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},బార్కోడ్ ఐటెమ్ను {0}
 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,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
@@ -1774,10 +1769,10 @@
 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 +608,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},అంశం {0} లో ఒక సేల్స్ అంశం ఉండాలి {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -1791,7 +1786,7 @@
 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: Process Payroll,Create Salary Slip,వేతనం స్లిప్ సృష్టించు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ఫండ్స్ యొక్క మూలం (లయబిలిటీస్)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,నుండి దిగుమతి ఇమెయిల్
@@ -1805,9 +1800,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required న
 DocType: Sales Invoice,Mass Mailing,మాస్ మెయిలింగ్
 DocType: Rename Tool,File to Rename,పేరుమార్చు దాఖలు
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},అంశం అవసరం purchse ఆర్డర్ సంఖ్య {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},అంశం కోసం లేదు పేర్కొన్న BOM {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},అంశం అవసరం purchse ఆర్డర్ సంఖ్య {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},అంశం కోసం లేదు పేర్కొన్న BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,ఫార్మాస్యూటికల్
@@ -1824,25 +1819,25 @@
 DocType: Upload Attendance,Attendance To Date,తేదీ హాజరు
 DocType: Warranty Claim,Raised By,లేవనెత్తారు
 DocType: Payment Gateway Account,Payment Account,చెల్లింపు ఖాతా
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,స్వీకరించదగిన ఖాతాలు నికర మార్పును
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,పరిహార ఆఫ్
 DocType: Quality Inspection Reading,Accepted,Accepted
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},చెల్లని సూచన {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 DocType: Newsletter,Test,టెస్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 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 +206,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} సమర్పించిన లేదు
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,అంశాలను అభ్యర్థనలు.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ప్రత్యేక నిర్మాణ ఆర్డర్ ప్రతి పూర్తయిన మంచి అంశం రూపొందించినవారు ఉంటుంది.
@@ -1851,7 +1846,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,వార్తా మెయిలింగ్ జాబితా
 DocType: Delivery Note,Transporter Name,ట్రాన్స్పోర్టర్ పేరు
 DocType: Authorization Rule,Authorized Value,ఆథరైజ్డ్ విలువ
@@ -1869,10 +1864,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} మూసి
 DocType: Email Digest,How frequently?,ఎంత తరచుగా?
 DocType: Purchase Receipt,Get Current Stock,ప్రస్తుత స్టాక్ పొందండి
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",తగిన సమూహం (సాధారణంగా ఫండ్స్ అప్లికేషన్&gt; ప్రస్తుత ఆస్తులు&gt; బ్యాంక్ ఖాతాలకు వెళ్ళి (రకం చైల్డ్ జోడించు) పై క్లిక్ చేసి కొత్త ఖాతా సృష్టించుకోండి &quot;బ్యాంక్&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,మెటీరియల్స్ బిల్లుని ట్రీ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,మార్క్ ప్రెజెంట్
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},నిర్వహణ ప్రారంభ తేదీ సీరియల్ నో డెలివరీ తేదీ ముందు ఉండరాదు {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,పర్పస్
@@ -1914,12 +1908,12 @@
 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: Purchase Receipt Item,Recd Quantity,Recd పరిమాణం
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
 DocType: Payment Reconciliation,Bank / Cash Account,బ్యాంకు / క్యాష్ ఖాతా
 DocType: Tax Rule,Billing City,బిల్లింగ్ సిటీ
 DocType: Global Defaults,Hide Currency Symbol,కరెన్సీ మానవ చిత్ర దాచు
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ఉదా బ్యాంక్, నగదు, క్రెడిట్ కార్డ్"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ఉదా బ్యాంక్, నగదు, క్రెడిట్ కార్డ్"
 DocType: Journal Entry,Credit Note,క్రెడిట్ గమనిక
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},పూర్తైన ప్యాక్ చేసిన అంశాల కంటే ఎక్కువగా ఉండకూడదు {0} ఆపరేషన్ కోసం {1}
 DocType: Features Setup,Quality,నాణ్యత
@@ -1943,9 +1937,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,నా చిరునామాలు
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,లేదా
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,డిఫాల్ట్ కొనుగోలు ధర జాబితా
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,పైన ఎంచుకున్న విధానం లేదా జీతం స్లిప్ కోసం ఏ ఉద్యోగి ఇప్పటికే రూపొందించినవారు
@@ -1972,7 +1966,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 ,To Produce,ఉత్పత్తి
 apps/erpnext/erpnext/config/hr.py +93,Payroll,పేరోల్
 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} కూడా చేర్చారు తప్పక"
@@ -1983,7 +1977,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,మలచుకొనుట పత్రాలు
 DocType: Account,Income Account,ఆదాయపు ఖాతా
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,Delivery,డెలివరీ
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",చూడండి వ్యయంతో విభాగం లో &quot;Materials బేస్డ్ న రేటు&quot;
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
@@ -2005,16 +1999,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,అన్ని చిరునామాలు.
 DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,కస్టమర్ గ్రూప్ ట్రీ నిర్వహించండి.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,కొత్త ఖర్చు సెంటర్ పేరు
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,కొత్త ఖర్చు సెంటర్ పేరు
 DocType: Leave Control Panel,Leave Control Panel,కంట్రోల్ ప్యానెల్ వదిలి
 DocType: Appraisal,HR User,ఆర్ వాడుకరి
 DocType: Purchase Invoice,Taxes and Charges Deducted,పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ
-apps/erpnext/erpnext/config/support.py +7,Issues,ఇష్యూస్
+apps/erpnext/erpnext/hooks.py +90,Issues,ఇష్యూస్
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},స్థితి ఒకటి ఉండాలి {0}
 DocType: Sales Invoice,Debit To,డెబిట్
 DocType: Delivery Note,Required only for sample item.,నమూనా మాత్రమే అంశం కోసం అవసరం.
@@ -2033,10 +2027,10 @@
 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 +139,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
 DocType: Stock Settings,Default Valuation Method,డిఫాల్ట్ లెక్కింపు విధానం
 DocType: Production Order Operation,Planned Start Time,అనుకున్న ప్రారంభ సమయం
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Close బ్యాలెన్స్ షీట్ మరియు పుస్తకం లాభం లేదా నష్టం.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Close బ్యాలెన్స్ షీట్ మరియు పుస్తకం లాభం లేదా నష్టం.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ఎక్స్చేంజ్ రేట్ మరొక లోకి ఒక కరెన్సీ మార్చేందుకు పేర్కొనండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,కొటేషన్ {0} రద్దు
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,మొత్తం అసాధారణ మొత్తాన్ని
@@ -2092,7 +2086,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, బహుళ కార్యకలాపాలు లోకి ఆపరేషన్ విచ్ఛిన్నం"
 ,Requested,అభ్యర్థించిన
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,సంఖ్య వ్యాఖ్యలు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,రూటు ఖాతా సమూహం ఉండాలి
@@ -2119,7 +2113,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
 DocType: Payment Request,Recipient and Message,గ్రహీతకు అందిస్తామని మరియు సందేశం
 DocType: Purchase Invoice,Apply Additional Discount On,అదనపు డిస్కౌంట్ న వర్తించు
@@ -2133,7 +2127,7 @@
 DocType: Purchase Invoice,Select Supplier Address,సరఫరాదారు అడ్రస్ ఎంచుకోండి
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
@@ -2156,10 +2150,10 @@
 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; ఉంది అంశాన్ని ఎంచుకుని, ఏ ఇతర ఉత్పత్తి కట్ట ఉంది దయచేసి"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,అసమానంగా నెలల అంతటా లక్ష్యాలను పంపిణీ మంత్లీ పంపిణీ ఎంచుకోండి.
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ఇప్పటికే దరఖాస్తు చేశారు {1} మధ్య {2} మరియు {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ప్రాజెక్ట్ ప్రారంభ తేదీ
@@ -2168,7 +2162,7 @@
 DocType: Installation Note Item,Against Document No,డాక్యుమెంట్ లేవు వ్యతిరేకంగా
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,సేల్స్ భాగస్వాములు నిర్వహించండి.
 DocType: Quality Inspection,Inspection Type,ఇన్స్పెక్షన్ టైప్
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},దయచేసి ఎంచుకోండి {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},దయచేసి ఎంచుకోండి {0}
 DocType: C-Form,C-Form No,సి ఫారం లేవు
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,పేరుపెట్టని హాజరు
@@ -2196,7 +2190,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ధృవీకరించబడిన
 DocType: Payment Gateway,Gateway,గేట్వే
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,ఆంట్
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,ఆంట్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,కేవలం హోదా &#39;అప్రూవ్డ్ సమర్పించిన చేయవచ్చు దరఖాస్తులను వదిలి
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,చిరునామా శీర్షిక తప్పనిసరి.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,విచారణ సోర్స్ ప్రచారం ఉంటే ప్రచారం పేరు ఎంటర్
@@ -2210,12 +2204,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,అంగీకరించిన వేర్హౌస్
 DocType: Bank Reconciliation Detail,Posting Date,పోస్ట్ చేసిన తేదీ
 DocType: Item,Valuation Method,మదింపు పద్ధతి
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} కు మారక రేటు దొరక్కపోతే {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} కు మారక రేటు దొరక్కపోతే {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,మార్క్ హాఫ్ డే
 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 +410,[Error],[లోపం]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[లోపం]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,మీరు అమ్మకాల ఉత్తర్వు సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 ,Employee Birthday,Employee పుట్టినరోజు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,వెంచర్ కాపిటల్
@@ -2247,13 +2241,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,నిబంధనలు ఒప్పందం మూస.
 DocType: Purchase Invoice,Address and Contact,చిరునామా మరియు సంప్రదించు
 DocType: Supplier,Last Day of the Next Month,వచ్చే నెల చివరి డే
 DocType: Employee,Feedback,అభిప్రాయం
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ముందు కేటాయించబడతాయి కాదు వదిలేయండి {0}, సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉన్నాడు, {1}"
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
 DocType: Item,Reorder level based on Warehouse,వేర్హౌస్ ఆధారంగా క్రమాన్ని స్థాయి
 DocType: Activity Cost,Billing Rate,బిల్లింగ్ రేటు
@@ -2267,12 +2261,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} రద్దు లేదా మూసివేయబడింది
 DocType: Delivery Note,Track this Delivery Note against any Project,ఏ ప్రాజెక్టు వ్యతిరేకంగా ఈ డెలివరీ గమనిక ట్రాక్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,ఇన్వెస్టింగ్ నుండి నికర నగదు
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,రూటు ఖాతాను తొలగించడం సాధ్యం కాదు
 ,Is Primary Address,ప్రాథమిక చిరునామా
 DocType: Production Order,Work-in-Progress Warehouse,పని లో ప్రోగ్రెస్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},సూచన # {0} నాటి {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,చిరునామాలు నిర్వహించండి
-DocType: Pricing Rule,Item Code,Item కోడ్
+DocType: Asset,Item Code,Item కోడ్
 DocType: Production Planning Tool,Create Production Orders,ఉత్పత్తి ఆర్డర్స్ సృష్టించు
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
@@ -2318,24 +2311,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,సీరియల్ లేవు మరియు బ్యాచ్
 DocType: Warranty Claim,From Company,కంపెనీ నుండి
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,నిమిషం
 DocType: Purchase Invoice,Purchase Taxes and Charges,పన్నులు మరియు ఆరోపణలు కొనుగోలు
 ,Qty to Receive,స్వీకరించడానికి అంశాల
 DocType: Leave Block List,Leave Block List Allowed,బ్లాక్ జాబితా అనుమతించబడినవి వదిలి
 DocType: Sales Partner,Retailer,రీటైలర్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,అన్ని సరఫరాదారు రకాలు
 DocType: Global Defaults,Disable In Words,వర్డ్స్ ఆపివేయి
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,వస్తువు దానంతటదే లెక్కించబడ్డాయి లేదు ఎందుకంటే Item కోడ్ తప్పనిసరి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,బ్యాంక్ ఓవర్డ్రాఫ్ట్ ఖాతా
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,ఓపెనింగ్ సంతులనం ఈక్విటీ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
 DocType: Appraisal,Appraisal,అప్రైసల్
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,తేదీ పునరావృతమవుతుంది
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,సంతకం పెట్టడానికి అధికారం
@@ -2344,7 +2337,7 @@
 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 +199,Select Quantity,Select పరిమాణం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Select పరిమాణం
 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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,సందేశం పంపబడింది
@@ -2385,7 +2378,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,కస్టమర్ గ్రూప్ / కస్టమర్
 DocType: Payment Gateway Account,Default Payment Request Message,డిఫాల్ట్ చెల్లింపు అభ్యర్థన సందేశం
 DocType: Item Group,Check this if you want to show in website,మీరు వెబ్సైట్ లో చూపించడానికి కావాలా ఈ తనిఖీ
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,బ్యాంకింగ్ మరియు చెల్లింపులు
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,బ్యాంకింగ్ మరియు చెల్లింపులు
 ,Welcome to ERPNext,ERPNext కు స్వాగతం
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ఓచర్ వివరాలు సంఖ్య
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,కొటేషన్ దారి
@@ -2393,17 +2386,17 @@
 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 +199,Purchase Order {0} is not submitted,ఆర్డర్ {0} సమర్పించిన లేదు కొనుగోలు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,ఆర్డర్ {0} సమర్పించిన లేదు కొనుగోలు
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,ఆకులు మరియు హాలిడే
 DocType: Sales Order,Not Billed,బిల్ చేయబడలేదు
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,రెండు వేర్హౌస్ అదే కంపెనీకి చెందిన ఉండాలి
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,బిల్లింగ్ కోసం బ్యాచ్
@@ -2421,13 +2414,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,వేర్హౌస్ {0}: కంపనీ తప్పనిసరి
 ,Payment Period Based On Invoice Date,వాయిస్ తేదీ ఆధారంగా చెల్లింపు కాలం
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},తప్పిపోయిన కరెన్సీ మారక {0}
 DocType: Journal Entry,Stock Entry,స్టాక్ ఎంట్రీ
 DocType: Account,Payable,చెల్లించవలసిన
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),రుణగ్రస్తులు ({0})
-DocType: Project,Margin,మార్జిన్
+DocType: Pricing Rule,Margin,మార్జిన్
 DocType: Salary Slip,Arrear Amount,బకాయిలో మొత్తం
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,కొత్త వినియోగదారులు
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,స్థూల లాభం%
@@ -2448,7 +2441,7 @@
 DocType: Payment Request,Email To,కు ఈమెయిల్
 DocType: Lead,Lead Owner,జట్టు యజమాని
 DocType: Bin,Requested Quantity,అభ్యర్థించిన పరిమాణం
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,వేర్హౌస్ అవసరం
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,వేర్హౌస్ అవసరం
 DocType: Employee,Marital Status,వైవాహిక స్థితి
 DocType: Stock Settings,Auto Material Request,ఆటో మెటీరియల్ అభ్యర్థన
 DocType: Time Log,Will be updated when billed.,బిల్ ఉన్నప్పుడు అప్డేట్ అవుతుంది.
@@ -2456,7 +2449,7 @@
 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 +115,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 +84,{0}% Delivered,{0}% పంపిణీ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
 DocType: Territory,Territory Targets,భూభాగం టార్గెట్స్
@@ -2476,7 +2469,7 @@
 DocType: Manufacturer,Manufacturers used in Items,వాడబడేది తయారీదారులు
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,కంపెనీ లో రౌండ్ ఆఫ్ కాస్ట్ సెంటర్ చెప్పలేదు దయచేసి
 DocType: Purchase Invoice,Terms,నిబంధనలు
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,న్యూ సృష్టించు
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,న్యూ సృష్టించు
 DocType: Buying Settings,Purchase Order Required,ఆర్డర్ అవసరం కొనుగోలు
 ,Item-wise Sales History,అంశం వారీగా సేల్స్ చరిత్ర
 DocType: Expense Claim,Total Sanctioned Amount,మొత్తం మంజూరు సొమ్ము
@@ -2489,7 +2482,7 @@
 ,Stock Ledger,స్టాక్ లెడ్జర్
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},రేటు: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,వేతనం స్లిప్ తీసివేత
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,మొదటి సమూహం నోడ్ ఎంచుకోండి.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,మొదటి సమూహం నోడ్ ఎంచుకోండి.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ఉద్యోగి మరియు హాజరు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},ప్రయోజనం ఒకటి ఉండాలి {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","మీ కంపెనీ చిరునామా, కస్టమర్, సరఫరాదారు, అమ్మకపు భాగస్వామిగా మరియు ప్రధాన సూచన తొలగించు"
@@ -2511,13 +2504,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: నుండి {1}
 DocType: Task,depends_on,ఆధారపడి
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,కొత్త ఖాతా యొక్క పేరు. గమనిక: వినియోగదారులు మరియు సరఫరాదారులతో కోసం ఖాతాలను సృష్టించడం లేదు దయచేసి
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,కొత్త ఖాతా యొక్క పేరు. గమనిక: వినియోగదారులు మరియు సరఫరాదారులతో కోసం ఖాతాలను సృష్టించడం లేదు దయచేసి
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,తదుపరి తేదీ వ్యాఖ్యలు తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,షో పన్ను విడిపోవడానికి
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,తదుపరి తేదీ వ్యాఖ్యలు తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,వాయిస్ పోస్టింగ్ తేదీ
@@ -2532,7 +2525,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,కంపెనీ (కాదు కస్టమర్ లేదా సరఫరాదారు) మాస్టర్.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;ఊహించినది డెలివరీ తేదీ&#39; నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,డెలివరీ గమనికలు {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,చెల్లించిన మొత్తం పరిమాణం గ్రాండ్ మొత్తం కంటే ఎక్కువ ఉండకూడదు ఆఫ్ వ్రాయండి +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,చెల్లించిన మొత్తం పరిమాణం గ్రాండ్ మొత్తం కంటే ఎక్కువ ఉండకూడదు ఆఫ్ వ్రాయండి +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} అంశం కోసం ఒక చెల్లుబాటులో బ్యాచ్ సంఖ్య కాదు {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","గమనిక: చెల్లింపు ఏ సూచన వ్యతిరేకంగా చేసిన చేయకపోతే, మానవీయంగా జర్నల్ ఎంట్రీ చేయడానికి."
@@ -2546,7 +2539,7 @@
 DocType: Hub Settings,Publish Availability,అందుబాటు ప్రచురించు
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
 ,Stock Ageing,స్టాక్ ఏజింగ్
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2548,7 @@
 DocType: Purchase Order,Customer Contact Email,కస్టమర్ సంప్రదించండి ఇమెయిల్
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
 DocType: Sales Team,Contribution (%),కాంట్రిబ్యూషన్ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,మూస
 DocType: Sales Person,Sales Person Name,సేల్స్ పర్సన్ పేరు
@@ -2566,7 +2559,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
@@ -2579,7 +2572,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,నగదు లేదా బ్యాంక్ ఖాతా చెల్లింపు ప్రవేశం చేయడానికి తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,ఇంటర్న్
@@ -2587,7 +2580,7 @@
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ప్రాథమిక
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} స్తంభింప ముందు స్టాక్ లావాదేవీలు
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,తేదీ హాఫ్ డే సెలవు తేదీ నుండి అదే ఉండాలి
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","ఉదా కిలోల యూనిట్, నాస్, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
@@ -2595,14 +2588,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,జీతం నిర్మాణం
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,వైనానిక
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ఇష్యూ మెటీరియల్
 DocType: Material Request Item,For Warehouse,వేర్హౌస్ కోసం
 DocType: Employee,Offer Date,ఆఫర్ తేదీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,కొటేషన్స్
 DocType: Hub Settings,Access Token,ప్రాప్తి టోకెన్
 DocType: Sales Invoice Item,Serial No,సీరియల్ లేవు
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,మొదటి Maintaince వివరాలు నమోదు చేయండి
-DocType: Item,Is Fixed Asset Item,స్థిర ఆస్తి Item ఉంది
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,మొదటి Maintaince వివరాలు నమోదు చేయండి
 DocType: Purchase Invoice,Print Language,ప్రింట్ భాషా
 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","మీరు దీర్ఘ print ఫార్మాట్లలో కలిగి ఉంటే, ఈ ఫీచర్ ప్రతి పేజీలో అన్ని శీర్షికలు మరియు ఫుటర్లు తో బహుళ పేజీలు మీద ముద్రించేవారు పేజీ విడిపోయినట్లు ఉపయోగించవచ్చు"
@@ -2619,7 +2611,7 @@
 DocType: Issue,Opening Time,ప్రారంభ సమయం
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,నుండి మరియు అవసరమైన తేదీలు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,సెక్యూరిటీస్ అండ్ కమోడిటీ ఎక్స్చేంజెస్
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
 DocType: Purchase Taxes and Charges,Valuation and Total,వాల్యుయేషన్ మరియు మొత్తం
@@ -2635,13 +2627,13 @@
 DocType: Quotation,Maintenance Manager,మెయింటెనెన్స్ మేనేజర్గా
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,మొత్తం సున్నాగా ఉండకూడదు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;లాస్ట్ ఆర్డర్ నుండి డేస్&#39; సున్నా కంటే ఎక్కువ లేదా సమానంగా ఉండాలి
-DocType: C-Form,Amended From,సవరించిన
+DocType: Asset,Amended From,సవరించిన
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,చైల్డ్ ఖాతా ఈ ఖాతా అవసరమయ్యారు. మీరు ఈ ఖాతా తొలగించలేరు.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,కుంటున్న
@@ -2655,20 +2647,20 @@
 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/public/js/setup_wizard.js +191,"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.","మీ పన్ను తలలు జాబితా (ఉదా వ్యాట్ కస్టమ్స్ etc; వారు ఏకైక పేర్లు ఉండాలి) మరియు వారి ప్రామాణిక రేట్లు. ఈ మీరు సవరించవచ్చు మరియు తరువాత జోడించవచ్చు ఇది ఒక ప్రామాణిక టెంప్లేట్, సృష్టిస్తుంది."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},సీరియల్ అంశం కోసం సీరియల్ మేము అవసరం {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,రసీదులు చెల్లింపుల మ్యాచ్
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,రసీదులు చెల్లింపుల మ్యాచ్
 DocType: Journal Entry,Bank Entry,బ్యాంక్ ఎంట్రీ
 DocType: Authorization Rule,Applicable To (Designation),వర్తించదగిన (హోదా)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,కార్ట్ జోడించు
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,గ్రూప్ ద్వారా
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ డిసేబుల్ కరెన్సీలు ప్రారంభించు.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ డిసేబుల్ కరెన్సీలు ప్రారంభించు.
 DocType: Production Planning Tool,Get Material Request,మెటీరియల్ అభ్యర్థన పొందండి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,పోస్టల్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,పోస్టల్ ఖర్చులు
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),మొత్తం (ఆంట్)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,వినోదం &amp; లీజర్
 DocType: Quality Inspection,Item Serial No,అంశం సీరియల్ లేవు
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} లేదా మీరు పెంచడానికి ఉండాలి ఓవర్ఫ్లో సహనం ద్వారా తగ్గించవచ్చు ఉండాలి
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,మొత్తం ప్రెజెంట్
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,అకౌంటింగ్ ప్రకటనలు
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,అకౌంటింగ్ ప్రకటనలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,అవర్
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి \ నవీకరించబడింది సాధ్యం కాదు
@@ -2687,13 +2679,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ప్రారంభం పాయింట్-ఆఫ్-సేల్ (POS)
 apps/erpnext/erpnext/config/support.py +32,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 యూనిట్ల పురమాయించారు ఉంటే. మరియు మీ భత్యం అప్పుడు మీరు 110 యూనిట్ల అందుకోవడానికి అనుమతించబడతాయి 10% ఉంది.
 DocType: Pricing Rule,Customer Group,కస్టమర్ గ్రూప్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: Item,Website Description,వెబ్సైట్ వివరణ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ఈక్విటీ నికర మార్పు
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
@@ -2703,12 +2695,12 @@
 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,కస్టమర్ గ్రూప్ పేరు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
 DocType: GL Entry,Against Voucher Type,ఓచర్ పద్ధతి వ్యతిరేకంగా
 DocType: Item,Attributes,గుణాలు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,అంశాలు పొందండి
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,చివరి ఆర్డర్ తేదీ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
 DocType: C-Form,C-Form,సి ఫారం
@@ -2720,18 +2712,17 @@
 DocType: Purchase Invoice,Mobile No,మొబైల్ లేవు
 DocType: Payment Tool,Make Journal Entry,జర్నల్ ఎంట్రీ చేయండి
 DocType: Leave Allocation,New Leaves Allocated,కొత్త ఆకులు కేటాయించిన
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,కమర్షియల్స్
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},లోపం: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,మాతృ అంశం {0} స్టాక్ అంశం ఉండకూడదు
 DocType: Cost Center,Distribution Id,పంపిణీ Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,అద్భుతంగా సేవలు
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,అన్ని ఉత్పత్తులు లేదా సేవలు.
 DocType: Supplier Quotation,Supplier Address,సరఫరాదారు చిరునామా
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,నిబంధనలు అమ్మకానికి షిప్పింగ్ మొత్తం లెక్కించేందుకు
+apps/erpnext/erpnext/config/accounts.py +259,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,ఫైనాన్షియల్ సర్వీసెస్
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} లక్షణం విలువ పరిధిలో ఉండాలి {1} కు {2} యొక్క ఇంక్రిమెంట్ {3}
@@ -2742,10 +2733,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,స్వీకరించదగిన ఖాతాలు Default
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,ట్రాన్స్ఫర్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,ట్రాన్స్ఫర్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
 DocType: Journal Entry,Pay To / Recd From,నుండి / Recd పే
 DocType: Naming Series,Setup Series,సెటప్ సిరీస్
@@ -2767,18 +2758,18 @@
 DocType: Journal Entry,Write Off Based On,బేస్డ్ న ఆఫ్ వ్రాయండి
 DocType: Features Setup,POS View,POS చూడండి
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,ఒక సీరియల్ నం సంస్థాపన రికార్డు
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,తదుపరి తేదీ రోజు మరియు నెల దినాన రిపీట్ సమానంగా ఉండాలి
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,తదుపరి తేదీ రోజు మరియు నెల దినాన రిపీట్ సమానంగా ఉండాలి
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ఒక రాయండి
 DocType: Offer Letter,Awaiting Response,రెస్పాన్స్ వేచిఉండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,పైన
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,సమయం లాగిన్ కస్టమర్లకు చెయ్యబడింది
 DocType: Salary Slip,Earning & Deduction,ఎర్నింగ్ &amp; తీసివేత
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,ఖాతా {0} గ్రూప్ ఉండకూడదు
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ఐచ్ఛికము. ఈ సెట్టింగ్ వివిధ లావాదేవీలలో ఫిల్టర్ ఉపయోగించబడుతుంది.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),ప్రొవిజనల్ లాభం / నష్టం (క్రెడిట్)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},కంపెనీ లో డిఫాల్ట్ విలువ {0} సెట్ దయచేసి {1}
@@ -2788,12 +2779,11 @@
 ,Monthly Attendance Sheet,మంత్లీ హాజరు షీట్
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,నగరాలు ఏవీ లేవు రికార్డు
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: కాస్ట్ సెంటర్ అంశం తప్పనిసరి {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"అవును లేదా సంఖ్య వంటి &#39;బహుకరించింది, మరలా ఉంది&#39; నమోదు చేయండి"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,ఎంట్రీ తెరవడం లో అనుమతించబడవు &#39;లాభం మరియు నష్టం&#39; రకం ఖాతా {0}
 DocType: Features Setup,Sales Discounts,సేల్స్ డిస్కౌంట్
@@ -2807,39 +2797,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ఆర్డర్ సంఖ్య
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ఉత్పత్తి జాబితా పైన కనిపిస్తాయి ఆ HTML / బ్యానర్.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,షిప్పింగ్ మొత్తం లెక్కించేందుకు పరిస్థితులు పేర్కొనండి
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,చైల్డ్ జోడించండి
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,ఓపెనింగ్ విలువ
 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,సేల్స్ కమిషన్
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,వినోదం ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,వినోదం ఖర్చులు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,సెలవు కోసం అప్లికేషన్స్.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,లీగల్ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,ఇప్పటికే లావాదేవీతో ఖాతా తొలగించడం సాధ్యం కాదు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,లీగల్ ఖర్చులు
 DocType: Sales Invoice,Posting Time,పోస్టింగ్ సమయం
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,టెలిఫోన్ ఖర్చులు
 DocType: Sales Partner,Logo,లోగో
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,మీరు సేవ్ ముందు వరుస ఎంచుకోండి యూజర్ బలవంతం అనుకుంటే ఈ తనిఖీ. మీరు ఈ తనిఖీ ఉంటే ఏ డిఫాల్ట్ ఉంటుంది.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},సీరియల్ లేవు ఐటెమ్ను {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},సీరియల్ లేవు ఐటెమ్ను {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ఓపెన్ ప్రకటనలు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ప్రత్యక్ష ఖర్చులు
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,ప్రత్యక్ష ఖర్చులు
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;నోటిఫికేషన్ \ ఇమెయిల్ చిరునామాకు చెల్లని ఇమెయిల్ చిరునామా
 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,ప్రయాణ ఖర్చులు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ప్రయాణ ఖర్చులు
 DocType: Maintenance Visit,Breakdown,విభజన
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},ఖాతా {0}: మాతృ ఖాతా {1} సంస్థ చెందదు: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,విజయవంతంగా ఈ కంపెనీకి సంబంధించిన అన్ని లావాదేవీలు తొలగించబడింది!
@@ -2856,7 +2846,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),మొత్తం బిల్లింగ్ మొత్తం (టైమ్ దినచర్య ద్వారా)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,మేము ఈ అంశం అమ్మే
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,సరఫరాదారు Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి
 DocType: Journal Entry,Cash Entry,క్యాష్ ఎంట్రీ
 DocType: Sales Partner,Contact Desc,సంప్రదించండి desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","సాధారణం వంటి ఆకులు రకం, జబ్బుపడిన మొదలైనవి"
@@ -2871,7 +2861,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,ముడిపదార్ధాల ప్రధాన అంశం అదే ఉండకూడదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,జీతం టెంప్లేట్ మాస్టర్.
@@ -2887,7 +2877,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
 ,Territory Target Variance Item Group-Wise,భూభాగం టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,ఖాతా {0}: మాతృ ఖాతా {1} ఉనికిలో లేదు
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ధర జాబితా రేటు (కంపెనీ కరెన్సీ)
@@ -2902,13 +2892,13 @@
 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,రుణదాతల
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,రుణదాతల
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,రో # {0}: సీరియల్ సంఖ్య తప్పనిసరి ఉంది
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,అంశం వైజ్ పన్ను వివరాలు
 ,Item-wise Price List Rate,అంశం వారీగా ధర జాబితా రేటు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
 DocType: Lead,Add to calendar on this date,ఈ తేదీ క్యాలెండర్ జోడించండి
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,షిప్పింగ్ ఖర్చులు జోడించడం కోసం రూల్స్.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,రాబోయే ఈవెంట్స్
@@ -2928,15 +2918,14 @@
 DocType: Customer,From Lead,లీడ్ నుండి
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Hub Settings,Name Token,పేరు టోకెన్
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ప్రామాణిక సెల్లింగ్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} సేల్స్ వాయిస్ వ్యతిరేకంగా {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,మెజర్ యొక్క డిఫాల్ట్ యూనిట్ నమోదు చేయండి
-DocType: Project,Project Name,ప్రాజెక్ట్ పేరు
+DocType: Request for Quotation 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,అంశం బ్యాచ్ నాస్
@@ -2973,7 +2962,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","మీ కంపెనీ చిరునామా వంటి కంపెనీ, తప్పనిసరి"
 DocType: Item Attribute,From Range,రేంజ్ నుండి
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,అది నుంచి నిర్లక్ష్యం అంశం {0} స్టాక్ అంశాన్ని కాదు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,తదుపరి ప్రాసెసింగ్ కోసం ఈ ఉత్పత్తి ఆర్డర్ సమర్పించండి.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,తదుపరి ప్రాసెసింగ్ కోసం ఈ ఉత్పత్తి ఆర్డర్ సమర్పించండి.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ఒక నిర్దిష్ట లావాదేవీ ధర రూల్ వర్తించదు, అన్ని వర్తించే ధర రూల్స్ డిసేబుల్ చేయాలి."
 DocType: Company,Domain,డొమైన్
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ఉద్యోగాలు
@@ -2985,6 +2974,7 @@
 DocType: Time Log,Additional Cost,అదనపు ఖర్చు
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
 DocType: Quality Inspection,Incoming,ఇన్కమింగ్
 DocType: BOM,Materials Required (Exploded),మెటీరియల్స్ (పేలుతున్న) అవసరం
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),పే లేకుండా వదిలి కోసం ఆదాయ తగ్గించండి (LWP)
@@ -3019,7 +3009,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,తాత్కాలిక అకౌంట్స్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,బ్లాక్
 DocType: BOM Explosion Item,BOM Explosion Item,బిఒఎం ప్రేలుడు అంశం
 DocType: Account,Auditor,ఆడిటర్
@@ -3033,16 +3023,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,మార్క్ కరువవడంతో
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,సమయం సమయం నుండి కంటే ఎక్కువ ఉండాలి కు
 DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,నుండి అంశాలను జోడించండి
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,నుండి అంశాలను జోడించండి
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""",ఉదా &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,అంశం కోసం ఉండలేవు స్టాక్ {0} నుండి రకాల్లో
 ,Sales Person-wise Transaction Summary,సేల్స్ పర్సన్ వారీగా లావాదేవీ సారాంశం
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,వేర్హౌస్ {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
@@ -3068,7 +3058,7 @@
 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,తదుపరి సంప్రదించండి
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,సెటప్ గేట్వే ఖాతాలు.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,సెటప్ గేట్వే ఖాతాలు.
 DocType: Employee,Employment Type,ఉపాధి రకం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,స్థిర ఆస్తులు
 ,Cash Flow,నగదు ప్రవాహం
@@ -3082,7 +3072,7 @@
 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 +132,Please find attached {0} #{1},కనుగొనడానికి దయచేసి జత {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},కనుగొనడానికి దయచేసి జత {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,జనరల్ లెడ్జర్ ప్రకారం బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Job Applicant,Applicant Name,దరఖాస్తుదారు పేరు
 DocType: Authorization Rule,Customer / Item Name,కస్టమర్ / అంశం పేరు
@@ -3098,19 +3088,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,మొదలుకుని / నుండి రాయండి
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,లావాదేవీలు అమ్మకం కోసం డిఫాల్ట్ సెట్టింగులను.
 DocType: BOM Replace Tool,Current BOM,ప్రస్తుత BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,సీరియల్ లేవు జోడించండి
 apps/erpnext/erpnext/config/support.py +43,Warranty,వారంటీ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,ముద్రణ మరియు స్టేషనరీ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,గ్రూప్ నోడ్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,నవీకరణ పూర్తయ్యింది గూడ్స్
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,నవీకరణ పూర్తయ్యింది గూడ్స్
 DocType: Workstation,per hour,గంటకు
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,కొనుగోలు
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,గిడ్డంగి (శాశ్వత ఇన్వెంటరీ) కోసం ఖాతాకు ఈ ఖాతా కింద సృష్టించబడుతుంది.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
 DocType: Company,Distribution,పంపిణీ
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,కట్టిన డబ్బు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ప్రాజెక్ట్ మేనేజర్
@@ -3140,7 +3129,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},తేదీ ఫిస్కల్ ఇయర్ లోపల ఉండాలి. = తేదీ ఊహిస్తే {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ఇక్కడ మీరు etc ఎత్తు, బరువు, అలెర్జీలు, వైద్య ఆందోళనలు అందుకోగలదు"
 DocType: Leave Block List,Applies to Company,కంపెనీకి వర్తిస్తుంది
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
 DocType: Purchase Invoice,In Words,వర్డ్స్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
 DocType: Production Planning Tool,Material Request For Warehouse,వేర్హౌస్ కోసం మెటీరియల్ అభ్యర్థన
@@ -3154,7 +3143,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},లావాదేవీ ఆగిపోయింది ఉత్పత్తి వ్యతిరేకంగా అనుమతి లేదు ఆర్డర్ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",డిఫాల్ట్ గా ఈ ఆర్థిక సంవత్సరం సెట్ &#39;డిఫాల్ట్ గా సెట్&#39; పై క్లిక్
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 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;అవసరం
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ప్యాకేజీలు అందజేసిన కోసం స్లిప్స్ ప్యాకింగ్ ఉత్పత్తి. ప్యాకేజీ సంఖ్య, ప్యాకేజీ విషయాలు మరియు దాని బరువు తెలియజేయడానికి వాడతారు."
@@ -3165,7 +3154,7 @@
 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,Employee ఎడ్యుకేషన్
-apps/erpnext/erpnext/public/js/controllers/transaction.js +782,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ఇప్పటికే అందింది
@@ -3173,14 +3162,13 @@
 DocType: Customer,Sales Team Details,సేల్స్ టీం వివరాలు
 DocType: Expense Claim,Total Claimed Amount,మొత్తం క్లెయిమ్ చేసిన మొత్తం
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,అమ్మకం కోసం సమర్థవంతమైన అవకాశాలు.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},చెల్లని {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ చెయ్యండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,డిపార్ట్మెంట్ స్టోర్స్
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,మొదటి డాక్యుమెంట్ సేవ్.
 DocType: Account,Chargeable,విధింపదగిన
 DocType: Company,Change Abbreviation,మార్పు సంక్షిప్తీకరణ
 DocType: Expense Claim Detail,Expense Date,ఖర్చుల తేదీ
@@ -3198,10 +3186,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,సాధారణ లెడ్జర్
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,చూడండి దారితీస్తుంది
 DocType: Item Attribute Value,Attribute Value,విలువ లక్షణం
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ఇమెయిల్ ఐడి ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","ఇమెయిల్ ఐడి ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 ,Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
 DocType: Features Setup,To get Item Group in details table,వివరాలు పట్టికలో అంశం సమూహం పొందుటకు
@@ -3226,23 +3214,23 @@
 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,ప్రాజెక్టు వారీగా స్టాక్ ట్రాకింగ్
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(మూలం / లక్ష్యం వద్ద) వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Item Customer Detail,Ref Code,Ref కోడ్
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee రికార్డులు.
 DocType: Payment Gateway,Payment Gateway,చెల్లింపు గేట్వే
 DocType: HR Settings,Payroll Settings,పేరోల్ సెట్టింగ్స్
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,కాని లింక్డ్ రసీదులు మరియు చెల్లింపులు ఫలితం.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,కాని లింక్డ్ రసీదులు మరియు చెల్లింపులు ఫలితం.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,ప్లేస్ ఆర్డర్
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,రూట్ ఒక పేరెంట్ ఖర్చు సెంటర్ ఉండకూడదు
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Select బ్రాండ్ ...
 DocType: Sales Invoice,C-Form Applicable,సి ఫారం వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,వేర్హౌస్ తప్పనిసరి
 DocType: Supplier,Address and Contacts,చిరునామా మరియు కాంటాక్ట్స్
 DocType: UOM Conversion Detail,UOM Conversion Detail,UoM మార్పిడి వివరాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100 px ద్వారా అది (w) వెబ్ స్నేహపూర్వక 900px ఉంచండి (h)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,ద్వారా పరిష్కరించిన
@@ -3260,7 +3248,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,లావాదేవీ కరెన్సీ చెల్లింపు గేట్వే కరెన్సీ అదే ఉండాలి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,స్వీకరించండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,స్వీకరించండి
 DocType: Maintenance Visit,Fully Completed,పూర్తిగా పూర్తయింది
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% పూర్తి
 DocType: Employee,Educational Qualification,అర్హతలు
@@ -3268,14 +3256,14 @@
 DocType: Purchase Invoice,Submit on creation,సృష్టి సమర్పించండి
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,కొనుగోలు మాస్టర్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,నా ఆర్డర్స్
@@ -3296,10 +3284,10 @@
 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 +250,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,హామీలేని రుణాలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,హామీలేని రుణాలు
 DocType: Cost Center,Cost Center Name,ఖర్చు సెంటర్ పేరు
 DocType: Maintenance Schedule Detail,Scheduled Date,షెడ్యూల్డ్ తేదీ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,మొత్తం చెల్లించిన ఆంట్
@@ -3311,7 +3299,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} అంశం కోసం దాటింది over- కోసం భత్యం {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,మీ సరఫరాదారులు
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
@@ -3324,12 +3312,12 @@
 DocType: Employee,Date of Issue,జారీ చేసిన తేది
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: నుండి {0} కోసం {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,ఇతర కరెన్సీ ఖాతాల అనుమతించటానికి మల్టీ కరెన్సీ ఎంపికను తనిఖీ చేయండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,అంశం: {0} వ్యవస్థ ఉనికిలో లేదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,అంశం: {0} వ్యవస్థ ఉనికిలో లేదు
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,మీరు స్తంభింపచేసిన విలువ సెట్ అధికారం లేదు
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ఎంట్రీలు పొందండి
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
@@ -3338,7 +3326,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,ఖాతా హెడ్
@@ -3351,7 +3339,7 @@
 DocType: Item,Customer Code,కస్టమర్ కోడ్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,స్టాక్ ఆస్తులు
@@ -3365,15 +3353,15 @@
 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 +576,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},నుండి మరియు కాలం పునరావృత తప్పనిసరి తేదీలు కాలం {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},నుండి మరియు కాలం పునరావృత తప్పనిసరి తేదీలు కాలం {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ప్రాజెక్టు చర్య / పని.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,జీతం స్లిప్స్ రూపొందించండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",వర్తించే ఎంపిక ఉంది ఉంటే కొనుగోలు తనిఖీ చెయ్యాలి {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,డిస్కౌంట్ 100 కంటే తక్కువ ఉండాలి
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,నెల రోజు రిపీట్
@@ -3394,7 +3382,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},అంశం కోసం ముగింపు తేదీ కంటే తక్కువ ఉండాలి తేదీ ప్రారంభించండి {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},అంశం కోసం ముగింపు తేదీ కంటే తక్కువ ఉండాలి తేదీ ప్రారంభించండి {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ఉదాహరణ:. వరుస సెట్ మరియు సీరియల్ లేవు లావాదేవీలు పేర్కొన్నారు చేయకపోతే ABCD #####, అప్పుడు ఆటోమేటిక్ క్రమ సంఖ్య ఈ సిరీస్ ఆధారంగా రూపొందించినవారు ఉంటుంది. మీరు ఎల్లప్పుడు స్పస్టముగా ఈ అంశం కోసం సీరియల్ మేము చెప్పలేదు అనుకొంటే. ఈ ఖాళీ వదిలి."
 DocType: Upload Attendance,Upload Attendance,అప్లోడ్ హాజరు
@@ -3405,11 +3393,11 @@
 ,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 +91,Please enter default currency in Company Master,కంపెనీ మాస్టర్ డిఫాల్ట్ కరెన్సీ నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},తో పన్ను రూల్ గొడవలు {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,కొత్త ఖాతా పేరు
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,వినియోగదారుల సేవ
@@ -3421,9 +3409,9 @@
 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 +72,Item {0} must be a stock Item,అంశం {0} స్టాక్ అంశం ఉండాలి
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ప్రోగ్రెస్ వేర్హౌస్ డిఫాల్ట్ వర్క్
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,అకౌంటింగ్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,అకౌంటింగ్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ఊహించినది తేదీ మెటీరియల్ అభ్యర్థన తేదీ ముందు ఉండరాదు
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,అంశం {0} సేల్స్ అంశం ఉండాలి
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,అంశం {0} సేల్స్ అంశం ఉండాలి
 DocType: Naming Series,Update Series Number,నవీకరణ సిరీస్ సంఖ్య
 DocType: Account,Equity,ఈక్విటీ
 DocType: Sales Order,Printing Details,ప్రింటింగ్ వివరాలు
@@ -3431,7 +3419,7 @@
 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,శోధన సబ్ అసెంబ్లీలకు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
 DocType: Sales Partner,Partner Type,భాగస్వామి రకం
 DocType: Purchase Taxes and Charges,Actual,వాస్తవ
 DocType: Authorization Rule,Customerwise Discount,Customerwise డిస్కౌంట్
@@ -3454,7 +3442,7 @@
 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,బహుళ సమూహాలు అంశం యొక్క క్రాస్ జాబితా
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ ఇప్పటికే ఫిస్కల్ ఇయర్ నిర్మితమయ్యాయి {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,విజయవంతంగా అనుకూలీకరించబడిన
 DocType: Production Order,Planned End Date,ప్రణాళిక ముగింపు తేదీ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,అంశాలను ఎక్కడ నిల్వ చేయబడతాయి.
@@ -3465,7 +3453,7 @@
 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 +508,Posting date and posting time is mandatory,తేదీ పోస్ట్ మరియు సమయం పోస్ట్ తప్పనిసరి
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,లావాదేవీలు కొనుగోలు కోసం పన్ను టెంప్లేట్.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,లావాదేవీలు కొనుగోలు కోసం పన్ను టెంప్లేట్.
 ,Item Prices,అంశం ధరలు
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,మీరు కొనుగోలు ఆర్డర్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 DocType: Period Closing Voucher,Period Closing Voucher,కాలం ముగింపు ఓచర్
@@ -3475,10 +3463,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,నికర మొత్తం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0} వరుసగా టార్గెట్ గిడ్డంగి ఉత్పత్తి ఆర్డర్ అదే ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,అనుమతి చెల్లింపు టూల్ ఉపయోగించడానికి
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,% S పునరావృత పేర్కొనబడలేదు &#39;నోటిఫికేషన్ ఇమెయిల్ చిరునామాలు&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,% S పునరావృత పేర్కొనబడలేదు &#39;నోటిఫికేషన్ ఇమెయిల్ చిరునామాలు&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,మార్చు
@@ -3497,13 +3485,13 @@
 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 +559,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,అన్ని అంశాలను కాని స్టాక్ అంశాలను ఉన్నాయి పన్ను వర్గం &#39;వాల్యుయేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; ఉండకూడదు
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,బ్యాచ్
@@ -3517,7 +3505,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,సేల్స్ పర్సన్
 DocType: Sales Invoice,Cold Calling,కోల్డ్ కాలింగ్
 DocType: SMS Parameter,SMS Parameter,SMS పారామిత
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
 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.,విలువలు ఆధారంగా లావాదేవీలు పరిమితం చేయడానికి నిబంధనలు సృష్టించు.
@@ -3550,7 +3538,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,కింది రోజులలో లీవ్ అప్లికేషన్స్ తయారీ నుండి వినియోగదారులు ఆపు.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ఉద్యోగుల లాభాల
 DocType: Sales Invoice,Is POS,POS ఉంది
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item కోడ్&gt; అంశాన్ని గ్రూప్&gt; బ్రాండ్
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Production Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
 DocType: Purchase Receipt Item,Accepted Quantity,అంగీకరించిన పరిమాణం
@@ -3558,7 +3545,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,వినియోగదారుడు ఎదిగింది బిల్లులు.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ప్రాజెక్ట్ ఐడి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,మాతృ ఖాతా
@@ -3574,7 +3561,7 @@
 DocType: Employee,Education,ఎడ్యుకేషన్
 DocType: Selling Settings,Campaign Naming By,ద్వారా ప్రచారం నేమింగ్
 DocType: Employee,Current Address Is,ప్రస్తుత చిరునామా
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","ఐచ్ఛికము. పేర్కొనబడలేదు ఉంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ అమర్చుతుంది."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","ఐచ్ఛికము. పేర్కొనబడలేదు ఉంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ అమర్చుతుంది."
 DocType: Address,Office,ఆఫీసు
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,అకౌంటింగ్ జర్నల్ ఎంట్రీలు.
 DocType: Delivery Note Item,Available Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
@@ -3609,7 +3596,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,మంత్లీ జీతం నమోదు
 DocType: Warranty Claim,If different than customer address,కస్టమర్ చిరునామా కంటే వివిధ ఉంటే
 DocType: BOM Operation,BOM Operation,బిఒఎం ఆపరేషన్
@@ -3617,22 +3604,22 @@
 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 ప్రొఫైల్
 DocType: Payment Gateway Account,Payment URL Message,చెల్లింపు URL సందేశం
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","సెట్ బడ్జెట్లు, లక్ష్యాలను మొదలైనవి కోసం కాలికోద్యోగం"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","సెట్ బడ్జెట్లు, లక్ష్యాలను మొదలైనవి కోసం కాలికోద్యోగం"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,రో {0}: చెల్లింపు మొత్తం విశిష్ట మొత్తానికన్నా ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,చెల్లించని మొత్తం
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,సమయం లాగిన్ బిల్ చేయగల కాదు
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,మానవీయంగా వ్యతిరేకంగా వోచర్లు నమోదు చేయండి
 DocType: SMS Settings,Static Parameters,స్టాటిక్ పారామితులు
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,సరఫరాదారు మెటీరియల్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,ఎక్సైజ్ వాయిస్
 DocType: Expense Claim,Employees Email Id,ఉద్యోగులు ఇమెయిల్ ఐడి
 DocType: Employee Attendance Tool,Marked Attendance,గుర్తించ హాజరు
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,ప్రస్తుత బాధ్యతలు
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,ప్రస్తుత బాధ్యతలు
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,వాస్తవ ప్యాక్ చేసిన అంశాల తప్పనిసరి
@@ -3653,17 +3640,16 @@
 DocType: Item Attribute,Numeric Values,సంఖ్యా విలువలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,లోగో అటాచ్
 DocType: Customer,Commission Rate,కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,విశ్లేషణలు
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
 DocType: Production Order,Actual Operating Cost,వాస్తవ ఆపరేటింగ్ వ్యయం
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. దయచేసి సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త సృష్టించడానికి.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,మూలధన నిల్వలను
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,మూలధన నిల్వలను
 DocType: Packing Slip,Package Weight Details,ప్యాకేజీ బరువు వివరాలు
 DocType: Payment Gateway Account,Payment Gateway Account,చెల్లింపు గేట్వే ఖాతా
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,చెల్లింపు పూర్తయిన తర్వాత ఎంపిక పేజీకి వినియోగదారు మళ్ళింపు.
@@ -3675,17 +3661,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
 ,Item-wise Purchase Register,అంశం వారీగా కొనుగోలు నమోదు
 DocType: Batch,Expiry Date,గడువు తీరు తేదీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","క్రమాన్ని స్థాయి సెట్, అంశం కొనుగోలు అంశం లేదా తయారీ అంశం ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,Project master.,ప్రాజెక్టు మాస్టర్.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,కరెన్సీ etc $ వంటి ఏ చిహ్నం తదుపరి చూపవద్దు.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +409, (Half Day),(హాఫ్ డే)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,వస్తువుల యొక్క జామా ఖర్చు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},రో {0}: పార్టీ పద్ధతి మరియు పార్టీ స్వీకరించదగిన / చెల్లించవలసిన ఖాతా కోసం అవసరం {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref తేదీ
@@ -3693,6 +3679,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,మంజూరు సొమ్ము
 DocType: GL Entry,Is Opening,ప్రారంభమని
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},రో {0}: డెబిట్ ప్రవేశం తో జతచేయవచ్చు ఒక {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,ఖాతా {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,ఖాతా {0} ఉనికిలో లేదు
 DocType: Account,Cash,క్యాష్
 DocType: Employee,Short biography for website and other publications.,వెబ్సైట్ మరియు ఇతర ప్రచురణలకు క్లుప్త జీవితచరిత్ర.
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 1d3c07c..c34610e 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,เจ้ามือ
 DocType: Employee,Rented,เช่า
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
 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.,* จะได้รับการคำนวณขณะการทำธุรกรรม
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาตั้งค่าระบบการตั้งชื่อของพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าการบริหารทรัพยากรบุคคล
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ต้นไม้
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,แอพลิเคชันออกใหม่
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,แสดงหลากหลายรูปแบบ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,จำนวน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,จำนวน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ในสต็อก
 DocType: Designation,Designation,การแต่งตั้ง
@@ -64,7 +63,7 @@
 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 +642,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},ใหม่ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},ใหม่ {0}: # {1}
 ,Sales Partners Commission,สำนักงานคณะกรรมการกำกับการขายหุ้นส่วน
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ตัวอักษรย่อ ห้ามมีความยาวมากกว่า 5 ตัวอักษร
 DocType: Payment Request,Payment Request,คำขอชำระเงิน
@@ -102,7 +101,7 @@
 DocType: Employee,Married,แต่งงาน
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,รับรายการจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 DocType: Payment Reconciliation,Reconcile,คืนดี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,เป้าหมาย ที่
 DocType: BOM,Total Cost,ค่าใช้จ่ายรวม
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,บันทึกกิจกรรม:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
@@ -156,7 +155,7 @@
 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,ค่าใช้จ่ายใน สต็อก
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 DocType: Newsletter,Email Sent?,อีเมลที่ส่ง?
 DocType: Journal Entry,Contra Entry,ในทางตรงกันข้ามการเข้า
 DocType: Production Order Operation,Show Time Logs,แสดงบันทึกเวลา
@@ -164,13 +163,13 @@
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,รายการ {0} จะต้องมี การสั่งซื้อ สินค้า
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: BOM Replace Tool,New BOM,BOM ใหม่
@@ -209,11 +208,11 @@
 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 +79,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,กรุณาใส่ บริษัท
@@ -222,7 +221,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
 DocType: Lead,Address & Contact,ที่อยู่และติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
 DocType: Newsletter List,Total Subscribers,สมาชิกทั้งหมด
 ,Contact Name,ชื่อผู้ติดต่อ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
@@ -236,8 +235,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 DocType: Payment Tool,Reference No,อ้างอิง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,รายการธนาคาร
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
@@ -249,8 +248,8 @@
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +264,7 @@
 DocType: Notification Control,Notification Control,ควบคุมการแจ้งเตือน
 DocType: Lead,Suggestions,ข้อเสนอแนะ
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,กำหนดงบประมาณกลุ่มฉลาดรายการในมณฑลนี้ คุณยังสามารถรวมฤดูกาลโดยการตั้งค่าการกระจาย
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},กรุณากรอกตัวอักษรกลุ่มบัญชีผู้ปกครองสำหรับคลังสินค้า {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},กรุณากรอกตัวอักษรกลุ่มบัญชีผู้ปกครองสำหรับคลังสินค้า {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
 DocType: Supplier,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
@@ -284,7 +283,7 @@
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,รหัสผ่านผิด
 DocType: Item,Variant Of,แตกต่างจาก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
@@ -295,10 +294,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,หมายเหตุจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,หมายเหตุจัดส่งสินค้า
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,กรุณาเลือกเดือนและปี
@@ -309,12 +308,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} เป็น {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,เลือกรายการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
@@ -337,9 +336,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน การจัดส่งสินค้า หมายเหตุ {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,รายการพารามิเตอร์การตรวจสอบคุณภาพ
 DocType: Leave Application,Leave Approver Name,ปล่อยให้อนุมัติชื่อ
-,Schedule Date,กำหนดการ วันที่
+DocType: Depreciation Schedule,Schedule Date,กำหนดการ วันที่
 DocType: Packed Item,Packed Item,จัดส่งสินค้าบรรจุหมายเหตุ
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,การตั้งค่าเริ่มต้นสำหรับ การทำธุรกรรมการซื้อ
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,การตั้งค่าเริ่มต้นสำหรับ การทำธุรกรรมการซื้อ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},ค่าใช้จ่ายในกิจกรรมที่มีอยู่สำหรับพนักงาน {0} กับประเภทกิจกรรม - {1}
 apps/erpnext/erpnext/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,แลกเปลี่ยนเงินตรา
@@ -388,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
-DocType: Material Request Item,Required Date,วันที่ที่ต้องการ
+DocType: Request for Quotation Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,จำนวนรวม
@@ -418,17 +417,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
@@ -448,7 +447,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,รายการที่ {0} ไม่ได้ ซื้อ สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,รายการที่ {0} ไม่ได้ ซื้อ สินค้า
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
@@ -459,7 +458,7 @@
 DocType: Production Plan Item,Pending Qty,รอดำเนินการจำนวน
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
 DocType: Pricing Rule,Valid From,ที่ถูกต้อง จาก
 DocType: Sales Invoice,Total Commission,คณะกรรมการรวม
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
@@ -471,13 +470,13 @@
  ต้องการกระจายงบประมาณโดยใช้การกระจายนี้ตั้งนี้การกระจายรายเดือน ** ** ** ในศูนย์ต้นทุน **"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,การเงิน รอบปีบัญชี /
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ค่าสะสม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,วันเริ่มต้นปีงบประมาณไม่ควรจะสูงกว่าปีงบประมาณที่สิ้นสุดวันที่
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,วันเริ่มต้นปีงบประมาณไม่ควรจะสูงกว่าปีงบประมาณที่สิ้นสุดวันที่
 DocType: Warranty Claim,Resolution,ความละเอียด
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},จัดส่ง: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,เจ้าหนี้การค้า
@@ -485,7 +484,7 @@
 DocType: Job Applicant,Resume Attachment,Resume สิ่งที่แนบมา
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
 DocType: Leave Control Panel,Allocate,จัดสรร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,ขายกลับ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,ขายกลับ
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,ส่วนประกอบเงินเดือน
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ฐานข้อมูลของลูกค้าที่มีศักยภาพ
@@ -494,7 +493,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
@@ -504,7 +503,7 @@
 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/config/accounts.py +70,Masters,ข้อมูลหลัก
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,ปรับปรุงธนาคารวันที่เกิดรายการ
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,ปรับปรุงธนาคารวันที่เกิดรายการ
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ข้อผิดพลาด หุ้น ลบ ( {6}) กับ รายการ {0} ใน คลังสินค้า {1} ใน {2} {3} ใน {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,การติดตามเวลา
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
@@ -522,19 +521,18 @@
 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,เริ่มต้นอัตราการคิดต้นทุน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,กำหนดการซ่อมบำรุง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,กำหนดการซ่อมบำรุง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,เปลี่ยนสุทธิในสินค้าคงคลัง
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,ขายเป้าหมายคน
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,กรุณาตั้งค่ารายการวันหยุดสำหรับทั้งพนักงานหรือ บริษัท ฯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,แปลงเป็น กลุ่ม
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
@@ -542,7 +540,7 @@
 DocType: Supplier,Fixed Days,วันคงที่
 DocType: Quotation Item,Item Balance,ยอดคงเหลือรายการ
 DocType: Sales Invoice,Packing List,รายการบรรจุ
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,ใบสั่งซื้อให้กับซัพพลายเออร์
+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,ถูกใช้
@@ -576,7 +574,7 @@
 DocType: Hub Settings,Seller City,ผู้ขายเมือง
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ประเภท ต้นไม้
@@ -613,14 +611,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,งบเงินเดือน
 DocType: Item Group,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},เกิดข้อผิดพลาดในแม่แบบที่อยู่ของคุณ {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,บัญชีผู้ใช้ใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,บัญชีผู้ใช้ใหม่
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",กฎราคาหลายอยู่กับเกณฑ์เดียวกันโปรดแก้ปัญหาความขัดแย้งโดยการกำหนดลำดับความสำคัญ กฎราคา: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",กฎราคาหลายอยู่กับเกณฑ์เดียวกันโปรดแก้ปัญหาความขัดแย้งโดยการกำหนดลำดับความสำคัญ กฎราคา: {0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +666,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","อนุทิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1}, ตรวจสอบว่ามันควรจะถูกดึงเป็นล่วงหน้าในใบแจ้งหนี้นี้"
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Account,Liability,ความรับผิดชอบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
 DocType: Company,Default Cost of Goods Sold Account,เริ่มต้นค่าใช้จ่ายของบัญชีที่ขายสินค้า
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Process Payroll,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -686,7 +684,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,ใบแจ้งหนี้ของฉัน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,ใบแจ้งหนี้ของฉัน
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Supplier Quotation,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
@@ -698,7 +696,7 @@
 DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์
 DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
 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 +267,C-Form records,C- บันทึก แบบฟอร์ม
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C- บันทึก แบบฟอร์ม
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,ลูกค้าและผู้จัดจำหน่าย
 DocType: Email Digest,Email Digest Settings,การตั้งค่าอีเมลเด่น
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,คำสั่งการสนับสนุนจากลูกค้า
@@ -722,7 +720,7 @@
 DocType: Quotation Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,รายจ่าย
@@ -759,14 +757,14 @@
 DocType: Supplier Quotation,Is Subcontracted,เหมา
 DocType: Item Attribute,Item Attribute Values,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ดูสมาชิก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
 DocType: Employee,Ms,นางสาว / นาง
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,พันธมิตรการขายและดินแดน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} จะต้องใช้งาน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,รถเข็นไปที่
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
@@ -785,7 +783,7 @@
 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 +524,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
@@ -795,10 +793,10 @@
 DocType: Employee,Permanent Address Is,ที่อยู่ ถาวร เป็น
 DocType: Production Order Operation,Operation completed for how many finished goods?,การดำเนินการเสร็จสมบูรณ์สำหรับวิธีการหลายสินค้าสำเร็จรูป?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,ยี่ห้อ
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Employee,Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
-DocType: Journal Entry Account,Purchase Invoice,ซื้อใบแจ้งหนี้
+DocType: Asset,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,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
@@ -808,16 +806,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;Bundle สินค้า, คลังสินค้า, ไม่มี Serial และรุ่นที่จะไม่ได้รับการพิจารณาจาก&#39; บรรจุรายชื่อ &#39;ตาราง ถ้าคลังสินค้าและรุ่นที่ไม่มีเหมือนกันสำหรับรายการที่บรรจุทั้งหมดรายการใด ๆ &#39;Bundle สินค้า&#39; ค่าเหล่านั้นสามารถป้อนในตารางรายการหลักค่าจะถูกคัดลอกไปบรรจุรายชื่อ &#39;ตาราง"
 DocType: Job Opening,Publish on website,เผยแพร่บนเว็บไซต์
 apps/erpnext/erpnext/config/stock.py +17,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,รายได้ ทางอ้อม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
 DocType: Purchase Invoice,Additional Discount Percentage,เพิ่มเติมร้อยละส่วนลด
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
@@ -831,14 +829,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
 ,Employee Holiday Attendance,พนักงานเข้าร่วมประชุมวันหยุด
 DocType: Opportunity,Walk In,Walk In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,หุ้นรายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,หุ้นรายการ
 DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,โอน
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,สร้าง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,รถเข็นของฉัน
@@ -848,7 +846,7 @@
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 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 +180,Qty for {0},จำนวนสำหรับ {0}
+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 +80,Leave Allocation Tool,ฝากเครื่องมือการจัดสรร
 DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
@@ -861,7 +859,7 @@
 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 +547,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,ส่วนลด
@@ -876,20 +874,20 @@
 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 +69,Selling Amount,ปริมาณการขาย
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,บันทึกเวลา
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,บันทึกเวลา
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,บัญชีไม่ตรงกับบริษัท
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,รับสมัครงาน
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายในการขาย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,ค่าใช้จ่ายในการขาย
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
@@ -906,7 +904,7 @@
 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 +18,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
+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,อายุเฉลี่ย
@@ -915,7 +913,7 @@
 DocType: Company,Default Currency,สกุลเงินเริ่มต้น
 DocType: Contact,Enter designation of this Contact,ใส่ชื่อของเราได้ที่นี่
 DocType: Expense Claim,From Employee,จากพนักงาน
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,พื้นที่การดำเนินงานหลัก
@@ -923,7 +921,7 @@
 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 +130,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,เงินสมทบ%
@@ -932,7 +930,7 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,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.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -940,14 +938,14 @@
 DocType: Salary Slip,Deductions,การหักเงิน
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,บันทึกเวลาชุดนี้ ถูกเรียกเก็บเงินแล้ว
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
 ,Trial Balance for Party,งบทดลองสำหรับพรรค
 DocType: Lead,Consultant,ผู้ให้คำปรึกษา
 DocType: Salary Slip,Earnings,ผลกำไร
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,ไม่มีอะไรที่จะ ขอ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,ไม่มีอะไรที่จะ ขอ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,การจัดการ
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,ประเภทของกิจกรรมสำหรับแผ่นเวลา
@@ -958,18 +956,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,กรุณาตั้งค่าอีเมล์ ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,กรุณาตั้งค่าอีเมล์ ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,ปัจจัยการแปลง UOM
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,ฐานข้อมูลผู้ผลิต
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ฐานข้อมูลผู้ผลิต
 DocType: Account,Balance Sheet,งบดุล
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,ภาษีและอื่น ๆ หักเงินเดือน
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
@@ -997,18 +995,18 @@
 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/page/accounts_browser/accounts_browser.js +128,View Ledger,ดู บัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,ดู บัญชีแยกประเภท
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,การจ่ายเงินปันผล
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,กำไรสะสม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,กำไรสะสม
 DocType: BOM Item,Item Description,รายละเอียดสินค้า
 DocType: Payment Tool,Payment Mode,วิธีการชำระเงิน
 DocType: Purchase Invoice,Is Recurring,เป็นที่เกิดขึ้น
@@ -1016,7 +1014,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,เปิดชั่วคราว
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},อัตราการประเมินที่จำเป็นสำหรับรายการในแถว {0}
@@ -1031,8 +1029,8 @@
 ,Accounts Payable Summary,สรุปบัญชีเจ้าหนี้
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 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 +165,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,เล็ก
@@ -1040,7 +1038,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,หัวบัญชีสำหรับ {0} ได้ถูกสร้างขึ้น
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,สีเขียว
 DocType: Item,Auto re-order,Auto สั่งซื้อใหม่
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,รวมประสบความสำเร็จ
@@ -1048,12 +1046,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 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,ข้อมูลการติดต่อคลังสินค้า
@@ -1063,17 +1061,17 @@
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
 DocType: Hub Settings,Seller Website,เว็บไซต์ขาย
 apps/erpnext/erpnext/controllers/selling_controller.py +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},สถานะการผลิต การสั่งซื้อ เป็น {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,ขาออกทั้งหมด
@@ -1083,10 +1081,10 @@
 DocType: Item,Website Item Groups,กลุ่มรายการเว็บไซต์
 DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,หมายเลข {0} เข้ามา มากกว่าหนึ่งครั้ง
-DocType: Journal Entry,Journal Entry,รายการบันทึก
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
 DocType: Salary Slip,Bank Account No.,เลขที่บัญชีธนาคาร
 DocType: Naming Series,This is the number of the last created transaction with this prefix,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้
@@ -1119,7 +1117,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
 DocType: Project,Start and End Dates,เริ่มต้นและสิ้นสุดวันที่
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,ส่วนลดโดยเฉลี่ย
@@ -1130,10 +1128,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
 DocType: Payment Request,Transaction Currency,ธุรกรรมเงินตรา
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},จาก {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},จาก {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ดำเนินการคำอธิบาย
 DocType: Item,Will also apply to variants,นอกจากนี้ยังจะนำไปใช้กับสายพันธุ์
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ไม่สามารถเปลี่ยนแปลงวันเริ่มต้นปีงบประมาณและปีงบประมาณวันที่สิ้นสุดเมื่อปีงบประมาณจะถูกบันทึกไว้
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,รณรงค์
@@ -1147,8 +1145,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},สูงสุด: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,สำหรับ บริษัท
 apps/erpnext/erpnext/config/support.py +17,Communication log.,บันทึกการสื่อสาร
@@ -1156,8 +1154,8 @@
 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 +472,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1179,11 +1177,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
 DocType: Rename Tool,Type of document to rename.,ประเภทของเอกสารที่จะเปลี่ยนชื่อ
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,เราซื้อ รายการ นี้
 DocType: Address,Billing,การเรียกเก็บเงิน
@@ -1196,8 +1194,8 @@
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Supplier,Stock Manager,ผู้จัดการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,สลิป
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,สำนักงาน ให้เช่า
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,สลิป
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 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.,ที่อยู่ไม่เพิ่มเลย
@@ -1215,7 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),รวม ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),รวม ({0})
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
@@ -1224,10 +1222,10 @@
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,กระแสเงินสดจากการลงทุน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 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 +86,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
@@ -1236,7 +1234,7 @@
 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.,กรุณาสร้างบัญชีใหม่ จากผังบัญชี
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,การเข้ามาบำรุงรักษา
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,การเข้ามาบำรุงรักษา
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,จำนวนชุดที่โกดัง
 DocType: Time Log Batch Detail,Time Log Batch Detail,รายละเอียดชุดบันทึกเวลา
 DocType: Landed Cost Voucher,Landed Cost Help,Landed ช่วยเหลือค่าใช้จ่าย
@@ -1250,7 +1248,6 @@
 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 +196,Brand master.,ต้นแบบแบรนด์
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้ผลิต
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,กล่อง
@@ -1278,7 +1275,7 @@
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +131,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,หนี้สิน หุ้น
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,หนี้สิน หุ้น
 DocType: Purchase Receipt,Supplier Warehouse,คลังสินค้าผู้จัดจำหน่าย
 DocType: Opportunity,Contact Mobile No,เบอร์มือถือไม่มี
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
@@ -1287,7 +1284,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ส่งอีเมล์การชำระเงิน
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,รายงานอื่น ๆ
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,หยุด วันเกิด การแจ้งเตือน
@@ -1297,26 +1294,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} ดู
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,ประเภท ผู้ผลิต หลัก
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
 DocType: Purchase Invoice,Reference Document,เอกสารอ้างอิง
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงินแล้ว
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
@@ -1338,7 +1335,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,เปลี่ยนสุทธิในบัญชีเจ้าหนี้
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,โปรดตรวจสอบอีเมลของคุณ id
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',ลูกค้า จำเป็นต้องใช้ สำหรับ ' Customerwise ส่วนลด '
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,การชำระเงินของธนาคารปรับปรุงวันที่มีวารสาร
+apps/erpnext/erpnext/config/accounts.py +137,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.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
@@ -1357,7 +1354,7 @@
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",จ่ายเงินล่วงหน้ากับ {0} {1} ไม่สามารถมากขึ้น \ กว่าแกรนด์รวม {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,กรุณา เลือกรหัส สินค้า
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,กรุณา เลือกรหัส สินค้า
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),ลดการหักออกโดยไม่จ่าย (LWP)
 DocType: Territory,Territory Manager,ผู้จัดการดินแดน
 DocType: Packed Item,To Warehouse (Optional),คลังสินค้า (อุปกรณ์เสริม)
@@ -1367,15 +1364,15 @@
 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,ค่าใช้จ่ายใน การตลาด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,หน่วยเดียวของรายการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',ต้อง 'ส่ง' ชุดบันทึกเวลา {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
@@ -1392,8 +1389,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,ค้นหาใบแจ้งหนี้เพื่อให้ตรงกับ
@@ -1404,21 +1401,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,รถเข็นถูกเปิดใช้งาน
 DocType: Job Applicant,Applicant for a Job,สำหรับผู้สมัครงาน
 DocType: Production Plan Material Request,Production Plan Material Request,แผนการผลิตวัสดุที่ขอ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,หลัก
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Item,Variants,สายพันธุ์
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,ทำให้ การสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,ทำให้ การสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
@@ -1426,26 +1423,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ผู้สมัครงาน
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,ที่อยู่
+apps/erpnext/erpnext/hooks.py +91,Addresses,ที่อยู่
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,การประเมินผล
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,รายการสินค้าที่ไม่ได้รับอนุญาตให้มีการสั่งซื้อการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,รายการสินค้าที่ไม่ได้รับอนุญาตให้มีการสั่งซื้อการผลิต
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),น้ำหนักสุทธิของแพคเกจนี้ (คำนวณโดยอัตโนมัติเป็นที่รวมของน้ำหนักสุทธิของรายการ)
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,บันทึกเวลาในการผลิต
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,บันทึกเวลาสำหรับงานต่างๆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,ประณม
@@ -1478,7 +1475,7 @@
 DocType: Sales Order Item,Delivery Warehouse,คลังสินค้าจัดส่งสินค้า
 DocType: Stock Settings,Allowance Percent,ร้อยละค่าเผื่อ
 DocType: SMS Settings,Message Parameter,พารามิเตอร์ข้อความ
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,ต้นไม้ของศูนย์ต้นทุนทางการเงิน
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,ต้นไม้ของศูนย์ต้นทุนทางการเงิน
 DocType: Serial No,Delivery Document No,เอกสารจัดส่งสินค้าไม่มี
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,รับสินค้าจากการสั่งซื้อใบเสร็จรับเงิน
 DocType: Serial No,Creation Date,วันที่สร้าง
@@ -1510,41 +1507,41 @@
 ,Amount to Deliver,ปริมาณการส่ง
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,สินค้าหรือบริการ
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} สร้าง
 DocType: Delivery Note Item,Against Sales Order,กับ การขายสินค้า
 ,Serial No Status,สถานะหมายเลขเครื่อง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,ตาราง รายการที่ ไม่ สามารถมีช่องว่าง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","แถว {0}: การตั้งค่า {1} ช่วงความแตกต่างระหว่างจากและไปยังวันที่ \
  ต้องมากกว่าหรือเท่ากับ {2}"
 DocType: Pricing Rule,Selling,การขาย
 DocType: Employee,Salary Information,ข้อมูลเงินเดือน
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,หน้าที่ และภาษี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,บัญชี Gateway การชำระเงินไม่ได้กำหนดค่า
 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: Production Order,Material Request Item,รายการวัสดุขอ
+DocType: Request for Quotation Item,Material Request Item,รายการวัสดุขอ
 apps/erpnext/erpnext/config/stock.py +85,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,สีแดง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
 DocType: Sales Invoice,Accounting Details,รายละเอียดบัญชี
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,ลบการทำธุรกรรมทั้งหมดของ บริษัท นี้
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,เงินลงทุน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,การจัดสรร
 DocType: Quality Inspection Reading,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,กรุณากรอกคำขอวัสดุในตารางข้างต้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,กรุณากรอกคำขอวัสดุในตารางข้างต้น
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 DocType: Item Group,Show In Website,แสดงในเว็บไซต์
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,กลุ่ม
@@ -1572,7 +1569,7 @@
 ,Maintenance Schedules,กำหนดการบำรุงรักษา
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
@@ -1586,23 +1583,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,รวมถึง คอมเมนต์ Reconciled
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,หน่วย
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,โปรดระบุ บริษัท
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,ค่าใช้จ่ายในการเรียกร้อง
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
 ,BOM Search,BOM ค้นหา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
@@ -1611,29 +1607,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},วันที่ โปรโมชั่น ไม่สามารถเป็น ก่อนวันที่ เช็คอิน แถว {0}
 DocType: Salary Slip,Deduction,การหัก
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 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,Gross Margin,อัตรากำไรขั้นต้น
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,ธนาคารคำนวณยอดเงินงบ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ผู้พิการ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,ใบเสนอราคา
 DocType: Salary Slip,Total Deduction,หักรวม
 DocType: Quotation,Maintenance User,ผู้บำรุงรักษา
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,หัก
@@ -1645,8 +1641,8 @@
 ,SO Qty,ดังนั้น จำนวน
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
+DocType: Request for Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
 apps/erpnext/erpnext/hooks.py +71,Shipments,การจัดส่ง
 DocType: Purchase Order Item,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
@@ -1654,12 +1650,12 @@
 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/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,แถว #
 DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท)
-DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย
+DocType: Asset,Supplier,ผู้จัดจำหน่าย
 DocType: C-Form,Quarter,ไตรมาส
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
 DocType: Global Defaults,Default Company,บริษัท เริ่มต้น
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,ผู้ใช้ {0} ถูกปิดใช้งาน
@@ -1668,7 +1664,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
@@ -1681,8 +1677,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,เด็กรายการไม่ควรจะเป็น Bundle สินค้า โปรดลบรายการ `{0}` และบันทึก
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,การธนาคาร
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,ศูนย์ต้นทุน ใหม่
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; และกล่าวถึงอัตราภาษี
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,ศูนย์ต้นทุน ใหม่
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
 DocType: Quality Inspection,In Process,ในกระบวนการ
@@ -1698,7 +1693,7 @@
 DocType: Quotation Item,Stock Balance,ยอดคงเหลือสต็อก
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,สร้างบันทึกเวลาเมื่อ:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,สร้างบันทึกเวลาเมื่อ:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Employee,Blood Group,กรุ๊ปเลือด
@@ -1716,13 +1711,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,เดบิตในการที่จะต้อง
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
 DocType: Offer Letter Term,Offer Term,ระยะเวลาเสนอ
 DocType: Quality Inspection,Quality Manager,ผู้จัดการคุณภาพ
 DocType: Job Applicant,Job Opening,เปิดงาน
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,จดหมายเสนอ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,สร้างคำขอวัสดุ (MRP) และคำสั่งการผลิต
@@ -1730,22 +1725,22 @@
 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 +103,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
 DocType: Production Order Operation,Completed Qty,จำนวนเสร็จ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/get_item_details.py +272,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} หมายเลข Serial จำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
 DocType: Stock Reconciliation Item,Current Valuation Rate,อัตราการประเมินมูลค่าปัจจุบัน
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,สร้างรายการการชำระเงินกับคำสั่งซื้อหรือใบแจ้งหนี้
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,สร้างรายการการชำระเงินกับคำสั่งซื้อหรือใบแจ้งหนี้
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,ผู้ใช้และสิทธิ์
@@ -1754,10 +1749,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,ลูกค้าของคุณ
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,ลงทะเบียนเลย
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,ลงทะเบียนเลย
 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.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
@@ -1781,7 +1776,7 @@
 DocType: Employee,Employment Details,รายละเอียดการจ้างงาน
 DocType: Employee,New Workplace,สถานที่ทำงานใหม่
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ตั้งเป็นปิด
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},ไม่มีรายการ ที่มี บาร์โค้ด {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},ไม่มีรายการ ที่มี บาร์โค้ด {0}
 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,สไลด์โชว์ที่ด้านบนของหน้า
@@ -1799,10 +1794,10 @@
 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 +608,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,โอน วัสดุ
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},รายการ {0} จะต้องเป็นรายการที่ยอดขายใน {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -1816,7 +1811,7 @@
 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: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),แหล่งที่มาของ เงินทุน ( หนี้สิน )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,ลูกจ้าง
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,นำเข้าอีเมล์จาก
@@ -1830,9 +1825,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,เภสัชกรรม
@@ -1849,25 +1844,25 @@
 DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Gateway Account,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
@@ -1876,7 +1871,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,จดหมายข่าวรายชื่อผู้รับจดหมาย
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
 DocType: Authorization Rule,Authorized Value,มูลค่าที่ได้รับอนุญาต
@@ -1894,10 +1889,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} คือปิด
 DocType: Email Digest,How frequently?,วิธีบ่อย?
 DocType: Purchase Receipt,Get Current Stock,รับสินค้าปัจจุบัน
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ไปที่กลุ่มที่เหมาะสม (ปกติแอพลิเคชันของกองทุนสำรองเลี้ยง&gt; สินทรัพย์หมุนเวียน&gt; บัญชีธนาคารและสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ธนาคาร&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ต้นไม้แห่ง Bill of Materials
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,ปัจจุบันมาร์ค
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},วันที่เริ่มต้น การบำรุงรักษา ไม่สามารถ ก่อนวัน ส่งสำหรับ อนุกรม ไม่มี {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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),ที่ใช้บังคับกับ (Role)
 DocType: Stock Entry,Purpose,ความมุ่งหมาย
@@ -1959,12 +1953,12 @@
  9 พิจารณาภาษีหรือค่าใช้จ่ายสำหรับ: ในส่วนนี้คุณสามารถระบุหากภาษี / ค่าใช้จ่ายเป็นเพียงสำหรับการประเมินมูลค่า (ไม่ใช่ส่วนหนึ่งของทั้งหมด) หรือเฉพาะรวม (ไม่ได้เพิ่มคุณค่าให้กับรายการ) หรือทั้ง
  10 เพิ่มหรือหัก: ไม่ว่าคุณต้องการที่จะเพิ่มหรือหักภาษี"
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","เช่นธนาคาร, เงินสด, บัตรเครดิต"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","เช่นธนาคาร, เงินสด, บัตรเครดิต"
 DocType: Journal Entry,Credit Note,หมายเหตุเครดิต
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},ที่เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {0} สำหรับการดำเนินงาน {1}
 DocType: Features Setup,Quality,คุณภาพ
@@ -1988,9 +1982,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,ที่อยู่ของฉัน
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,ปริญญาโท สาขา องค์กร
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,รายการราคาซื้อเริ่มต้น
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,ไม่มีพนักงานสำหรับเกณฑ์ที่เลือกข้างต้นหรือสลิปเงินเดือนที่สร้างไว้แล้ว
@@ -2017,7 +2011,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/config/hr.py +93,Payroll,บัญชีเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/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} จะต้องรวม
@@ -2028,7 +2022,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,การปรับรูปแบบ
 DocType: Account,Income Account,บัญชีรายได้
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,พื้นที่ความรับผิดชอบหลัก
@@ -2050,16 +2044,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
 DocType: Purchase Invoice,Taxes and Charges Deducted,ภาษีและค่าบริการหัก
-apps/erpnext/erpnext/config/support.py +7,Issues,ปัญหา
+apps/erpnext/erpnext/hooks.py +90,Issues,ปัญหา
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},สถานะ ต้องเป็นหนึ่งใน {0}
 DocType: Sales Invoice,Debit To,เดบิตเพื่อ
 DocType: Delivery Note,Required only for sample item.,ที่จำเป็นสำหรับรายการตัวอย่าง
@@ -2078,10 +2072,10 @@
 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 +139,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ระบุอัตราแลกเปลี่ยนการแปลงสกุลเงินหนึ่งไปยังอีก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ยอดคงค้างทั้งหมด
@@ -2149,7 +2143,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
 ,Requested,ร้องขอ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,หมายเหตุไม่มี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
@@ -2176,7 +2170,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 DocType: Payment Request,Recipient and Message,และผู้รับข้อความ
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
@@ -2190,7 +2184,7 @@
 DocType: Purchase Invoice,Select Supplier Address,เลือกที่อยู่ผู้ผลิต
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
@@ -2213,10 +2207,10 @@
 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 สินค้าอื่น ๆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,วันที่เริ่มต้นโครงการ
@@ -2225,7 +2219,7 @@
 DocType: Installation Note Item,Against Document No,กับเอกสารเลขที่
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,การจัดการหุ้นส่วนขาย
 DocType: Quality Inspection,Inspection Type,ประเภทการตรวจสอบ
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},กรุณาเลือก {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,เข้าร่วมประชุมที่ไม่มีเครื่องหมาย
@@ -2253,7 +2247,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ได้รับการยืนยัน
 DocType: Payment Gateway,Gateway,เกตเวย์
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
@@ -2267,12 +2261,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,คลังสินค้าได้รับการยอมรับ
 DocType: Bank Reconciliation Detail,Posting Date,โพสต์วันที่
 DocType: Item,Valuation Method,วิธีการประเมิน
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,มาร์คครึ่งวัน
 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 +410,[Error],[ข้อผิดพลาด]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,บริษัท ร่วมทุน
@@ -2304,13 +2298,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,แม่ของข้อตกลงหรือสัญญา
 DocType: Purchase Invoice,Address and Contact,ที่อยู่และการติดต่อ
 DocType: Supplier,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Employee,Feedback,ข้อเสนอแนะ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ออกจากไม่สามารถได้รับการจัดสรรก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
 DocType: Item,Reorder level based on Warehouse,ระดับสั่งซื้อใหม่บนพื้นฐานของคลังสินค้า
 DocType: Activity Cost,Billing Rate,อัตราการเรียกเก็บเงิน
@@ -2324,12 +2318,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} ถูกยกเลิกหรือปิด
 DocType: Delivery Note,Track this Delivery Note against any Project,ติดตามการจัดส่งสินค้าหมายเหตุนี้กับโครงการใด ๆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,เงินสดสุทธิจากการลงทุน
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,การจัดการที่อยู่
-DocType: Pricing Rule,Item Code,รหัสสินค้า
+DocType: Asset,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
@@ -2375,24 +2368,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,ไม่มี Serial และแบทช์
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ค่าหรือ จำนวน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,นาที
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 ,Qty to Receive,จำนวน การรับ
 DocType: Leave Block List,Leave Block List Allowed,ฝากรายการบล็อกอนุญาตให้นำ
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
 DocType: Global Defaults,Disable In Words,ปิดการใช้งานในคำพูด
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,เปิดทุนคงเหลือ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,เปิดทุนคงเหลือ
 DocType: Appraisal,Appraisal,การตีราคา
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ผู้มีอำนาจลงนาม
@@ -2401,7 +2394,7 @@
 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 +199,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,ยกเลิกการรับอีเมล์ Digest นี้
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,ข้อความส่งแล้ว
@@ -2442,7 +2435,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
 DocType: Payment Gateway Account,Default Payment Request Message,เริ่มต้นการชำระเงินรวมเข้าข้อความ
 DocType: Item Group,Check this if you want to show in website,ตรวจสอบนี้ถ้าคุณต้องการที่จะแสดงในเว็บไซต์
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,การธนาคารและการชำระเงิน
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,การธนาคารและการชำระเงิน
 ,Welcome to ERPNext,ขอต้อนรับสู่ ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,จำนวนรายละเอียดบัตรกำนัล
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,นำไปสู่การเสนอราคา
@@ -2450,17 +2443,17 @@
 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 +199,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,ใบและวันหยุด
 DocType: Sales Order,Not Billed,ไม่ได้เรียกเก็บ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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 สำหรับการเรียกเก็บเงิน
@@ -2478,13 +2471,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,คลังสินค้า {0}: บริษัท มีผลบังคับใช้
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Account,Payable,ที่ต้องชำระ
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),ลูกหนี้ ({0})
-DocType: Project,Margin,ขอบ
+DocType: Pricing Rule,Margin,ขอบ
 DocType: Salary Slip,Arrear Amount,จำนวน Arrear
 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 +72,Gross Profit %,% กำไรขั้นต้น
@@ -2505,7 +2498,7 @@
 DocType: Payment Request,Email To,อีเมล์เพื่อ
 DocType: Lead,Lead Owner,เจ้าของช่องทาง
 DocType: Bin,Requested Quantity,จำนวนการขอใช้บริการ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,โกดังสินค้าที่จำเป็น
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,โกดังสินค้าที่จำเป็น
 DocType: Employee,Marital Status,สถานภาพการสมรส
 DocType: Stock Settings,Auto Material Request,ขอวัสดุอัตโนมัติ
 DocType: Time Log,Will be updated when billed.,จะมีการปรับปรุงเมื่อเรียกเก็บเงิน
@@ -2513,7 +2506,7 @@
 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 +115,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 +84,{0}% Delivered,{0}% ส่งแล้ว
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
@@ -2533,7 +2526,7 @@
 DocType: Manufacturer,Manufacturers used in Items,ผู้ผลิตนำมาใช้ในรายการ
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,กรุณาระบุรอบปิดศูนย์ต้นทุนของ บริษัท
 DocType: Purchase Invoice,Terms,ข้อตกลงและเงื่อนไข
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,สร้างใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,สร้างใหม่
 DocType: Buying Settings,Purchase Order Required,ใบสั่งซื้อที่ต้องการ
 ,Item-wise Sales History,รายการที่ชาญฉลาดขายประวัติการ
 DocType: Expense Claim,Total Sanctioned Amount,จำนวนรวมตามทำนองคลองธรรม
@@ -2546,7 +2539,7 @@
 ,Stock Ledger,บัญชีแยกประเภทสินค้า
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},ราคา: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,หักเงินเดือนสลิป
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,เลือกโหนดกลุ่มแรก
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,เลือกโหนดกลุ่มแรก
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,พนักงานและพนักงาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",นำการอ้างอิงของลูกค้าซัพพลายเออร์พันธมิตรการขายและตะกั่วที่มันเป็นอยู่ บริษัท ของคุณ
@@ -2568,13 +2561,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: จาก {1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
 DocType: BOM Replace Tool,BOM Replace Tool,เครื่องมือแทนที่ BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,วันถัดไปจะต้องมากกว่าการโพสต์วันที่
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,แสดงภาษีผิดขึ้น
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,วันถัดไปจะต้องมากกว่าการโพสต์วันที่
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/accounts/party.py +289,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',หากคุณ มีส่วนร่วมใน กิจกรรมการผลิต ให้เปิดใช้ตัวเลือก 'เป็นผลิตภัณฑ์ที่ถูกผลิต '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,ใบแจ้งหนี้วันที่โพสต์
@@ -2589,7 +2582,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",หมายเหตุ: หากการชำระเงินไม่ได้ทำกับการอ้างอิงใด ๆ ให้วารสารเข้าด้วยตนเอง
@@ -2603,7 +2596,7 @@
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2606,7 @@
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
@@ -2624,7 +2617,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
@@ -2637,7 +2630,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,แพทย์ฝึกหัด
@@ -2645,7 +2638,7 @@
 DocType: Stock Entry,From BOM,จาก BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,วันที่ ควรจะเป็น เช่นเดียวกับการ จาก วันที่ ลา ครึ่งวัน
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","กิโลกรัมเช่นหน่วย Nos, ม."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
@@ -2653,14 +2646,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,โครงสร้างเงินเดือน
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ใบเสนอราคา
 DocType: Hub Settings,Access Token,เข้าสู่ Token
 DocType: Sales Invoice Item,Serial No,อนุกรมไม่มี
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
-DocType: Item,Is Fixed Asset Item,เป็น รายการ สินทรัพย์ถาวร
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
 DocType: Purchase Invoice,Print Language,พิมพ์ภาษา
 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",หากคุณมีความยาวพิมพ์รูปแบบคุณลักษณะนี้สามารถใช้ในการแยกหน้าเว็บที่จะพิมพ์บนหน้าเว็บหลายหน้ากับส่วนหัวและท้ายกระดาษทั้งหมดในแต่ละหน้า
@@ -2677,7 +2669,7 @@
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,จากและถึง วันที่คุณต้องการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
@@ -2693,13 +2685,13 @@
 DocType: Quotation,Maintenance Manager,ผู้จัดการซ่อมบำรุง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,รวม ไม่ สามารถเป็นศูนย์
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,' ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด ' ต้องมากกว่า หรือเท่ากับศูนย์
-DocType: C-Form,Amended From,แก้ไขเพิ่มเติมจาก
+DocType: Asset,Amended From,แก้ไขเพิ่มเติมจาก
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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
@@ -2713,20 +2705,20 @@
 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/public/js/setup_wizard.js +191,"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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,การชำระเงินการแข่งขันกับใบแจ้งหนี้
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,การชำระเงินการแข่งขันกับใบแจ้งหนี้
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,ใส่ในรถเข็น
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,กลุ่มตาม
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
 DocType: Production Planning Tool,Get Material Request,ได้รับวัสดุที่ขอ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,ปัจจุบันทั้งหมด
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,งบบัญชี
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,งบบัญชี
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,ชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
@@ -2746,13 +2738,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),จุดเริ่มต้นของการขาย (POS)
 apps/erpnext/erpnext/config/support.py +32,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,กลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: Item,Website Description,คำอธิบายเว็บไซต์
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,เปลี่ยนสุทธิในส่วนของ
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
@@ -2762,12 +2754,12 @@
 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,ชื่อกลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
 DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
 DocType: Item,Attributes,คุณลักษณะ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,รับสินค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,รับสินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: C-Form,C-Form,C-Form
@@ -2779,18 +2771,17 @@
 DocType: Purchase Invoice,Mobile No,เบอร์มือถือ
 DocType: Payment Tool,Make Journal Entry,ทำให้อนุทิน
 DocType: Leave Allocation,New Leaves Allocated,ใหม่ใบจัดสรร
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,เชิงพาณิชย์
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},ข้อผิดพลาด: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 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 +52,All Products or Services.,ผลิตภัณฑ์หรือบริการ  ทั้งหมด
 DocType: Supplier Quotation,Supplier Address,ที่อยู่ผู้ผลิต
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
+apps/erpnext/erpnext/config/accounts.py +259,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,บริการทางการเงิน
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ราคาแอตทริบิวต์ {0} &#39;จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3}
@@ -2801,10 +2792,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,โอน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,โอน
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
@@ -2826,18 +2817,18 @@
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
 DocType: Features Setup,POS View,ดู POS
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,วันวันถัดไปและทำซ้ำในวันเดือนจะต้องเท่ากัน
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,วันวันถัดไปและทำซ้ำในวันเดือนจะต้องเท่ากัน
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,โปรดระบุ
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ดังกล่าวข้างต้น
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,เวลาเข้าสู่ระบบได้รับการเรียกเก็บเงิน
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),กำไรเฉพาะกาล / ขาดทุน (เครดิต)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
@@ -2847,12 +2838,11 @@
 ,Monthly Attendance Sheet,แผ่นผู้เข้าร่วมรายเดือน
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,บันทึกไม่พบ
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ศูนย์ต้นทุนจำเป็นสำหรับรายการ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งค่าหมายเลขชุดสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; เลขซีรีส์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
 DocType: Features Setup,Sales Discounts,ส่วนลดการขาย
@@ -2866,39 +2856,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,จำนวนการสั่งซื้อ
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / แบนเนอร์ที่จะแสดงอยู่ด้านบนของรายการสินค้า
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ระบุเงื่อนไขในการคำนวณปริมาณการจัดส่งสินค้า
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,เพิ่ม เด็ก
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,ราคาเปิด
 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,สำนักงานคณะกรรมการกำกับ การขาย
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,โปรแกรมประยุกต์สำหรับการลา
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,ค่าใช้จ่ายทางกฎหมาย
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,ค่าใช้จ่ายทางกฎหมาย
 DocType: Sales Invoice,Posting Time,โพสต์เวลา
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,ค่าใช้จ่าย โทรศัพท์
 DocType: Sales Partner,Logo,เครื่องหมาย
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ตรวจสอบเรื่องนี้ถ้าคุณต้องการบังคับให้ผู้ใช้เลือกชุดก่อนที่จะบันทึก จะมีค่าเริ่มต้นไม่ถ้าคุณตรวจสอบนี้
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},ไม่มีรายการ ที่มี หมายเลขเครื่อง {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,เปิดการแจ้งเตือน
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ค่าใช้จ่าย โดยตรง
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,ค่าใช้จ่าย โดยตรง
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} เป็นที่อยู่อีเมลที่ไม่ถูกต้องในการแจ้งเตือน \ อีเมล์ที่อยู่ &#39;
 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,ค่าใช้จ่ายใน การเดินทาง
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
@@ -2915,7 +2905,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,เราขาย สินค้า นี้
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id ผู้ผลิต
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
 DocType: Journal Entry,Cash Entry,เงินสดเข้า
 DocType: Sales Partner,Contact Desc,Desc ติดต่อ
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",ประเภทของใบเช่นลำลอง ฯลฯ ป่วย
@@ -2930,7 +2920,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,วัตถุดิบที่ ไม่สามารถเป็น เช่นเดียวกับ รายการ หลัก
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,แม่ เงินเดือน หลัก
@@ -2946,7 +2936,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
@@ -2961,13 +2951,13 @@
 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,เจ้าหนี้
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,เจ้าหนี้
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
@@ -2987,15 +2977,14 @@
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Hub Settings,Name Token,ชื่อ Token
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
-DocType: Project,Project Name,ชื่อโครงการ
+DocType: Request for Quotation 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 Batch รายการ
@@ -3032,7 +3021,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",บริษัท มีผลบังคับใช้ตามที่มันเป็นอยู่ บริษัท ของคุณ
 DocType: Item Attribute,From Range,จากช่วง
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,รายการที่ {0} ไม่สนใจ เพราะมัน ไม่ได้เป็น รายการที่ สต็อก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ส่ง การผลิต การสั่งซื้อ นี้ สำหรับการประมวลผล ต่อไป
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,ส่ง การผลิต การสั่งซื้อ นี้ สำหรับการประมวลผล ต่อไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ที่จะไม่ใช้กฎการกำหนดราคาในการทำธุรกรรมโดยเฉพาะอย่างยิ่งกฎการกำหนดราคาทั้งหมดสามารถใช้งานควรจะปิดการใช้งาน
 DocType: Company,Domain,โดเมน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,งาน
@@ -3044,6 +3033,7 @@
 DocType: Time Log,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ลดรายได้สำหรับการออกโดยไม่จ่าย (LWP)
@@ -3078,7 +3068,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,บัญชีชั่วคราว
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,สีดำ
 DocType: BOM Explosion Item,BOM Explosion Item,รายการระเบิด BOM
 DocType: Account,Auditor,ผู้สอบบัญชี
@@ -3092,16 +3082,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,มาร์คขาด
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,เวลาที่จะต้องมากกว่าจากเวลา
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,เพิ่มรายการจาก
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,เพิ่มรายการจาก
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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,รหัสงาน
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","เช่นผู้ "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,หุ้นไม่สามารถที่มีอยู่สำหรับรายการ {0} ตั้งแต่มีสายพันธุ์
 ,Sales Person-wise Transaction Summary,การขายอย่างย่อรายการคนฉลาด
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,คลังสินค้า {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,รายการที่เลือกไม่สามารถมีแบทช์
@@ -3127,7 +3117,7 @@
 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,ติดต่อถัดไป
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,บัญชีการติดตั้งเกตเวย์
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,บัญชีการติดตั้งเกตเวย์
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,สินทรัพย์ถาวร
 ,Cash Flow,กระแสเงินสด
@@ -3141,7 +3131,7 @@
 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 +132,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,ยอดเงินบัญชีธนาคารตามบัญชีแยกประเภททั่วไป
 DocType: Job Applicant,Applicant Name,ชื่อผู้ยื่นคำขอ
 DocType: Authorization Rule,Customer / Item Name,ชื่อลูกค้า / รายการ
@@ -3157,19 +3147,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; ดินแดน
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,ตั้งค่าเริ่มต้น สำหรับการขาย ในการทำธุรกรรม
 DocType: BOM Replace Tool,Current BOM,BOM ปัจจุบัน
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,เพิ่ม หมายเลขซีเรียล
 apps/erpnext/erpnext/config/support.py +43,Warranty,การประกัน
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,การพิมพ์และ เครื่องเขียน
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,กลุ่มโหนด
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,ปรับปรุง สินค้า สำเร็จรูป
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,ปรับปรุง สินค้า สำเร็จรูป
 DocType: Workstation,per hour,ต่อชั่วโมง
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,การจัดซื้อ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้
-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/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,จำนวนเงินที่ชำระ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
@@ -3199,7 +3188,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
 DocType: Leave Block List,Applies to Company,นำไปใช้กับ บริษัท
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
 DocType: Purchase Invoice,In Words,จำนวนเงิน (ตัวอักษร)
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
 DocType: Production Planning Tool,Material Request For Warehouse,ขอวัสดุสำหรับคลังสินค้า
@@ -3213,7 +3202,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
@@ -3224,7 +3213,7 @@
 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 +782,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} ได้รับ อยู่แล้ว
@@ -3232,14 +3221,13 @@
 DocType: Customer,Sales Team Details,ขายรายละเอียดทีม
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},ไม่ถูกต้อง {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อชุด
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,บันทึกเอกสารครั้งแรก
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,บันทึกเอกสารครั้งแรก
 DocType: Account,Chargeable,รับผิดชอบ
 DocType: Company,Change Abbreviation,เปลี่ยนชื่อย่อ
 DocType: Expense Claim Detail,Expense Date,วันที่ค่าใช้จ่าย
@@ -3257,10 +3245,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,บัญชีแยกประเภททั่วไป
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ดูนำ
 DocType: Item Attribute Value,Attribute Value,ค่าแอตทริบิวต์
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",id อีเมล ต้องไม่ซ้ำกัน อยู่ แล้วสำหรับ {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",id อีเมล ต้องไม่ซ้ำกัน อยู่ แล้วสำหรับ {0}
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 DocType: Features Setup,To get Item Group in details table,ที่จะได้รับกลุ่มสินค้าในตารางรายละเอียด
@@ -3296,23 +3284,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},ตาราง การบำรุงรักษา {0} อยู่ กับ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},ตาราง การบำรุงรักษา {0} อยู่ กับ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),จำนวนที่เกิดขึ้นจริง (ที่มา / เป้าหมาย)
 DocType: Item Customer Detail,Ref Code,รหัส Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ระเบียนพนักงาน
 DocType: Payment Gateway,Payment Gateway,ช่องทางการชำระเงิน
 DocType: HR Settings,Payroll Settings,การตั้งค่า บัญชีเงินเดือน
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,สถานที่การสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,รากไม่สามารถมีศูนย์ต้นทุนผู้ปกครอง
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,เลือกยี่ห้อ ...
 DocType: Sales Invoice,C-Form Applicable,C-Form สามารถนำไปใช้ได้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,คลังสินค้ามีผลบังคับใช้
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,แก้ไขได้โดยการ
@@ -3330,7 +3318,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,สกุลเงินการทำธุรกรรมจะต้องเป็นเช่นเดียวกับการชำระเงินสกุลเงินเกตเวย์
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,รับ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,รับ
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% เสร็จแล้ว
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
@@ -3338,14 +3326,14 @@
 DocType: Purchase Invoice,Submit on creation,ส่งในการสร้าง
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,คำสั่งซื้อของฉัน
@@ -3366,10 +3354,10 @@
 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,กรุณาใส่ข้อความ ก่อนที่จะส่ง
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
+apps/erpnext/erpnext/config/accounts.py +258,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} เรียกเก็บเงินแล้ว
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
 DocType: Cost Center,Cost Center Name,ค่าใช้จ่ายชื่อศูนย์
 DocType: Maintenance Schedule Detail,Scheduled Date,วันที่กำหนด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,ทั้งหมดที่จ่าย Amt
@@ -3381,7 +3369,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
@@ -3394,12 +3382,12 @@
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
@@ -3408,7 +3396,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,หัวบัญชี
@@ -3421,7 +3409,7 @@
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,สินทรัพย์ หุ้น
@@ -3435,15 +3423,15 @@
 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 +576,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,กิจกรรมของโครงการ / งาน
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,สร้าง Slips เงินเดือน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",ต้องเลือก การซื้อ ถ้าเลือก ใช้ได้กับ เป็น {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,ทำซ้ำในวันเดือน
@@ -3464,7 +3452,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ตัวอย่าง:. ABCD ##### 
  ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
@@ -3476,11 +3464,11 @@
 ,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 +91,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,ชื่อ บัญชีผู้ใช้ใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,บริการลูกค้า
@@ -3492,9 +3480,9 @@
 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 +72,Item {0} must be a stock Item,รายการ {0} จะต้องมี รายการ หุ้น
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,เริ่มต้นการทำงานในความคืบหน้าโกดัง
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,รายการ {0} จะต้องเป็น รายการ ขาย
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,รายการ {0} จะต้องเป็น รายการ ขาย
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
 DocType: Account,Equity,ความเสมอภาค
 DocType: Sales Order,Printing Details,รายละเอียดการพิมพ์
@@ -3502,7 +3490,7 @@
 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,ค้นหาประกอบย่อย
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
@@ -3525,7 +3513,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Reconciled ประสบความสำเร็จ
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,ที่รายการจะถูกเก็บไว้
@@ -3536,7 +3524,7 @@
 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 +508,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,แม่แบบภาษี สำหรับการทำธุรกรรมการซื้อ
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,แม่แบบภาษี สำหรับการทำธุรกรรมการซื้อ
 ,Item Prices,รายการราคาสินค้า
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
 DocType: Period Closing Voucher,Period Closing Voucher,บัตรกำนัลปิดงวด
@@ -3546,10 +3534,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,เปลี่ยนแปลง
@@ -3568,13 +3556,13 @@
 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 +559,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,หมวดหมู่ ภาษี ไม่สามารถ ' ประเมิน ' หรือ ' การประเมิน และ รวม เป็นรายการ ทุก รายการที่ไม่ สต็อก
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,ชุด
@@ -3588,7 +3576,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,พนักงานขาย
 DocType: Sales Invoice,Cold Calling,โทรเย็น
 DocType: SMS Parameter,SMS Parameter,พารามิเตอร์ SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
 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.,สร้างกฎ เพื่อ จำกัด การ ทำธุรกรรม ตามค่า
@@ -3621,7 +3609,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
 DocType: Sales Invoice,Is POS,POS เป็น
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสสินค้า&gt; กลุ่มสินค้า&gt; ยี่ห้อ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
@@ -3629,7 +3616,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,บัญชีผู้ปกครอง
@@ -3645,7 +3632,7 @@
 DocType: Employee,Education,การศึกษา
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
 DocType: Address,Office,สำนักงาน
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,รายการบัญชีวารสาร
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
@@ -3680,7 +3667,7 @@
 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}
+apps/erpnext/erpnext/accounts/party.py +234,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,สมัครสมาชิกเงินเดือน
 DocType: Warranty Claim,If different than customer address,หาก แตกต่างจาก ที่อยู่ของลูกค้า
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
@@ -3688,22 +3675,22 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,URL ข้อความการชำระเงิน
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,แถว {0}: จำนวนเงินที่ชำระไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,รวมค้างชำระ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,บันทึกเวลาออกใบเสร็จไม่ได้
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,กรุณากรอกตัวกับบัตรกำนัลด้วยตนเอง
 DocType: SMS Settings,Static Parameters,พารามิเตอร์คง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,วัสดุในการจัดจำหน่าย
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,สรรพสามิตใบแจ้งหนี้
 DocType: Expense Claim,Employees Email Id,Email รหัสพนักงาน
 DocType: Employee Attendance Tool,Marked Attendance,ผู้เข้าร่วมการทำเครื่องหมาย
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,หนี้สินหมุนเวียน
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,หนี้สินหมุนเวียน
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
@@ -3724,17 +3711,16 @@
 DocType: Item Attribute,Numeric Values,ค่าที่เป็นตัวเลข
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบว่า กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า&gt; การพิมพ์และการสร้างแบรนด์&gt; แม่แบบที่อยู่
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,ทุนหลักทรัพย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,ทุนหลักทรัพย์
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
 DocType: Payment Gateway Account,Payment Gateway Account,บัญชี Gateway การชำระเงิน
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,หลังจากเสร็จสิ้นการชำระเงินเปลี่ยนเส้นทางผู้ใช้ไปยังหน้าเลือก
@@ -3746,17 +3732,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref วันที่สมัคร
@@ -3764,6 +3750,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,บัญชี {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,บัญชี {0} ไม่อยู่
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 51f2d10..84e6d66 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -23,10 +23,9 @@
 DocType: Employee,Rented,Kiralanmış
 DocType: Employee,Rented,Kiralanmış
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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/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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen&gt; İnsan Kaynakları İK Ayarları adlandırma sistemi kurulum Çalışan
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Ağaç
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
@@ -58,17 +57,17 @@
 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/projects/doctype/project/project.py +44,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 +229,New Leave Application,Yeni İzin Uygulaması
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka Havalesi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Şekli Hesabı
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Göster Varyantlar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Krediler (Yükümlülükler)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Stokta Var
 DocType: Designation,Designation,Atama
@@ -81,7 +80,7 @@
 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 +642,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Mali yıl {0} gereklidir
@@ -104,7 +103,7 @@
 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 +131,New {0}: #{1},Yeni {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,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 +38,Abbreviation cannot have more than 5 characters,Kısaltma 5 karakterden fazla olamaz.
@@ -130,7 +129,7 @@
 DocType: Employee,Married,Evli
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Izin verilmez {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Öğeleri alın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Bakkal
@@ -174,7 +173,7 @@
 DocType: BOM,Total Cost,Toplam Maliyet
 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 +197,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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ı
@@ -196,8 +195,8 @@
 DocType: SMS Center,All Contact,Tüm İrtibatlar
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stok Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Stok Giderleri
 DocType: Newsletter,Email Sent?,Email Gönderildi mi?
 DocType: Journal Entry,Contra Entry,Hesaba Alacak Girişi
 DocType: Production Order Operation,Show Time Logs,Show Time Kayıtlar
@@ -205,13 +204,13 @@
 DocType: Delivery Note,Installation Status,Kurulum Durumu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Ürün {0} Satın alma ürünü olmalıdır
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
  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 +507,"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 +533,"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 +170,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +170,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
@@ -261,12 +260,12 @@
 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 +79,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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
@@ -276,7 +275,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Finansman Sağlanan Net Nakit
 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 +217,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
 DocType: Newsletter List,Total Subscribers,Toplam Aboneler
 ,Contact Name,İletişim İsmi
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Yukarıda belirtilen kriterler için maaş makbuzu oluştur.
@@ -291,8 +290,8 @@
 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: Payment Tool,Reference No,Referans No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Banka Girişler
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
@@ -307,9 +306,9 @@
 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 +592,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -327,7 +326,7 @@
 DocType: Lead,Suggestions,Öneriler
 DocType: Lead,Suggestions,Öneriler
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Bu bölgede Ürün grubu bütçeleri ayarlayın. Dağıtımı ayarlayarak dönemsellik de ekleyebilirsiniz.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Depo ana hesap grubu giriniz {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Depo ana hesap grubu giriniz {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Cep No
@@ -348,7 +347,7 @@
 DocType: Item,Synced With Hub,Hub ile Senkronize
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Yanlış Şifre
 DocType: Item,Variant Of,Of Varyant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
 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ı
@@ -362,10 +361,10 @@
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,İrsaliye
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Vergiler kurma
 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 +381,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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
@@ -377,12 +376,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Dikkat Toplam Sipariş
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Öğe Seç
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -411,10 +410,10 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Ürün Kalite Kontrol Parametreleri
 DocType: Leave Application,Leave Approver Name,Onaylayan Adı bırakın
-,Schedule Date,Program Tarihi
+DocType: Depreciation Schedule,Schedule Date,Program Tarihi
 DocType: Packed Item,Packed Item,Paketli Ürün
 DocType: Packed Item,Packed Item,Paketli Ürün
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Alış İşlemleri için Varsayılan ayarlar.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Alış İşlemleri için Varsayılan ayarlar.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Etkinlik Maliyet Etkinlik Türü karşı Çalışan {0} için var - {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.,Müşteriler ve Tedarikçiler için Hesapları oluşturmak etmeyin lütfen. Onlar Müşteri / Tedarikçi ustaları doğrudan oluşturulur.
 DocType: Currency Exchange,Currency Exchange,Döviz
@@ -474,16 +473,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 +555,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 +70,Holiday master.,Ana tatil.
-DocType: Material Request Item,Required Date,Gerekli Tarih
-DocType: Material Request Item,Required Date,Gerekli Tarih
+DocType: Request for Quotation Item,Required Date,Gerekli Tarih
+DocType: Request for Quotation Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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"
@@ -510,8 +509,8 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,Doğrudan Gelir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
@@ -520,10 +519,10 @@
 DocType: Stock Entry,Difference Account,Fark Hesabı
 DocType: Stock Entry,Difference Account,Fark Hesabı
 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 +378,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -540,7 +539,7 @@
 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ı
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Hesap {0} Şirkete ait değil: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Kısaltma zaten başka bir şirket için kullanılan
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Kısaltma zaten başka bir şirket için kullanılıyor
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Devre dışıysa, 'Yuvarlanmış Toplam' alanı hiçbir işlemde görünmeyecektir."
@@ -549,7 +548,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Artım 0 olamaz
 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 +86,Item {0} is not Purchase Item,Ürün {0} Satın alma ürünü değildir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Ürün {0} Satın alma ürünü değildir
 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
@@ -564,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 +126,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 +127,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
@@ -580,14 +579,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,Mali / Muhasebe yılı.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Birikmiş Değerler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
 DocType: Project Task,Project Task,Proje Görevi
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Teslim: {0}
@@ -596,7 +595,7 @@
 DocType: Job Applicant,Resume Attachment,Devam Eklenti
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
 DocType: Leave Control Panel,Allocate,Tahsis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Satış İade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Satış İade
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Maaş bileşenleri.
@@ -609,7 +608,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
 apps/erpnext/erpnext/accounts/utils.py +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ı
@@ -620,7 +619,7 @@
 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/config/accounts.py +70,Masters,Alanlar
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Güncelleme Banka İşlem Tarihleri
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Güncelleme Banka İşlem Tarihleri
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Zaman Takip
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
@@ -641,8 +640,8 @@
 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: Activity Type,Default Costing Rate,Standart Maliyetlendirme Oranı
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Bakım Programı
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Bakım Programı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,Bakım Programı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Envanter Net Değişim
@@ -650,7 +649,7 @@
 DocType: Employee,Passport Number,Pasaport Numarası
 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/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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
@@ -658,8 +657,7 @@
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Çalışan veya Şirket biri için bir tatil listesi ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,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,Müşterinin Bilinen Adı
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,Gruba Dönüştürmek
 DocType: Activity Cost,Activity Type,Faaliyet Türü
@@ -668,7 +666,7 @@
 DocType: Supplier,Fixed Days,Sabit Günleri
 DocType: Quotation Item,Item Balance,Ürün Denge
 DocType: Sales Invoice,Packing List,Paket listesi
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Tedarikçilere verilen Satın alma Siparişleri.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Tedarikçilere verilen Satın alma Siparişleri.
 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ı
@@ -712,7 +710,7 @@
 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 +529,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -759,16 +757,16 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
 DocType: Item Group,Website Specifications,Web Sitesi Özellikleri
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Adres Şablon bir hata var {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Yeni Hesap
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Yeni Hesap
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Yeni Hesap
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Yeni Hesap
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {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.,Muhasebe Girişler yaprak düğümleri karşı yapılabilir. Gruplar karşı Girişler izin verilmez.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -818,20 +816,20 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Ofis Bakım Giderleri
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,Ürün Kodu girin
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Fiyat Listesi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Fiyat Listesi seçilmemiş
 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 +147,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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ı
@@ -841,7 +839,7 @@
 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 +666,My Invoices,Benim Faturalar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Benim Faturalar
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Çalışan bulunmadı
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Supplier Quotation,Stopped,Durduruldu
@@ -855,8 +853,8 @@
 DocType: Item,Website Warehouse,Web Sitesi Depo
 DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor 5'ten az veya eşit olmalıdır
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form kayıtları
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-Form kayıtları
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form kayıtları
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-Form kayıtları
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Müşteri ve Tedarikçi
 DocType: Email Digest,Email Digest Settings,E-Mail Bülteni ayarları
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Müşterilerden gelen destek sorguları.
@@ -883,7 +881,7 @@
 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 +240,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 +227,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
@@ -929,15 +927,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Taşerona verilmiş
 DocType: Item Attribute,Item Attribute Values,Ürün Özellik Değerler
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Aboneleri Göster
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Satın Alma makbuzu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Satın Alma makbuzu
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
 DocType: Employee,Ms,Bayan
 DocType: Employee,Ms,Bayan
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Ana Döviz Kuru.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Ana Döviz Kuru.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Satış Ortakları ve Bölge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} aktif olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,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 +36,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Sepeti
 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
@@ -960,7 +958,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 +524,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -971,11 +969,11 @@
 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/public/js/setup_wizard.js +139,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
+apps/erpnext/erpnext/controllers/status_updater.py +165,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: Journal Entry Account,Purchase Invoice,Satınalma Faturası
-DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
+DocType: Asset,Purchase Invoice,Satınalma Faturası
+DocType: Asset,Purchase Invoice,Satınalma Faturası
 DocType: Stock Ledger Entry,Voucher Detail No,Föy Detay no
 DocType: Stock Entry,Total Outgoing Value,Toplam Giden Değeri
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarih ve Kapanış Tarihi Açılış aynı Mali Yılı içinde olmalıdır
@@ -986,20 +984,20 @@
 DocType: Material Request Item,Lead Time Date,Teslim Zamanı Tarihi
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Döviz kur kayıdının yaratılamadığı hesap
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,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 +539,"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/accounts/doctype/sales_invoice/sales_invoice.js +542,"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."
 DocType: Job Opening,Publish on website,Web sitesinde yayımlamak
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 DocType: Purchase Invoice Item,Purchase Order Item,Satınalma Siparişi Ürünleri
-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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Dolaylı Gelir
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Indirect Income,Dolaylı Gelir
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ayarla Ödeme Tutarı = Toplam Alacak Tutarı
 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 +672,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Transferi için seçin Öğe
 DocType: Purchase Invoice,Additional Discount Percentage,Ek iskonto yüzdesi
 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
@@ -1015,14 +1013,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Doğumgünü Hatırlatmalarını gönderme
 ,Employee Holiday Attendance,Çalışan Tatil Seyirci
 DocType: Opportunity,Walk In,Rezervasyonsuz Müşteri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stok Girişler
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stok Girişler
 DocType: Item,Inspection Criteria,Muayene Kriterleri
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Aktarılan
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Oluştur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Oluştur
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 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 +5,My Cart,Benim Sepeti
@@ -1034,7 +1032,7 @@
 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 +180,Qty for {0},Için Adet {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Için Adet {0}
 DocType: Leave Application,Leave Application,İzin uygulaması
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,İzin Tahsis Aracı
 DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
@@ -1048,7 +1046,7 @@
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 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 +547,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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
@@ -1065,22 +1063,22 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Satın Alma makbuzu Ürünleri
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Satış Tutarı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Zaman Günlükleri
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Zaman Günlükleri
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/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 +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,İşe Alım
 DocType: BOM Operation,Operation,Operasyon
 DocType: Lead,Organization Name,Kuruluş Adı
 DocType: Lead,Organization Name,Kuruluş Adı
 DocType: Tax Rule,Shipping State,Nakliye Devlet
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Satış Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standart Satın Alma
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Standart Satın Alma
 DocType: GL Entry,Against,Karşı
@@ -1101,7 +1099,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,Zaman Kayıtlar üzerinden güncellenir
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
@@ -1111,7 +1109,7 @@
 DocType: Company,Default Currency,Varsayılan Para Birimi
 DocType: Contact,Enter designation of this Contact,Bu irtibatın görevini girin
 DocType: Expense Claim,From Employee,Çalışanlardan
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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ı
@@ -1121,7 +1119,7 @@
 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 +130,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 +131,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 +42,Contribution %,Katkı%
@@ -1130,7 +1128,7 @@
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
@@ -1139,7 +1137,7 @@
 DocType: Salary Slip,Deductions,Kesintiler
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Bu Günlük Partisi faturalandı.
 DocType: Salary Slip,Leave Without Pay,Ücretsiz İzin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Kapasite Planlama Hatası
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Kapasite Planlama Hatası
 ,Trial Balance for Party,Parti için Deneme Dengesi
 DocType: Lead,Consultant,Danışman
 DocType: Lead,Consultant,Danışman
@@ -1147,7 +1145,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
 apps/erpnext/erpnext/config/learn.py +92,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 +473,Nothing to request,Talep edecek bir şey yok
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,Yönetim
@@ -1160,7 +1158,7 @@
 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
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,E-posta kimliğini ayarlamak Lütfen
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,E-posta kimliğini ayarlamak Lütfen
 DocType: Item,UOMs,Ölçü Birimleri
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
@@ -1168,12 +1166,12 @@
 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,Ölçü Birimi Dönüşüm Katsayısı
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Tedarikçi Veritabanı.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tedarikçi Veritabanı.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,Tax and other salary deductions.,Vergi ve diğer Maaş kesintileri.
 DocType: Lead,Lead,Talep Yaratma
 DocType: Email Digest,Payables,Borçlar
@@ -1209,19 +1207,19 @@
 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
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Değerlendirme Defteri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Değerlendirme Defteri
 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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Temettü Ücretli
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Temettü Ücretli
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Muhasebe Defteri
 DocType: Stock Reconciliation,Difference Amount,Fark Tutarı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Dağıtılmamış Karlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Dağıtılmamış Karlar
 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ı
@@ -1229,7 +1227,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Geçici Açma
 ,Employee Leave Balance,Çalışanın Kalan İzni
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
@@ -1246,8 +1244,8 @@
 ,Accounts Payable Summary,Ödeme Hesabı Özeti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Küçük
@@ -1255,7 +1253,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Hesap başlığı {0} oluşturuldu
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Toplam Elde
@@ -1264,8 +1262,8 @@
 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 +493,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Dolaylı Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Tarım
@@ -1273,7 +1271,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 apps/erpnext/erpnext/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
@@ -1286,21 +1284,21 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/stock/get_item_details.py +142,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ı
 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.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
 DocType: Hub Settings,Seller Website,Satıcı Sitesi
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Üretim Sipariş durumu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Üretim Sipariş durumu {0}
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,Beklenen Teslim Tarihi Planlanan Başlama Tarihi daha az olduğunu.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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
@@ -1312,11 +1310,11 @@
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 DocType: Purchase Invoice,Total (Company Currency),Toplam (Şirket Para)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
-DocType: Journal Entry,Journal Entry,Kayıt Girdisi
+DocType: Depreciation Schedule,Journal Entry,Kayıt Girdisi
 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 +433,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
 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
@@ -1355,7 +1353,7 @@
 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}
 DocType: Project,Start and End Dates,Başlangıç ve Tarihler End
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Operasyon boş bırakılamaz.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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
@@ -1370,10 +1368,10 @@
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
 DocType: Payment Request,Transaction Currency,İşlem Döviz
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Gönderen {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,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 +31,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 +32,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
@@ -1393,8 +1391,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Sabit Varlık Net Değişim
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 DocType: Email Digest,For Company,Şirket için
@@ -1404,8 +1402,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Hesap Tablosu
 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 +472,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,100 'den daha büyük olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1432,12 +1430,12 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Işlemler için vergi Kural.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Bu ürünü alıyoruz
 DocType: Address,Billing,Faturalama
@@ -1454,9 +1452,9 @@
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Supplier,Stock Manager,Stok Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Ambalaj Makbuzu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Ofis Kiraları
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Ambalaj Makbuzu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Ofis Kiraları
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İthalat Başarısız oldu
@@ -1478,8 +1476,8 @@
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 DocType: Company,Services,Servisler
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Toplam ({0})
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Toplam ({0})
 DocType: Cost Center,Parent Cost Center,Ana Maliyet Merkezi
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
@@ -1491,21 +1489,21 @@
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Yatırım Nakit Akışı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 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 +27,Taken,Alınmış
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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)
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para Birimi)
 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
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Bakım Ziyareti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Bakım Ziyareti
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Bakım Ziyareti
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Bakım Ziyareti
 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: Landed Cost Voucher,Landed Cost Help,Indi Maliyet Yardım
@@ -1519,7 +1517,6 @@
 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.,Tutarın Yazılı Hali İrsaliyeyi kaydettiğinizde görünür olacaktır
 apps/erpnext/erpnext/config/stock.py +196,Brand master.,Esas marka.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 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ı
@@ -1554,7 +1551,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Şirket Gideri Talepleri.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Stok Yükümlülükleri
 DocType: Purchase Receipt,Supplier Warehouse,Tedarikçi Deposu
 DocType: Purchase Receipt,Supplier Warehouse,Tedarikçi Deposu
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
@@ -1564,7 +1561,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ödeme E-posta tekrar gönder
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,diğer Raporlar
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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
@@ -1576,28 +1573,28 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nakit Net Değişim
 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/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Ödeme Talebi zaten var {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Tedarikçi Türü Alanı.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Tedarikçi Türü Alanı.
 DocType: Purchase Order Item,Supplier Part Number,Tedarikçi Parti Numarası
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
 DocType: Purchase Invoice,Reference Document,referans Belgesi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Faturalandırıldı
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
@@ -1624,7 +1621,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Borç Hesapları Net Değişim
 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/config/accounts.py +129,Update bank payment dates with journals.,Günlüklerle ödeme tarihlerini güncelle.
+apps/erpnext/erpnext/config/accounts.py +137,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
@@ -1645,8 +1642,8 @@
 DocType: Employee,Permanent Address,Daimi Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Genel Toplam den \ {0} {1} büyük olamaz karşı ödenen Peşin {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Ürün kodu seçiniz
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Ürün kodu seçiniz
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Ürün kodu seçiniz
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Ürün kodu seçiniz
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kesintiyi azalt
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Territory,Territory Manager,Bölge Müdürü
@@ -1658,17 +1655,17 @@
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Pazarlama Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,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 +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
 apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,Bir Ürünün tek birimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Satır No gerekli Depo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Satır No gerekli Depo {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,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
@@ -1688,8 +1685,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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ü
 DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
@@ -1702,7 +1699,7 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Alışveriş Sepeti etkindir
 DocType: Job Applicant,Applicant for a Job,İş için aday
 DocType: Production Plan Material Request,Production Plan Material Request,Üretim Planı Malzeme Talebi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Üretim Emri Oluşturulmadı
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Üretim Emri Oluşturulmadı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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
@@ -1710,16 +1707,16 @@
 DocType: Sales Invoice Item,Batch No,Parti No
 DocType: Sales Invoice Item,Batch No,Parti No
 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 +145,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Ana
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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ı
@@ -1729,29 +1726,29 @@
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Territory,Territory Name,Bölge Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,İş için aday
 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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Adresleri
+apps/erpnext/erpnext/hooks.py +91,Addresses,Adresleri
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,Appraisals
 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 +337,Item is not allowed to have Production Order.,Ürün Üretim Siparişi için izin verilmez.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Ürün Üretim Siparişi için izin verilmez.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
 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: Sales Order,To Deliver and Bill,Teslim edildi ve Faturalandı
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Üretim için Time Kayıtlar.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} teslim edilmelidir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Görevler için günlük.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Tahsilat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Payment,Tahsilat
 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
@@ -1789,7 +1786,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Teslim Depo
 DocType: Stock Settings,Allowance Percent,Ödenek Yüzdesi
 DocType: SMS Settings,Message Parameter,Mesaj Parametresi
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı.
 DocType: Serial No,Delivery Document No,Teslim Belge No
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Satınalma Makbuzlar Gönderen Ürünleri alın
 DocType: Serial No,Creation Date,Oluşturulma Tarihi
@@ -1827,34 +1824,34 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} oluşturuldu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oluşturuldu
 DocType: Delivery Note Item,Against Sales Order,Satış Emri Karşılığı
 ,Serial No Status,Seri No Durumu
 ,Serial No Status,Seri No Durumu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Ürün tablosu boş olamaz
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Satır {0}: ayarlamak için {1} dönemsellik, gelen ve tarih \
  arasındaki fark daha büyük ya da eşit olmalıdır {2}"
 DocType: Pricing Rule,Selling,Satış
 DocType: Pricing Rule,Selling,Satış
 DocType: Employee,Salary Information,Maaş Bilgisi
 DocType: Sales Person,Name and Employee ID,İsim ve Çalışan Kimliği
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Harç ve Vergiler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Harç ve Vergiler
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Referrans tarihi girin
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Ödeme Gateway Hesap yapılandırılmamış
 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: Production Order,Material Request Item,Malzeme Talebi Kalemi
+DocType: Request for Quotation Item,Material Request Item,Malzeme Talebi Kalemi
 apps/erpnext/erpnext/config/stock.py +85,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/setup_wizard/install_fixtures.py +152,Red,Kırmızı
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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ç
 DocType: Installation Note,Installation Time,Kurulum Zaman
@@ -1862,13 +1859,13 @@
 DocType: Sales Invoice,Accounting Details,Muhasebe Detayları
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Bu şirket için bütün İşlemleri sil
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Satır # {0}: {1} Çalışma Üretimde mamul mal {2} qty tamamlanmış değil Sipariş # {3}. Zaman Kayıtlar üzerinden çalışma durumunu güncelleyin Lütfen
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Yatırımlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
 DocType: Issue,Resolution Details,Karar Detayları
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tahsisler
 DocType: Quality Inspection Reading,Acceptance Criteria,Onaylanma Kriterleri
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 DocType: Item Group,Show In Website,Web sitesinde Göster
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Grup
@@ -1903,7 +1900,7 @@
 ,Maintenance Schedules,Bakım Programları
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 ,Pending Amount,Bekleyen Tutar
@@ -1920,21 +1917,20 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Mutabık girdileri dahil edin
 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
 DocType: Landed Cost Voucher,Distribute Charges Based On,Dağıt Masraflar Dayalı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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ı
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gerçek Toplam
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Birim
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Birim
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Şirket belirtiniz
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Şirket belirtiniz
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Şirket belirtiniz
+apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Şirket belirtiniz
 ,Customer Acquisition and Loyalty,Müşteri Kazanma ve Bağlılık
 ,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
@@ -1942,7 +1938,7 @@
 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ı
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Gider İddiaları
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
 ,BOM Search,BOM Arama
@@ -1952,32 +1948,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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},Ölçü Birimi Dönüşüm katsayısı satır {0} da gereklidir
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
 DocType: Address Template,Address Template,Adres Şablonu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Bu satış kişinin Çalışan Kimliği giriniz
 DocType: Territory,Classification of Customers by region,Bölgelere göre Müşteriler sınıflandırılması
 DocType: Project,% Tasks Completed,% Görev Tamamlandı
 DocType: Project,Gross Margin,Brüt Marj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Önce Üretim Ürününü giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Önce Üretim Ürününü giriniz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Hesaplanan Banka Hesap bakiyesi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Engelli kullanıcı
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Fiyat Teklifi
 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 +142,Cost Updated,Maliyet Güncelleme
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,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 +85,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri Adresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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
@@ -1992,8 +1988,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
+DocType: Request for Quotation,Manufacturing Manager,Üretim Müdürü
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Gönderiler
 DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
@@ -2001,15 +1997,15 @@
 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/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
+DocType: Asset,Supplier,Tedarikçi
+DocType: Asset,Supplier,Tedarikçi
 DocType: C-Form,Quarter,Çeyrek
 DocType: C-Form,Quarter,Çeyrek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Çeşitli Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Çeşitli Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Çeşitli Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Çeşitli Giderler
 DocType: Global Defaults,Default Company,Standart Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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
@@ -2020,7 +2016,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Currency Exchange,From Currency,Para biriminden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli
@@ -2036,9 +2032,8 @@
 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 +39,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 +296,New Cost Center,Yeni Maliyet Merkezi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Yeni Maliyet Merkezi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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 grupta (Fonlar&gt; Güncel Yükümlülüklerin&gt; Vergi ve Görevleri genellikle Kaynak git ve türü &quot;Vergi&quot; nin) Çocuk ekle tıklayarak (yeni Hesabı oluşturun ve bunu.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Yeni Maliyet Merkezi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Yeni Maliyet Merkezi
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
 DocType: Quality Inspection,In Process,Süreci
@@ -2055,7 +2050,7 @@
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Zaman Günlükleri oluşturuldu:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Zaman Günlükleri oluşturuldu:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,Doğru hesabı seçin
 DocType: Item,Weight UOM,Ağırlık Ölçü Birimi
 DocType: Employee,Blood Group,Kan grubu
@@ -2076,13 +2071,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Bu Nakliye Kural için bir ülke belirtin ya da Dünya Denizcilik&#39;in kontrol edin
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Bankamatik To gereklidir
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
 DocType: Offer Letter Term,Offer Term,Teklif Dönem
 DocType: Quality Inspection,Quality Manager,Kalite Müdürü
 DocType: Job Applicant,Job Opening,İş Açılışı
 DocType: Payment Reconciliation,Payment Reconciliation,Ödeme Mutabakat
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Mektubu Teklif
@@ -2092,25 +2087,25 @@
 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 +103,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 +234,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
 DocType: Manufacturing Settings,Allow Overtime,Mesai izin ver
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Güncel Değerleme Oranı
 DocType: Item,Customer Item Codes,Müşteri Ürün Kodları
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Siparişler veya Faturalar karşı Ödeme Girişleri oluşturun.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Siparişler veya Faturalar karşı Ödeme Girişleri oluşturun.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Boyu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -2120,11 +2115,11 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ay bulunamadı maaş kayma:
 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 +175,Serial No {0} not found,Bulunamadı Seri No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Bulunamadı Seri No {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Müşterileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Müşterileriniz
 DocType: Leave Block List Date,Block Date,Blok Tarih
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Şimdi Başvur
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Şimdi Başvur
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 ,Bank Clearance Summary,Banka Gümrükleme Özet
@@ -2154,7 +2149,7 @@
 DocType: Employee,Employment Details,İstihdam Detayları
 DocType: Employee,New Workplace,Yeni İş Yeri
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Kapalı olarak ayarla
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Barkodlu Ürün Yok {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Barkodlu Ürün Yok {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Durum No 0 olamaz
 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,Satış Takımınız ve Satış Ortaklarınız (Kanal Ortakları) varsa işaretlenebilirler ve satış faaliyetine katkılarını sürdürebilirler
 DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster
@@ -2176,10 +2171,10 @@
 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 +608,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Transfer Malzemesi
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Öğe {0} bir satış Öğe olmalıdır {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -2198,7 +2193,7 @@
 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: Process Payroll,Create Salary Slip,Maaş Makbuzu Oluştur
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 DocType: Appraisal,Employee,Çalışan
@@ -2214,9 +2209,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Sales Invoice,Mass Mailing,Toplu Posta
 DocType: Rename Tool,File to Rename,Rename Dosya
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
@@ -2235,28 +2230,28 @@
 DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 DocType: Warranty Claim,Raised By,Talep eden
 DocType: Payment Gateway Account,Payment Account,Ödeme Hesabı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,Accepted,Onaylanmış
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Bu şirkete ait bütün işlemleri silmek istediğinizden emin olun. Ana veriler olduğu gibi kalacaktır. Bu işlem geri alınamaz.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} teslim edilmedi
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -2265,7 +2260,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Bülten Posta Listesi
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
 DocType: Authorization Rule,Authorized Value,Yetkili Değer
@@ -2287,10 +2282,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} kapatıldı
 DocType: Email Digest,How frequently?,Ne sıklıkla?
 DocType: Purchase Receipt,Get Current Stock,Cari Stok alın
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; 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 tipi) Çocuk ekle tıklayarak (yeni Hesabı oluşturmak &quot;Banka&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Malzeme Listesinde Ağacı
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mevcut İşaretle
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Authorization Rule,Applicable To (Role),(Rolü) için uygulanabilir
@@ -2356,13 +2350,13 @@
  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: Purchase Receipt Item,Recd Quantity,Alınan Miktar
-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/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
 DocType: Global Defaults,Hide Currency Symbol,Para birimi simgesini gizle
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","Örneğin: Banka, Nakit, Kredi Kartı"
 DocType: Journal Entry,Credit Note,Kredi mektubu
 DocType: Journal Entry,Credit Note,Kredi mektubu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},Tamamlanan Miktar fazla olamaz {0} çalışması için {1}
@@ -2393,11 +2387,11 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Adreslerim
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Kuruluş Şube Alanı
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Yardımcı Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,Yardımcı Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,Yardımcı Giderleri
 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
@@ -2429,7 +2423,7 @@
 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 +200,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
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Bordro
 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"
@@ -2441,7 +2435,7 @@
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Payment Request,Amount in customer's currency,Müşterinin para miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,Delivery,İrsaliye
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
@@ -2469,19 +2463,19 @@
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Tüm adresler.
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
 DocType: Company,Stock Settings,Stok Ayarları
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Yeni Maliyet Merkezi Adı
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Yeni Maliyet Merkezi Adı
 DocType: Leave Control Panel,Leave Control Panel,İzin Kontrol Paneli
 DocType: Appraisal,HR User,İK Kullanıcı
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mahsup Vergi ve Harçlar
-apps/erpnext/erpnext/config/support.py +7,Issues,Sorunlar
+apps/erpnext/erpnext/hooks.py +90,Issues,Sorunlar
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Durum şunlardan biri olmalıdır {0}
 DocType: Sales Invoice,Debit To,Borç
 DocType: Delivery Note,Required only for sample item.,Sadece örnek Ürün için gereklidir.
@@ -2505,11 +2499,11 @@
 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 +139,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç Zamanı
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
 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 +142,Quotation {0} is cancelled,Teklif {0} iptal edildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Toplam Alacakların Tutarı
@@ -2581,7 +2575,7 @@
 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"
 ,Requested,Talep
 ,Requested,Talep
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Hiçbir Açıklamalar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Kök Hesabı bir grup olmalı
@@ -2612,7 +2606,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Payment Request,Recipient and Message,Alıcı ve Mesaj
@@ -2630,7 +2624,7 @@
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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 +190,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,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ı.
@@ -2660,11 +2654,11 @@
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
 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.
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2674,7 +2668,7 @@
 apps/erpnext/erpnext/config/selling.py +113,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 +165,Please select {0},Lütfen  {0} seçiniz
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
@@ -2709,7 +2703,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Onaylı
 DocType: Payment Gateway,Gateway,Geçit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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
@@ -2726,15 +2720,15 @@
 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 +91,Unable to find exchange rate for {0} to {1},{0} için döviz kurunu bulamayan {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} için döviz kurunu bulamayan {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Yarım Gün İşaretle
 DocType: Sales Invoice,Sales Team,Satış Ekibi
 DocType: Sales Invoice,Sales Team,Satış Ekibi
 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 +410,[Error],[Hata]
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[Error],[Hata]
 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ü
@@ -2774,13 +2768,13 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Işlemin türünü seçin
 DocType: GL Entry,Voucher No,Föy No
 DocType: Leave Allocation,Leave Allocation,İzin Tahsisi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Şart veya sözleşmeler şablonu.
 DocType: Purchase Invoice,Address and Contact,Adresler ve Kontaklar
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
+apps/erpnext/erpnext/accounts/party.py +286,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)
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
 DocType: Item,Reorder level based on Warehouse,Depo dayalı Yeniden Sipariş seviyeli
 DocType: Activity Cost,Billing Rate,Fatura Oranı
@@ -2797,14 +2791,13 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} iptal edildi veya kapatıldı
 DocType: Delivery Note,Track this Delivery Note against any Project,Bu irsaliyeyi bütün Projelere karşı takip et
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Yatırım Kaynaklanan Net Nakit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Kök hesabı silinemez
 ,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 +324,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Adresleri yönetin
-DocType: Pricing Rule,Item Code,Ürün Kodu
-DocType: Pricing Rule,Item Code,Ürün Kodu
+DocType: Asset,Item Code,Ürün Kodu
+DocType: Asset,Item Code,Ürün Kodu
 DocType: Production Planning Tool,Create Production Orders,Üretim Emirleri Oluştur
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
@@ -2833,7 +2826,7 @@
 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 +135,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
-apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,Birkaç örnek kayıtları ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,Birkaç örnek kayıt ekle
 apps/erpnext/erpnext/config/hr.py +247,Leave Management,Yönetim bırakın
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Hesap Grubu
 DocType: Sales Order,Fully Delivered,Tamamen Teslim Edilmiş
@@ -2857,7 +2850,7 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Seri No ve Toplu
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Dakika
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Dakika
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
@@ -2865,20 +2858,20 @@
 DocType: Leave Block List,Leave Block List Allowed,Müsaade edilen izin engel listesi
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Words devre dışı bırak
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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ı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,BOM Araştır
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Teminatlı Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Teminatlı Krediler
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Açılış Bakiyesi Hisse
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarih tekrarlanır
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Yetkili imza
@@ -2888,12 +2881,12 @@
 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: Item Price,Bulk Import Help,Toplu İthalat Yardım
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,",Miktar Seç"
+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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Bu e-posta Digest aboneliğinden çık
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
-apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,Alt düğümleri ile Hesap defterinde olarak ayarlanamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with child nodes cannot be set as ledger,Alt düğümleri olan hesaplar Hesap Defteri olarak ayarlanamaz
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Fiyat listesi para biriminin müşterinin temel para birimine dönüştürülme oranı
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Tutar (Şirket Para)
 DocType: BOM Operation,Hour Rate,Saat Hızı
@@ -2936,7 +2929,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
 DocType: Payment Gateway Account,Default Payment Request Message,Standart Ödeme Talebi Mesajı
 DocType: Item Group,Check this if you want to show in website,Web sitesinde göstermek istiyorsanız işaretleyin
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Bankacılık ve Ödemeler
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Bankacılık ve Ödemeler
 ,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
@@ -2945,11 +2938,11 @@
 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 Ölçü Birimi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
 DocType: Notification Control,Quotation Message,Teklif Mesajı
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
@@ -2957,7 +2950,7 @@
 DocType: Purchase Receipt Item,Rate and Amount,Oran ve Miktar
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Yapraklar ve Tatil
 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/stock/doctype/warehouse/warehouse.py +115,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ş.
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Indi Maliyet Çeki Miktarı
 DocType: Time Log,Batched for Billing,Faturalanmak için partiler haline getirilmiş
@@ -2977,14 +2970,14 @@
 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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
 ,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}
 DocType: Journal Entry,Stock Entry,Stok Girişleri
 DocType: Account,Payable,Borç
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Borçlular ({0})
-DocType: Project,Margin,Kar Marjı
+DocType: Pricing Rule,Margin,Kar Marjı
 DocType: Salary Slip,Arrear Amount,Bakiye Tutarı
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yeni Müşteriler
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Brüt Kazanç%
@@ -3008,7 +3001,7 @@
 DocType: Payment Request,Email To,To Email
 DocType: Lead,Lead Owner,Talep Yaratma Sahibi
 DocType: Bin,Requested Quantity,istenen Miktar
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Depo gereklidir
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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
@@ -3018,7 +3011,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 DocType: Sales Invoice,Against Income Account,Gelir Hesabı Karşılığı
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Teslim Edildi
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Teslim Edildi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
 DocType: Territory,Territory Targets,Bölge Hedefleri
@@ -3039,8 +3032,8 @@
 DocType: Manufacturer,Manufacturers used in Items,Öğeler kullanılan Üreticileri
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Yeni Oluştur
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -3054,7 +3047,7 @@
 ,Stock Ledger,Stok defteri
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Puan: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Bordro Dahili Kesinti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,İlk grup düğümünü seçin.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,İlk grup düğümünü seçin.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Çalışan ve Seyirci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","o şirket adresi olarak, müşteri, tedarikçi, satış ortağı ve kurşun başvurusunu kaldırın"
@@ -3078,13 +3071,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Sonraki Tarih Gönderme Tarihi daha büyük olmalıdır
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Göster vergi break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Sonraki Tarih Gönderme Tarihi daha büyük olmalıdır
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/accounts/party.py +289,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
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Fatura Gönderme Tarihi
@@ -3101,7 +3094,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,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 +379,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -3118,7 +3111,7 @@
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -3129,7 +3122,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Ürün ve Garanti Detayları
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Şablon
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Template,Şablon
@@ -3142,7 +3135,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
@@ -3159,7 +3152,7 @@
 DocType: Notification Control,Custom Message,Özel Mesaj
 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 +375,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
@@ -3169,7 +3162,7 @@
 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 +96,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,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 +186,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
@@ -3180,7 +3173,7 @@
 DocType: Account,Bank,Banka
 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 +612,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,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
@@ -3189,8 +3182,7 @@
 DocType: Hub Settings,Access Token,Erişim Anahtarı
 DocType: Sales Invoice Item,Serial No,Seri No
 DocType: Sales Invoice Item,Serial No,Seri No
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Lütfen ilk önce Bakım Detayını girin
-DocType: Item,Is Fixed Asset Item,Sabit Varlık Maddesi
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Lütfen ilk önce Bakım Detayını girin
 DocType: Purchase Invoice,Print Language,baskı Dili
 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"
@@ -3211,7 +3203,7 @@
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
@@ -3229,15 +3221,15 @@
 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/inactive_customers/inactive_customers.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
-DocType: C-Form,Amended From,İtibaren değiştirilmiş
+DocType: Asset,Amended From,İtibaren değiştirilmiş
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,Raw Material,Hammadde
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,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 +484,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 +325,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
@@ -3254,24 +3246,24 @@
 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/public/js/setup_wizard.js +191,"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
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Faturalar ile maç Ödemeleri
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Faturalar ile maç Ödemeleri
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Sepete ekle
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Sepete ekle
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grup tarafından
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
 DocType: Production Planning Tool,Get Material Request,Malzeme İsteği alın
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Posta Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Toplam (Amt)
 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: 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 +143,{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 +145,{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 +56,Total Present,Toplam Mevcut
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Muhasebe Tablolar
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Muhasebe Tabloları
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Saat
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Saat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
@@ -3295,14 +3287,14 @@
 DocType: C-Form,Invoices,Faturalar
 DocType: Job Opening,Job Title,İş Unvanı
 DocType: Features Setup,Item Groups in Details,Ayrıntılı Ürün Grupları
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,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/config/support.py +32,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 +169,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 +171,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: Item,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Özkaynak Net Değişim
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
@@ -3315,12 +3307,12 @@
 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
 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 +416,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 +409,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont  Tipi Karşılığı
 DocType: Item,Attributes,Nitelikler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Ürünleri alın
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,Borç Silme Hesabı Girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Ürünleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Son Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
 DocType: C-Form,C-Form,C-Formu
@@ -3333,13 +3325,12 @@
 DocType: Purchase Invoice,Mobile No,Mobil No
 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 +261,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Ticari
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +343,Commercial,Ticari
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Hata: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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
@@ -3348,7 +3339,7 @@
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 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 +251,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
@@ -3360,11 +3351,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Alacak Hesapları Standart
 DocType: Tax Rule,Billing State,Fatura Kamu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -3390,7 +3381,7 @@
 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 +123,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
 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
@@ -3398,13 +3389,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Zaman Günlüğü Faturalı olmuştur
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Hesap {0} Grup olamaz
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},Şirket varsayılan değeri {0} set Lütfen {1}
@@ -3415,12 +3406,11 @@
 ,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 +176,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kurulum Numaralandırma Serisi&gt; Kur aracılığıyla Katılım için seri numaralandırma Lütfen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,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 +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,'Kar ve Zarar' tipi hesaba {0} izin verilmez
 DocType: Features Setup,Sales Discounts,Satış İndirimleri
@@ -3438,49 +3428,49 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Alt öğe ekle
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,açılış Değeri
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Satış Komisyonu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Satış Komisyonu
 DocType: Offer Letter Term,Value / Description,Değer / Açıklama
 DocType: Tax Rule,Billing Country,Fatura Ülke
 ,Customers Not Buying Since Long Time,Uzun zamandır alım yapmamış Müşteriler
 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 +127,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/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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Eğlence Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,İzin başvuruları.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Yasal Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Yasal Giderler
 DocType: Sales Invoice,Posting Time,Gönderme Zamanı
 DocType: Sales Invoice,Posting Time,Gönderme Zamanı
 DocType: Sales Order,% Amount Billed,% Faturalanan Tutar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefon Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Telefon Giderleri
 DocType: Sales Partner,Logo,Logo
 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.,Kullanıcıya kaydetmeden önce seri seçtirmek istiyorsanız işaretleyin. Eğer işaretlerseniz atanmış seri olmayacaktır.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Seri Numaralı Ürün Yok {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Açık Bildirimler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Doğrudan Giderler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Doğrudan Giderler
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Doğrudan Giderler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Doğrudan Giderler
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;Bildirim \ E-posta Adresi&#39; geçersiz e-posta adresi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Yeni Müşteri Gelir
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Seyahat Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,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 +60,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
@@ -3499,7 +3489,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 DocType: Sales Partner,Contact Desc,İrtibat Desc
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Normal, hastalık vb izin tipleri"
@@ -3518,7 +3508,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Hammadde ana Malzeme ile aynı olamaz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Maaş Şablon Alanı.
@@ -3534,7 +3524,7 @@
 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/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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/controllers/accounts_controller.py +514,{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 +44,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)
@@ -3552,13 +3542,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Bu Günlük partisi iptal edildi.
 ,Reqd By Date,Teslim Tarihi
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Alacaklılar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,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ı
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,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/stock.py +97,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
@@ -3584,7 +3574,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Standart Satış
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Standart Satış
@@ -3594,9 +3584,8 @@
 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 +330,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
-DocType: Project,Project Name,Proje Adı
-DocType: Project,Project Name,Proje Adı
+DocType: Request for Quotation Item,Project Name,Proje Adı
+DocType: Request for Quotation Item,Project Name,Proje Adı
 DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
 DocType: Features Setup,Item Batch Nos,Ürün Parti Numaraları
@@ -3642,7 +3631,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","o şirket adresi olarak şirket, zorunludur"
 DocType: Item Attribute,From Range,Sınıfımızda
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Stok ürünü olmadığından Ürün {0} yok sayıldı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Daha fazla işlem için bu Üretim Siparişini Gönderin.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Daha fazla işlem için bu Üretim Siparişini Gönderin.
 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.",Belli bir işlemde Fiyatlandırma kuralını uygulamamak için bütün mevcut Fiyatlandırma Kuralları devre dışı bırakılmalıdır.
 DocType: Company,Domain,Etki Alanı
 DocType: Company,Domain,Etki Alanı
@@ -3658,6 +3647,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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
@@ -3697,7 +3687,7 @@
 DocType: Opportunity,To Discuss,Görüşülecek
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Geçici Hesaplar
 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
@@ -3711,9 +3701,9 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Gelmedi işaretle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Öğe ekleme
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Öğe ekleme
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
 DocType: Account,Asset,Varlık
@@ -3722,7 +3712,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""","örneğin ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depo {0} yoktur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3752,7 +3742,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Kur Gateway hesapları.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Kur Gateway hesapları.
 DocType: Employee,Employment Type,İstihdam Tipi
 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
@@ -3770,7 +3760,7 @@
 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 +132,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Genel Muhasebe uyarınca Banka Hesap bakiyesi
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
 DocType: Authorization Rule,Customer / Item Name,Müşteri / Ürün İsmi
@@ -3787,7 +3777,6 @@
 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
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Satış İşlemleri için  Varsayılan ayarlar.
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
@@ -3796,14 +3785,14 @@
 apps/erpnext/erpnext/config/support.py +43,Warranty,Garanti
 DocType: Production Order,Warehouses,Depolar
 DocType: Production Order,Warehouses,Depolar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Baskı ve Kırtasiye
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Baskı ve Kırtasiye
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Baskı ve Kırtasiye
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Baskı ve Kırtasiye
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Grup Düğüm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Mamülleri Güncelle
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Mamülleri Güncelle
 DocType: Workstation,per hour,saat başına
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,satın alma
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Ödenen Tutar;
@@ -3844,7 +3833,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Burada boy, kilo, alerji, tıbbi endişeler vb  muhafaza edebilirsiniz"
 DocType: Leave Block List,Applies to Company,Şirket için geçerli
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
 DocType: Purchase Invoice,In Words,Kelimelerle
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Bugün {0} 'in doğum günü!
 DocType: Production Planning Tool,Material Request For Warehouse,Depo için Malzeme Talebi
@@ -3861,7 +3850,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/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/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +569,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/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."
@@ -3873,7 +3862,7 @@
 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 +782,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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
@@ -3883,16 +3872,15 @@
 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 +17,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Geçersiz {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} Ayarlar&gt; Ayarlar yoluyla&gt; Adlandırma Serisi için Serisi adlandırma ayarlayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departman mağazaları
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
 DocType: Company,Change Abbreviation,Değişim Kısaltma
@@ -3913,11 +3901,11 @@
 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
-,General Ledger,Genel Muhasebe
-,General Ledger,Genel Muhasebe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Genel Muhasebe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Genel Muhasebe
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Görünüm İlanlar
 DocType: Item Attribute Value,Attribute Value,Değer Özellik
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-posta yeni olmalıdır, {0} için zaten mevcut"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","E-posta yeni olmalıdır, {0} için zaten mevcut"
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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
@@ -3956,7 +3944,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
 DocType: Tax Rule,Purchase Tax Template,Vergi Şablon Satınalma
 ,Project wise Stock Tracking,Proje bilgisi Stok Takibi
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Bakım Programı {0} {0} karşılığında mevcuttur
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Bakım Programı {0} {0} karşılığında mevcuttur
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Item Customer Detail,Ref Code,Referans Kodu
@@ -3966,18 +3954,18 @@
 DocType: Payment Gateway,Payment Gateway,Ödeme Gateway
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Sipariş
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Kökün ana maliyet merkezi olamaz
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marka Seçiniz ...
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,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}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Depo zorunludur
 DocType: Supplier,Address and Contacts,Adresler ve Kontaklar
 DocType: UOM Conversion Detail,UOM Conversion Detail,Ölçü Birimi Dönüşüm Detayı
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +340,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Alacak Kayıtlarından alın
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
@@ -3998,7 +3986,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,İşlem birimi Ödeme Gateway para birimi olarak aynı olmalıdır
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Alma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -4006,15 +3994,15 @@
 DocType: Purchase Invoice,Submit on creation,oluşturma Gönder
 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 +420,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 +425,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 +65,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Siparişlerim
@@ -4042,11 +4030,11 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Satış Noktası Profili
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Teminatsız Krediler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Teminatsız Krediler
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Maintenance Schedule Detail,Scheduled Date,Program Tarihi
@@ -4059,7 +4047,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +234,Your Suppliers,Tedarikçileriniz
@@ -4075,14 +4063,14 @@
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 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 +296,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 +65,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,Donmuş değeri ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
 DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
@@ -4093,7 +4081,7 @@
 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 +351,'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 +356,'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ığı
@@ -4110,7 +4098,7 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
@@ -4128,15 +4116,15 @@
 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 +576,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
-apps/erpnext/erpnext/controllers/recurring_document.py +168,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 +169,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 +18,Project activity / task.,Proje faaliyeti / görev.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Maaş Makbuzu Oluşturun
 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: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -4163,7 +4151,7 @@
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Receipt Item,Rejected Serial No,Seri No Reddedildi
 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 +144,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 +148,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır
 DocType: 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 ##### 
 , daha sonra otomatik seri numarası bu serisine dayanan oluşturulur. Her zaman açıkça bu öğe için seri No. bahsetmek istiyorum. Bu boş bırakın."
@@ -4175,12 +4163,12 @@
 ,Sales Analytics,Satış Analizleri
 DocType: Manufacturing Settings,Manufacturing Settings,Üretim Ayarları
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-posta kurma
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Lütfen Şirket Alanına varsayılan para birimini girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Lütfen Şirket Alanına varsayılan para birimini girin
 DocType: Stock Entry Detail,Stock Entry Detail,Stok Girdisi Detayı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Günlük Hatırlatmalar
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Yeni Hesap Adı
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Yeni Hesap Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Yeni Hesap Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
@@ -4193,9 +4181,9 @@
 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 +72,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 +225,Default settings for accounting transactions.,Muhasebe işlemleri için Varsayılan ayarlar.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Muhasebe işlemleri için Varsayılan ayarlar.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Ürün {0} Satış ürünü olmalı
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
 DocType: Account,Equity,Özkaynak
@@ -4207,7 +4195,7 @@
 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 +385,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Sales Partner,Partner Type,Ortak Türü
 DocType: Purchase Taxes and Charges,Actual,Gerçek
@@ -4241,7 +4229,7 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Ürünlerin saklandığı yer
@@ -4253,22 +4241,22 @@
 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 +508,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
 ,Item Prices,Ürün Fiyatları
 ,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 +77,Price List master.,Fiyat Listesi alanı
 DocType: Task,Review Date,İnceleme tarihi
-DocType: Purchase Invoice,Advance Payments,Peşin Ödeme
+DocType: Purchase Invoice,Advance Payments,Avans Ödemeleri
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 +123,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/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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Yönetim Giderleri
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Yönetim Giderleri
 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
@@ -4289,14 +4277,14 @@
 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 +559,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +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."
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Yığın
@@ -4313,7 +4301,7 @@
 DocType: Sales Invoice,Cold Calling,Soğuk Arama
 DocType: SMS Parameter,SMS Parameter,SMS Parametresi
 DocType: SMS Parameter,SMS Parameter,SMS Parametresi
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Bütçe ve Maliyet Merkezi
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Bütçe ve Maliyet Merkezi
 DocType: Maintenance Schedule Item,Half Yearly,Yarım Yıllık
 DocType: Lead,Blog Subscriber,Blog Abone
 DocType: Lead,Blog Subscriber,Blog Abone
@@ -4352,7 +4340,6 @@
 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/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -4361,7 +4348,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Müşterilere artırılan faturalar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Ana Hesap
@@ -4380,7 +4367,7 @@
 DocType: Employee,Education,Eğitim
 DocType: Selling Settings,Campaign Naming By,Kampanya İsimlendirmesini yapan
 DocType: Employee,Current Address Is,Güncel Adresi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Muhasebe günlük girişleri.
@@ -4428,7 +4415,7 @@
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: BOM,With Operations,Operasyon ile
 DocType: BOM,With Operations,Operasyon ile
-apps/erpnext/erpnext/accounts/party.py +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}.
+apps/erpnext/erpnext/accounts/party.py +234,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ı
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
@@ -4436,11 +4423,11 @@
 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
 DocType: Payment Gateway Account,Payment URL Message,Ödeme URL Mesajı
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,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 +69,Total Unpaid,Ödenmemiş Toplam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Günlük faturalandırılamaz
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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
@@ -4449,11 +4436,11 @@
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
 DocType: Item,Item Tax,Ürün Vergisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Tedarikçi Malzeme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Tüketim Fatura
 DocType: Expense Claim,Employees Email Id,Çalışanların e-posta adresleri
 DocType: Employee Attendance Tool,Marked Attendance,İşaretlenmiş Devamlılık
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kısa Vadeli Borçlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Kısa Vadeli Borçlar
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Gerçek Adet zorunludur
@@ -4474,19 +4461,18 @@
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Logo Ekleyin
 DocType: Customer,Commission Rate,Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variant olun
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Variant olun
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Sepet Boş
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Hiçbir varsayılan Adres Şablon bulundu. Ayarlar&gt; Baskı ve Markalaşma&gt; Adres Şablon yeni bir tane oluşturun.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,Kök düzenlenemez.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Öz sermaye
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
 DocType: Payment Gateway Account,Payment Gateway Account,Ödeme Gateway Hesabı
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Ödeme tamamlandıktan sonra seçilen sayfaya yönlendirmek.
@@ -4499,19 +4485,19 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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
 ,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 +408,"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 +413,"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 +13,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 +409, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Teslim zamanı Günü
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Malzeme Listesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Tarihi
@@ -4520,7 +4506,7 @@
 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 +169,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 +212,Account {0} does not exist,Hesap {0} yok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,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.
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 4303d86..1a30df6 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Орендовані
 DocType: POS Profile,Applicable for User,Стосується для користувача
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Зупинився виробничого замовлення не може бути скасовано, відкорковувати спочатку скасувати"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Зупинився виробничого замовлення не може бути скасовано, відкорковувати спочатку скасувати"
 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.,* Буде розраховується в угоді.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть співробітників система імен в людських ресурсів&gt; HR Налаштування"
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Робота Заявник
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Новий Залишити заявку
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,Показати варіанти
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,Кількість
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (зобов&#39;язання)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),Кредити (зобов&#39;язання)
 DocType: Employee Education,Year of Passing,Рік Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В наявності
 DocType: Designation,Designation,Позначення
@@ -64,7 +63,7 @@
 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 +642,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фінансовий рік {0} вимагається
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},Новий {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Новий {0}: # {1}
 ,Sales Partners Commission,Партнери по збуту комісія
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,"Скорочення не може мати більше, ніж 5 символів"
 DocType: Payment Request,Payment Request,Оплата Запит
@@ -102,7 +101,7 @@
 DocType: Employee,Married,Одружений
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Отримати елементи з
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовий
 DocType: Quality Inspection Reading,Reading 1,Читання 1
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Цільова На
 DocType: BOM,Total Cost,Загальна вартість
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активності:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
@@ -156,7 +155,7 @@
 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,Сток Витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Сток Витрати
 DocType: Newsletter,Email Sent?,Листа відправлено?
 DocType: Journal Entry,Contra Entry,Виправна запис
 DocType: Production Order Operation,Show Time Logs,Показати журнали Час
@@ -164,12 +163,12 @@
 DocType: Delivery Note,Installation Status,Стан установки
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Пункт {0} повинен бути Купівля товару
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,Налаштування модуля HR для
 DocType: SMS Center,SMS Center,SMS-центр
 DocType: BOM Replace Tool,New BOM,Новий специфікації
@@ -208,11 +207,11 @@
 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 +79,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Попередня сума не може бути більше, ніж {0} {1}"
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,"Будь ласка, введіть компанія"
@@ -221,7 +220,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Чисті грошові кошти від фінансової
 DocType: Lead,Address & Contact,Адреса &amp; Контактна
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористовувані листя від попередніх асигнувань
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
 DocType: Newsletter List,Total Subscribers,Всього Передплатники
 ,Contact Name,Контактна особа
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
@@ -235,8 +234,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 DocType: Payment Tool,Reference No,Посилання Немає
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Банківські записи
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
@@ -248,8 +247,8 @@
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Матеріал Запит
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +263,7 @@
 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.,"Set Group мудрий бюджети товару на цій території. Ви також можете включити сезонність, встановивши розподіл."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},"Будь ласка, введіть батьківську групу рахунки для складу {0}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},"Будь ласка, введіть батьківську групу рахунки для складу {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата з {0} {1} не може бути більше, ніж суми заборгованості {2}"
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
@@ -283,7 +282,7 @@
 DocType: Item,Synced With Hub,Синхронізуються з Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Неправильний пароль
 DocType: Item,Variant Of,Варіант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',"Завершений Кількість не може бути більше, ніж &quot;Кількість для виробництва&quot;"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',"Завершений Кількість не може бути більше, ніж &quot;Кількість для виробництва&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,Циклічна посилання Помилка
@@ -294,10 +293,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичної матеріалів Запит
 DocType: Journal Entry,Multi Currency,Мульти валют
 DocType: Payment Reconciliation Invoice,Invoice Type,Рахунок Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Накладна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Накладна
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,"Ласка, виберіть місяць та рік"
@@ -308,12 +307,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей пункт є шаблоном і не можуть бути використані в операціях. Атрибути товару буде копіюватися в варіантах, якщо &quot;Ні Копіювати&quot; не встановлений"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).","Співробітник позначення (наприклад, генеральний директор, директор і т.д.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Потрібні {1} для періоду {2} в {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Вибрати пункт
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
@@ -326,7 +325,7 @@
 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 +213,Please see attachment,"Будь ласка, див вкладення"
-DocType: Purchase Order,% Received,Отримане%
+DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Налаштування Вже Повний !!
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
@@ -335,9 +334,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладної {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Пункт Параметр Контроль якості
 DocType: Leave Application,Leave Approver Name,Залиште Ім&#39;я стверджує
-,Schedule Date,Розклад Дата
+DocType: Depreciation Schedule,Schedule Date,Розклад Дата
 DocType: Packed Item,Packed Item,Упакування товару
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Налаштування за замовчуванням для операцій покупки.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Налаштування за замовчуванням для операцій покупки.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Діяльність Вартість існує для працівника {0} проти типу активність - {1}
 apps/erpnext/erpnext/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,Обмін валюти
@@ -367,7 +366,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,СР Продаж Оцінити
 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,Ім&#39;я постачальника
@@ -386,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заморожені Upto
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер відпочинку.
-DocType: Material Request Item,Required Date,Потрібно Дата
+DocType: Request for Quotation Item,Required Date,Потрібно Дата
 DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,Всього Кількість
@@ -413,20 +412,20 @@
 DocType: Journal Entry,Accounts Payable,Рахунки кредиторів
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Відібрані ВВП не для того ж пункту
 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",""" не iснує"
 DocType: Pricing Rule,Valid Upto,Дійсно Upto
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для яких Матеріал Запит буде піднято"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 ,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
@@ -446,7 +445,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,Пункт {0} Купівля товару
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Пункт {0} Купівля товару
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки і збори
 DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
 DocType: Territory,For reference,Для довідки
@@ -457,7 +456,7 @@
 DocType: Production Plan Item,Pending Qty,В очікуванні Кількість
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
 DocType: Pricing Rule,Valid From,Діє з
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Партнер по продажах
@@ -467,13 +466,13 @@
 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 +126,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 +230,Financial / accounting year.,Фінансова / звітний рік.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,накопичені значення
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, послідовний пп не можуть бути об&#39;єднані"
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Ведучий Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Фінансовий рік Дата початку не повинна бути більше, ніж фінансовий рік Дата закінчення"
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Фінансовий рік Дата початку не повинна бути більше, ніж фінансовий рік Дата закінчення"
 DocType: Warranty Claim,Resolution,Дозвіл
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},Поставляється: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Оплачується аккаунт
@@ -481,7 +480,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Додаток
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Продажі Повернутися
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Drop кораблів)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,Зарплата компоненти.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База даних потенційних клієнтів.
@@ -490,7 +489,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,"Логічний склад, на якому акції записів зроблені."
@@ -500,7 +499,7 @@
 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/config/accounts.py +70,Masters,майстри
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Оновлення банку транзакцій Дати
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Оновлення банку транзакцій Дати
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативний Помилка з ({6}) для пункту {0} на складі {1} на {2} {3} в {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,відстеження часу
 DocType: Fiscal Year Company,Fiscal Year Company,Фінансовий рік компанії
@@ -518,19 +517,18 @@
 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,За замовчуванням Калькуляція Оцінити
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Графік регламентних робіт
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Чиста зміна в інвентаризації
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,Продавець Цілі
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,"Будь ласка, встановіть список свят для будь-якого співробітника або компанії"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,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/cost_center/cost_center.js +69,Convert to Group,Перетворити в групі
 DocType: Activity Cost,Activity Type,Тип діяльності
@@ -538,7 +536,7 @@
 DocType: Supplier,Fixed Days,Основні Дні
 DocType: Quotation Item,Item Balance,показник Залишок
 DocType: Sales Invoice,Packing List,Список Упаковка
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,"Замовлення, видані постачальникам."
+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,Споживана
@@ -572,7 +570,7 @@
 DocType: Hub Settings,Seller City,Продавець Місто
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Пункт має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Вартість акцій
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -609,14 +607,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Існує помилка в адресному Шаблон {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Новий акаунт
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Новий акаунт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: З {0} типу {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
 DocType: Opportunity,Maintenance,Технічне обслуговування
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -645,17 +643,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Витрати офісу обслуговування
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Account,Liability,Відповідальність
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
 DocType: Company,Default Cost of Goods Sold Account,За замовчуванням Собівартість проданих товарів рахунок
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Ціни не обраний
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Process Payroll,Send Email,Відправити лист
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -663,7 +661,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Мої Рахунки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,Мої Рахунки
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Жоден працівник не знайдено
 DocType: Supplier Quotation,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо по субпідряду постачальника
@@ -675,14 +673,14 @@
 DocType: Item,Website Warehouse,Сайт Склад
 DocType: Payment Reconciliation,Minimum Invoice Amount,Мінімальна Сума рахунку
 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 +267,C-Form records,С-Form записи
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,С-Form записи
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Замовник і Постачальник
 DocType: Email Digest,Email Digest Settings,Відправити Дайджест Налаштування
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Підтримка запитів від клієнтів.
 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 +342,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} проти рахунку {1} від {2}
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: Production Order,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
@@ -699,7 +697,7 @@
 DocType: Quotation Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,Витрати
@@ -736,14 +734,14 @@
 DocType: Supplier Quotation,Is Subcontracted,Субпідряду
 DocType: Item Attribute,Item Attribute Values,Пункт значень атрибутів
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Подивитися Передплатники
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Купівля Надходження
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Купівля Надходження
 ,Received Items To Be Billed,"Надійшли пунктів, які будуть Оголошений"
 DocType: Employee,Ms,Міссісіпі
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Валютний курс майстер.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Валютний курс майстер.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,Партнери по збуту і території
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Специфікація {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,Специфікація {0} повинен бути активним
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Перейти Кошик
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
@@ -762,7 +760,7 @@
 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 +524,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
@@ -772,10 +770,10 @@
 DocType: Employee,Permanent Address Is,Постійна адреса Є
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Операція виконана для багатьох, як готової продукції?"
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,Бренд
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
 DocType: Item,Is Purchase Item,Хіба Купівля товару
-DocType: Journal Entry Account,Purchase Invoice,Купівля Рахунок
+DocType: Asset,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,Відкриття Дата і Дата закриття повинна бути в межах тієї ж фінансовий рік
@@ -785,16 +783,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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; Bundle, склад, серійний номер і серія № буде розглядатися з &quot;пакувальний лист &#39;таблиці. Якщо Склад і пакетна Немає є однаковими для всіх пакувальних компонентів для будь &quot;продукту&quot; Bundle пункту, ці значення можуть бути введені в основній таблиці Item значення будуть скопійовані в &quot;список упаковки&quot; таблицю."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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; Bundle, склад, серійний номер і серія № буде розглядатися з &quot;пакувальний лист &#39;таблиці. Якщо Склад і пакетна Немає є однаковими для всіх пакувальних компонентів для будь &quot;продукту&quot; Bundle пункту, ці значення можуть бути введені в основній таблиці Item значення будуть скопійовані в &quot;список упаковки&quot; таблицю."
 DocType: Job Opening,Publish on website,Публікація на сайті
 apps/erpnext/erpnext/config/stock.py +17,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,Непряме прибуток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),Всього повідомлень (їй)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Вибрати пункт трансферу
 DocType: Purchase Invoice,Additional Discount Percentage,Додаткова знижка у відсотках
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
@@ -808,14 +806,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
 ,Employee Holiday Attendance,Співробітник відпустку Відвідуваність
 DocType: Opportunity,Walk In,Заходити
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Сток Записи
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Сток Записи
 DocType: Item,Inspection Criteria,Інспекційні Критерії
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Всі передані
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Зробити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв&#39;яжіться з support@erpnext.com якщо проблема не усунена."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Мій кошик
@@ -825,7 +823,7 @@
 DocType: Holiday List,Holiday List Name,Ім&#39;я відпочинку Список
 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 +180,Qty for {0},Кількість для {0}
+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 +80,Leave Allocation Tool,Залишити Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Залишити Чорний список дат
@@ -838,7 +836,7 @@
 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 +547,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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/public/js/pos/pos.html +28,Discount,Знижка
@@ -853,20 +851,20 @@
 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 +69,Selling Amount,Продаж Сума
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Журнали Час
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Журнали Час
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Рахунок не відповідає з Компанією
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} за контрактом Шифрування до обслуговування {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} за контрактом Шифрування до обслуговування {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,вербування
 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;Отримати товари від покупки розписок&quot; кнопки
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажі Витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Продажі Витрати
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
@@ -883,7 +881,7 @@
 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 +18,Quotations received from Suppliers.,Котирування отриманих від постачальників.
+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,оновлюється через журнали Time
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Середній вік
@@ -892,7 +890,7 @@
 DocType: Company,Default Currency,Базова валюта
 DocType: Contact,Enter designation of this Contact,Введіть позначення цього контакту
 DocType: Expense Claim,From Employee,Від працівника
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,Ключ Площа Продуктивність
@@ -900,7 +898,7 @@
 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 +130,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Внесок%
@@ -909,7 +907,7 @@
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,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.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -917,15 +915,15 @@
 DocType: Salary Slip,Deductions,Відрахування
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ця партія Час Ввійти був виставлений.
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Планування потужностей Помилка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Планування потужностей Помилка
 ,Trial Balance for Party,Пробний баланс для партії
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Заробіток
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Відкриття бухгалтерський баланс
 DocType: Sales Invoice Advance,Sales Invoice Advance,Видаткова накладна Попередня
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,Нічого не просити
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж «Дата фактичного завершення"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управління
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Види діяльності для табелів
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Або дебетова або кредитна сума необхідна для {0}
@@ -935,18 +933,18 @@
 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;
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,"Будь ласка, встановіть Email ID"
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Будь ласка, встановіть Email ID"
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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,За замовчуванням Об&#39;єкт Група
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,Постачальник баз даних.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Постачальник баз даних.
 DocType: Account,Balance Sheet,Бухгалтерський баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,Податкові та інші відрахування заробітної плати.
 DocType: Lead,Lead,Вести
 DocType: Email Digest,Payables,Кредиторська заборгованість
@@ -974,18 +972,18 @@
 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/page/accounts_browser/accounts_browser.js +128,View Ledger,Подивитися Леджер
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Подивитися Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,Деталь {0} не може мати Batch
 ,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,Нерозподілений чистий прибуток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Нерозподілений чистий прибуток
 DocType: BOM Item,Item Description,Опис товару
 DocType: Payment Tool,Payment Mode,Режим компенсації
 DocType: Purchase Invoice,Is Recurring,Повторюється
@@ -993,7 +991,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Тимчасове відкриття
 ,Employee Leave Balance,Співробітник Залишити Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Оцінка Оцініть необхідний для пункту в рядку {0}
@@ -1008,8 +1006,8 @@
 ,Accounts Payable Summary,Кредиторська заборгованість Основна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Чи не дозволено редагувати заморожений рахунок {0}
 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 +165,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Загальна кількість випуску / передачі {0} в Material Request {1} \ не може бути більше необхідної кількості {2} для п {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Невеликий
@@ -1017,7 +1015,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Рахунок глава {0} створена
 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,Всього Виконано
@@ -1025,12 +1023,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
 DocType: Warehouse,Warehouse Contact Info,Склад Контактна інформація
@@ -1040,17 +1038,17 @@
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,Пункт {0} повинен бути субпідрядником товару
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
+apps/erpnext/erpnext/stock/get_item_details.py +142,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; поле, яке може бути Пункт, Пункт Група або Марка."
 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},Статус виробничого замовлення {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,Для Постачальника
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,Всього Вихідні
@@ -1060,10 +1058,10 @@
 DocType: Item,Website Item Groups,Сайт Групи товарів
 DocType: Purchase Invoice,Total (Company Currency),Всього (Компанія валют)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Серійний номер {0} введений більш ніж один раз
-DocType: Journal Entry,Journal Entry,Запис в журналі
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
 DocType: Sales Partner,Target Distribution,Цільова поширення
 DocType: Salary Slip,Bank Account No.,Банк № рахунку
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом
@@ -1096,7 +1094,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Це {0}
 DocType: Project,Start and End Dates,Дати початку і закінчення
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,"Операції, що не може бути порожнім."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,Середня Знижка
@@ -1107,10 +1105,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути період розподілу межами відпустку
 DocType: Activity Cost,Projects,Проектів
 DocType: Payment Request,Transaction Currency,Валюта угоди
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},З {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},З {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Операція Опис
 DocType: Item,Will also apply to variants,Буде також застосовуватися до варіантів
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Неможливо змінити фінансовий рік Дата початку і фінансовий рік Дата закінчення колись фінансовий рік зберігається.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,Кампанія
@@ -1124,8 +1122,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Чиста зміна в основних фондів
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},Макс: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,За компанію
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з&#39;єднань.
@@ -1133,8 +1131,8 @@
 DocType: Sales Invoice,Shipping Address Name,Адреса доставки Ім&#39;я
 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 +472,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,не може бути більше ніж 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1155,11 +1153,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,Податковий Правило для угод.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,Податковий Правило для угод.
 DocType: Rename Tool,Type of document to rename.,Тип документа перейменувати.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,Ми купуємо цей пункт
 DocType: Address,Billing,Біллінг
@@ -1172,8 +1170,8 @@
 DocType: Shipping Rule Condition,To Value,Оцінювати
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Пакувальний лист
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Оренда площі для офісу
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Пакувальний лист
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Настройки шлюзу Налаштування SMS
 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.,Немає адреса ще не додавали.
@@ -1191,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Уряд
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Предмет Варіанти
 DocType: Company,Services,Послуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Всього ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),Всього ({0})
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
 DocType: Sales Invoice,Source,Джерело
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
@@ -1200,10 +1198,10 @@
 DocType: Employee External Work History,Total Experience,Загальний досвід
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Потік грошових коштів від інвестиційної
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Вантажні та експедиторські Збори
 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 +86,Transfer Materials for Manufacture,Передача матеріалів для виробництва
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,Передача матеріалів для виробництва
 DocType: Pricing Rule,For Price List,Для Прайс-лист
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} не знайдений, який необхідний для ведення бухгалтерського обліку запис (рахунок). Будь ласка, вкажіть ціна товару проти цінової покупка списку."
@@ -1212,7 +1210,7 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,Специфікація Деталь Немає
 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.,"Будь ласка, створіть новий обліковий запис з Планом рахунків бухгалтерського обліку."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Обслуговування відвідування
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Обслуговування відвідування
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступні Пакетна Кількість на складі
 DocType: Time Log Batch Detail,Time Log Batch Detail,Час входу Пакетне Подробиці
 DocType: Landed Cost Voucher,Landed Cost Help,Приземлився Вартість Допомога
@@ -1226,7 +1224,6 @@
 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 +196,Brand master.,Марка майстер.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 DocType: Sales Invoice Item,Brand Name,Бренд
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Коробка
@@ -1254,7 +1251,7 @@
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +131,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,Сток зобов&#39;язання
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,Сток зобов&#39;язання
 DocType: Purchase Receipt,Supplier Warehouse,Постачальник Склад
 DocType: Opportunity,Contact Mobile No,Зв&#39;язатися з мобільних Немає
 ,Material Requests for which Supplier Quotations are not created,"Матеріал запити, для яких Постачальник Котирування не створюються"
@@ -1263,7 +1260,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплати на e-mail
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,інші звіти
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,Стоп народження Нагадування
@@ -1273,26 +1270,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,Перегляд {0}
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Оплата Запит вже існує {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Постачальник Тип майстром.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Постачальник Тип майстром.
 DocType: Purchase Order Item,Supplier Part Number,Постачальник Номер деталі
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
 DocType: Purchase Invoice,Reference Document,довідковий документ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Оголошений
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
@@ -1314,7 +1311,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Чиста зміна кредиторської заборгованості
 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;&#39; Customerwise Знижка
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,Оновлення банківські платіжні дати з журналів.
+apps/erpnext/erpnext/config/accounts.py +137,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.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
@@ -1328,12 +1325,12 @@
 DocType: Sales Invoice,Packed Items,Упаковані товари
 apps/erpnext/erpnext/config/support.py +48,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","Замініть особливе специфікації у всіх інших специфікацій, де він використовується. Він замінить стару посилання специфікації, оновити і відновити вартість &quot;специфікації Вибух Item&quot; таблицю на новій специфікації"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total','Разом'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включити Кошик
 DocType: Employee,Permanent Address,Постійна адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платний проти {0} {1} не може бути більше \, ніж загальний підсумок {2}"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,"Будь ласка, виберіть пункт код"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,"Будь ласка, виберіть пункт код"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Скорочення вирахування для відпустки без збереження (LWP)
 DocType: Territory,Territory Manager,Регіональний менеджер
 DocType: Packed Item,To Warehouse (Optional),На склад (Необов&#39;язково)
@@ -1343,15 +1340,15 @@
 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,Маркетингові витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Пункт Брак Повідомити
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,Одномісний блок елемента.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',Час входу Пакетне {0} повинен бути «Передано»
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсний фінансовий рік дати початку і закінчення"
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
@@ -1368,8 +1365,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,"Знайти фактури, щоб відповідати"
@@ -1380,21 +1377,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,Кошик включена
 DocType: Job Applicant,Applicant for a Job,Претендент на роботу
 DocType: Production Plan Material Request,Production Plan Material Request,Виробництво План Матеріал Запит
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,"Немає Виробничі замовлення, створені"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,"Немає Виробничі замовлення, створені"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Зробити замовлення на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,Зробити замовлення на
 DocType: SMS Center,Send To,Відправити
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Асигнувати сума
@@ -1402,26 +1399,26 @@
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Фото Примирення
 DocType: Territory,Territory Name,Територія Ім&#39;я
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Робота-в-Прогрес Склад потрібно перед Розмістити
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Робота-в-Прогрес Склад потрібно перед Розмістити
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Претендент на роботу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутний інформація і інша загальна інформація про вашу Постачальника
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Адреси
+apps/erpnext/erpnext/hooks.py +91,Addresses,Адреси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,атестації
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умова для Правила доставки
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Деталь не дозволяється мати виробничого замовлення.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Деталь не дозволяється мати виробничого замовлення.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Вага нетто цього пакета. (розраховується автоматично як сума чистого ваги товарів)
 DocType: Sales Order,To Deliver and Bill,Щоб доставити і Білл
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,Журнали Час для виготовлення.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Час входу для завдань.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,Привітання
@@ -1454,7 +1451,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 DocType: Stock Settings,Allowance Percent,Посібник Відсоток
 DocType: SMS Settings,Message Parameter,Повідомлення Параметр
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Дерево центрів фінансових витрат.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Дерево центрів фінансових витрат.
 DocType: Serial No,Delivery Document No,Доставка Документ №
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Отримати товари від покупки розписок
 DocType: Serial No,Creation Date,Дата створення
@@ -1486,40 +1483,40 @@
 ,Amount to Deliver,Сума Поставте
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,Продукт або послуга
 DocType: Naming Series,Current Value,Поточна вартість
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} створена
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} створена
 DocType: Delivery Note Item,Against Sales Order,На замовлення клієнта
 ,Serial No Status,Серійний номер Статус
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Пункт таблиця не може бути порожнім
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Рядок {0}: Для установки {1} періодичності, різниця між від і до теперішнього часу \ повинно бути більше, ніж або дорівнює {2}"
 DocType: Pricing Rule,Selling,Продаж
 DocType: Employee,Salary Information,Зарплата Інформація
 DocType: Sales Person,Name and Employee ID,Ім&#39;я та ідентифікатор співробітника
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Мита і податки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,"Будь ласка, введіть дату Reference"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Платіжний шлюз аккаунт не налаштований
 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: Production Order,Material Request Item,Матеріал Запит товару
+DocType: Request for Quotation Item,Material Request Item,Матеріал Запит товару
 apps/erpnext/erpnext/config/stock.py +85,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,Червоний
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
 DocType: Account,Frozen,Заморожені
 ,Open Production Orders,Відкриті Виробничі замовлення
 DocType: Installation Note,Installation Time,Установка часу
 DocType: Sales Invoice,Accounting Details,Облік Детальніше
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Видалити всі транзакції цієї компанії
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,Інвестиції
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерії приймання
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,"Будь ласка, введіть Матеріал запитів в наведеній вище таблиці"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Будь ласка, введіть Матеріал запитів в наведеній вище таблиці"
 DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
 DocType: Item Group,Show In Website,Показати на веб-сайті
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Група
@@ -1547,7 +1544,7 @@
 ,Maintenance Schedules,Режими технічного обслуговування
 ,Quotation Trends,Котирування Тенденції
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
@@ -1561,23 +1558,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Включити примиритися Записи
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Загальний фактичний
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,Блок
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,"Будь ласка, сформулюйте компанії"
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,Витратні Претензії
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Витратні Претензії
 DocType: Issue,Support,Підтримка
 ,BOM Search,Специфікація Пошук
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриття (відкриття + Итоги)
@@ -1586,29 +1582,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},Дата просвіт не може бути до дати реєстрації в рядку {0}
 DocType: Salary Slip,Deduction,Відрахування
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Ціна товару додається для {0} в Прейскуранті {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Ціна товару додається для {0} в Прейскуранті {1}
 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 цього менеджера з продажу"
 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 +137,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Розрахунковий банк собі баланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,відключений користувач
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Цитата
 DocType: Salary Slip,Total Deduction,Всього Відрахування
 DocType: Quotation,Maintenance User,Технічне обслуговування Користувач
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,Вартість Оновлене
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,Вартість Оновлене
 DocType: Employee,Date of Birth,Дата народження
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,Відняти
@@ -1620,8 +1616,8 @@
 ,SO Qty,ТАК Кількість
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
+DocType: Request for Quotation,Manufacturing Manager,Виробництво менеджер
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,Спліт накладної в пакети.
 apps/erpnext/erpnext/hooks.py +71,Shipments,Поставки
 DocType: Purchase Order Item,To be delivered to customer,Для поставлятися замовнику
@@ -1629,12 +1625,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),У Слів (Компанія валют)
-DocType: Pricing Rule,Supplier,Постачальник
+DocType: Asset,Supplier,Постачальник
 DocType: C-Form,Quarter,Чверть
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Різні витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Різні витрати
 DocType: Global Defaults,Default Company,За замовчуванням Компанія
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Витрати або рахунок різниці є обов&#39;язковим для п {0}, як це впливає на вартість акцій в цілому"
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,Користувач {0} відключена
@@ -1643,7 +1639,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
 DocType: Currency Exchange,From Currency,Від Валюта
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
@@ -1656,8 +1652,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Дитина Пункт не повинен бути Bundle продукту. Будь ласка, видаліть пункт `{0}` і зберегти"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад, щоб отримати розклад"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,Новий Центр Вартість
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; по податках і зборах і створити новий обліковий запис (натиснувши на Add Child) типу &quot;податок&quot; і згадують ставки податку.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Новий Центр Вартість
 DocType: Bin,Ordered Quantity,Замовлену кількість
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
 DocType: Quality Inspection,In Process,В процесі
@@ -1673,7 +1668,7 @@
 DocType: Quotation Item,Stock Balance,Фото Баланс
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,Продажі Наказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Витрати Заявити Подробиці
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,Журнали Час створення:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Журнали Час створення:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Item,Weight UOM,Вага Одиниця виміру
 DocType: Employee,Blood Group,Група крові
@@ -1691,13 +1686,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Дебет вимагається
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Купівля Прайс-лист
 DocType: Offer Letter Term,Offer Term,Пропозиція термін
 DocType: Quality Inspection,Quality Manager,Менеджер з якості
 DocType: Job Applicant,Job Opening,Робота Відкриття
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирення
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,"Ласка, виберіть назву InCharge людини"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,"Ласка, виберіть назву InCharge людини"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологія
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Лист-пропозиція
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Створення запитів матеріал (ППМ) і виробничі замовлення.
@@ -1705,22 +1700,22 @@
 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 +103,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +121,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Ціни {0} відключена
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Поточна оцінка Оцінити
 DocType: Item,Customer Item Codes,Замовник Предмет коди
 DocType: Opportunity,Lost Reason,Забули Причина
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,Створити Записи оплати по замовленнях або рахунків-фактур.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,Створити Записи оплати по замовленнях або рахунків-фактур.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,Люди і дозволу
@@ -1729,10 +1724,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,Серійний номер {0} знайдений
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Серійний номер {0} знайдений
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Ваші клієнти
 DocType: Leave Block List Date,Block Date,Блок Дата
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Застосувати зараз
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Застосувати зараз
 DocType: Sales Order,Not Delivered,Чи не Поставляється
 ,Bank Clearance Summary,Банк оформлення Резюме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Створення і управління щоденні, щотижневі та щомісячні дайджести новин."
@@ -1756,7 +1751,7 @@
 DocType: Employee,Employment Details,Подробиці з працевлаштування
 DocType: Employee,New Workplace,Новий Робоче
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Встановити як Закрито
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Немає товару зі штрих-кодом {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Немає товару зі штрих-кодом {0}
 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,"Якщо у вас є команда, і продаж з продажу Партнери (Channel Partners), вони можуть бути помічені і підтримувати їх внесок у збутової діяльності"
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
@@ -1774,10 +1769,10 @@
 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 +608,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Передача матеріалів
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Стан {0} повинен бути в продажу товару в {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
 DocType: Purchase Invoice,Price List Currency,Ціни валют
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити негативний складі
@@ -1791,7 +1786,7 @@
 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: Process Payroll,Create Salary Slip,Створити зарплата Сліп
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,Співробітник
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Імпортувати пошту з
@@ -1805,9 +1800,9 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Sales Invoice,Mass Mailing,Розсилок
 DocType: Rename Tool,File to Rename,Файл Перейменувати
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},"Будь ласка, виберіть BOM для пункту в рядку {0}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Будь ласка, виберіть BOM для пункту в рядку {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,Фармацевтична
@@ -1824,25 +1819,25 @@
 DocType: Upload Attendance,Attendance To Date,Відвідуваність Для Дата
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Оплата рахунку
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Чисте зміна дебіторської заборгованості
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неприпустима посилання {0} {1}
 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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Сировина не може бути порожнім.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Швидкий журнал запис
 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 +206,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть плановий Кількість для Пункт {0} в рядку {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть плановий Кількість для Пункт {0} в рядку {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} не буде поданий
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Запити для елементів.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
@@ -1851,7 +1846,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Були створені такі Виробничі замовлення:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Були створені такі Виробничі замовлення:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,Розсилка розсилки
 DocType: Delivery Note,Transporter Name,Transporter Назва
 DocType: Authorization Rule,Authorized Value,Статутний Значення
@@ -1869,10 +1864,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} закрито
 DocType: Email Digest,How frequently?,Як часто?
 DocType: Purchase Receipt,Get Current Stock,Отримати поточний запас
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти до відповідної групи (як правило використання коштів&gt; Поточні активи&gt; Банківські рахунки і створити новий обліковий запис (натиснувши на Add Child) типу &quot;Банк&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Білла матеріалів
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Відзначити даний
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Дата початку обслуговування не може бути до дати доставки для Серійний номер {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,Мета
@@ -1914,12 +1908,12 @@
 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: Purchase Receipt Item,Recd Quantity,Кількість RECD
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,Фото запис {0} не представлено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","наприклад банк, готівка, кредитна карта"
 DocType: Journal Entry,Credit Note,Кредитове авізо
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},"Завершений Кількість не може бути більше, ніж {0} для роботи {1}"
 DocType: Features Setup,Quality,Якість
@@ -1943,9 +1937,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мої Адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідні Оцінити
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Організація філії господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,За замовчуванням Купівля Прайс-лист
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Жоден співробітник для обраних критеріїв вище або ковзання заробітної плати вже не створено
@@ -1972,7 +1966,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платіжна відомість
 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}
@@ -1983,7 +1977,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Налаштування форми
 DocType: Account,Income Account,Рахунок Доходи
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,Ключ Відповідальність Площа
@@ -2005,16 +1999,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,Трек веде по промисловості Type.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,"Будь ласка, введіть код предмета, щоб отримати партії не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Сток Налаштування
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Новий Центр Вартість Ім&#39;я
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Новий Центр Вартість Ім&#39;я
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
 DocType: Appraisal,HR User,HR Користувач
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Податки та відрахування,"
-apps/erpnext/erpnext/config/support.py +7,Issues,Питань
+apps/erpnext/erpnext/hooks.py +90,Issues,Питань
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус повинен бути одним з {0}
 DocType: Sales Invoice,Debit To,Дебет
 DocType: Delivery Note,Required only for sample item.,Потрібно лише для зразка пункту.
@@ -2033,10 +2027,10 @@
 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 +139,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Stock Settings,Default Valuation Method,Оцінка за замовчуванням метод
 DocType: Production Order Operation,Planned Start Time,Плановані Час
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Вкажіть обмінний курс для перетворення однієї валюти в іншу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,Цитата {0} скасовується
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Загальною сумою заборгованості
@@ -2092,7 +2086,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}, зламати операції в кілька операцій"
 ,Requested,Запитаний
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Немає Зауваження
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Корінь аккаунт має бути група
@@ -2119,7 +2113,7 @@
 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,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
 DocType: Payment Request,Recipient and Message,Одержувач і повідомлення
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
@@ -2133,7 +2127,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Вибір постачальника Адреса
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,Рахунок {0} заморожені
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 DocType: Payment Request,Mute Email,Відключення E-mail
@@ -2156,10 +2150,10 @@
 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;язка"
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) проти ордена {1} не може бути більше, ніж загальна сума ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) проти ордена {1} не може бути більше, ніж загальна сума ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілити цілі по місяців.
 DocType: Purchase Invoice Item,Valuation Rate,Оцінка Оцініть
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Ціни валют не визначена
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,Дата початку
@@ -2168,7 +2162,7 @@
 DocType: Installation Note Item,Against Document No,Проти Документ №
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,Управління партнери по збуту.
 DocType: Quality Inspection,Inspection Type,Інспекція Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},"Будь ласка, виберіть {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Відвідуваність
@@ -2196,7 +2190,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Підтвердив
 DocType: Payment Gateway,Gateway,Шлюз
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,"Будь ласка, введіть дату зняття."
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
@@ -2210,12 +2204,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Прийнято Склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата розміщення
 DocType: Item,Valuation Method,Метод Оцінка
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},Неможливо знайти обмінний курс {0} до {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},Неможливо знайти обмінний курс {0} до {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Відзначити Півдня
 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 +410,[Error],[Помилка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,Венчурний капітал
@@ -2247,13 +2241,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,"Матеріал просить {0}, створені"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,"Матеріал просить {0}, створені"
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,Шаблон точки або договором.
 DocType: Purchase Invoice,Address and Contact,Адреса та контактна
 DocType: Supplier,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 +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 DocType: Stock Settings,Freeze Stock Entries,Заморожування зображення щоденнику
 DocType: Item,Reorder level based on Warehouse,Рівень Зміна порядку на основі Склад
 DocType: Activity Cost,Billing Rate,Платіжна Оцінити
@@ -2267,12 +2261,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} скасовано або закрито
 DocType: Delivery Note,Track this Delivery Note against any Project,Підписка на накладну проти будь-якого проекту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Чисті грошові кошти від інвестиційної
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Корінь рахунок не може бути видалений
 ,Is Primary Address,Є первинним Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Управління адрес
-DocType: Pricing Rule,Item Code,Код товару
+DocType: Asset,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
 DocType: Serial No,Warranty / AMC Details,Гарантія / КУА Детальніше
 DocType: Journal Entry,User Remark,Зауваження Користувач
@@ -2318,24 +2311,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Серійний номер і пакетна
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значення або Кількість
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,Хвилин
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купити податки і збори
 ,Qty to Receive,Кількість на отримання
 DocType: Leave Block List,Leave Block List Allowed,Залишити Чорний список тварин
 DocType: Sales Partner,Retailer,Роздрібний торговець
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
 DocType: Global Defaults,Disable In Words,Відключити в словах
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Банк Овердрафт аккаунт
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,Відкриття Баланс акцій
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Відкриття Баланс акцій
 DocType: Appraisal,Appraisal,Оцінка
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторюється
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,"Особа, яка має право підпису"
@@ -2344,7 +2337,7 @@
 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 +199,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,Відмовитися від цієї Email Дайджест
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Відправлено повідомлення
@@ -2385,7 +2378,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
 DocType: Payment Gateway Account,Default Payment Request Message,За замовчуванням Оплата Повідомлення запиту
 DocType: Item Group,Check this if you want to show in website,"Перевірте це, якщо ви хочете, щоб показати на веб-сайті"
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,Банки і платежі
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Банки і платежі
 ,Welcome to ERPNext,Ласкаво просимо в ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Деталь Кількість
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Свинець у Котирувальний
@@ -2393,17 +2386,17 @@
 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 +199,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,Листя і відпустку
 DocType: Sales Order,Not Billed,Чи не Оголошений
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Обидва Склад повинен належати тій же компанії
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,Рулонірованние для рахунків
@@ -2421,13 +2414,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Склад {0}: Компанія є обов&#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}
 DocType: Journal Entry,Stock Entry,Фото запис
 DocType: Account,Payable,До оплати
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Боржники ({0})
-DocType: Project,Margin,маржа
+DocType: Pricing Rule,Margin,маржа
 DocType: Salary Slip,Arrear Amount,Сума недоїмки
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нові клієнти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Загальний прибуток %
@@ -2448,7 +2441,7 @@
 DocType: Payment Request,Email To,E-mail Для
 DocType: Lead,Lead Owner,Ведучий Власник
 DocType: Bin,Requested Quantity,Необхідна кількість
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Сімейний стан
 DocType: Stock Settings,Auto Material Request,Авто Матеріал Запит
 DocType: Time Log,Will be updated when billed.,Буде оновлюватися при рахунок.
@@ -2456,7 +2449,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Поточна специфікація і Нью-специфікації не може бути таким же
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,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 +84,{0}% Delivered,{0}% Поставляється
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Замовив Кількість {1} не може бути менше мінімального замовлення Кіл {2} (визначених у пункті).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
 DocType: Territory,Territory Targets,Територія Цілі
@@ -2476,7 +2469,7 @@
 DocType: Manufacturer,Manufacturers used in Items,Виробники використовували в пунктах
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Будь ласка, вкажіть округлити МВЗ в Компанії"
 DocType: Purchase Invoice,Terms,Терміни
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,Створити новий
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,Створити новий
 DocType: Buying Settings,Purchase Order Required,"Купівля порядку, передбаченому"
 ,Item-wise Sales History,Пункт мудрий Історія продажів
 DocType: Expense Claim,Total Sanctioned Amount,Всього санкціоновані Сума
@@ -2489,7 +2482,7 @@
 ,Stock Ledger,Книга обліку акцій
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Оцінити: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата ковзання Відрахування
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Виберіть вузол групи в першу чергу.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Виберіть вузол групи в першу чергу.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Співробітник і відвідуваності
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Мета повинна бути одним з {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Видалити посилання на клієнта, постачальника, торгового партнера і свинцю, як це ваша компанія адреса"
@@ -2511,13 +2504,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: З {1}
 DocType: Task,depends_on,залежить від
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Показати податок розпад
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Рахунок Дата розміщення
@@ -2532,7 +2525,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} не є допустимим Номер партії за Пункт {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.","Примітка: Якщо оплата не буде зроблена відносно будь-якого посилання, щоб запис журналу вручну."
@@ -2546,7 +2539,7 @@
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Фото Старіння
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} {1} &#39;відключений
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2555,7 +2548,7 @@
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажі Особа Ім&#39;я
@@ -2566,7 +2559,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,"Будь ласка, повторіть введення назва компанії, щоб підтвердити"
@@ -2579,7 +2572,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
 DocType: Purchase Invoice,Price List Exchange Rate,Ціни обмінний курс
 DocType: Purchase Invoice Item,Rate,Ставка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Інтерн
@@ -2587,7 +2580,7 @@
 DocType: Stock Entry,From BOM,З специфікації
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,Біржові операції до {0} заморожені
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,"Для Дата повинна бути такою ж, як від Дата для половини дня відпустки"
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
@@ -2595,14 +2588,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Пропозиція Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
 DocType: Hub Settings,Access Token,Маркер доступу
 DocType: Sales Invoice Item,Serial No,Серійний номер
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,"Будь ласка, введіть Maintaince докладніше Ім&#39;я"
-DocType: Item,Is Fixed Asset Item,Фіксується активами товару
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,"Будь ласка, введіть Maintaince докладніше Ім&#39;я"
 DocType: Purchase Invoice,Print Language,Мова друку
 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","Якщо у вас довге формати друку, ця функція може бути використана, щоб розділити сторінку, яка буде надрукована на декількох сторінках з усіма колонтитули на кожній сторінці"
@@ -2619,7 +2611,7 @@
 DocType: Issue,Opening Time,Відкриття Час
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Від і До дати, необхідних"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
@@ -2635,13 +2627,13 @@
 DocType: Quotation,Maintenance Manager,Технічне обслуговування менеджер
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всього не може бути нульовим
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Днів з часу останнього замовлення"" має бути більше або дорівнювати нулю"
-DocType: C-Form,Amended From,Змінений З
+DocType: Asset,Amended From,Змінений З
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,Переносити
@@ -2655,20 +2647,20 @@
 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/public/js/setup_wizard.js +191,"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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Відповідність Платежі з рахунків-фактур
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Відповідність Платежі з рахунків-фактур
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Позначення)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Додати в кошик
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група За
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Включити / відключити валюти.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Включити / відключити валюти.
 DocType: Production Planning Tool,Get Material Request,Отримати матеріал Запит
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштові витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,Поштові витрати
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всього (АМТ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 DocType: Quality Inspection,Item Serial No,Пункт Серійний номер
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} повинна бути зменшена на {1} або ви повинні підвищити рівень толерантності переливу
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,Разом Поточна
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Бухгалтерська звітність
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Бухгалтерська звітність
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,Година
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серійний товару {0} не може бути оновлена \ на примирення зі
@@ -2687,13 +2679,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Початкова точка-оф-продажу (POS)
 apps/erpnext/erpnext/config/support.py +32,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,Група клієнтів
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: Item,Website Description,Сайт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Чиста зміна в капіталі
 DocType: Serial No,AMC Expiry Date,КУА Дата закінчення терміну дії
@@ -2703,12 +2695,12 @@
 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,Група Ім&#39;я клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Будь ласка, виберіть переносити, якщо ви також хочете включити баланс попереднього фінансового року залишає цей фінансовий рік"
 DocType: GL Entry,Against Voucher Type,На Сертифікати Тип
 DocType: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Отримати товари
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,Отримати товари
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Остання дата замовлення
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
 DocType: C-Form,C-Form,С-форма
@@ -2720,18 +2712,17 @@
 DocType: Purchase Invoice,Mobile No,Номер мобільного
 DocType: Payment Tool,Make Journal Entry,Зробити запис журналу
 DocType: Leave Allocation,New Leaves Allocated,Нові листя номером
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,Комерційна
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Помилка: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
 DocType: Cost Center,Distribution Id,Розподіл Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Всі продукти або послуги.
 DocType: Supplier Quotation,Supplier Address,Постачальник Адреса
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,З Кількість
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
+apps/erpnext/erpnext/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Відповідність атрибутів {0} має бути в межах {1} до {2} в збільшень {3}
@@ -2742,10 +2733,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
 DocType: Tax Rule,Billing State,Державний рахунків
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Переклад
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Переклад
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
 DocType: Journal Entry,Pay To / Recd From,Зверніть Для / RECD Від
 DocType: Naming Series,Setup Series,Серія установки
@@ -2767,18 +2758,18 @@
 DocType: Journal Entry,Write Off Based On,Списання заснований на
 DocType: Features Setup,POS View,POS Перегляд
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,Установка рекорд для серійним номером
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,день Дата наступного і повторити на День місяця має дорівнювати
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,день Дата наступного і повторити на День місяця має дорівнювати
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Введи
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Вище
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Час входу була Оголошений
 DocType: Salary Slip,Earning & Deduction,Заробіток і дедукція
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Рахунок {0} не може бути група
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,Необов&#39;язково. Ця установка буде використовуватися для фільтрації в різних угод.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Попередня прибуток / збиток (кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в Компанії {1}"
@@ -2788,12 +2779,11 @@
 ,Monthly Attendance Sheet,Щомісячна відвідуваність лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,"Чи не запис, не знайдено"
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов&#39;язковим для пп {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідування за допомогою Setup&gt; Нумерація серії"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Отримати елементів з комплекту продукту
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Отримати елементів з комплекту продукту
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Прибуток і збитки&quot; тип рахунку {0} не допускаються в вхідний отвір
 DocType: Features Setup,Sales Discounts,Продажі Знижки
@@ -2807,39 +2797,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Кількість ордена
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / банер, який буде відображатися у верхній частині списку продукції."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Вкажіть умови для розрахунку суми доставки
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Додати Дитину
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,значення відкриття
 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,Комісія з продажу
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представницькі витрати
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Представницькі витрати
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Заявки на відпустку.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,Судові витрати
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судові витрати
 DocType: Sales Invoice,Posting Time,Проводка Час
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,Телефон Витрати
 DocType: Sales Partner,Logo,Логотип
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Перевірте це, якщо ви хочете, щоб змусити користувача вибрати ряд перед збереженням. Там не буде за замовчуванням, якщо ви перевірити це."
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Немає товару з серійним № {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Немає товару з серійним № {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Відкриті Повідомлення
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Прямі витрати
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
-						Email Address'",{0} є неприпустимим адресу електронної пошти в &quot;Повідомлення \ адреса електронної пошти&quot;
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Прямі витрати
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
+						Email Address'","{0} є неприпустимою адресою електронної пошти в ""Повідомлення \ адреса електронної пошти"""
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новий Клієнт Виручка
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Витрати на відрядження
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} не належить компанії: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
@@ -2856,7 +2846,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Всього рахунків Сума (за допомогою журналів Time)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,Ми продаємо цей пункт
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Постачальник Id
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
 DocType: Journal Entry,Cash Entry,Грошові запис
 DocType: Sales Partner,Contact Desc,Зв&#39;язатися Опис вироби
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листя, як випадкові, хворих і т.д."
@@ -2871,7 +2861,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,"Сировина не може бути таким же, як основний пункт"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Зарплата шаблоном.
@@ -2887,7 +2877,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль тварин редагувати заморожені акції
 ,Territory Target Variance Item Group-Wise,Територія Цільова Різниця Пункт Група Мудрий
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
@@ -2902,13 +2892,13 @@
 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,Кредитори
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Кредитори
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Ряд # {0}: Серійний номер є обов&#39;язковим
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрий Податковий Подробиці
 ,Item-wise Price List Rate,Пункт мудрий Ціни Оцінити
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Постачальник цитати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Штрих {0} вже використовується в пункті {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},Штрих {0} вже використовується в пункті {1}
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Майбутні події
@@ -2928,15 +2918,14 @@
 DocType: Customer,From Lead,Зі свинцю
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} проти накладна {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
-DocType: Project,Project Name,Назва проекту
+DocType: Request for Quotation 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,Пункт Пакетне пп
@@ -2973,7 +2962,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Компанія є обов&#39;язковим, так як це ваша компанія адреса"
 DocType: Item Attribute,From Range,Від хребта
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Пункт {0} ігноруються, так як це не стандартні вироби"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Відправити цю виробничого замовлення для подальшої обробки.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Відправити цю виробничого замовлення для подальшої обробки.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Не застосовувати правило Ціни в конкретній угоді, всі застосовні правила ціноутворення повинна бути відключена."
 DocType: Company,Domain,Домен
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,роботи
@@ -2985,6 +2974,7 @@
 DocType: Time Log,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,Зробити постачальників цитати
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Скорочення Заробіток для відпустки без збереження (LWP)
@@ -3002,7 +2992,7 @@
 DocType: Opportunity,Opportunity Date,Можливість Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повернутися Проти покупки отриманні
 DocType: Purchase Order,To Bill,Для Білла
-DocType: Material Request,% Ordered,Замовив%
+DocType: Material Request,% Ordered,% Замовлено
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Відрядна робота
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,СР Купівля Оцінити
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
@@ -3019,7 +3009,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Тимчасові рахунки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Специфікація Вибух товару
 DocType: Account,Auditor,Аудитор
@@ -3033,16 +3023,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Марк Відсутня
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,"Часу повинен бути більше, ніж від часу"
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Додати елементи з
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Додати елементи з
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""","наприклад, &quot;МК&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,"Фото не може існувати Пункт {0}, так як має варіанти"
 ,Sales Person-wise Transaction Summary,Продажі Людина-мудрий Резюме угода
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Склад {0} не існує
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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
@@ -3068,7 +3058,7 @@
 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,Наступна Контактні
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Налаштування шлюзу рахунку.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Налаштування шлюзу рахунку.
 DocType: Employee,Employment Type,Вид зайнятості
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Основні активи
 ,Cash Flow,Грошовий потік
@@ -3082,7 +3072,7 @@
 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 +132,Please find attached {0} #{1},Додається {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Додається {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Банк балансовий звіт за Головну книгу
 DocType: Job Applicant,Applicant Name,Заявник Ім&#39;я
 DocType: Authorization Rule,Customer / Item Name,Замовник / Назва товару
@@ -3098,19 +3088,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Будь ласка, сформулюйте з / в діапазоні"
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Налаштування за замовчуванням для продажу угод.
 DocType: BOM Replace Tool,Current BOM,Поточна специфікація
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додати серійний номер
 apps/erpnext/erpnext/config/support.py +43,Warranty,гарантія
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,Друк та стаціонарні
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Вузол Група
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Оновлення готової продукції
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Оновлення готової продукції
 DocType: Workstation,per hour,в годину
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом.
-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/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки існує запис складі книга для цього складу."
 DocType: Company,Distribution,Розподіл
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,Виплачувана сума
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
@@ -3140,7 +3129,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
 DocType: Leave Block List,Applies to Company,Відноситься до Компанії
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що представив зі входу {0} існує"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що представив зі входу {0} існує"
 DocType: Purchase Invoice,In Words,За словами
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
 DocType: Production Planning Tool,Material Request For Warehouse,Матеріал Запит Склад
@@ -3154,7 +3143,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
 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.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
@@ -3165,7 +3154,7 @@
 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 +782,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} вже отримав
@@ -3173,14 +3162,13 @@
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
 DocType: Expense Claim,Total Claimed Amount,Усього сума претензії
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенційні можливості для продажу.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Невірний {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Неймінг Series для {0} через Setup&gt; Установки&gt; Naming Series"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зберегти документ у першу чергу.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Зберегти документ у першу чергу.
 DocType: Account,Chargeable,Оплаті
 DocType: Company,Change Abbreviation,Змінити Абревіатура
 DocType: Expense Claim Detail,Expense Date,Витрати Дата
@@ -3198,10 +3186,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,Головна бухгалтерська книга
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Подивитися покупка
 DocType: Item Attribute Value,Attribute Value,Значення атрибута
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Посвідчення особи електронної пошти повинен бути унікальним, вже існує для {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Посвідчення особи електронної пошти повинен бути унікальним, вже існує для {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуємо Змінити порядок Рівень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 DocType: Features Setup,To get Item Group in details table,Щоб отримати елемент групи в таблиці дані
@@ -3226,23 +3214,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},Технічне обслуговування Розклад {0} існує проти {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Технічне обслуговування Розклад {0} існує проти {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактична Кількість (в джерелі / цілі)
 DocType: Item Customer Detail,Ref Code,Код посилання
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Співробітник записів.
 DocType: Payment Gateway,Payment Gateway,Платіжний шлюз
 DocType: HR Settings,Payroll Settings,Налаштування заробітної плати
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Підходимо незв&#39;язані Рахунки та платежі.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Підходимо незв&#39;язані Рахунки та платежі.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Зробити замовлення
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Корінь не може бути батько МВЗ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Виберіть бренд ...
 DocType: Sales Invoice,C-Form Applicable,"С-формі, застосовної"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Склад є обов&#39;язковим
 DocType: Supplier,Address and Contacts,Адреса та контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),Тримайте це веб-дружній 900px (W) по 100px (ч)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,Виробничий замовлення не може бути піднято проти Item Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,Вирішили За
@@ -3260,7 +3248,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,"Валюта угоди повинна бути такою ж, як платіжний шлюз валюти"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Отримати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,Отримати
 DocType: Maintenance Visit,Fully Completed,Повністю завершено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Повний
 DocType: Employee,Educational Qualification,Освітня кваліфікація
@@ -3268,14 +3256,14 @@
 DocType: Purchase Invoice,Submit on creation,Відправити по створенню
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Мої Замовлення
@@ -3296,10 +3284,10 @@
 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 +250,Point-of-Sale Profile,Точка-в-продажу Профіль
+apps/erpnext/erpnext/config/accounts.py +258,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} вже виставлений
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Незабезпечені кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Незабезпечені кредити
 DocType: Cost Center,Cost Center Name,Вартість Ім&#39;я центр
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланована дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Всього виплачено Amt
@@ -3311,7 +3299,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Ваші Постачальники
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
@@ -3324,12 +3312,12 @@
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: З {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сайт зображення {0} прикріплений до пункту {1} не може бути знайдений
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Сайт зображення {0} прикріплений до пункту {1} не може бути знайдений
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Payment Reconciliation,From Invoice Date,Від Накладна Дата
@@ -3338,7 +3326,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,Рахунок Керівник
@@ -3351,7 +3339,7 @@
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Активи фонду
@@ -3365,15 +3353,15 @@
 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 +576,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна діяльність / завдання.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Створення Зарплата ковзає
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка повинна бути перевірена, якщо вибраний Стосується для в {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,Повторіть день місяця
@@ -3394,7 +3382,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Приклад :. ABCD ##### Якщо серія встановлений і Серійний номер не згадується в угодах, то автоматична серійний номер буде створений на основі цієї серії. Якщо ви хочете завжди явно згадати заводським номером для даного елемента. залишити це поле порожнім."
 DocType: Upload Attendance,Upload Attendance,Завантажити Відвідуваність
@@ -3405,11 +3393,11 @@
 ,Sales Analytics,Продажі Аналітика
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування Виробництво
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Налаштування e-mail
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,"Будь ласка, введіть валюту за замовчуванням в компанії Master"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,"Будь ласка, введіть валюту за замовчуванням в компанії 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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Податковий Правило конфлікти з {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Новий акаунт Ім&#39;я
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,Новий акаунт Ім&#39;я
 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,Обслуговування клієнтів
@@ -3421,9 +3409,9 @@
 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 +72,Item {0} must be a stock Item,Пункт {0} повинен бути запас товару
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,За замовчуванням роботи на складі Прогрес
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути перед матеріалу Запит Дата
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Пункт {0} повинен бути Продажі товару
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,Пункт {0} повинен бути Продажі товару
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
 DocType: Account,Equity,Капітал
 DocType: Sales Order,Printing Details,Друк Подробиці
@@ -3431,7 +3419,7 @@
 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,Пошук Sub Асамблей
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 Знижка
@@ -3454,7 +3442,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фінансовий рік Дата початку і фінансовий рік Дата закінчення вже встановлені у фінансовий рік {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,Успішно Примирення
 DocType: Production Order,Planned End Date,Планована Дата закінчення
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,Де елементи зберігаються.
@@ -3465,7 +3453,7 @@
 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 +508,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Податковий шаблон для покупки угод.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Податковий шаблон для покупки угод.
 ,Item Prices,Предмет Ціни
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"За словами будуть видні, як тільки ви збережете замовлення."
 DocType: Period Closing Voucher,Period Closing Voucher,Період закриття Ваучер
@@ -3475,10 +3463,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,На Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,"&quot;Повідомлення Адреси електронної пошти&quot;, не зазначені для повторюваних% S"
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Повідомлення Адреси електронної пошти"", не зазначені для повторюваних %s"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,Зміна
@@ -3497,13 +3485,13 @@
 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 +559,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Податковий Категорія не може бути &quot;Оцінка&quot; або &quot;Оцінка і загальне&quot;, як всі елементи, немає в наявності"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Партія
@@ -3517,7 +3505,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Людина з продажу
 DocType: Sales Invoice,Cold Calling,Холодні дзвінки
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Бюджет і МВЗ
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Бюджет і МВЗ
 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.,Створення правил по обмеженню угод на основі значень.
@@ -3550,7 +3538,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп користувачам вносити Залишити додатків на наступні дні.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група товару&gt; Марка
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Виробник Кількість
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнято Кількість
@@ -3558,7 +3545,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,Батьки рахунку
@@ -3574,7 +3561,7 @@
 DocType: Employee,Education,Освіта
 DocType: Selling Settings,Campaign Naming By,Кампанія Неймінг За
 DocType: Employee,Current Address Is,Поточна адреса
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
 DocType: Address,Office,Офіс
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
@@ -3609,7 +3596,7 @@
 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}."
+apps/erpnext/erpnext/accounts/party.py +234,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,Щомісячна зарплата Реєстрація
 DocType: Warranty Claim,If different than customer address,"Якщо відрізняється, ніж адресою замовника"
 DocType: BOM Operation,BOM Operation,Специфікація Операція
@@ -3617,22 +3604,22 @@
 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-профілю
 DocType: Payment Gateway Account,Payment URL Message,Оплата URL повідомлення
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сума платежу не може бути більше, ніж суми заборгованості"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,Всього Неоплачений
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Час входу не оплачується
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants","Пункт {0} шаблон, виберіть один з його варіантів"
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants","Пункт {0} шаблон, виберіть один з його варіантів"
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,"Будь ласка, введіть проти Ваучери вручну"
 DocType: SMS Settings,Static Parameters,Статичні параметри
 DocType: Purchase Order,Advance Paid,Попередня Платні
 DocType: Item,Item Tax,Стан податкової
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Матеріал Постачальнику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Акцизний Рахунок
 DocType: Expense Claim,Employees Email Id,Співробітники Email ID
 DocType: Employee Attendance Tool,Marked Attendance,Помітне Відвідуваність
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Поточні зобов&#39;язання
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Поточні зобов&#39;язання
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Фактична Кількість обов&#39;язково
@@ -3653,17 +3640,16 @@
 DocType: Item Attribute,Numeric Values,Числові значення
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Прикріпіть логотип
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Зробити Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Зробити Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок відпустки додатки по кафедрі.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,аналітика
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошик Пусто
 DocType: Production Order,Actual Operating Cost,Фактична Операційна Вартість
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Ні адреси за замовчуванням шаблону, не знайдено. Будь ласка, створіть новий з Setup&gt; Друк і Брендинг&gt; Адреса шаблону."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,Капітал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Капітал
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
 DocType: Payment Gateway Account,Payment Gateway Account,Платіжний шлюз аккаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Після завершення оплати перенаправити користувача на обрану сторінку.
@@ -3675,17 +3661,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 ,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
 DocType: Batch,Expiry Date,Термін придатності
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,Отримати елементів із специфікації
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення в наведеній вище таблиці"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення в наведеній вище таблиці"
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Відомість матеріалів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Посилання Дата
@@ -3693,6 +3679,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
 DocType: GL Entry,Is Opening,Відкриває
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,Рахунок {0} не існує
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 79a2d5d..9a9d9b4 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,ڈیلر
 DocType: Employee,Rented,کرایے
 DocType: POS Profile,Applicable for User,صارف کے لئے قابل اطلاق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},کرنسی قیمت کی فہرست کے لئے ضروری ہے {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ٹرانزیکشن میں حساب کیا جائے گا.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
 DocType: Purchase Order,Customer Contact,اپرنٹسشپس
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,ملازمت کی درخواست گزار
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,صف # {0}: شرح کے طور پر ایک ہی ہونا چاہیے {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,نیا رخصت کی درخواست
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,بینک ڈرافٹ
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,دکھائیں متغیرات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),قرضے (واجبات)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),قرضے (واجبات)
 DocType: Employee Education,Year of Passing,پاسنگ کا سال
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,اسٹاک میں
 DocType: Designation,Designation,عہدہ
@@ -64,7 +63,7 @@
 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 +642,Invoice,انوائس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,انوائس
 DocType: Maintenance Schedule Item,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},نیا {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},نیا {0}: # {1}
 ,Sales Partners Commission,سیلز شراکت دار کمیشن
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,زیادہ سے زیادہ 5 حروف نہیں کر سکتے ہیں مخفف
 DocType: Payment Request,Payment Request,ادائیگی کی درخواست
@@ -102,7 +101,7 @@
 DocType: Employee,Married,شادی
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},کی اجازت نہیں {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,سے اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
 DocType: Payment Reconciliation,Reconcile,مصالحت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,گروسری
 DocType: Quality Inspection Reading,Reading 1,1 پڑھنا
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,ہدف پر
 DocType: BOM,Total Cost,کل لاگت
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,سرگرمی لاگ ان:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,{0} آئٹم نظام میں موجود نہیں ہے یا ختم ہو گیا ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,دواسازی
@@ -156,7 +155,7 @@
 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,اسٹاک اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,اسٹاک اخراجات
 DocType: Newsletter,Email Sent?,ای میل بھیجا ہے؟
 DocType: Journal Entry,Contra Entry,برعکس انٹری
 DocType: Production Order Operation,Show Time Logs,وقت دکھائیں لاگز
@@ -164,12 +163,12 @@
 DocType: Delivery Note,Installation Status,تنصیب کی حیثیت
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,آئٹم {0} ایک خرید آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: BOM Replace Tool,New BOM,نیا BOM
@@ -208,11 +207,11 @@
 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 +79,Account {0} does not belong to Company {1},اکاؤنٹ {0} کمپنی سے تعلق نہیں ہے {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,کمپنی داخل کریں
@@ -221,7 +220,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
 DocType: Lead,Address & Contact,ایڈریس اور رابطہ
 DocType: Leave Allocation,Add unused leaves from previous allocations,گزشتہ آونٹن سے غیر استعمال شدہ پتے شامل
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},اگلا مکرر {0} پر پیدا کیا جائے گا {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},اگلا مکرر {0} پر پیدا کیا جائے گا {1}
 DocType: Newsletter List,Total Subscribers,کل والے
 ,Contact Name,رابطے کا نام
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,مندرجہ بالا معیار کے لئے تنخواہ پرچی بناتا ہے.
@@ -235,8 +234,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
 DocType: Payment Tool,Reference No,حوالہ نہیں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,چھوڑ کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,بینک لکھے
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
@@ -248,8 +247,8 @@
 DocType: Pricing Rule,Supplier Type,پردایک قسم
 DocType: Item,Publish in Hub,حب میں شائع
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +263,7 @@
 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.,اس علاقے پر مقرر آئٹم گروپ وار بجٹ. آپ کو بھی تقسیم کی ترتیب کی طرف seasonality کے شامل کر سکتے ہیں.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},گودام کے لئے والدین کے اکاؤنٹ گروپ درج کریں {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},گودام کے لئے والدین کے اکاؤنٹ گروپ درج کریں {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},کے خلاف ادائیگی {0} {1} بقایا رقم سے زیادہ نہیں ہو سکتا {2}
 DocType: Supplier,Address HTML,ایڈریس HTML
 DocType: Lead,Mobile No.,موبائل نمبر
@@ -283,7 +282,7 @@
 DocType: Item,Synced With Hub,حب کے ساتھ موافقت پذیر
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,غلط شناختی لفظ
 DocType: Item,Variant Of,کے مختلف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
 DocType: Period Closing Voucher,Closing Account Head,اکاؤنٹ ہیڈ بند
 DocType: Employee,External Work History,بیرونی کام کی تاریخ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,سرکلر حوالہ خرابی
@@ -294,10 +293,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Payment Reconciliation Invoice,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,ترسیل کے نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,ترسیل کے نوٹ
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,مہینے اور سال براہ مہربانی منتخب کریں
@@ -308,12 +307,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,سمجھا کل آرڈر
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,درج میدان قیمت &#39;دن ماہ پر دہرائیں براہ مہربانی
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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، ترسیل کے نوٹ، انوائس خریداری، پروڈکشن آرڈر، خریداری کے آرڈر، خریداری کی رسید، فروخت انوائس، سیلز آرڈر، اسٹاک انٹری، timesheet میں دستیاب
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
@@ -335,9 +334,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سیریل نمبر {0} ترسیل کے نوٹ سے تعلق نہیں ہے {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,آئٹم کے معیار معائنہ پیرامیٹر
 DocType: Leave Application,Leave Approver Name,منظوری دینے والا چھوڑ دو نام
-,Schedule Date,شیڈول تاریخ
+DocType: Depreciation Schedule,Schedule Date,شیڈول تاریخ
 DocType: Packed Item,Packed Item,پیک آئٹم
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,لین دین کی خریداری کے لئے پہلے سے طے شدہ ترتیبات.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,لین دین کی خریداری کے لئے پہلے سے طے شدہ ترتیبات.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},سرگرمی لاگت سرگرمی قسم کے خلاف ملازم {0} کے لئے موجود ہے - {1}
 apps/erpnext/erpnext/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,کرنسی کا تبادلہ
@@ -386,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تمام مینوفیکچرنگ کے عمل کے لئے عالمی ترتیبات.
 DocType: Accounts Settings,Accounts Frozen Upto,منجمد تک اکاؤنٹس
 DocType: SMS Log,Sent On,پر بھیجا
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
-DocType: Material Request Item,Required Date,مطلوبہ تاریخ
+DocType: Request for Quotation Item,Required Date,مطلوبہ تاریخ
 DocType: Delivery Note,Billing Address,بل کا پتہ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,آئٹم کوڈ داخل کریں.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,کل مقدار
@@ -416,17 +415,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;موجود نہیں ہے
 DocType: Pricing Rule,Valid Upto,درست تک
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
 DocType: Shipping Rule,Net Weight,سارا وزن
 DocType: Employee,Emergency Phone,ایمرجنسی فون
 ,Serial No Warranty Expiry,سیریل کوئی وارنٹی ختم ہونے کی
@@ -446,7 +445,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,آئٹم {0} خریدیں نہیں ہے آئٹم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,آئٹم {0} خریدیں نہیں ہے آئٹم
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ ترمیم ٹیکس اور الزامات شامل
 DocType: Purchase Invoice,Supplier Invoice No,سپلائر انوائس کوئی
 DocType: Territory,For reference,حوالے کے لیے
@@ -457,7 +456,7 @@
 DocType: Production Plan Item,Pending Qty,زیر مقدار
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ذیلی کنٹریکٹڈ خریداری کی رسید کے لئے لازمی پردایک گودام
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ذیلی کنٹریکٹڈ خریداری کی رسید کے لئے لازمی پردایک گودام
 DocType: Pricing Rule,Valid From,سے درست
 DocType: Sales Invoice,Total Commission,کل کمیشن
 DocType: Pricing Rule,Sales Partner,سیلز پارٹنر
@@ -467,13 +466,13 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** ماہانہ تقسیم *** آپ کے کاروبار میں آپ کو seasonality کے ہے تو آپ ماہ میں آپ کے بجٹ کی تقسیم میں مدد ملتی ہے. **، اس کی تقسیم کا استعمال کرتے ہوئے بجٹ تقسیم ** لاگت مرکز میں ** یہ ** ماہانہ تقسیم قائم کرنے کے لئے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,جمع اقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,مالی سال شروع کرنے کی تاریخ مالی سال کے اختتام کی تاریخ سے زیادہ نہیں ہونا چاہئے
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,مالی سال شروع کرنے کی تاریخ مالی سال کے اختتام کی تاریخ سے زیادہ نہیں ہونا چاہئے
 DocType: Warranty Claim,Resolution,قرارداد
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},نجات: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,قابل ادائیگی اکاؤنٹ
@@ -481,7 +480,7 @@
 DocType: Job Applicant,Resume Attachment,پھر جاری منسلکہ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,دوبارہ گاہکوں
 DocType: Leave Control Panel,Allocate,مختص
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,سیلز واپس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,سیلز واپس
 DocType: Item,Delivered by Supplier (Drop Ship),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,تنخواہ کے اجزاء.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ممکنہ گاہکوں کے ڈیٹا بیس.
@@ -490,7 +489,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,اسٹاک اندراجات بنا رہے ہیں جس کے خلاف ایک منطقی گودام.
@@ -500,7 +499,7 @@
 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/config/accounts.py +70,Masters,ماسٹرز
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,اپ ڈیٹ بینک ٹرانزیکشن تواریخ
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,اپ ڈیٹ بینک ٹرانزیکشن تواریخ
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},منفی اسٹاک خرابی ({6}) شے کے لئے {0} گودام میں {1} پر {2} {3} میں {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,وقت سے باخبر رکھنے
 DocType: Fiscal Year Company,Fiscal Year Company,مالی سال کمپنی
@@ -518,19 +517,18 @@
 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,پہلے سے طے شدہ لاگت کی شرح
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,بحالی کے شیڈول
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,بحالی کے شیڈول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",پھر قیمتوں کا تعین قواعد وغیرہ کسٹمر، کسٹمر گروپ، علاقہ، سپلائر، سپلائر کی قسم، مہم، سیلز پارٹنر کی بنیاد پر فلٹر کر رہے ہیں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,انوینٹری میں خالص تبدیلی
 DocType: Employee,Passport Number,پاسپورٹ نمبر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مینیجر
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,ایک ہی شے کے ایک سے زیادہ مرتبہ داخل کیا گیا ہے.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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;ہی نہیں ہو سکتا
 DocType: Sales Person,Sales Person Targets,فروخت شخص اہداف
 DocType: Production Order Operation,In minutes,منٹوں میں
 DocType: Issue,Resolution Date,قرارداد تاریخ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,ملازم یا کمپنی یا تو کے لئے ایک چھٹی کی فہرست مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
 DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,گروپ میں تبدیل
 DocType: Activity Cost,Activity Type,سرگرمی کی قسم
@@ -538,7 +536,7 @@
 DocType: Supplier,Fixed Days,فکسڈ دنوں
 DocType: Quotation Item,Item Balance,آئٹم بیلنس
 DocType: Sales Invoice,Packing List,پیکنگ کی فہرست
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,خریداری کے احکامات سپلائر کو دیا.
+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,بسم
@@ -572,7 +570,7 @@
 DocType: Hub Settings,Seller City,فروش شہر
 DocType: Email Digest,Next email will be sent on:,پیچھے اگلا، دوسرا ای میل پر بھیجا جائے گا:
 DocType: Offer Letter Term,Offer Letter Term,خط مدتی پیشکش
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,آئٹم مختلف حالتوں ہے.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,درخت کی قسم
@@ -608,13 +606,13 @@
 DocType: Opportunity,Opportunity From,سے مواقع
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ماہانہ تنخواہ بیان.
 DocType: Item Group,Website Specifications,ویب سائٹ نردجیکرن
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,نیا کھاتہ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,نیا کھاتہ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: سے {0} قسم کا {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
+apps/erpnext/erpnext/controllers/buying_controller.py +275,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.,اکاؤنٹنگ اندراجات پتی نوڈس کے خلاف بنایا جا سکتا ہے. گروپوں کے خلاف لکھے کی اجازت نہیں ہے.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
 DocType: Opportunity,Maintenance,بحالی
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},آئٹم کے لئے ضروری خریداری کی رسید نمبر {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},آئٹم کے لئے ضروری خریداری کی رسید نمبر {0}
 DocType: Item Attribute Value,Item Attribute Value,شے کی قیمت خاصیت
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -643,17 +641,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",جرنل اندراج {0} اس انوائس میں پیشگی کے طور پر نکالا جانا چاہئے تو {1}، چیک کے خلاف منسلک کیا جاتا ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,آفس دیکھ بھال کے اخراجات
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,پہلی شے داخل کریں
 DocType: Account,Liability,ذمہ داری
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.
 DocType: Company,Default Cost of Goods Sold Account,سامان فروخت اکاؤنٹ کے پہلے سے طے شدہ لاگت
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,قیمت کی فہرست منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Process Payroll,Send Email,ای میل بھیجیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
@@ -661,7 +659,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,میری انوائس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,میری انوائس
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,کوئی ملازم پایا
 DocType: Supplier Quotation,Stopped,روک
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
@@ -673,7 +671,7 @@
 DocType: Item,Website Warehouse,ویب سائٹ گودام
 DocType: Payment Reconciliation,Minimum Invoice Amount,کم از کم انوائس کی رقم
 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 +267,C-Form records,سی فارم ریکارڈز
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,سی فارم ریکارڈز
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,کسٹمر اور سپلائر
 DocType: Email Digest,Email Digest Settings,ای میل ڈائجسٹ ترتیبات
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,گاہکوں کی طرف سے حمایت کے سوالات.
@@ -697,7 +695,7 @@
 DocType: Quotation Item,Projected Qty,متوقع مقدار
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
 DocType: Newsletter,Newsletter Manager,نیوز لیٹر منیجر
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,اخراجات
@@ -734,14 +732,14 @@
 DocType: Supplier Quotation,Is Subcontracted,ٹھیکے ہے
 DocType: Item Attribute,Item Attribute Values,آئٹم خاصیت فہرست
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,لنک والے
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,خریداری کی رسید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,خریداری کی رسید
 ,Received Items To Be Billed,موصول ہونے والی اشیاء بل بھیجا جائے کرنے کے لئے
 DocType: Employee,Ms,محترمہ
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,کرنسی کی شرح تبادلہ ماسٹر.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,کرنسی کی شرح تبادلہ ماسٹر.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
 DocType: Production Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,پہلی دستاویز کی قسم منتخب کریں
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,روانگی بر ٹوکری
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,اس کی بحالی کا منسوخ کرنے سے پہلے منسوخ مواد دورہ {0}
@@ -760,7 +758,7 @@
 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 +524,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
 DocType: Address,Shop,دکان
@@ -770,10 +768,10 @@
 DocType: Employee,Permanent Address Is,مستقل پتہ ہے
 DocType: Production Order Operation,Operation completed for how many finished goods?,آپریشن کتنے تیار مال کے لئے مکمل کیا ہے؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,برانڈ
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} شے کے لئے پار over- کے لیے الاؤنس {1}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,{0} شے کے لئے پار over- کے لیے الاؤنس {1}.
 DocType: Employee,Exit Interview Details,باہر نکلیں انٹرویو کی تفصیلات
 DocType: Item,Is Purchase Item,خریداری آئٹم
-DocType: Journal Entry Account,Purchase Invoice,خریداری کی رسید
+DocType: Asset,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,تاریخ اور آخری تاریخ کھولنے اسی مالی سال کے اندر اندر ہونا چاہئے
@@ -783,16 +781,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},صف # {0}: شے کے لئے کوئی سیریل کی وضاحت کریں {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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;پیکنگ کی فہرست&#39; کے لئے کاپی کیا جائے گا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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;پیکنگ کی فہرست&#39; کے لئے کاپی کیا جائے گا.
 DocType: Job Opening,Publish on website,ویب سائٹ پر شائع کریں
 apps/erpnext/erpnext/config/stock.py +17,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,بالواسطہ آمدنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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),کل پیغام (ے)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
 DocType: Purchase Invoice,Additional Discount Percentage,اضافی ڈسکاؤنٹ فی صد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,تمام قسم کی مدد ویڈیوز کی ایک فہرست دیکھیں
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,چیک جمع کیا گیا تھا جہاں بینک کے اکاؤنٹ منتخب کریں سر.
@@ -806,14 +804,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگرہ کی یاددہانیاں نہ بھیجیں
 ,Employee Holiday Attendance,ملازم چھٹیوں حاضری
 DocType: Opportunity,Walk In,میں چلنے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,اسٹاک میں لکھے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,اسٹاک میں لکھے
 DocType: Item,Inspection Criteria,معائنہ کا کلیہ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,transfered کیا
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,بنائیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,میری کارڈز
@@ -823,7 +821,7 @@
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 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 +180,Qty for {0},کے لئے مقدار {0}
+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 +80,Leave Allocation Tool,ایلوکیشن چھوڑ دیں آلہ
 DocType: Leave Block List,Leave Block List Dates,بلاک فہرست تاریخوں چھوڑ
@@ -836,7 +834,7 @@
 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 +547,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} منفی نہیں ہو سکتا
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,ڈسکاؤنٹ
@@ -851,20 +849,20 @@
 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 +69,Selling Amount,فروخت رقم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,وقت کیلیے نوشتہ جات دیکھیے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,وقت کیلیے نوشتہ جات دیکھیے
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,اکاؤنٹ کمپنی کے ساتھ مماثل نہیں ہے
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,نوکری کے لئے
 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,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,فروخت کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,فروخت کے اخراجات
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,سٹینڈرڈ خرید
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
@@ -881,7 +879,7 @@
 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 +18,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
+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,اوسط عمر
@@ -890,7 +888,7 @@
 DocType: Company,Default Currency,پہلے سے طے شدہ کرنسی
 DocType: Contact,Enter designation of this Contact,اس رابطے کے عہدہ درج
 DocType: Expense Claim,From Employee,ملازم سے
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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,کلیدی کارکردگی کے علاقے
@@ -898,7 +896,7 @@
 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 +130,Please select BOM in BOM field for Item {0},آئٹم کے لئے BOM میدان میں BOM منتخب کریں {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,شراکت٪
@@ -907,7 +905,7 @@
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,پروڈکشن آرڈر {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
 ,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.,وقت کیلیے نوشتہ جات دیکھیے کو منتخب کریں اور ایک نئے فروخت انوائس پیدا کرنے کے لئے جمع کرائیں.
@@ -915,14 +913,14 @@
 DocType: Salary Slip,Deductions,کٹوتیوں
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,اس وقت لاگ بیچ بل دیا گیا ہے.
 DocType: Salary Slip,Leave Without Pay,بغیر تنخواہ چھٹی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
 ,Trial Balance for Party,پارٹی کے لئے مقدمے کی سماعت توازن
 DocType: Lead,Consultant,کنسلٹنٹ
 DocType: Salary Slip,Earnings,آمدنی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,ختم آئٹم {0} تیاری قسم اندراج کے لئے داخل ہونا ضروری ہے
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,کھولنے اکاؤنٹنگ بیلنس
 DocType: Sales Invoice Advance,Sales Invoice Advance,فروخت انوائس ایڈوانس
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,کچھ درخواست کرنے کے لئے
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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/setup_wizard/install_fixtures.py +75,Management,مینجمنٹ
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,وقت کی چادریں کے لئے سرگرمیوں کی اقسام
@@ -933,18 +931,18 @@
 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; قسم نوڈس کے تحت پیدا کیا جا سکتا
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,ای میل ID مقرر کریں
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ای میل ID مقرر کریں
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{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},پی او ایس پروفائل {0} پہلے ہی صارف کے لئے پیدا کیا: {1} اور کمپنی {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM تبادلوں فیکٹر
 DocType: Stock Settings,Default Item Group,پہلے سے طے شدہ آئٹم گروپ
-apps/erpnext/erpnext/config/buying.py +33,Supplier database.,پردایک ڈیٹا بیس.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پردایک ڈیٹا بیس.
 DocType: Account,Balance Sheet,بیلنس شیٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,ٹیکس اور دیگر کٹوتیوں تنخواہ.
 DocType: Lead,Lead,لیڈ
 DocType: Email Digest,Payables,Payables
@@ -972,18 +970,18 @@
 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/page/accounts_browser/accounts_browser.js +128,View Ledger,لنک لیجر
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,لنک لیجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
 ,Budget Variance Report,بجٹ تغیر رپورٹ
 DocType: Salary Slip,Gross Pay,مجموعی ادائیگی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,فائدہ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,برقرار رکھا آمدنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,برقرار رکھا آمدنی
 DocType: BOM Item,Item Description,آئٹم تفصیل
 DocType: Payment Tool,Payment Mode,ادائیگی کے موڈ
 DocType: Purchase Invoice,Is Recurring,مکرر ہے
@@ -991,7 +989,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,عارضی افتتاحی
 ,Employee Leave Balance,ملازم کی رخصت بیلنس
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
 DocType: Address,Address Type,ایڈریس کی قسم
@@ -1005,14 +1003,14 @@
 ,Accounts Payable Summary,قابل ادائیگی اکاؤنٹس کے خلاصے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
 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 +165,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,اکاؤنٹ سر {0} پیدا
 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,کل حاصل کیا
@@ -1020,12 +1018,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,بالواسطہ اخراجات
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,صف {0}: مقدار لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعت
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
 DocType: Journal Entry Account,Purchase Order,خریداری کے آرڈر
 DocType: Warehouse,Warehouse Contact Info,گودام معلومات رابطہ کریں
@@ -1035,17 +1033,17 @@
 DocType: Serial No,Serial No Details,سیریل کوئی تفصیلات
 DocType: Purchase Invoice Item,Item Tax Rate,آئٹم ٹیکس کی شرح
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/stock/get_item_details.py +142,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;.
 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},پروڈکشن آرڈر حیثیت ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,متوقع تاریخ کی ترسیل منصوبہ بندی شروع کرنے کی تاریخ کے مقابلے میں کم ہے.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,سپلائر کے لئے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,متوقع تاریخ کی ترسیل منصوبہ بندی شروع کرنے کی تاریخ کے مقابلے میں کم ہے.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,کل سبکدوش ہونے والے
@@ -1055,10 +1053,10 @@
 DocType: Item,Website Item Groups,ویب سائٹ آئٹم گروپس
 DocType: Purchase Invoice,Total (Company Currency),کل (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,{0} سیریل نمبر ایک سے زائد بار میں داخل
-DocType: Journal Entry,Journal Entry,جرنل اندراج
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
 DocType: Sales Partner,Target Distribution,ہدف تقسیم
 DocType: Salary Slip,Bank Account No.,بینک اکاؤنٹ نمبر
 DocType: Naming Series,This is the number of the last created transaction with this prefix,یہ اپسرگ کے ساتھ گزشتہ پیدا لین دین کی تعداد ہے
@@ -1091,7 +1089,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},بند اکاؤنٹ کی کرنسی ہونا ضروری ہے {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},تمام مقاصد کے لئے پوائنٹس کی رقم یہ ہے 100. ہونا چاہئے {0}
 DocType: Project,Start and End Dates,شروع کریں اور تواریخ اختتام
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,آپریشنز خالی نہیں چھوڑا جا سکتا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,اوسط ڈسکاؤنٹ
@@ -1102,10 +1100,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
 DocType: Activity Cost,Projects,منصوبوں
 DocType: Payment Request,Transaction Currency,ٹرانزیکشن ست
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},سے {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},سے {0} | {1} {2}
 DocType: BOM Operation,Operation Description,آپریشن تفصیل
 DocType: Item,Will also apply to variants,بھی مختلف حالتوں پر لاگو ہوں گی
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,مالی سال محفوظ کیا جاتا ہے ایک بار مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ تبدیل نہیں کر سکتے.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,مہم
@@ -1119,8 +1117,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,پہلے سے پروڈکشن آرڈر کے لئے پیدا اسٹاک میں لکھے
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,فکسڈ اثاثہ میں خالص تبدیلی
 DocType: Leave Control Panel,Leave blank if considered for all designations,تمام مراتب کے لئے غور کیا تو خالی چھوڑ دیں
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,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 +181,Max: {0},زیادہ سے زیادہ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,کمپنی کے لئے
 apps/erpnext/erpnext/config/support.py +17,Communication log.,مواصلات لاگ ان کریں.
@@ -1128,8 +1126,8 @@
 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 +472,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
@@ -1150,11 +1148,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
 DocType: Rename Tool,Type of document to rename.,دستاویز کی قسم کا نام تبدیل کرنے.
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,ہم اس شے کے خریدنے
 DocType: Address,Billing,بلنگ
@@ -1167,8 +1165,8 @@
 DocType: Shipping Rule Condition,To Value,قدر میں
 DocType: Supplier,Stock Manager,اسٹاک مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,پیکنگ پرچی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,دفتر کرایہ پر دستیاب
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,دفتر کرایہ پر دستیاب
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
 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.,کوئی ایڈریس کی ابھی تک شامل.
@@ -1186,7 +1184,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حکومت
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,آئٹم متغیرات
 DocType: Company,Services,خدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),کل ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),کل ({0})
 DocType: Cost Center,Parent Cost Center,والدین لاگت مرکز
 DocType: Sales Invoice,Source,ماخذ
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
@@ -1195,10 +1193,10 @@
 DocType: Employee External Work History,Total Experience,کل تجربہ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,منسوخ پیکنگ پرچی (ے)
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,سرمایہ کاری سے کیش فلو
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز
 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 +86,Transfer Materials for Manufacture,تیاری کے لئے کی منتقلی کی معدنیات
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,تیاری کے لئے کی منتقلی کی معدنیات
 DocType: Pricing Rule,For Price List,قیمت کی فہرست کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ایگزیکٹو تلاش کریں
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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} نہیں ملا، اکاؤنٹنگ اندراج (اخراجات) کتاب کرنے کی ضرورت ہے جس میں. ایک خرید قیمت کی فہرست کے خلاف شے کی قیمت کا ذکر کریں.
@@ -1207,7 +1205,7 @@
 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.,اکاؤنٹس کی چارٹ سے نیا اکاؤنٹ بنانے کے لئے براہ مہربانی.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,بحالی کا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,بحالی کا
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,گودام پر دستیاب بیچ مقدار
 DocType: Time Log Batch Detail,Time Log Batch Detail,وقت لاگ ان بیچ تفصیل
 DocType: Landed Cost Voucher,Landed Cost Help,لینڈڈ لاگت مدد
@@ -1221,7 +1219,6 @@
 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 +196,Brand master.,برانڈ ماسٹر.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,پردایک&gt; پردایک قسم
 DocType: Sales Invoice Item,Brand Name,برانڈ کا نام
 DocType: Purchase Receipt,Transporter Details,ٹرانسپورٹر تفصیلات
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,باکس
@@ -1249,7 +1246,7 @@
 DocType: Quality Inspection Reading,Reading 4,4 پڑھنا
 apps/erpnext/erpnext/config/hr.py +131,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,اسٹاک واجبات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,اسٹاک واجبات
 DocType: Purchase Receipt,Supplier Warehouse,پردایک گودام
 DocType: Opportunity,Contact Mobile No,موبائل سے رابطہ کریں کوئی
 ,Material Requests for which Supplier Quotations are not created,پردایک کوٹیشن پیدا نہیں کر رہے ہیں جس کے لئے مواد کی درخواست
@@ -1258,7 +1255,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ادائیگی ای میل بھیج
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,دیگر رپورٹوں
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,سٹاپ سالگرہ تخسمارک
@@ -1268,26 +1265,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} دیکھیں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,کیش میں خالص تبدیلی
 DocType: Salary Structure Deduction,Salary Structure Deduction,تنخواہ کٹوتی کی ساخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تاریخ اجراء اشیا کی لاگت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,پردایک قسم ماسٹر.
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,پردایک قسم ماسٹر.
 DocType: Purchase Order Item,Supplier Part Number,پردایک حصہ نمبر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,تبادلے کی شرح 0 یا 1 نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,تبادلے کی شرح 0 یا 1 نہیں ہو سکتا
 DocType: Purchase Invoice,Reference Document,حوالہ دستاویز
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,خریداری کی رسید {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ بل
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",اس طرح کے شپنگ کے قوانین، قیمت کی فہرست وغیرہ کے طور پر آن لائن خریداری کی ٹوکری کے لئے ترتیبات
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,انسانی وسائل
@@ -1309,7 +1306,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,قابل ادائیگی اکاؤنٹس میں خالص تبدیلی
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,آپ کا ای میل ID براہ کرم توثیق کریں
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',&#39;Customerwise ڈسکاؤنٹ کے لئے کی ضرورت ہے کسٹمر
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,روزنامچے کے ساتھ بینک کی ادائیگی کی تاریخوں کو اپ ڈیٹ کریں.
+apps/erpnext/erpnext/config/accounts.py +137,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.,اشیاء میں سے کوئی بھی مقدار یا قدر میں کوئی تبدیلی ہے.
@@ -1328,7 +1325,7 @@
 DocType: Employee,Permanent Address,مستقل پتہ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",گرینڈ کل کے مقابلے میں \ {0} {1} زیادہ نہیں ہو سکتا کے خلاف ادا پیشگی {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,شے کے کوڈ کا انتخاب کریں
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,شے کے کوڈ کا انتخاب کریں
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),بغیر تنخواہ چھٹی کے لئے کٹوتی کم (LWP)
 DocType: Territory,Territory Manager,علاقہ مینیجر
 DocType: Packed Item,To Warehouse (Optional),گودام میں (اختیاری)
@@ -1338,15 +1335,15 @@
 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,مارکیٹنگ کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,ایک آئٹم کی سنگل یونٹ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',وقت لاگ ان بیچ {0} &#39;پیش&#39; ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},صف کوئی ضرورت گودام {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},صف کوئی ضرورت گودام {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,درست مالی سال شروع کریں اور انتھاء داخل کریں
 DocType: Employee,Date Of Retirement,ریٹائرمنٹ کے تاریخ
 DocType: Upload Attendance,Get Template,سانچے حاصل
@@ -1363,8 +1360,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},قطار میں آئٹم {0} کے لئے ضروری مقدار {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,میچ کو رسید تلاش
@@ -1375,21 +1372,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,خریداری کی ٹوکری چالو حالت میں ہے
 DocType: Job Applicant,Applicant for a Job,ایک کام کے لئے درخواست
 DocType: Production Plan Material Request,Production Plan Material Request,پیداوار کی منصوبہ بندی مواد گذارش
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,پیدا کوئی پیداوار کے احکامات
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,پیدا کوئی پیداوار کے احکامات
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,مین
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,مین
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
 DocType: Employee,Leave Encashed?,Encashed چھوڑ دیں؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,میدان سے مواقع لازمی ہے
 DocType: Item,Variants,متغیرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
@@ -1397,26 +1394,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ایک کام کے لئے درخواست.
 DocType: Purchase Order Item,Warehouse and Reference,گودام اور حوالہ
 DocType: Supplier,Statutory info and other general information about your Supplier,اپنے سپلائر کے بارے میں قانونی معلومات اور دیگر عمومی معلومات
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,پتے
+apps/erpnext/erpnext/hooks.py +91,Addresses,پتے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,تشخیص
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},سیریل کوئی آئٹم کے لئے داخل نقل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ایک شپنگ حکمرانی کے لئے ایک شرط
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,آئٹم پروڈکشن آرڈر حاصل کرنے کی اجازت نہیں ہے.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,آئٹم پروڈکشن آرڈر حاصل کرنے کی اجازت نہیں ہے.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),اس پیکج کی خالص وزن. (اشیاء کی خالص وزن کی رقم کے طور پر خود کار طریقے سے شمار کیا جاتا)
 DocType: Sales Order,To Deliver and Bill,نجات اور بل میں
 DocType: GL Entry,Credit Amount in Account Currency,اکاؤنٹ کی کرنسی میں قرضے کی رقم
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,مینوفیکچرنگ کے لئے وقت کیلیے نوشتہ جات دیکھیے.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,کاموں کے لئے وقت لاگ ان.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,ادائیگی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,آداب
@@ -1449,7 +1446,7 @@
 DocType: Sales Order Item,Delivery Warehouse,ڈلیوری گودام
 DocType: Stock Settings,Allowance Percent,الاؤنس فیصد
 DocType: SMS Settings,Message Parameter,پیغام پیرامیٹر
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,مالیاتی لاگت کے مراکز کا درخت.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,مالیاتی لاگت کے مراکز کا درخت.
 DocType: Serial No,Delivery Document No,ڈلیوری دستاویز
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,خریداری کی رسیدیں سے اشیاء حاصل
 DocType: Serial No,Creation Date,بنانے کی تاریخ
@@ -1481,40 +1478,40 @@
 ,Amount to Deliver,رقم فراہم کرنے
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,ایک پروڈکٹ یا سروس
 DocType: Naming Series,Current Value,موجودہ قیمت
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0} بن گیا
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} بن گیا
 DocType: Delivery Note Item,Against Sales Order,سیلز کے خلاف
 ,Serial No Status,سیریل کوئی حیثیت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,آئٹم میز خالی نہیں ہو سکتا
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",صف {0}: قائم کرنے {1} مدت، اور تاریخ \ کے درمیان فرق کرنے کے لئے یا اس سے زیادہ کے برابر ہونا چاہیے {2}
 DocType: Pricing Rule,Selling,فروخت
 DocType: Employee,Salary Information,تنخواہ معلومات
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,ڈیوٹی اور ٹیکس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,حوالہ کوڈ داخل کریں.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,ادائیگی کے گیٹ وے اکاؤنٹ تشکیل نہیں ہے
 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: Production Order,Material Request Item,مواد درخواست آئٹم
+DocType: Request for Quotation Item,Material Request Item,مواد درخواست آئٹم
 apps/erpnext/erpnext/config/stock.py +85,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,ریڈ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
 DocType: Account,Frozen,منجمد
 ,Open Production Orders,کھولیں پیداوار کے احکامات
 DocType: Installation Note,Installation Time,کی تنصیب کا وقت
 DocType: Sales Invoice,Accounting Details,اکاؤنٹنگ تفصیلات
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,اس کمپنی کے لئے تمام معاملات حذف
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,سرمایہ کاری
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,سرمایہ کاری
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تین ہلاک
 DocType: Quality Inspection Reading,Acceptance Criteria,قبولیت کا کلیہ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,مندرجہ بالا جدول میں مواد درخواستیں داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,مندرجہ بالا جدول میں مواد درخواستیں داخل کریں
 DocType: Item Attribute,Attribute Name,نام وصف
 DocType: Item Group,Show In Website,ویب سائٹ میں دکھائیں
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,گروپ
@@ -1542,7 +1539,7 @@
 ,Maintenance Schedules,بحالی شیڈول
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 DocType: Shipping Rule Condition,Shipping Amount,شپنگ رقم
 ,Pending Amount,زیر التواء رقم
 DocType: Purchase Invoice Item,Conversion Factor,تبادلوں فیکٹر
@@ -1556,23 +1553,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Reconciled میں لکھے گئے مراسلے شامل
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,آئٹم {1} ایک اثاثہ ہے آئٹم کے طور پر اکاؤنٹ {0} &#39;فکسڈ اثاثہ&#39; قسم کا ہونا چاہیے
 DocType: HR Settings,HR Settings,HR ترتیبات
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,کھیل
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,اصل کل
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,یونٹ
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,اخراجات کے دعووں
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,اخراجات کے دعووں
 DocType: Issue,Support,سپورٹ
 ,BOM Search,Bom تلاش
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),بند (کل کھولنے)
@@ -1581,29 +1577,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},کلیئرنس تاریخ قطار میں چیک کی تاریخ سے پہلے نہیں ہو سکتا {0}
 DocType: Salary Slip,Deduction,کٹوتی
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
 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 +137,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,محسوب بینک کا گوشوارہ توازن
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معذور صارف
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,کوٹیشن
 DocType: Salary Slip,Total Deduction,کل کٹوتی
 DocType: Quotation,Maintenance User,بحالی صارف
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,لاگت اپ ڈیٹ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,لاگت اپ ڈیٹ
 DocType: Employee,Date of Birth,پیدائش کی تاریخ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,منہا
@@ -1615,8 +1611,8 @@
 ,SO Qty,تو مقدار
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
+DocType: Request for Quotation,Manufacturing Manager,مینوفیکچرنگ کے مینیجر
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,پیکجوں کے میں تقسیم ترسیل کے نوٹ.
 apps/erpnext/erpnext/hooks.py +71,Shipments,ترسیل
 DocType: Purchase Order Item,To be delivered to customer,گاہک کے حوالے کیا جائے گا
@@ -1624,12 +1620,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سیریل نمبر {0} کسی گودام سے تعلق نہیں ہے
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,صف #
 DocType: Purchase Invoice,In Words (Company Currency),الفاظ میں (کمپنی کرنسی)
-DocType: Pricing Rule,Supplier,پردایک
+DocType: Asset,Supplier,پردایک
 DocType: C-Form,Quarter,کوارٹر
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,متفرق اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,متفرق اخراجات
 DocType: Global Defaults,Default Company,پہلے سے طے شدہ کمپنی
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجات یا فرق اکاؤنٹ آئٹم {0} کے طور پر اس کے اثرات مجموعی اسٹاک قیمت کے لئے لازمی ہے
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,صارف {0} غیر فعال ہے
@@ -1638,7 +1634,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
 DocType: Currency Exchange,From Currency,کرنسی سے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",کم سے کم ایک قطار میں مختص رقم، انوائس کی قسم اور انوائس تعداد کو منتخب کریں
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},آئٹم کے لئے ضروری سیلز آرڈر {0}
@@ -1650,8 +1646,7 @@
 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/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بینکنگ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,شیڈول حاصل کرنے کے لئے پیدا شیڈول &#39;پر کلک کریں براہ مہربانی
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,نیا لاگت مرکز
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; 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; کی چائلڈ شامل کریں پر کلک کرنے) کی طرف سے تشکیل دیتے ہیں اور ایسا ٹیکس کی شرح کا ذکر.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,نیا لاگت مرکز
 DocType: Bin,Ordered Quantity,کا حکم دیا مقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",مثلا &quot;عمارت سازوں کے لئے، فورم کے اوزار کی تعمیر&quot;
 DocType: Quality Inspection,In Process,اس عمل میں
@@ -1667,7 +1662,7 @@
 DocType: Quotation Item,Stock Balance,اسٹاک توازن
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,ادائیگی سیلز آرڈر
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجات دعوی تفصیل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,وقت کیلیے نوشتہ جات دیکھیے پیدا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,وقت کیلیے نوشتہ جات دیکھیے پیدا
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,درست اکاؤنٹ منتخب کریں
 DocType: Item,Weight UOM,وزن UOM
 DocType: Employee,Blood Group,خون کا گروپ
@@ -1685,13 +1680,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
 DocType: Offer Letter Term,Offer Term,پیشکش ٹرم
 DocType: Quality Inspection,Quality Manager,کوالٹی منیجر
 DocType: Job Applicant,Job Opening,کام افتتاحی
 DocType: Payment Reconciliation,Payment Reconciliation,ادائیگی مصالحتی
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,انچارج شخص کا نام منتخب کریں
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,انچارج شخص کا نام منتخب کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ٹیکنالوجی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,خط پیش کرتے ہیں
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,مواد درخواستوں (یمآرپی) اور پیداوار کے احکامات حاصل کریں.
@@ -1699,22 +1694,22 @@
 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 +103,Credit To account must be a Payable account,اکاؤنٹ کریڈٹ ایک قابل ادائیگی اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,اکاؤنٹ کریڈٹ ایک قابل ادائیگی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
 DocType: Production Order Operation,Completed Qty,مکمل مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0}، صرف ڈیبٹ اکاؤنٹس دوسرے کریڈٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,قیمت کی فہرست {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,موجودہ تشخیص کی شرح
 DocType: Item,Customer Item Codes,کسٹمر شے کوڈز
 DocType: Opportunity,Lost Reason,کھو وجہ
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,احکامات یا انوائس کے خلاف ادائیگی میں لکھے بنائیں.
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,احکامات یا انوائس کے خلاف ادائیگی میں لکھے بنائیں.
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,صارفین اور اجازت
@@ -1723,10 +1718,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,آپ کے گاہکوں کو
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,اب لگائیں
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,اب لگائیں
 DocType: Sales Order,Not Delivered,نجات نہیں
 ,Bank Clearance Summary,بینک کلیئرنس خلاصہ
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",بنائیں اور، یومیہ، ہفتہ وار اور ماہانہ ای میل ڈائجسٹ کا انتظام.
@@ -1750,7 +1745,7 @@
 DocType: Employee,Employment Details,نوکری کے لئے تفصیلات
 DocType: Employee,New Workplace,نئے کام کی جگہ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,بند کے طور پر مقرر
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},بارکوڈ کے ساتھ کوئی آئٹم {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},بارکوڈ کے ساتھ کوئی آئٹم {0}
 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,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
@@ -1768,9 +1763,9 @@
 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 +608,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,منتقلی مواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -1784,7 +1779,7 @@
 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: Process Payroll,Create Salary Slip,تنخواہ پرچی بنائیں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),فنڈز کا ماخذ (واجبات)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,ملازم
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,سے درآمد ای میل
@@ -1798,8 +1793,8 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},آئٹم کے لئے ضروری Purchse آرڈر نمبر {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},شے کے لئے موجود نہیں ہے واضع BOM {0} {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},آئٹم کے لئے ضروری Purchse آرڈر نمبر {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},شے کے لئے موجود نہیں ہے واضع BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,دواسازی
@@ -1816,25 +1811,25 @@
 DocType: Upload Attendance,Attendance To Date,تاریخ کرنے کے لئے حاضری
 DocType: Warranty Claim,Raised By,طرف سے اٹھائے گئے
 DocType: Payment Gateway Account,Payment Account,ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,اکاؤنٹس وصولی میں خالص تبدیلی
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},غلط حوالہ {0} {1}
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 DocType: Newsletter,Test,ٹیسٹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} جمع نہیں ہے
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,اشیاء کے لئے درخواست.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,علیحدہ پروڈکشن آرڈر ہر ایک کو ختم اچھی شے کے لئے پیدا کیا جائے گا.
@@ -1843,7 +1838,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,نیوز لیٹر میلنگ لسٹ
 DocType: Delivery Note,Transporter Name,ٹرانسپورٹر نام
 DocType: Authorization Rule,Authorized Value,مجاز ویلیو
@@ -1861,10 +1856,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} کو بند کر دیا ہے
 DocType: Email Digest,How frequently?,کتنی بار؟
 DocType: Purchase Receipt,Get Current Stock,موجودہ اسٹاک حاصل کریں
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",مناسب گروپ (عام طور پر فنڈز کی درخواست&gt; موجودہ اثاثے&gt; بینک اکاؤنٹس کے پاس جاؤ اور ایک نیا اکاؤنٹ (قسم کی چائلڈ شامل کریں) پر کلک کر کے تخلیق &quot;بینک&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,مواد کے بل کے پیڑ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,مارک موجودہ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},بحالی کے آغاز کی تاریخ سیریل نمبر کے لئے ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,مقصد
@@ -1906,12 +1900,12 @@
 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: Purchase Receipt Item,Recd Quantity,Recd مقدار
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
 DocType: Payment Reconciliation,Bank / Cash Account,بینک / کیش اکاؤنٹ
 DocType: Tax Rule,Billing City,بلنگ شہر
 DocType: Global Defaults,Hide Currency Symbol,کرنسی کی علامت چھپائیں
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",مثال کے طور پر بینک، کیش، کریڈٹ کارڈ
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",مثال کے طور پر بینک، کیش، کریڈٹ کارڈ
 DocType: Journal Entry,Credit Note,کریڈٹ نوٹ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},مکمل مقدار سے زیادہ نہیں ہو سکتا {0} آپریشن کے لئے {1}
 DocType: Features Setup,Quality,معیار
@@ -1935,9 +1929,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,میرے پتے
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,تنظیم شاخ ماسٹر.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,یوٹیلٹی اخراجات
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,۹۰ سے بڑھ کر
 DocType: Buying Settings,Default Buying Price List,پہلے سے طے شدہ خرید قیمت کی فہرست
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,اوپر منتخب شدہ معیار یا تنخواہ پرچی کے لئے کوئی ملازم پہلے ہی پیدا
@@ -1964,7 +1958,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 ,To Produce,پیدا کرنے کے لئے
 apps/erpnext/erpnext/config/hr.py +93,Payroll,پے رول
 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} بھی شامل کیا جانا چاہئے
@@ -1975,7 +1969,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,تخصیص فارم
 DocType: Account,Income Account,انکم اکاؤنٹ
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,کلیدی ذمہ داری کے علاقے
@@ -1997,16 +1991,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,تمام پتے.
 DocType: Company,Stock Settings,اسٹاک ترتیبات
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,گاہک گروپ درخت کا انتظام کریں.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,نیا لاگت مرکز نام
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,نیا لاگت مرکز نام
 DocType: Leave Control Panel,Leave Control Panel,کنٹرول پینل چھوڑنا
 DocType: Appraisal,HR User,HR صارف
 DocType: Purchase Invoice,Taxes and Charges Deducted,ٹیکسز اور الزامات کٹوتی
-apps/erpnext/erpnext/config/support.py +7,Issues,مسائل
+apps/erpnext/erpnext/hooks.py +90,Issues,مسائل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},سٹیٹس سے ایک ہونا ضروری {0}
 DocType: Sales Invoice,Debit To,ڈیبٹ
 DocType: Delivery Note,Required only for sample item.,صرف نمونے شے کے لئے کی ضرورت ہے.
@@ -2025,10 +2019,10 @@
 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 +139,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
 DocType: Stock Settings,Default Valuation Method,پہلے سے طے شدہ تشخیص کا طریقہ
 DocType: Production Order Operation,Planned Start Time,منصوبہ بندی کے آغاز کا وقت
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,بند بیلنس شیٹ اور کتاب نفع یا نقصان.
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,بند بیلنس شیٹ اور کتاب نفع یا نقصان.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,زر مبادلہ کی شرح دوسرے میں ایک کرنسی میں تبدیل کرنے کی وضاحت کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,کوٹیشن {0} منسوخ کر دیا ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,کل بقایا رقم
@@ -2084,7 +2078,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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}، ایک سے زیادہ کی کارروائیوں میں آپریشن کو توڑنے
 ,Requested,درخواست
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,کوئی ریمارکس
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,روٹ اکاؤنٹ ایک گروپ ہونا ضروری ہے
@@ -2111,7 +2105,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Sales Invoice,Customer Address,گاہک پتہ
 DocType: Payment Request,Recipient and Message,وصول کنندہ اور پیغام
 DocType: Purchase Invoice,Apply Additional Discount On,اضافی رعایت پر لاگو ہوتے ہیں
@@ -2125,7 +2119,7 @@
 DocType: Purchase Invoice,Select Supplier Address,منتخب سپلائر ایڈریس
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
@@ -2148,10 +2142,10 @@
 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; ہے شے کو منتخب کریں اور کوئی دوسری مصنوعات بنڈل ہے براہ مہربانی
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اسمان ماہ میں اہداف تقسیم کرنے ماہانہ تقسیم کریں.
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,اس منصوبے کے آغاز کی تاریخ
@@ -2160,7 +2154,7 @@
 DocType: Installation Note Item,Against Document No,دستاویز کے خلاف
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,سیلز شراکت داروں کا انتظام کریں.
 DocType: Quality Inspection,Inspection Type,معائنہ کی قسم
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},براہ مہربانی منتخب کریں {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},براہ مہربانی منتخب کریں {0}
 DocType: C-Form,C-Form No,سی فارم نہیں
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,بے نشان حاضری
@@ -2188,7 +2182,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,اس بات کی تصدیق
 DocType: Payment Gateway,Gateway,گیٹ وے
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,صرف حیثیت &#39;منظور&#39; پیش کیا جا سکتا کے ساتھ درخواستیں چھوڑ دو
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ایڈریس عنوان لازمی ہے.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,انکوائری کے ذریعہ مہم ہے تو مہم کا نام درج کریں
@@ -2202,12 +2196,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,منظور گودام
 DocType: Bank Reconciliation Detail,Posting Date,پوسٹنگ کی تاریخ
 DocType: Item,Valuation Method,تشخیص کا طریقہ
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},{0} کے لئے زر مبادلہ کی شرح تلاش کرنے سے قاصر {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},{0} کے لئے زر مبادلہ کی شرح تلاش کرنے سے قاصر {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,مارک آدھے دن
 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 +410,[Error],[خرابی]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,وینچر کیپیٹل کی
@@ -2239,13 +2233,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,پیدا مواد درخواستوں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,پیدا مواد درخواستوں {0}
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,شرائط یا معاہدے کے سانچے.
 DocType: Purchase Invoice,Address and Contact,ایڈریس اور رابطہ
 DocType: Supplier,Last Day of the Next Month,اگلے ماہ کے آخری دن
 DocType: Employee,Feedback,آپ کی رائے
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",پہلے مختص نہیں کیا جا سکتا چھوڑ {0}، چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر {1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
 DocType: Item,Reorder level based on Warehouse,گودام کی بنیاد پر ترتیب کی سطح کو منتخب
 DocType: Activity Cost,Billing Rate,بلنگ کی شرح
@@ -2259,12 +2253,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} منسوخ یا بند کر دیا ہے
 DocType: Delivery Note,Track this Delivery Note against any Project,کسی بھی منصوبے کے خلاف اس کی ترسیل نوٹ ٹریک
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,سرمایہ کاری سے نیٹ کیش
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,روٹ اکاؤنٹ خارج کر دیا نہیں کیا جا سکتا
 ,Is Primary Address,پرائمری ایڈریس ہے
 DocType: Production Order,Work-in-Progress Warehouse,کام میں پیش رفت گودام
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},حوالہ # {0} ء {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,پتے کا انتظام
-DocType: Pricing Rule,Item Code,آئٹم کوڈ
+DocType: Asset,Item Code,آئٹم کوڈ
 DocType: Production Planning Tool,Create Production Orders,پیداوار کے احکامات بنائیں
 DocType: Serial No,Warranty / AMC Details,وارنٹی / AMC تفصیلات
 DocType: Journal Entry,User Remark,صارف تبصرہ
@@ -2310,24 +2303,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,سیریل نمبر اور بیچ
 DocType: Warranty Claim,From Company,کمپنی کی طرف سے
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,قیمت یا مقدار
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,منٹ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ٹیکس اور الزامات کی خریداری
 ,Qty to Receive,وصول کرنے کی مقدار
 DocType: Leave Block List,Leave Block List Allowed,بلاک فہرست اجازت چھوڑ دو
 DocType: Sales Partner,Retailer,خوردہ فروش
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,تمام پردایک اقسام
 DocType: Global Defaults,Disable In Words,الفاظ میں غیر فعال کریں
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,آئٹم خود کار طریقے سے شمار نہیں ہے کیونکہ آئٹم کوڈ لازمی ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,بینک وورڈرافٹ اکاؤنٹ
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,افتتاحی بیلنس اکوئٹی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
 DocType: Appraisal,Appraisal,تشخیص
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,مجاز دستخط
@@ -2336,7 +2329,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پیغام بھیجا
@@ -2377,7 +2370,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,گاہک گروپ / کسٹمر
 DocType: Payment Gateway Account,Default Payment Request Message,پہلے سے طے شدہ ادائیگی کی درخواست پیغام
 DocType: Item Group,Check this if you want to show in website,آپ کی ویب سائٹ میں ظاہر کرنا چاہتے ہیں تو اس کی جانچ پڑتال
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,بینکنگ اور ادائیگی
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,بینکنگ اور ادائیگی
 ,Welcome to ERPNext,ERPNext میں خوش آمدید
 DocType: Payment Reconciliation Payment,Voucher Detail Number,واؤچر نمبر تفصیل
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,کوٹیشن کی قیادت
@@ -2385,17 +2378,17 @@
 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 +199,Purchase Order {0} is not submitted,آرڈر {0} پیش نہیں کی خریداری
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,آرڈر {0} پیش نہیں کی خریداری
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,پتے اور چھٹیوں
 DocType: Sales Order,Not Billed,بل نہیں
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,دونوں گودام ایک ہی کمپنی سے تعلق رکھتے ہیں چاہئے
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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
@@ -2413,13 +2406,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,گودام {0}: کمپنی لازمی ہے
 ,Payment Period Based On Invoice Date,انوائس کی تاریخ کی بنیاد پر ادائیگی کی مدت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},کے لئے لاپتہ کرنسی ایکسچینج قیمتیں {0}
 DocType: Journal Entry,Stock Entry,اسٹاک انٹری
 DocType: Account,Payable,قابل ادائیگی
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),دیندار ({0})
-DocType: Project,Margin,مارجن
+DocType: Pricing Rule,Margin,مارجن
 DocType: Salary Slip,Arrear Amount,بقایا رقم
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نئے گاہکوں
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,کل منافع ٪
@@ -2440,7 +2433,7 @@
 DocType: Payment Request,Email To,کرنے کے لئے ای میل
 DocType: Lead,Lead Owner,لیڈ مالک
 DocType: Bin,Requested Quantity,درخواست کی مقدار
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,گودام کی ضرورت ہے
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,گودام کی ضرورت ہے
 DocType: Employee,Marital Status,ازدواجی حالت
 DocType: Stock Settings,Auto Material Request,آٹو مواد کی درخواست
 DocType: Time Log,Will be updated when billed.,بل جب اپ ڈیٹ کیا جائے گا.
@@ -2448,7 +2441,7 @@
 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 +115,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 +84,{0}% Delivered,{0}٪ پھنچ گیا
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ماہانہ تقسیم فی صد
 DocType: Territory,Territory Targets,علاقہ اہداف
@@ -2468,7 +2461,7 @@
 DocType: Manufacturer,Manufacturers used in Items,اشیاء میں استعمال کیا مینوفیکچررز
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,کمپنی میں گول آف لاگت مرکز کا ذکر کریں
 DocType: Purchase Invoice,Terms,شرائط
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,نیا بنائیں
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,نیا بنائیں
 DocType: Buying Settings,Purchase Order Required,آرڈر کی ضرورت ہے خریدیں
 ,Item-wise Sales History,آئٹم وار سیلز تاریخ
 DocType: Expense Claim,Total Sanctioned Amount,کل منظوری رقم
@@ -2481,7 +2474,7 @@
 ,Stock Ledger,اسٹاک لیجر
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},شرح: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,تنخواہ پرچی کٹوتی
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,سب سے پہلے ایک گروپ نوڈ کو منتخب کریں.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,سب سے پہلے ایک گروپ نوڈ کو منتخب کریں.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ملازم اور حاضری
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},مقصد میں سے ایک ہونا ضروری ہے {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",یہ آپ کی کمپنی ایڈریس ہے کے طور پر، کسٹمر، سپلائر، فروخت پارٹنر اور قیادت کا حوالہ ہٹا دیں
@@ -2503,13 +2496,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: سے {1}
 DocType: Task,depends_on,منحصرکرتاہے
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نئے اکاؤنٹ کا نام. نوٹ: صارفین اور سپلائرز کے اکاؤنٹس کی تخلیق نہیں کرتے ہیں براہ مہربانی
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نئے اکاؤنٹ کا نام. نوٹ: صارفین اور سپلائرز کے اکاؤنٹس کی تخلیق نہیں کرتے ہیں براہ مہربانی
 DocType: BOM Replace Tool,BOM Replace Tool,BOM آلے کی جگہ لے لے
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ملک وار طے شدہ ایڈریس سانچے
 DocType: Sales Order Item,Supplier delivers to Customer,پردایک کسٹمر کو فراہم
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,اگلی تاریخ پوسٹنگ کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,دکھائیں ٹیکس بریک اپ
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,اگلی تاریخ پوسٹنگ کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/accounts/party.py +289,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;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,انوائس پوسٹنگ کی تاریخ
@@ -2524,7 +2517,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,کمپنی (نہیں مستقل خریدار یا سپلائر) ماسٹر.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',&#39;متوقع تاریخ کی ترسیل&#39; درج کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ترسیل نوٹوں {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,ادائیگی کی رقم رقم گرینڈ کل سے زیادہ نہیں ہو سکتا لکھنے +
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,ادائیگی کی رقم رقم گرینڈ کل سے زیادہ نہیں ہو سکتا لکھنے +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0} شے کے لئے ایک درست بیچ نمبر نہیں ہے {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",نوٹ: ادائیگی کے خلاف کسی بھی حوالہ نہیں بنایا ہے تو، دستی طور پر جرنل اندراج.
@@ -2538,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,دستیابی شائع
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
 ,Stock Ageing,اسٹاک خستہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{0} '{1}' is disabled,{0} {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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2547,7 +2540,7 @@
 DocType: Purchase Order,Customer Contact Email,کسٹمر رابطہ ای میل
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
 DocType: Sales Team,Contribution (%),شراکت (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,سانچہ
 DocType: Sales Person,Sales Person Name,فروخت کے شخص کا نام
@@ -2558,7 +2551,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,دوبارہ ٹائپ کمپنی کا نام کی توثیق کے لئے براہ کرم
@@ -2571,7 +2564,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,نقد یا بینک اکاؤنٹ کی ادائیگی کے اندراج بنانے کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,انٹرن
@@ -2579,7 +2572,7 @@
 DocType: Stock Entry,From BOM,BOM سے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,بنیادی
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0} منجمد کر رہے ہیں سے پہلے اسٹاک لین دین
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',&#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',&#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,تاریخ کرنے کے لئے آدھے دن کی چھٹی کے لئے تاریخ سے ایک ہی ہونا چاہئے
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",مثال کے طور پر کلو، یونٹ، نمبر، میٹر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
@@ -2587,14 +2580,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,تنخواہ ساخت
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ایئرلائن
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,مسئلہ مواد
 DocType: Material Request Item,For Warehouse,گودام کے لئے
 DocType: Employee,Offer Date,پیشکش تاریخ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,کوٹیشن
 DocType: Hub Settings,Access Token,رسائی کا ٹوکن
 DocType: Sales Invoice Item,Serial No,سیریل نمبر
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,پہلے Maintaince تفصیلات درج کریں
-DocType: Item,Is Fixed Asset Item,فکسڈ اثاثہ آئٹم
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,پہلے Maintaince تفصیلات درج کریں
 DocType: Purchase Invoice,Print Language,پرنٹ کریں زبان
 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",آپ کو طویل پرنٹ دونوں فارمیٹس ہیں، تو، اس خصوصیت کو ہر صفحے پر تمام ہیڈر اور footers ساتھ ایک سے زیادہ صفحات پر پرنٹ کرنے کے لئے صفحے کو تقسیم کرنے کے لئے استعمال کیا جا سکتا ہے
@@ -2611,7 +2603,7 @@
 DocType: Issue,Opening Time,افتتاحی وقت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,سے اور مطلوبہ تاریخوں کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,سیکورٹیز اینڈ ایکسچینج کماڈٹی
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
 DocType: Purchase Taxes and Charges,Valuation and Total,تشخیص اور کل
@@ -2627,13 +2619,13 @@
 DocType: Quotation,Maintenance Manager,بحالی مینیجر
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,کل صفر نہیں ہو سکتے
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;آخری آرڈر کے بعد دن&#39; صفر سے زیادہ یا برابر ہونا چاہیے
-DocType: C-Form,Amended From,سے ترمیم شدہ
+DocType: Asset,Amended From,سے ترمیم شدہ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,چائلڈ اکاؤنٹ اس اکاؤنٹ کے لئے موجود ہے. آپ اس اکاؤنٹ کو حذف نہیں کر سکتے ہیں.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,آگے لے جانے
@@ -2647,20 +2639,20 @@
 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/public/js/setup_wizard.js +191,"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},serialized کی شے کے لئے سیریل نمبر مطلوب {0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,انوائس کے ساتھ ملائیں ادائیگیاں
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,انوائس کے ساتھ ملائیں ادائیگیاں
 DocType: Journal Entry,Bank Entry,بینک انٹری
 DocType: Authorization Rule,Applicable To (Designation),لاگو (عہدہ)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,ٹوکری میں شامل کریں
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروپ سے
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,کو فعال / غیر فعال کریں کرنسیاں.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,کو فعال / غیر فعال کریں کرنسیاں.
 DocType: Production Planning Tool,Get Material Request,مواد گذارش حاصل کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,پوسٹل اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,پوسٹل اخراجات
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),کل (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,تفریح اور تفریح
 DocType: Quality Inspection,Item Serial No,آئٹم سیریل نمبر
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} یا آپ میں اضافہ کرنا چاہئے اتپرواہ رواداری کی طرف سے کم کیا جانا چاہئے
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,کل موجودہ
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,اکاؤنٹنگ بیانات
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,اکاؤنٹنگ بیانات
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,قیامت
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",serialized کی آئٹم {0} اسٹاک مصالحتی استعمال \ اپ ڈیٹ نہیں کیا جا سکتا
@@ -2679,13 +2671,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),نقطہ آغاز کے آف سیل (POS)
 apps/erpnext/erpnext/config/support.py +32,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 یونٹس کا حکم دیا ہے تو. اور آپ الاؤنس تو آپ کو 110 یونٹس حاصل کرنے کے لئے اجازت دی جاتی ہے 10٪ ہے.
 DocType: Pricing Rule,Customer Group,گاہک گروپ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: Item,Website Description,ویب سائٹ تفصیل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
@@ -2695,12 +2687,12 @@
 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,گاہک گروپ کا نام
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
 DocType: GL Entry,Against Voucher Type,واؤچر قسم کے خلاف
 DocType: Item,Attributes,صفات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,آخری آرڈر کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
 DocType: C-Form,C-Form,سی فارم
@@ -2712,18 +2704,17 @@
 DocType: Purchase Invoice,Mobile No,موبائل نہیں
 DocType: Payment Tool,Make Journal Entry,جرنل اندراج
 DocType: Leave Allocation,New Leaves Allocated,نئے پتے مختص
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,کمرشل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},خرابی: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,والدین آئٹم {0} اسٹاک آئٹم نہیں ہونا چاہئے
 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 +52,All Products or Services.,تمام مصنوعات یا خدمات.
 DocType: Supplier Quotation,Supplier Address,پردایک ایڈریس
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,مقدار باہر
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,قواعد فروخت کے لئے شپنگ رقم کا حساب کرنے
+apps/erpnext/erpnext/config/accounts.py +259,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,مالیاتی خدمات
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} وصف کے لئے قدر کی حد کے اندر اندر ہونا ضروری ہے {1} کو {2} کے دھیرے بڑھتا میں {3}
@@ -2734,10 +2725,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروڑ
 DocType: Customer,Default Receivable Accounts,وصولی اکاؤنٹس پہلے سے طے شدہ
 DocType: Tax Rule,Billing State,بلنگ ریاست
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,منتقلی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,منتقلی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
 DocType: Journal Entry,Pay To / Recd From,سے / Recd کرنے کے لئے ادا
 DocType: Naming Series,Setup Series,سیٹ اپ سیریز
@@ -2759,18 +2750,18 @@
 DocType: Journal Entry,Write Off Based On,کی بنیاد پر لکھنے
 DocType: Features Setup,POS View,پی او ایس دیکھیں
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,ایک سیریل نمبر کے لئے تنصیب ریکارڈ
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,اگلی تاریخ کے دن اور مہینے کے دن دہرائیں برابر ہونا چاہیے
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,اگلی تاریخ کے دن اور مہینے کے دن دہرائیں برابر ہونا چاہیے
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ایک کی وضاحت کریں
 DocType: Offer Letter,Awaiting Response,جواب کا منتظر
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,اوپر
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,وقت لاگ ان بل دیا گیا ہے
 DocType: Salary Slip,Earning & Deduction,کمائی اور کٹوتی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,اکاؤنٹ {0} ایک گروپ نہیں ہو سکتا
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),عبوری منافع / خسارہ (کریڈٹ)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},کمپنی میں ڈیفالٹ قدر {0} مقرر کریں {1}
@@ -2780,12 +2771,11 @@
 ,Monthly Attendance Sheet,ماہانہ حاضری شیٹ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,کوئی ریکارڈ نہیں ملا
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,ہاں یا نہیں کے طور پر &#39;ٹھیکے ہے&#39; درج کریں
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,انٹری کھولنے میں کی اجازت نہیں &#39;منافع اور نقصان&#39; قسم اکاؤنٹ {0}
 DocType: Features Setup,Sales Discounts,سیلز ڈسکاؤنٹس
@@ -2799,39 +2789,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,آرڈر کی تعداد
 DocType: Item Group,HTML / Banner that will show on the top of product list.,مصنوعات کی فہرست کے سب سے اوپر پر دکھایا جائے گا کہ ایچ ٹی ایم ایل / بینر.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,شپنگ رقم کا حساب کرنے کی شرائط کی وضاحت
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,چائلڈ شامل
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,افتتاحی ویلیو
 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,فروخت پر کمیشن
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ڈیبٹ اور کریڈٹ {0} # کے لئے برابر نہیں {1}. فرق ہے {2}.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,تفریح اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,تفریح اخراجات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,چھٹی کے لئے درخواستیں.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,قانونی اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,موجودہ لین دین کے ساتھ اکاؤنٹ خارج کر دیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانونی اخراجات
 DocType: Sales Invoice,Posting Time,پوسٹنگ وقت
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,ٹیلی فون اخراجات
 DocType: Sales Partner,Logo,علامت (لوگو)
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,آپ کی بچت سے پہلے ایک سلسلہ منتخب کرنے کے لئے صارف کو مجبور کرنا چاہتے ہیں تو اس کی جانچ پڑتال. آپ کو اس کی جانچ پڑتال اگر کوئی پہلے سے طے شدہ ہو گا.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},سیریل نمبر کے ساتھ کوئی آئٹم {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},سیریل نمبر کے ساتھ کوئی آئٹم {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,کھولیں نوٹیفیکیشن
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,براہ راست اخراجات
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,براہ راست اخراجات
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} &#39;نوٹیفکیشن \ ای میل پتہ&#39; میں ایک غلط ای میل پتہ ہے
 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,سفر کے اخراجات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,سفر کے اخراجات
 DocType: Maintenance Visit,Breakdown,خرابی
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},اکاؤنٹ {0}: والدین اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,کامیابی کے ساتھ اس کمپنی سے متعلق تمام لین دین کو خارج کر دیا!
@@ -2848,7 +2838,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),کل بلنگ رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,ہم اس شے کے فروخت
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,پردایک شناخت
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,مقدار 0 سے زیادہ ہونا چاہئے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,مقدار 0 سے زیادہ ہونا چاہئے
 DocType: Journal Entry,Cash Entry,کیش انٹری
 DocType: Sales Partner,Contact Desc,رابطہ DESC
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",آرام دہ اور پرسکون طرح پتیوں کی قسم، بیمار وغیرہ
@@ -2863,7 +2853,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,خام مال بنیادی شے کے طور پر ایک ہی نہیں ہو سکتا
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,تنخواہ سانچے ماسٹر.
@@ -2879,7 +2869,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
 ,Territory Target Variance Item Group-Wise,علاقہ ھدف تغیر آئٹم گروپ حکیم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,تمام کسٹمر گروپوں
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,اکاؤنٹ {0}: والدین اکاؤنٹ {1} موجود نہیں ہے
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قیمت کی فہرست شرح (کمپنی کرنسی)
@@ -2894,13 +2884,13 @@
 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,قرض
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,قرض
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,صف # {0}: سیریل کوئی لازمی ہے
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,آئٹم حکمت ٹیکس تفصیل
 ,Item-wise Price List Rate,آئٹم وار قیمت کی فہرست شرح
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
 DocType: Lead,Add to calendar on this date,اس تاریخ پر کیلنڈر میں شامل کریں
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,شپنگ کے اخراجات شامل کرنے کے لئے رولز.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,انے والی تقریبات
@@ -2920,15 +2910,14 @@
 DocType: Customer,From Lead,لیڈ سے
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Hub Settings,Name Token,نام ٹوکن
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,سٹینڈرڈ فروخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} فروخت انوائس کے خلاف {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,پیمائش کی پہلے سے طے شدہ یونٹ داخل کریں
-DocType: Project,Project Name,پراجیکٹ کا نام
+DocType: Request for Quotation 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,آئٹم بیچ نمبر
@@ -2965,7 +2954,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",یہ آپ کی کمپنی ایڈریس ہے کے طور پر کمپنی، لازمی ہے
 DocType: Item Attribute,From Range,رینج سے
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,اس کے بعد سے نظر انداز کر دیا آئٹم {0} اسٹاک شے نہیں ہے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,مزید کارروائی کے لئے اس کی پیداوار آرڈر جمع کرائیں.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,مزید کارروائی کے لئے اس کی پیداوار آرڈر جمع کرائیں.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ایک مخصوص ٹرانزیکشن میں قیمتوں کا تعین اصول لاگو نہیں کرنے کے لئے، تمام قابل اطلاق قیمتوں کا تعین قواعد غیر فعال کیا جانا چاہئے.
 DocType: Company,Domain,ڈومین
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,نوکریاں
@@ -2977,6 +2966,7 @@
 DocType: Time Log,Additional Cost,اضافی لاگت
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,پردایک کوٹیشن بنائیں
 DocType: Quality Inspection,Incoming,موصولہ
 DocType: BOM,Materials Required (Exploded),مواد (دھماکے) کی ضرورت
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),بغیر تنخواہ چھٹی کے لئے کمانے کو کم (LWP)
@@ -3011,7 +3001,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,عارضی اکاؤنٹس
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,سیاہ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM دھماکہ آئٹم
 DocType: Account,Auditor,آڈیٹر
@@ -3025,16 +3015,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,مارک غائب
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,وقت وقت کے مقابلے میں زیادہ ہونا ضروری ہے
 DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,سے اشیاء شامل کریں
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,سے اشیاء شامل کریں
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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/public/js/setup_wizard.js +20,"e.g. ""MC""",مثال کے طور پر &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,شے کے لئے موجود نہیں کر سکتے اسٹاک {0} کے بعد مختلف حالتوں ہے
 ,Sales Person-wise Transaction Summary,فروخت شخص وار ٹرانزیکشن کا خلاصہ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,گودام {0} موجود نہیں ہے
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,منتخب شے بیچ نہیں کر سکتے ہیں
@@ -3060,7 +3050,7 @@
 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,اگلی رابطہ
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,سیٹ اپ گیٹ وے اکاؤنٹس.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,سیٹ اپ گیٹ وے اکاؤنٹس.
 DocType: Employee,Employment Type,ملازمت کی قسم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,مقرر اثاثے
 ,Cash Flow,پیسے کا بہاو
@@ -3074,7 +3064,7 @@
 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 +132,Please find attached {0} #{1},تلاش کریں منسلک {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},تلاش کریں منسلک {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,جنرل لیجر کے مطابق بینک کا گوشوارہ توازن
 DocType: Job Applicant,Applicant Name,درخواست گزار کا نام
 DocType: Authorization Rule,Customer / Item Name,کسٹمر / نام شے
@@ -3090,19 +3080,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; ٹیرٹری
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,لین دین کی فروخت کے لئے پہلے سے طے شدہ ترتیبات.
 DocType: BOM Replace Tool,Current BOM,موجودہ BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,سیریل نمبر شامل
 apps/erpnext/erpnext/config/support.py +43,Warranty,وارنٹی
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,پرنٹ اور اسٹیشنری
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,گروپ گھنڈی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,اپ ڈیٹ ختم سامان
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,اپ ڈیٹ ختم سامان
 DocType: Workstation,per hour,فی گھنٹہ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,پرچیزنگ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,گودام (ہمیشہ انوینٹری) کے لئے اکاؤنٹ اس اکاؤنٹ کے تحت پیدا کیا جائے گا.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
 DocType: Company,Distribution,تقسیم
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,رقم ادا کر دی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,پروجیکٹ مینیجر
@@ -3132,7 +3121,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},تاریخ مالی سال کے اندر اندر ہونا چاہئے. = تاریخ کے فرض {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",یہاں آپ کو وغیرہ اونچائی، وزن، یلرجی، طبی خدشات کو برقرار رکھنے کے کر سکتے ہیں
 DocType: Leave Block List,Applies to Company,کمپنی پر لاگو ہوتا ہے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
 DocType: Purchase Invoice,In Words,الفاظ میں
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
 DocType: Production Planning Tool,Material Request For Warehouse,گودام کے لئے مواد کی درخواست
@@ -3146,7 +3135,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},ٹرانزیکشن روک پیداوار کے خلاف کی اجازت نہیں آرڈر {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",، پہلے سے طے شدہ طور پر اس مالی سال مقرر کرنے کیلئے &#39;پہلے سے طے شدہ طور پر مقرر کریں&#39; پر کلک کریں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"تاریخ"" کئ ضرورت ہے To"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",پیکجوں پیش کی جائے کرنے کے لئے تخم پیکنگ پیدا. پیکیج کی تعداد، پیکج مندرجات اور اس کا وزن مطلع کرنے کے لئے استعمال.
@@ -3157,7 +3146,7 @@
 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 +782,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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} پہلے سے حاصل کیا گیا ہے
@@ -3165,14 +3154,13 @@
 DocType: Customer,Sales Team Details,سیلز ٹیم تفصیلات
 DocType: Expense Claim,Total Claimed Amount,کل دعوی رقم
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فروخت کے لئے ممکنہ مواقع.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},غلط {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کے لئے نام دینے سیریز مقرر کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ڈیپارٹمنٹ سٹور
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,پہلی دستاویز کو بچانے کے.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,پہلی دستاویز کو بچانے کے.
 DocType: Account,Chargeable,ادائیگی
 DocType: Company,Change Abbreviation,پیج مخفف
 DocType: Expense Claim Detail,Expense Date,اخراجات تاریخ
@@ -3190,10 +3178,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,جنرل لیجر
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,لنک لیڈز
 DocType: Item Attribute Value,Attribute Value,ویلیو وصف
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",ای میل کی شناخت پہلے ہی موجود ہے، منفرد ہونا چاہئے {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",ای میل کی شناخت پہلے ہی موجود ہے، منفرد ہونا چاہئے {0}
 ,Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
 DocType: Features Setup,To get Item Group in details table,تفصیلات ٹیبل میں آئٹم گروپ حاصل کرنے کے لئے
@@ -3218,23 +3206,23 @@
 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,پروجیکٹ وار اسٹاک ٹریکنگ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},بحالی کے شیڈول {0} کے خلاف موجود {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},بحالی کے شیڈول {0} کے خلاف موجود {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ماخذ / ہدف میں) اصل مقدار
 DocType: Item Customer Detail,Ref Code,ممبران کوڈ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ملازم کے ریکارڈ.
 DocType: Payment Gateway,Payment Gateway,ادائیگی کے گیٹ وے
 DocType: HR Settings,Payroll Settings,پے رول کی ترتیبات
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,حکم صادر کریں
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,روٹ والدین لاگت مرکز نہیں کر سکتے ہیں
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,منتخب برانڈ ہے ...
 DocType: Sales Invoice,C-Form Applicable,سی فارم لاگو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,گودام لازمی ہے
 DocType: Supplier,Address and Contacts,ایڈریس اور رابطے
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تبادلوں تفصیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),100px کی طرف سے (ڈبلیو) ویب چھپنے 900px رکھو (H)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,کی طرف سے حل
@@ -3252,7 +3240,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,ٹرانزیکشن کی کرنسی ادائیگی کے گیٹ وے کرنسی کے طور پر ایک ہی ہونا چاہیے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,وصول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,وصول
 DocType: Maintenance Visit,Fully Completed,مکمل طور پر مکمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مکمل
 DocType: Employee,Educational Qualification,تعلیمی اہلیت
@@ -3260,14 +3248,14 @@
 DocType: Purchase Invoice,Submit on creation,تخلیق پر جمع کرائیں
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خریداری ماسٹر مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,/ ترمیم قیمتیں شامل
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,میرے حکم
@@ -3287,10 +3275,10 @@
 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,بھیجنے سے پہلے پیغام درج کریں
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
+apps/erpnext/erpnext/config/accounts.py +258,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,امائبھوت قرض
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,امائبھوت قرض
 DocType: Cost Center,Cost Center Name,لاگت مرکز نام
 DocType: Maintenance Schedule Detail,Scheduled Date,تخسوچت تاریخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,کل ادا AMT
@@ -3302,7 +3290,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},{0} شے کے لئے پار over- کے لیے الاؤنس {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,اپنے سپلائرز
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
@@ -3315,12 +3303,12 @@
 DocType: Employee,Date of Issue,تاریخ اجراء
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: سے {0} کے لئے {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
 DocType: Issue,Content Type,مواد کی قسم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپیوٹر
 DocType: Item,List this Item in multiple groups on the website.,ویب سائٹ پر ایک سے زیادہ گروہوں میں اس شے کی فہرست.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,دوسری کرنسی کے ساتھ اکاؤنٹس کی اجازت دینے ملٹی کرنسی آپشن کو چیک کریں براہ مہربانی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,آئٹم: {0} نظام میں موجود نہیں ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,آئٹم: {0} نظام میں موجود نہیں ہے
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,آپ منجمد قیمت مقرر کرنے کی اجازت نہیں ہے
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled لکھے حاصل
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
@@ -3329,7 +3317,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,اکاؤنٹ ہیڈ
@@ -3342,7 +3330,7 @@
 DocType: Item,Customer Code,کسٹمر کوڈ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,اسٹاک اثاثوں
@@ -3356,15 +3344,15 @@
 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 +576,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},سے اور مدت بار بار چلنے والی کے لئے لازمی تاریخوں کی مدت {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},سے اور مدت بار بار چلنے والی کے لئے لازمی تاریخوں کی مدت {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,پروجیکٹ سرگرمی / کام.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تنخواہ تخم پیدا
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",قابل اطلاق کے لئے کے طور پر منتخب کیا جاتا ہے تو خریدنے، جانچ پڑتال ہونا ضروری {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ڈسکاؤنٹ کم 100 ہونا ضروری ہے
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,مہینے کا دن پر دہرائیں
@@ -3385,7 +3373,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},شے کے لئے ختم ہونے کی تاریخ سے کم ہونا چاہئے شروع کرنے کی تاریخ {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},شے کے لئے ختم ہونے کی تاریخ سے کم ہونا چاہئے شروع کرنے کی تاریخ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",مثال: سیریز مقرر کیا گیا ہے اور سیریل کوئی لین دین میں ذکر نہیں کیا جاتا ہے تو ABCD #####، پھر خود کار طریقے سے سیریل نمبر اس سیریز کی بنیاد پر پیدا کیا جائے گا. آپ کو ہمیشہ واضح طور پر اس شے کے لئے سیریل نمبر کا ذکر کرنا چاہتے ہیں. خالی چھوڑ دیں.
 DocType: Upload Attendance,Upload Attendance,اپ لوڈ کریں حاضری
@@ -3396,11 +3384,11 @@
 ,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 +91,Please enter default currency in Company Master,کمپنی ماسٹر میں پہلے سے طے شدہ کرنسی داخل کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ٹیکس اصول ٹکراؤ {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,نئے اکاؤنٹ کا نام
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,کسٹمر سروس
@@ -3412,9 +3400,9 @@
 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 +72,Item {0} must be a stock Item,آئٹم {0} اسٹاک آئٹم ہونا ضروری ہے
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش رفت گودام میں پہلے سے طے شدہ کام
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,اکاؤنٹنگ لین دین کے لئے پہلے سے طے شدہ ترتیبات.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,اکاؤنٹنگ لین دین کے لئے پہلے سے طے شدہ ترتیبات.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,متوقع تاریخ مواد کی درخواست کی تاریخ سے پہلے نہیں ہو سکتا
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,آئٹم {0} سیلز آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,آئٹم {0} سیلز آئٹم ہونا ضروری ہے
 DocType: Naming Series,Update Series Number,اپ ڈیٹ سلسلہ نمبر
 DocType: Account,Equity,اکوئٹی
 DocType: Sales Order,Printing Details,پرنٹنگ تفصیلات
@@ -3422,7 +3410,7 @@
 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,تلاش ذیلی اسمبلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},آئٹم کوڈ صف کوئی ضرورت {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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 ڈسکاؤنٹ
@@ -3445,7 +3433,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خوردہ اور تھوک فروشی
 DocType: Issue,First Responded On,پہلے جواب
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ایک سے زیادہ گروہوں میں شے کی کراس لسٹنگ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ پہلے ہی مالی سال میں مقرر کیا جاتا ہے {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,کامیابی سے Reconciled
 DocType: Production Order,Planned End Date,منصوبہ بندی اختتام تاریخ
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,اشیاء کہاں محفوظ کیا جاتا ہے.
@@ -3456,7 +3444,7 @@
 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 +508,Posting date and posting time is mandatory,تاریخ پوسٹنگ اور وقت پوسٹنگ لازمی ہے
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,لین دین کی خریداری کے لئے ٹیکس سانچے.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,لین دین کی خریداری کے لئے ٹیکس سانچے.
 ,Item Prices,آئٹم کی قیمتوں میں اضافہ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,آپ کی خریداری آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
 DocType: Period Closing Voucher,Period Closing Voucher,مدت بند واؤچر
@@ -3466,10 +3454,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,نیٹ کل پر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,{0} قطار میں ہدف گودام پروڈکشن آرڈر کے طور پر ایک ہی ہونا چاہیے
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,کوئی اجازت ادائیگی کے آلے کا استعمال کرنے کے لئے
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,٪ s کو بار بار چلنے والی کے لئے مخصوص نہیں &#39;اطلاعی ای میل پتوں&#39;
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,٪ s کو بار بار چلنے والی کے لئے مخصوص نہیں &#39;اطلاعی ای میل پتوں&#39;
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,پیج
@@ -3488,13 +3476,13 @@
 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 +559,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,تمام اشیاء غیر اسٹاک اشیاء ہیں کے طور پر ٹیکس زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; نہیں ہو سکتا
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,بیچ
@@ -3508,7 +3496,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,فروخت شخص
 DocType: Sales Invoice,Cold Calling,سرد کالنگ
 DocType: SMS Parameter,SMS Parameter,ایس ایم ایس پیرامیٹر
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,بجٹ اور لاگت سینٹر
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,بجٹ اور لاگت سینٹر
 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.,اقدار پر مبنی لین دین کو محدود کرنے کے قوانین تشکیل دیں.
@@ -3541,7 +3529,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,مندرجہ ذیل دنوں میں رخصت کی درخواستیں کرنے سے صارفین کو روکنے کے.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ملازم فوائد
 DocType: Sales Invoice,Is POS,پوزیشن ہے
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Production Order,Manufactured Qty,تیار مقدار
 DocType: Purchase Receipt Item,Accepted Quantity,منظور مقدار
@@ -3549,7 +3536,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,گاہکوں کو اٹھایا بل.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروجیکٹ کی شناخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,والدین کے اکاؤنٹ
@@ -3565,7 +3552,7 @@
 DocType: Employee,Education,تعلیم
 DocType: Selling Settings,Campaign Naming By,مہم کا نام دینے
 DocType: Employee,Current Address Is,موجودہ پتہ ہے
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",اختیاری. کی وضاحت نہیں کی ہے تو، کمپنی کے پہلے سے طے شدہ کرنسی سیٹ.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",اختیاری. کی وضاحت نہیں کی ہے تو، کمپنی کے پہلے سے طے شدہ کرنسی سیٹ.
 DocType: Address,Office,آفس
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,اکاؤنٹنگ جرنل اندراج.
 DocType: Delivery Note Item,Available Qty at From Warehouse,گودام سے پر دستیاب مقدار
@@ -3600,7 +3587,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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,ماہانہ تنخواہ رجسٹر
 DocType: Warranty Claim,If different than customer address,کسٹمر ایڈریس سے مختلف تو
 DocType: BOM Operation,BOM Operation,BOM آپریشن
@@ -3608,22 +3595,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,کم سے کم ایک قطار میں ادائیگی کی رقم درج کریں
 DocType: POS Profile,POS Profile,پی او ایس پروفائل
 DocType: Payment Gateway Account,Payment URL Message,ادائیگی URL پیغام
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,صف {0}: ادائیگی کی رقم بقایا رقم سے زیادہ نہیں ہو سکتا
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,بلا معاوضہ کل
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,وقت لاگ ان بل قابل نہیں ہے
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,دستی طور پر خلاف واؤچر کوڈ داخل کریں
 DocType: SMS Settings,Static Parameters,جامد پیرامیٹر
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,سپلائر مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,ایکسائز انوائس
 DocType: Expense Claim,Employees Email Id,ملازمین ای میل کی شناخت
 DocType: Employee Attendance Tool,Marked Attendance,نشان حاضری
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,موجودہ قرضوں
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,موجودہ قرضوں
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,اصل مقدار لازمی ہے
@@ -3644,17 +3631,16 @@
 DocType: Item Attribute,Numeric Values,عددی اقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,علامت (لوگو) منسلک کریں
 DocType: Customer,Commission Rate,کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,تجزیات
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,ٹوکری خالی ہے
 DocType: Production Order,Actual Operating Cost,اصل آپریٹنگ لاگت
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,کوئی طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچے سے نئی تشکیل مہربانی.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,دارالحکومت اسٹاک
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,دارالحکومت اسٹاک
 DocType: Packing Slip,Package Weight Details,پیکیج وزن تفصیلات
 DocType: Payment Gateway Account,Payment Gateway Account,ادائیگی کے گیٹ وے اکاؤنٹ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ادائیگی مکمل ہونے کے بعد منتخب صفحے پر صارف ری.
@@ -3666,17 +3652,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
 ,Item-wise Purchase Register,آئٹم وار خریداری رجسٹر
 DocType: Batch,Expiry Date,خاتمے کی تاریخ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ترتیب سطح قائم کرنے، شے ایک خریداری شے یا مینوفیکچرنگ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),آدھا دن
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,سامان کا بل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},صف {0}: پارٹی قسم اور پارٹی وصولی / قابل ادائیگی اکاؤنٹ کے لئے ضروری ہے {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,ممبران تاریخ
@@ -3684,6 +3670,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,منظور رقم
 DocType: GL Entry,Is Opening,افتتاحی ہے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},صف {0}: ڈیبٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,اکاؤنٹ {0} موجود نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,اکاؤنٹ {0} موجود نہیں ہے
 DocType: Account,Cash,کیش
 DocType: Employee,Short biography for website and other publications.,ویب سائٹ اور دیگر مطبوعات کے لئے مختصر سوانح عمری.
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index df73fa0..bd9dffe 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Employee,Rented,Thuê
 DocType: POS Profile,Applicable for User,Áp dụng cho User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"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/manufacturing/doctype/production_order/production_order.py +173,"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.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,Hãy cài đặt nhân viên đặt tên hệ thống trong Human Resource&gt; Cài đặt nhân sự
 DocType: Purchase Order,Customer Contact,Khách hàng Liên hệ
 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
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,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 +229,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: 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 +49,Show Variants,Hiện biến thể
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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ả)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,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
 DocType: Designation,Designation,Định
@@ -64,7 +63,7 @@
 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 +642,Invoice,Hóa đơn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Quốc phòng
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},New {0}: {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +132,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 +38,Abbreviation cannot have more than 5 characters,Tên viết tắt không thể có nhiều hơn 5 ký tự
 DocType: Payment Request,Payment Request,Yêu cầu thanh toán
@@ -102,7 +101,7 @@
 DocType: Employee,Married,Kết hôn
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Không được phép cho {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,Được các mục từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,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/doctype/sales_invoice/sales_invoice.py +390,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/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
 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 +197,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/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,Dược phẩm
@@ -156,7 +155,7 @@
 DocType: SMS Center,All Contact,Liên hệ với tất cả
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,Chi phí chứng khoán
 DocType: Newsletter,Email Sent?,Email gửi?
 DocType: Journal Entry,Contra Entry,Contra nhập
 DocType: Production Order Operation,Show Time Logs,Hiển thị Thời gian Logs
@@ -164,13 +163,13 @@
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,Mục {0} phải là mua hàng
+apps/erpnext/erpnext/stock/get_item_details.py +139,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.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải Template, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
  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 +507,"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 +533,"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 +170,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 DocType: BOM Replace Tool,New BOM,Mới BOM
@@ -209,11 +208,11 @@
 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 +79,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: 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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,Vui lòng nhập Công ty
@@ -222,7 +221,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Tiền thuần từ tài chính
 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 +217,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 +227,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
 ,Contact Name,Tên liên lạc
 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.
@@ -236,8 +235,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 DocType: Payment Tool,Reference No,Reference No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,Ngân hàng Entries
 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
@@ -249,8 +248,8 @@
 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 +592,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +264,7 @@
 DocType: Notification Control,Notification Control,Kiểm soát thông báo
 DocType: Lead,Suggestions,Đề xuất
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Thiết lập mục Nhóm-khôn ngoan ngân sách trên lãnh thổ này. Bạn cũng có thể bao gồm thời vụ bằng cách thiết lập phân phối.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Vui lòng nhập nhóm tài khoản phụ huynh cho kho {0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},Vui lòng nhập nhóm tài khoản phụ huynh cho kho {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
@@ -284,7 +283,7 @@
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Sai Mật Khẩu
 DocType: Item,Variant Of,Trong Variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,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'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,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: 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
@@ -295,10 +294,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,Giao hàng Ghi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,Giao hàng Ghi
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Thiết lập 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 +381,{0} entered twice in Item Tax,{0} Nhập hai lần vào Mục Thuế
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0} Nhập hai lần vào Mục 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 +73,Please select month and year,Vui lòng chọn tháng và năm
@@ -309,12 +308,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Tổng số thứ tự coi
 apps/erpnext/erpnext/config/hr.py +190,"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 +210,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 +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân bổ cho Employee {1} cho kỳ {2} {3} để
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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"
@@ -337,9 +336,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kiểm tra chất lượng sản phẩm Thông số
 DocType: Leave Application,Leave Approver Name,Để lại Tên Người phê duyệt
-,Schedule Date,Lịch trình ngày
+DocType: Depreciation Schedule,Schedule Date,Lịch trình ngày
 DocType: Packed Item,Packed Item,Khoản đóng gói
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,Thiết lập mặc định cho giao dịch mua.
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Thiết lập mặc định cho giao dịch mua.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Hoạt động Chi phí tồn tại cho {0} Employee chống Kiểu Hoạt động - {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.,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ệ
@@ -388,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,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 +550,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 +555,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
-DocType: Material Request Item,Required Date,Ngày yêu cầu
+DocType: Request for Quotation 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 +770,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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
@@ -418,17 +417,17 @@
 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/public/js/setup_wizard.js +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/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 +308,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 +378,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
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"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
@@ -448,7 +447,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Tăng không thể là 0
 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 +86,Item {0} is not Purchase Item,Mục {0} không được mua hàng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,Mục {0} không được mua hàng
 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
@@ -459,7 +458,7 @@
 DocType: Production Plan Item,Pending Qty,Pending Qty
 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 +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
+apps/erpnext/erpnext/controllers/buying_controller.py +127,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
@@ -471,13 +470,13 @@
  Để 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 +126,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 +230,Financial / accounting year.,Năm tài chính / kế toán.
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Giá trị tích lũy
 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"
 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
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,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
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,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 +61,Delivered: {0},Delivered: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Tài khoản phải trả
@@ -485,7 +484,7 @@
 DocType: Job Applicant,Resume Attachment,Resume đính kèm
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
 DocType: Leave Control Panel,Allocate,Phân bổ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,Bán hàng trở lại
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +115,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.
@@ -494,7 +493,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.
@@ -504,7 +503,7 @@
 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/config/accounts.py +70,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,Ngày giao dịch Cập nhật Ngân hàng
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,Ngày giao dịch Cập nhật Ngân hàng
 apps/erpnext/erpnext/stock/stock_ledger.py +337,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}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,thời gian theo dõi
 DocType: Fiscal Year Company,Fiscal Year Company,Công ty tài chính Năm
@@ -522,19 +521,18 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Vui lòng nhập Purchase Receipt đầu tiên
 DocType: Buying Settings,Supplier Naming By,Nhà cung cấp đặt tên By
 DocType: Activity Type,Default Costing Rate,Mặc định Costing Rate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,Lịch trình bảo trì
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Thay đổi ròng trong kho
 DocType: Employee,Passport Number,Số hộ chiếu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,"khai báo 2 mục ""Dựa trên"" và ""Bởi Nhóm"" không thể giống nhau"
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,Hãy thiết lập một danh sách Tốt cho cả các nhân viên hoặc Công ty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,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 +699,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/cost_center/cost_center.js +69,Convert to Group,Chuyển đổi cho Tập đoàn
 DocType: Activity Cost,Activity Type,Loại hoạt động
@@ -542,7 +540,7 @@
 DocType: Supplier,Fixed Days,Days cố định
 DocType: Quotation Item,Item Balance,mục Balance
 DocType: Sales Invoice,Packing List,Danh sách đóng gói
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,Đơn đặt hàng mua cho nhà cung cấp.
+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/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ụ
@@ -576,7 +574,7 @@
 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 +529,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,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
@@ -613,14 +611,14 @@
 apps/erpnext/erpnext/config/hr.py +98,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/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Có một lỗi trong Template Địa chỉ của bạn {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,Tài khoản mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,Tài khoản mới
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
-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/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {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.,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.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,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 +371,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ì
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,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 +190,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 +84,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.
@@ -668,17 +666,17 @@
 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 +320,"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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Chi phí bảo trì văn phòng
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,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 +60,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}.
 DocType: Company,Default Cost of Goods Sold Account,Mặc định Chi phí tài khoản hàng bán
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Danh sách giá không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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"
@@ -686,7 +684,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,Hoá đơn của tôi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,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: Supplier Quotation,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
@@ -698,7 +696,7 @@
 DocType: Item,Website Warehouse,Trang web kho
 DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Điểm số phải nhỏ hơn hoặc bằng 5
-apps/erpnext/erpnext/config/accounts.py +267,C-Form records,Hồ sơ C-Mẫu
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,Hồ sơ C-Mẫu
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,Khách hàng và Nhà cung cấp
 DocType: Email Digest,Email Digest Settings,Email chỉnh Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Hỗ trợ các truy vấn từ khách hàng.
@@ -722,7 +720,7 @@
 DocType: Quotation 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 +240,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 +227,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','Đang mở'
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
 DocType: Expense Claim,Expenses,Chi phí
@@ -759,14 +757,14 @@
 DocType: Supplier Quotation,Is Subcontracted,Được ký hợp đồng phụ
 DocType: Item Attribute,Item Attribute Values,Giá trị mục Attribute
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Xem Subscribers
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,Mua hóa đơn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,Tổng tỷ giá hối đoái.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,Tổng tỷ giá hối đoái.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/config/selling.py +99,Sales Partners and Territory,Đối tác bán hàng và lãnh thổ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0} phải được hoạt động
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,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 +36,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,Goto Giỏ hàng
 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
@@ -785,7 +783,7 @@
 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 +524,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -795,10 +793,10 @@
 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/public/js/setup_wizard.js +139,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}.
+apps/erpnext/erpnext/controllers/status_updater.py +165,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
-DocType: Journal Entry Account,Purchase Invoice,Mua hóa đơn
+DocType: Asset,Purchase Invoice,Mua hóa đơn
 DocType: Stock Ledger Entry,Voucher Detail No,Chứng từ chi tiết Không
 DocType: Stock Entry,Total Outgoing Value,Tổng giá trị Outgoing
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Khai mạc Ngày và ngày kết thúc nên trong năm tài chính tương tự
@@ -808,16 +806,16 @@
 DocType: Material Request Item,Lead Time Date,Chì Thời gian ngày
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,là bắt buộc. Có bản ghi Tỷ Giá không được tạo ra cho
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +110,Row #{0}: Please specify Serial No for Item {1},Hàng # {0}: Hãy xác định Serial No cho mục {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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.","Đối với những mặt &#39;gói sản phẩm&#39;, Warehouse, Serial No và hàng loạt No sẽ được xem xét từ &#39;Packing List&#39; bảng. Nếu kho và hàng loạt Không là giống nhau cho tất cả các mặt hàng đóng gói cho các mặt hàng bất kỳ &#39;gói sản phẩm&#39;, những giá trị có thể được nhập vào mục bảng chính, giá trị này sẽ được sao chép vào &#39;Packing List&#39; bảng."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"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.","Đối với những mặt &#39;gói sản phẩm&#39;, Warehouse, Serial No và hàng loạt No sẽ được xem xét từ &#39;Packing List&#39; bảng. Nếu kho và hàng loạt Không là giống nhau cho tất cả các mặt hàng đóng gói cho các mặt hàng bất kỳ &#39;gói sản phẩm&#39;, những giá trị có thể được nhập vào mục bảng chính, giá trị này sẽ được sao chép vào &#39;Packing List&#39; bảng."
 DocType: Job Opening,Publish on website,Xuất bản trên trang web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Lô hàng cho khách hàng.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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
 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 +672,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,Chọn mục Chuyển giao
 DocType: Purchase Invoice,Additional Discount Percentage,Tỷ lệ giảm giá bổ sung
 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.
@@ -831,14 +829,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân viên sinh Nhắc nhở
 ,Employee Holiday Attendance,Nhân viên khách sạn Holiday Attendance
 DocType: Opportunity,Walk In,Trong đi bộ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Cổ Entries
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Cổ Entries
 DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nhận chuyển nhượng
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,Làm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Make ,Làm
 DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ
 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 +5,My Cart,Giỏ hàng
@@ -848,7 +846,7 @@
 DocType: Holiday List,Holiday List Name,Kỳ nghỉ Danh sách Tê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 +180,Qty for {0},Số lượng cho {0}
+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 +80,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
@@ -861,7 +859,7 @@
 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 +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 +547,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,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 thể bị âm
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Giảm giá
@@ -876,20 +874,20 @@
 DocType: Landed Cost Item,Purchase Receipt Item,Mua hóa đơn hàng
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Kho dự trữ trong bán hàng đặt hàng / Chế Hàng Kho
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Số tiền bán
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,Thời gian Logs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,Thời gian Logs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/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 +191,"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 +181,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,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}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,tuyển dụng
 DocType: BOM Operation,Operation,Hoạt động
 DocType: Lead,Organization Name,Tên tổ chức
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,Chi phí bán hàng
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,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
@@ -906,7 +904,7 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Ngày kết thúc không thể nhỏ hơn Bắt đầu ngày
 DocType: Sales Person,Select company name first.,Chọn tên công ty đầu tiên.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Tiến sĩ
-apps/erpnext/erpnext/config/buying.py +18,Quotations received from Suppliers.,Trích dẫn nhận được từ nhà cung cấp.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Trích dẫn nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Để {0} | {1} {2}
 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
@@ -915,7 +913,7 @@
 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: Expense Claim,From Employee,Từ nhân viên
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,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 +347,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
@@ -923,7 +921,7 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,và năm:
 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 +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}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,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 +42,Contribution %,Đóng góp%
@@ -932,7 +930,7 @@
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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.
@@ -940,14 +938,14 @@
 DocType: Salary Slip,Deductions,Các khoản giảm trừ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Hàng loạt Giờ này đã được lập hoá đơn.
 DocType: Salary Slip,Leave Without Pay,Nếu không phải trả tiền lại
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,Công suất Lỗi Kế hoạch
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,Công suất Lỗi Kế hoạch
 ,Trial Balance for Party,Trial Balance cho Đảng
 DocType: Lead,Consultant,Tư vấn
 DocType: Salary Slip,Earnings,Thu nhập
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Hoàn thành mục {0} phải được nhập cho loại Sản xuất nhập cảnh
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Mở cân đối kế toán
 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 +473,Nothing to request,Không có gì để yêu cầu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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' không thể sau 'Ngày kết thúc'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Quản lý
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,Loại hoạt động cho Thời gian Sheets
@@ -958,18 +956,18 @@
 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'
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Hãy đặt Email ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Hãy đặt Email ID
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} nos nối tiếp hợp lệ cho mục {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mã hàng không có thể được thay đổi cho Số sản
 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/config/buying.py +33,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: Account,Balance Sheet,Cân đối kế toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',Trung tâm chi phí Đối với mục Item Code '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',Trung tâm chi phí Đối với mục Item Code '
 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 +209,"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/accounts/page/accounts_browser/accounts_browser.js +212,"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 +120,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ả
@@ -997,18 +995,18 @@
 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
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,Xem Ledger
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,Xem Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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/setup_wizard/setup_wizard.py +412,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 +83,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Cổ tức trả tiền
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,Cổ tức trả tiền
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kế toán Ledger
 DocType: Stock Reconciliation,Difference Amount,Chênh lệch Số tiền
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Thu nhập giữ lại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,Thu nhập giữ lại
 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ỳ
@@ -1016,7 +1014,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,Mở cửa tạm thời
 ,Employee Leave Balance,Để lại cân nhân viên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,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}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Tỷ lệ đánh giá cần thiết cho mục trong hàng {0}
@@ -1031,8 +1029,8 @@
 ,Accounts Payable Summary,Tóm tắt các tài khoản phải trả
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},Không được phép chỉnh sửa tài khoản đông lạnh {0}
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +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 +165,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,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 +168,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Nhỏ
@@ -1040,7 +1038,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,Đầu tài khoản {0} tạo
 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/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Tổng số đã đạt được
@@ -1048,12 +1046,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,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/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
 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
@@ -1063,17 +1061,17 @@
 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 +118,"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 +482,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
-apps/erpnext/erpnext/stock/get_item_details.py +143,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/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/stock/get_item_details.py +142,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."
 DocType: Hub Settings,Seller Website,Người bán website
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
-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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,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/selling/doctype/sales_order/sales_order.js +750,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,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/request_for_quotation/request_for_quotation.js +617,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
@@ -1083,10 +1081,10 @@
 DocType: Item,Website Item Groups,Trang web mục Groups
 DocType: Purchase Invoice,Total (Company Currency),Tổng số (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
-DocType: Journal Entry,Journal Entry,Tạp chí nhập
+DocType: Depreciation Schedule,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 +433,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 +442,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
 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
@@ -1119,7 +1117,7 @@
 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}
 DocType: Project,Start and End Dates,Bắt đầu và kết thúc Ngày
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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: Authorization Rule,Average Discount,Giảm giá trung bình
@@ -1130,10 +1128,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Payment Request,Transaction Currency,giao dịch tiền tệ
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Từ {0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Từ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Mô tả hoạt động
 DocType: Item,Will also apply to variants,Cũng sẽ áp dụng cho các biến thể
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Không thể thay đổi năm tài chính bắt đầu ngày và năm tài chính kết thúc ngày khi năm tài chính được lưu.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Không thể thay đổi năm tài chính bắt đầu ngày và năm tài chính kết thúc ngày khi năm tài chính được lưu.
 DocType: Quotation,Shopping Cart,"<a href=""#Sales Browser/Territory""> Add / Edit </ a>"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: Pricing Rule,Campaign,Chiến dịch
@@ -1147,8 +1145,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Thay đổi ròng trong Tài sản cố định
 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 +513,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 +181,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
@@ -1156,8 +1154,8 @@
 DocType: Sales Invoice,Shipping Address Name,Địa chỉ Shipping Name
 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 +472,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,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/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,không có thể lớn hơn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,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
@@ -1179,11 +1177,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,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 +460,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 +44,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 +167,Tax Rule for transactions.,Rule thuế cho các giao dịch.
+apps/erpnext/erpnext/config/accounts.py +175,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/public/js/setup_wizard.js +276,We buy this Item,Chúng tôi mua sản phẩm này
 DocType: Address,Billing,Thanh toán cước
@@ -1196,8 +1194,8 @@
 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 +142,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,Đóng gói trượt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Thuê văn phòng
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,Đóng gói trượt
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
@@ -1215,7 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,Mục Biến thể
 DocType: Company,Services,Dịch vụ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),Tổng số ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,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
@@ -1224,10 +1222,10 @@
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư
-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í
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Item Group,Item Group Name,Mục Group Name
 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 +86,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,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/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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."
@@ -1236,7 +1234,7 @@
 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/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.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,Bảo trì đăng nhập
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,Bảo trì đăng nhập
 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: Landed Cost Voucher,Landed Cost Help,Chi phí hạ cánh giúp
@@ -1250,7 +1248,6 @@
 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 +196,Brand master.,Chủ thương hiệu.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 DocType: Sales Invoice Item,Brand Name,Thương hiệu
 DocType: Purchase Receipt,Transporter Details,Chi tiết Transporter
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,Box
@@ -1278,7 +1275,7 @@
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,Tuyên bố cho chi phí công ty.
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,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
 ,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
@@ -1287,7 +1284,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gửi lại Email Thanh toán
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,Báo cáo khác
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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ở
@@ -1297,26 +1294,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0} Xem
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Thay đổi ròng trong Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,Loại nhà cung cấp tổng thể.
+apps/erpnext/erpnext/config/buying.py +43,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/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
 DocType: Purchase Invoice,Reference Document,Tài liệu tham khảo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,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 +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Được xem
+apps/erpnext/erpnext/config/website.py +12,"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/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
@@ -1338,7 +1335,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Thay đổi ròng trong Accounts Payable
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Vui lòng kiểm tra id email của bạn
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Khách hàng cần thiết cho 'Customerwise Giảm giá'
-apps/erpnext/erpnext/config/accounts.py +129,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í.
+apps/erpnext/erpnext/config/accounts.py +137,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 +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ị.
@@ -1357,7 +1354,7 @@
 DocType: Employee,Permanent Address,Địa chỉ thường trú
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance thanh toán đối với {0} {1} không thể lớn \ hơn Tổng cộng {2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,Vui lòng chọn mã hàng
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,Vui lòng chọn mã hàng
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Giảm Trích Để lại Nếu không phải trả tiền (LWP)
 DocType: Territory,Territory Manager,Quản lý lãnh thổ
 DocType: Packed Item,To Warehouse (Optional),Để Warehouse (Tùy chọn)
@@ -1367,15 +1364,15 @@
 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ị
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,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 +194,"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 +181,"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 +53,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 +215,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,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 +385,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 +55,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
@@ -1392,8 +1389,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,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 +93,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
@@ -1404,21 +1401,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,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
 DocType: Production Plan Material Request,Production Plan Material Request,Sản xuất Kế hoạch Chất liệu Yêu cầu
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,Không có đơn đặt hàng sản xuất tạo ra
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,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 +151,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 +145,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,Chính
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Biến thể
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,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/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,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 +131,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ổ
@@ -1426,26 +1423,26 @@
 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
 DocType: Territory,Territory Name,Tên lãnh thổ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
 apps/erpnext/erpnext/config/hr.py +40,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
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,Địa chỉ
+apps/erpnext/erpnext/hooks.py +91,Addresses,Địa chỉ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,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/config/hr.py +141,Appraisals,đánh giá
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Trùng lặp Serial No nhập cho hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Một điều kiện cho một Rule Vận Chuyển
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,Item không được phép có thứ tự sản xuất.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,Item không được phép có thứ tự sản xuất.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,Xin hãy thiết lập bộ lọc dựa trên Item hoặc kho
 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: 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 +27,Time Logs for manufacturing.,Thời gian Logs cho sản xuất.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0} phải được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Bị từ chối Warehouse là bắt buộc chống lại từ chối khoản {1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,Giờ cho các nhiệm vụ.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,Thanh toán
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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
@@ -1478,7 +1475,7 @@
 DocType: Sales Order Item,Delivery Warehouse,Giao hàng tận kho
 DocType: Stock Settings,Allowance Percent,Trợ cấp Percent
 DocType: SMS Settings,Message Parameter,Thông số tin nhắn
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,Cây của Trung tâm Chi phí tài chính.
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,Cây của Trung tâm Chi phí tài chính.
 DocType: Serial No,Delivery Document No,Giao văn bản số
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Nhận Items Từ biên nhận mua hàng
 DocType: Serial No,Creation Date,Ngày Khởi tạo
@@ -1510,41 +1507,41 @@
 ,Amount to Deliver,Số tiền để Cung cấp
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,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 +230,{0} created,{0} được tạo
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} được tạo
 DocType: Delivery Note Item,Against Sales Order,So với bán hàng đặt hàng
 ,Serial No Status,Serial No Tình trạng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,Mục bảng không thể để trống
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Để thiết lập {1} chu kỳ, sự khác biệt giữa các từ và đến ngày \
  phải lớn hơn hoặc bằng {2}"
 DocType: Pricing Rule,Selling,Bán hàng
 DocType: Employee,Salary Information,Thông tin tiền lương
 DocType: Sales Person,Name and Employee ID,Tên và nhân viên ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,Nhiệm vụ và thuế
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Vui lòng nhập ngày tham khảo
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,Thanh toán Tài khoản Gateway không được cấu hình
 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: Production Order,Material Request Item,Tài liệu Yêu cầu mục
+DocType: Request for Quotation Item,Material Request Item,Tài liệu Yêu cầu mục
 apps/erpnext/erpnext/config/stock.py +85,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/setup_wizard/install_fixtures.py +152,Red,Đỏ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,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}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,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
 DocType: Installation Note,Installation Time,Thời gian cài đặt
 DocType: Sales Invoice,Accounting Details,Chi tiết kế toán
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Xóa tất cả các giao dịch cho công ty này
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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ư
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,phân bổ
 DocType: Quality Inspection Reading,Acceptance Criteria,Các tiêu chí chấp nhận
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 DocType: Item Group,Show In Website,Hiện Trong Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,Nhóm
@@ -1572,7 +1569,7 @@
 ,Maintenance Schedules,Lịch bảo trì
 ,Quotation Trends,Xu hướng báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,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 +308,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
@@ -1586,23 +1583,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,Bao gồm Entries hòa giải
 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 +318,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/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Nhóm Non-Group
 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/public/js/setup_wizard.js +272,Unit,Đơn vị
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,Vui lòng ghi rõ Công ty
+apps/erpnext/erpnext/stock/get_item_details.py +123,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/public/js/setup_wizard.js +42,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
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ 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ố)
@@ -1611,29 +1607,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,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/controllers/accounts_controller.py +262,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}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,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ừ
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Item Giá tăng cho {0} trong Giá liệt {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Item Giá tăng cho {0} trong Giá liệt {1}
 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
 DocType: Territory,Classification of Customers by region,Phân loại khách hàng theo vùng
 DocType: Project,% Tasks Completed,Nhiệm vụ đã hoàn thành%
 DocType: Project,Gross Margin,Margin Gross
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,Ngân hàng tính toán cân bằng Trữ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,sử dụng người khuyết tật
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,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 +142,Cost Updated,Chi phí cập nhật
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,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 +85,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 +151,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}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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
@@ -1645,8 +1641,8 @@
 ,SO Qty,Số lượng SO
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
+DocType: Request for Quotation,Manufacturing Manager,Sản xuất Quản lý
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,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 +154,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 +71,Shipments,Lô hàng
 DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
@@ -1654,12 +1650,12 @@
 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/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: Asset,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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,Chi phí linh tinh
 DocType: Global Defaults,Default Company,Công ty mặc định
 apps/erpnext/erpnext/controllers/stock_controller.py +167,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 +350,"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 +363,"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 +139,User {0} is disabled,Người sử dụng {0} bị vô hiệu hóa
@@ -1668,7 +1664,7 @@
 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 +175,"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 +361,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{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ệ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"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 +94,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
@@ -1681,8 +1677,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Con hàng không phải là một gói sản phẩm. Hãy loại bỏ mục &#39;{0} `và tiết kiệm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Ngân hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,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 +296,New Cost Center,Trung tâm Chi phí mới
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Chuyển đến nhóm thích hợp (thường Nguồn vốn&gt; Nợ phải trả hiện tại&gt; Thuế và Nhiệm vụ và tạo một tài khoản mới (bằng cách nhấp vào Add Child) của loại &quot;thuế&quot; và làm đề cập đến tỷ lệ thuế.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,Trung tâm Chi phí mới
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"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
@@ -1698,7 +1693,7 @@
 DocType: Quotation Item,Stock Balance,Số dư chứng khoán
 apps/erpnext/erpnext/config/selling.py +306,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 +281,Time Logs created:,Thời gian Logs tạo:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,Thời gian Logs tạo:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,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
@@ -1716,13 +1711,13 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Hãy xác định một quốc gia cho Rule Shipping này hoặc kiểm tra vận chuyển trên toàn thế giới
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,Nợ Để được yêu cầu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,Nợ Để được yêu cầu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
 DocType: Offer Letter Term,Offer Term,Offer hạn
 DocType: Quality Inspection,Quality Manager,Quản lý chất lượng
 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 +141,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Cung cấp Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,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.
@@ -1730,22 +1725,22 @@
 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 +103,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 +234,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/accounts/doctype/purchase_invoice/purchase_invoice.py +104,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 +243,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 +121,"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 +273,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
 DocType: Manufacturing Settings,Allow Overtime,Cho phép làm việc ngoài giờ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} số Serial yêu cầu cho khoản {1}. Bạn đã cung cấp {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Hiện tại Rate Định giá
 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 +123,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/config/accounts.py +131,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/public/js/templates/address_list.html +1,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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
@@ -1754,10 +1749,10 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Không tìm thấy cho phiếu lương tháng:
 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 +175,Serial No {0} not found,Số thứ tự {0} không tìm thấy
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,Số thứ tự {0} không tìm thấy
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,Khách hàng của bạn
 DocType: Leave Block List Date,Block Date,Khối ngày
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,Áp dụng ngay bây giờ
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,Áp dụng ngay bây giờ
 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."
@@ -1781,7 +1776,7 @@
 DocType: Employee,Employment Details,Chi tiết việc làm
 DocType: Employee,New Workplace,Nơi làm việc mới
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Đặt làm đóng
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},Không có hàng với mã vạch {0}
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Không có hàng với mã vạch {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Trường hợp số không thể là 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Nếu bạn có đội ngũ bán hàng và bán Đối tác (Channel Partners) họ có thể được gắn và duy trì đóng góp của họ trong các hoạt động bán hàng
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
@@ -1799,10 +1794,10 @@
 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 +608,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,Vật liệu chuyển
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},Mục {0} phải là một mục bán hàng tại {1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và cung cấp cho một hoạt động độc đáo không để các hoạt động của bạn."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
 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
@@ -1816,7 +1811,7 @@
 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: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Nhập Email Từ
@@ -1830,9 +1825,9 @@
 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: Rename Tool,File to Rename,File để Đổi tên
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
-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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,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 +196,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/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
@@ -1849,25 +1844,25 @@
 DocType: Upload Attendance,Attendance To Date,Tham gia Đến ngày
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Gateway Account,Payment Account,Tài khoản thanh toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Thay đổi ròng trong tài khoản phải thu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,Accepted,Chấp nhận
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,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.
 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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật cổ phiếu, hóa đơn chứa chi tiết vận chuyển thả."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật cổ phiếu, hóa đơn chứa chi tiết vận chuyển thả."
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,Tạp chí nhanh chóng nhập
 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 +206,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,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}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} chưa ghi sổ
 apps/erpnext/erpnext/config/stock.py +27,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.
@@ -1876,7 +1871,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
 apps/erpnext/erpnext/config/crm.py +116,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
@@ -1894,10 +1889,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} là đóng lại
 DocType: Email Digest,How frequently?,Làm thế nào thường xuyên?
 DocType: Purchase Receipt,Get Current Stock,Nhận chứng khoán hiện tại
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Chuyển đến nhóm thích hợp (thường áp dụng các Quỹ&gt; Tài sản hiện tại&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ấp vào Add Child) của kiểu &quot;Ngân hàng&quot;
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Cây Bill Vật liệu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Đánh dấu hiện tại
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
 DocType: Production Order,Actual End Date,Ngày kết thúc thực tế
 DocType: Authorization Rule,Applicable To (Role),Để áp dụng (Role)
 DocType: Stock Entry,Purpose,Mục đích
@@ -1959,12 +1953,12 @@
  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: Purchase Receipt Item,Recd Quantity,Recd Số lượng
-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/manufacturing/doctype/production_order/production_order.py +106,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 +497,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
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card","ví dụ như Ngân hàng, tiền mặt, thẻ tín dụng"
 DocType: Journal Entry,Credit Note,Tín dụng Ghi chú
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,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
@@ -1988,9 +1982,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Địa chỉ của tôi
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,hoặc
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, or ,hoặc
 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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á
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,Không một nhân viên cho các tiêu chí lựa chọn ở trên OR phiếu lương đã tạo
@@ -2017,7 +2011,7 @@
 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 +200,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'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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/config/hr.py +93,Payroll,Bảng lương
 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"
@@ -2028,7 +2022,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Các hình thức tùy biến
 DocType: Account,Income Account,Tài khoản thu nhập
 DocType: Payment Request,Amount in customer's currency,Số tiền bằng đồng tiền của khách hàng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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
@@ -2050,16 +2044,16 @@
 apps/erpnext/erpnext/config/selling.py +168,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
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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 +47,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập chứng khoán
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"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 +92,Manage Customer Group Tree.,Quản lý Nhóm khách hàng Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,Tên mới Trung tâm Chi phí
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,Tên mới Trung tâm Chi phí
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
 DocType: Appraisal,HR User,Nhân tài
 DocType: Purchase Invoice,Taxes and Charges Deducted,Thuế và lệ phí được khấu trừ
-apps/erpnext/erpnext/config/support.py +7,Issues,Vấn đề
+apps/erpnext/erpnext/hooks.py +90,Issues,Vấn đề
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tình trạng phải là một trong {0}
 DocType: Sales Invoice,Debit To,Để ghi nợ
 DocType: Delivery Note,Required only for sample item.,Yêu cầu chỉ cho mục mẫu.
@@ -2078,10 +2072,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
 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 +139,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
-apps/erpnext/erpnext/config/accounts.py +214,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/config/accounts.py +222,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.
 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 +142,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ợ
@@ -2149,7 +2143,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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"
 ,Requested,Yêu cầu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,Không có Bình luận
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,Tài khoản gốc phải là một nhóm
@@ -2176,7 +2170,7 @@
 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
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
 DocType: Payment Request,Recipient and Message,Người nhận và tin nhắn
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
@@ -2190,7 +2184,7 @@
 DocType: Purchase Invoice,Select Supplier Address,Chọn nhà cung cấp Địa chỉ
 DocType: Quality Inspection,Quality Inspection,Kiểm tra chất 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 +579,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/stock/doctype/material_request/material_request.js +582,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 +190,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.
 DocType: Payment Request,Mute Email,Mute Email
@@ -2213,10 +2207,10 @@
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,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} không thể lớn hơn Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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} không thể lớn hơn Grand Total ({2})
 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 +294,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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
@@ -2225,7 +2219,7 @@
 DocType: Installation Note Item,Against Document No,Đối với văn bản số
 apps/erpnext/erpnext/config/selling.py +113,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 +165,Please select {0},Vui lòng chọn {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Attendance đánh dấu
@@ -2253,7 +2247,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Xác nhận
 DocType: Payment Gateway,Gateway,Cổng vào
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,Vui lòng nhập ngày giảm.
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,Amt
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,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 +25,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
@@ -2267,12 +2261,12 @@
 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 +91,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}
+apps/erpnext/erpnext/setup/utils.py +93,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}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Đánh dấu Nửa ngày
 DocType: Sales Invoice,Sales Team,Đội ngũ bán hàng
 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 +410,[Error],[Lỗi]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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/setup_wizard/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
@@ -2304,13 +2298,13 @@
 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ừ
 DocType: Leave Allocation,Leave Allocation,Phân bổ lại
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,Các yêu cầu nguyên liệu {0} tạo
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,Các yêu cầu nguyên liệu {0} tạo
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,"Mẫu thời hạn, điều hợp đồng."
 DocType: Purchase Invoice,Address and Contact,Địa chỉ và liên hệ
 DocType: Supplier,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 +280,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/accounts/party.py +286,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)
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
 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
@@ -2324,12 +2318,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1} được huỷ bỏ hoặc đóng lại
 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/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Tiền thuần từ đầu tư
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,Tài khoản gốc không thể bị xóa
 ,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 +324,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,Quản lý địa chỉ
-DocType: Pricing Rule,Item Code,Mã hàng
+DocType: Asset,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
 DocType: Serial No,Warranty / AMC Details,Bảo hành / AMC chi tiết
 DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
@@ -2375,24 +2368,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,Số thứ tự và hàng loạt
 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/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,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/accounts/doctype/purchase_invoice/purchase_invoice.py +101,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
 DocType: Global Defaults,Disable In Words,Vô hiệu hóa Trong Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,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 +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,Các khoản cho vay được bảo đảm
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,Khai mạc Balance Equity
 DocType: Appraisal,Appraisal,Thẩm định
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ngày được lặp đi lặp lại
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ký Ủy quyền
@@ -2401,7 +2394,7 @@
 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
 DocType: Item Price,Bulk Import Help,Bulk nhập Trợ giúp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,Chọn Số lượng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Chọn Số lượng
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Phê duyệt Vai trò không thể giống như vai trò của quy tắc là áp dụng để
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Hủy đăng ký từ Email này Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gửi tin nhắn
@@ -2442,7 +2435,7 @@
 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: Payment Gateway Account,Default Payment Request Message,Yêu cầu thanh toán mặc định tin nhắn
 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/config/accounts.py +118,Banking and Payments,Ngân hàng và Thanh toán
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,Ngân hàng và Thanh toán
 ,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á
@@ -2450,17 +2443,17 @@
 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 +199,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,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
 DocType: Notification Control,Quotation Message,Báo giá tin nhắn
 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/config/hr.py +55,Leaves and Holiday,Lá và Holiday
 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/stock/doctype/warehouse/warehouse.py +115,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.
 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
@@ -2478,13 +2471,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"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"
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,Kho {0}: Công ty là bắt buộc
 ,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}
 DocType: Journal Entry,Stock Entry,Chứng khoán nhập
 DocType: Account,Payable,Phải nộp
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),Con nợ ({0})
-DocType: Project,Margin,Biên
+DocType: Pricing Rule,Margin,Biên
 DocType: Salary Slip,Arrear Amount,Tiền còn thiếu Số tiền
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Khách hàng mới
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Lợi nhuận gộp%
@@ -2505,7 +2498,7 @@
 DocType: Payment Request,Email To,Để Email
 DocType: Lead,Lead Owner,Chủ đầu
 DocType: Bin,Requested Quantity,yêu cầu Số lượng
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,Kho được yêu cầu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,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.
@@ -2513,7 +2506,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,Trong ngày hưu trí phải lớn hơn ngày của Tham gia
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Phân phối
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}% Phân phối
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 DocType: Territory,Territory Targets,Mục tiêu lãnh thổ
@@ -2533,7 +2526,7 @@
 DocType: Manufacturer,Manufacturers used in Items,Các nhà sản xuất sử dụng trong mục
 apps/erpnext/erpnext/accounts/general_ledger.py +140,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 +247,Create New,Tạo mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,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
@@ -2546,7 +2539,7 @@
 ,Stock Ledger,Chứng khoán Ledger
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lương trượt trích
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,Chọn một nút nhóm đầu tiên.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,Chọn một nút nhóm đầu tiên.
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Nhân viên và chấm công
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},Mục đích phải là một trong {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Di chuyển tài liệu tham khảo của các khách hàng, nhà cung cấp, đối tác bán hàng và chì, vì nó là địa chỉ công ty của bạn"
@@ -2568,13 +2561,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Từ {1}
 DocType: Task,depends_on,depends_on
 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 +207,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
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,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: 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/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,Ngày tiếp theo phải lớn hơn gửi bài ngày
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,Hiện thuế break-up
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Do / Reference ngày không được sau {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Ngày tiếp theo phải lớn hơn gửi bài ngày
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/accounts/party.py +289,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 '
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Hóa đơn viết bài ngày
@@ -2589,7 +2582,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,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 +101,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 +181,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 +379,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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +80,{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 +128,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."
@@ -2603,7 +2596,7 @@
 DocType: Hub Settings,Publish Availability,Xuất bản sẵn có
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,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 +213,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2606,7 @@
 DocType: Purchase Order,Customer Contact Email,Khách hàng Liên hệ Email
 DocType: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
@@ -2624,7 +2617,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
@@ -2637,7 +2630,7 @@
 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/setup_wizard/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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á
 DocType: Purchase Invoice Item,Rate,Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Tập
@@ -2645,7 +2638,7 @@
 DocType: Stock Entry,From BOM,Từ BOM
 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 +96,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 +204,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,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 +63,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 +186,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,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
@@ -2653,14 +2646,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,Cơ cấu tiền lương
 DocType: Account,Bank,Tài khoản
 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 +612,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho
 DocType: Employee,Offer Date,Phục vụ ngày
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Báo giá
 DocType: Hub Settings,Access Token,Truy cập Mã
 DocType: Sales Invoice Item,Serial No,Không nối tiếp
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,Thông tin chi tiết vui lòng nhập Maintaince đầu tiên
-DocType: Item,Is Fixed Asset Item,Tài sản cố định là mục
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,Thông tin chi tiết vui lòng nhập Maintaince đầu tiên
 DocType: Purchase Invoice,Print Language,In Ngôn ngữ
 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"
@@ -2677,7 +2669,7 @@
 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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Dựa trên tính toán
 DocType: Delivery Note Item,From Warehouse,Từ kho
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
@@ -2693,13 +2685,13 @@
 DocType: Quotation,Maintenance Manager,Quản lý bảo trì
 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/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Số ngày từ lần đặt hàng gần nhất"" phải lớn hơn hoặc bằng 0"
-DocType: C-Form,Amended From,Sửa đổi Từ
+DocType: Asset,Amended From,Sửa đổi Từ
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +195,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 +486,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 +484,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 +325,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
@@ -2713,20 +2705,20 @@
 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/public/js/setup_wizard.js +191,"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}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,Thanh toán phù hợp với hoá đơn
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,Thanh toán phù hợp với hoá đơn
 DocType: Journal Entry,Bank Entry,Ngân hàng nhập
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,Thêm vào giỏ hàng
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Nhóm By
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
 DocType: Production Planning Tool,Get Material Request,Nhận Chất liệu Yêu cầu
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,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/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Quality Inspection,Item Serial No,Mục Serial No
-apps/erpnext/erpnext/controllers/status_updater.py +143,{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/controllers/status_updater.py +145,{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 +56,Total Present,Tổng số hiện tại
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,Báo cáo kế toán
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,Báo cáo kế toán
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,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 \
@@ -2746,13 +2738,13 @@
 DocType: C-Form,Invoices,Hoá đơn
 DocType: Job Opening,Job Title,Chức vụ
 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 +346,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Bắt đầu Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,Thăm báo cáo cho các cuộc gọi bảo trì.
 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 +169,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 +171,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
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Thay đổi ròng trong vốn chủ sở hữu
 DocType: Serial No,AMC Expiry Date,AMC hết hạn ngày
@@ -2762,12 +2754,12 @@
 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
 DocType: Customer Group,Customer Group Name,Nhóm khách hàng Tên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,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 +409,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Item,Attributes,Thuộc tính
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,Được mục
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,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 +522,Get Items,Được mục
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order ngày
 apps/erpnext/erpnext/accounts/doctype/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: C-Form,C-Form,C-Mẫu
@@ -2779,18 +2771,17 @@
 DocType: Purchase Invoice,Mobile No,Điện thoại di động Không
 DocType: Payment Tool,Make Journal Entry,Hãy Journal nhập
 DocType: Leave Allocation,New Leaves Allocated,Lá mới phân bổ
-apps/erpnext/erpnext/controllers/trends.py +261,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á
+apps/erpnext/erpnext/controllers/trends.py +265,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/setup_wizard/setup_wizard.py +343,Commercial,Thương mại
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},Lỗi: {0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
 apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,Tất cả sản phẩm hoặc dịch vụ.
 DocType: Supplier Quotation,Supplier Address,Địa chỉ nhà cung cấp
 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 +251,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/config/accounts.py +259,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/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 apps/erpnext/erpnext/controllers/item_variant.py +62,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}
@@ -2801,10 +2792,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
 DocType: Tax Rule,Billing State,Thanh toán Nhà nước
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,Truyền
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,Truyền
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,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 +92,Due Date is mandatory,Due Date là bắt buộc
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,Due Date là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
 DocType: Journal Entry,Pay To / Recd From,Để trả / Recd Từ
 DocType: Naming Series,Setup Series,Thiết lập Dòng
@@ -2826,18 +2817,18 @@
 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 +123,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,"Ngày hôm sau, ngày và lặp lại vào ngày của tháng phải bằng"
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,"Ngày hôm sau, ngày và lặp lại vào ngày của tháng phải bằng"
 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/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,Giờ đã được Billed
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Tài khoản {0} không thể là một Tập đoàn
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,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/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +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}
@@ -2847,12 +2838,11 @@
 ,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 +176,{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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Hãy thiết lập đánh số series cho khán giả qua Setup&gt; Numbering series
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,Nhận Items từ Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,Nhận Items từ Bundle sản phẩm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +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"
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,Kiểu tài khoản 'Lãi và Lỗ' {0} không được phép trong Mục đang mở
 DocType: Features Setup,Sales Discounts,Giảm giá bán hàng
@@ -2866,39 +2856,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.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 +117,Add Child,Thêm trẻ em
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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/report/stock_balance/stock_balance.py +47,Opening Value,Giá trị khai mạc
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,Hoa hồng trên doanh
 DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
 DocType: Tax Rule,Billing Country,Đất nước thanh toán
 ,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 +127,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Chi phí Giải trí
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Chi phí Giải trí
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,Ứng dụng cho nghỉ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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ý
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,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 +102,Legal Expenses,Chi phí pháp lý
 DocType: Sales Invoice,Posting Time,Thời gian gửi bài
 DocType: Sales Order,% Amount Billed,% Số tiền Được quảng cáo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Chi phí điện thoại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Telephone Expenses,Chi phí điện thoại
 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.,Kiểm tra này nếu bạn muốn ép buộc người dùng lựa chọn một loạt trước khi lưu. Sẽ không có mặc định nếu bạn kiểm tra này.
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},Không có hàng với Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Không có hàng với Serial No {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Mở Notifications
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Chi phí trực tiếp
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,Chi phí trực tiếp
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} là một địa chỉ email hợp lệ trong &#39;Thông báo \ Địa chỉ Email&#39;
 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
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,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 +553,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 +50,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 +60,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!
@@ -2915,7 +2905,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Time Logs)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,Số lượng phải lớn hơn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,Số lượng phải lớn hơn 0
 DocType: Journal Entry,Cash Entry,Cash nhập
 DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Loại lá như bình thường, bệnh vv"
@@ -2930,7 +2920,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,Nguyên liệu không thể giống nhau như mục chính
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,Lương mẫu chủ.
@@ -2946,7 +2936,7 @@
 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/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 +488,{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/controllers/accounts_controller.py +514,{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 +44,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ệ)
@@ -2961,13 +2951,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Hàng loạt Giờ này đã bị hủy.
 ,Reqd By Date,Reqd theo địa điểm
 DocType: Salary Slip Earning,Salary Slip Earning,Lương trượt Earning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Nợ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,Nợ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,Row # {0}: Serial No là bắt buộc
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Mục khôn ngoan chi tiết thuế
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,Nhà cung cấp báo giá
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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/stock/doctype/item/item.py +390,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 +395,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/stock.py +97,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
@@ -2988,15 +2978,14 @@
 DocType: Customer,From Lead,Từ chì
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
 apps/erpnext/erpnext/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 +456,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 +449,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/setup_wizard/setup_wizard.py +106,Standard Selling,Tiêu chuẩn bán hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
-DocType: Project,Project Name,Tên dự án
+DocType: Request for Quotation Item,Project Name,Tên dự án
 DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
 DocType: 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
@@ -3033,7 +3022,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address","Công ty là bắt buộc, vì nó là địa chỉ công ty của bạn"
 DocType: Item Attribute,From Range,Từ Phạm vi
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Mục {0} bỏ qua vì nó không phải là một mục chứng khoán
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Trình tự sản xuất này để chế biến tiếp.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,Trình tự sản xuất này để chế biến tiếp.
 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.","Không áp dụng giá quy tắc trong giao dịch cụ thể, tất cả các quy giá áp dụng phải được vô hiệu hóa."
 DocType: Company,Domain,Tên miền
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,việc làm
@@ -3045,6 +3034,7 @@
 DocType: Time Log,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,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)
@@ -3079,7 +3069,7 @@
 DocType: Sales Partner,Partner's Website,Trang web đối tác của
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,Tài khoản tạm thời
 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
@@ -3093,16 +3083,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Đánh dấu Absent
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,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 +479,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,Thêm các mục từ
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,Thêm các mục từ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,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}
 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/public/js/setup_wizard.js +20,"e.g. ""MC""","ví dụ như ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,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
-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/stock/doctype/warehouse/warehouse.py +112,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
@@ -3128,7 +3118,7 @@
 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
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,Thiết lập các tài khoản Gateway.
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,Thiết lập các tài khoản Gateway.
 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
 ,Cash Flow,Dòng tiền
@@ -3142,7 +3132,7 @@
 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 +132,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 +133,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,Ngân hàng Phát Biểu cân bằng theo General Ledger
 DocType: Job Applicant,Applicant Name,Tên đơn
 DocType: Authorization Rule,Customer / Item Name,Khách hàng / Item Name
@@ -3158,19 +3148,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Hãy xác định từ / dao
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Khách hàng Nhóm&gt; Lãnh thổ
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,Thiết lập mặc định cho bán giao dịch.
 DocType: BOM Replace Tool,Current BOM,BOM hiện tại
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Thêm Serial No
 apps/erpnext/erpnext/config/support.py +43,Warranty,Sự bảo đảm
 DocType: Production Order,Warehouses,Kho
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,In và Văn phòng phẩm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,In và Văn phòng phẩm
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Nhóm Node
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,Cập nhật hoàn thành Hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,Cập nhật hoàn thành Hàng
 DocType: Workstation,per hour,mỗi giờ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua
 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.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,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.js +435,Amount Paid,Số tiền trả
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
@@ -3200,7 +3189,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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"
 DocType: Leave Block List,Applies to Company,Áp dụng đối với Công ty
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì nộp chứng khoán nhập {0} tồn tại
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì nộp chứng khoán nhập {0} tồn tại
 DocType: Purchase Invoice,In Words,Trong từ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,Hôm nay là {0} 's sinh nhật!
 DocType: Production Planning Tool,Material Request For Warehouse,Yêu cầu tài liệu Đối với Kho
@@ -3214,7 +3203,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Giao dịch không được phép chống lại dừng lại tự sản xuất {0}
 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/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +569,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Phải điền mục 'Đến ngày'
 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ó."
@@ -3225,7 +3214,7 @@
 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 +782,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 +793,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
@@ -3233,14 +3222,13 @@
 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 +17,Potential opportunities for selling.,Cơ hội tiềm năng để bán.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},Không hợp lệ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Hãy đặt Naming Series cho {0} qua Setup&gt; Cài đặt&gt; Đặt tên series
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Cửa hàng bách
 apps/erpnext/erpnext/controllers/stock_controller.py +72,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.
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
 DocType: Expense Claim Detail,Expense Date,Chi phí ngày
@@ -3258,10 +3246,10 @@
 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
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,Sổ cái chung
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Xem chào
 DocType: Item Attribute Value,Attribute Value,Attribute Value
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Id email phải là duy nhất, đã tồn tại cho {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}","Id email phải là duy nhất, đã tồn tại cho {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Đê Sắp xếp lại Cấp
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,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
@@ -3297,23 +3285,23 @@
 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.
 DocType: Tax Rule,Purchase Tax Template,Mua Template Thuế
 ,Project wise Stock Tracking,Dự án theo dõi chứng khoán khôn ngoan
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},Lịch trình bảo trì {0} tồn tại đối với {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},Lịch trình bảo trì {0} tồn tại đối với {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Số lượng thực tế (tại nguồn / mục tiêu)
 DocType: Item Customer Detail,Ref Code,Tài liệu tham khảo Mã
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Hồ sơ nhân viên.
 DocType: Payment Gateway,Payment Gateway,Cổng thanh toán
 DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,Đặt hàng
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Gốc không thể có một trung tâm chi phí cha mẹ
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Chọn thương hiệu ...
 DocType: Sales Invoice,C-Form Applicable,C-Mẫu áp dụng
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,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}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,Warehouse là bắt buộc
 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/public/js/setup_wizard.js +144,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 +340,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/manufacturing/doctype/production_order/production_order.py +342,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
@@ -3331,7 +3319,7 @@
 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: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,Đồng tiền giao dịch phải được giống như thanh toán tiền tệ Cổng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,Nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,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
@@ -3339,14 +3327,14 @@
 DocType: Purchase Invoice,Submit on creation,Gửi về sáng tạo
 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 +420,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 +425,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 +65,"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."
 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 +137,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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,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/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 +187,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,Đơn hàng của tôi
@@ -3367,10 +3355,10 @@
 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
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,Point-of-Sale hồ sơ
+apps/erpnext/erpnext/config/accounts.py +258,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Các khoản cho vay không có bảo đảm
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Chi phí Tên Trung tâm
 DocType: Maintenance Schedule Detail,Scheduled Date,Dự kiến ngày
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,Tổng Paid Amt
@@ -3382,7 +3370,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,Các nhà cung cấp của bạn
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,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.
@@ -3395,12 +3383,12 @@
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Từ {0} cho {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,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/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,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 +65,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,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 +105,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: Payment Reconciliation,From Invoice Date,Từ Invoice ngày
@@ -3409,7 +3397,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,'Có số serial' không thể 'Có' cho hàng hóa không nhập kho
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,'Có số serial' không thể 'Có' cho hàng hóa không nhập kho
 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
@@ -3422,7 +3410,7 @@
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},Birthday Reminder cho {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản chứng khoán
@@ -3436,15 +3424,15 @@
 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 +576,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,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 +168,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 +169,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 +18,Project activity / task.,Hoạt động dự án / nhiệm vụ.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tạo ra lương Trượt
 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: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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
@@ -3465,7 +3453,7 @@
 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/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 +144,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/support/doctype/maintenance_schedule/maintenance_schedule.py +148,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}
 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.","Ví dụ:. ABCD ##### 
  Nếu series được thiết lập và Serial No không được đề cập trong các giao dịch, số serial sau đó tự động sẽ được tạo ra dựa trên series này. Nếu bạn luôn muốn đề cập đến một cách rõ ràng nối tiếp Nos cho mặt hàng này. để trống này."
@@ -3477,11 +3465,11 @@
 ,Sales Analytics,Bán hàng Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Cài đặt sản xuất
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Thiết lập Email
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,Vui lòng nhập tiền tệ mặc định trong Công ty Thạc sĩ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,Vui lòng nhập tiền tệ mặc định trong Công ty Thạc sĩ
 DocType: Stock Entry Detail,Stock Entry Detail,Cổ phiếu nhập chi tiết
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Nhắc nhở hàng ngày
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Rule thuế Xung đột với {0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,Tài khoản mới Tên
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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/setup_wizard/install_fixtures.py +73,Customer Service,Dịch vụ khách hàng
@@ -3493,9 +3481,9 @@
 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 +72,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 +225,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
 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
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,Mục {0} phải là một mục bán hàng
+apps/erpnext/erpnext/stock/get_item_details.py +131,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
@@ -3503,7 +3491,7 @@
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
 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 +385,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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
 DocType: Purchase Taxes and Charges,Actual,Thực tế
 DocType: Authorization Rule,Customerwise Discount,Customerwise Giảm giá
@@ -3526,7 +3514,7 @@
 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/accounts/doctype/fiscal_year/fiscal_year.py +49,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/fiscal_year/fiscal_year.py +81,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 +115,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 +180,Where items are stored.,Nơi các mặt hàng được lưu trữ.
@@ -3537,7 +3525,7 @@
 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 +508,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,Mẫu thuế đối với giao dịch mua.
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Mẫu thuế đối với giao dịch mua.
 ,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
@@ -3547,10 +3535,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,Trên Net Tổng số
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,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 +99,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 +204,'Notification Email Addresses' not specified for recurring %s,'Địa chỉ Email thông báo' không chỉ rõ cho kỳ hạn %s
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Địa chỉ Email thông báo' không chỉ rõ cho kỳ hạn %s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Chi phí hành chính
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,Chi phí hành chính
 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 +455,Change,Thay đổi
@@ -3569,13 +3557,13 @@
 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 +559,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 +564,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 +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ổ"
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,Hàng loạt
@@ -3589,7 +3577,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Người bán hàng
 DocType: Sales Invoice,Cold Calling,Cold Calling
 DocType: SMS Parameter,SMS Parameter,Thông số tin nhắn SMS
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,Ngân sách nhà nước và Trung tâm chi phí
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,Ngân sách nhà nước và Trung tâm chi phí
 DocType: Maintenance Schedule Item,Half Yearly,Nửa Trong Năm
 DocType: Lead,Blog Subscriber,Blog thuê bao
 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ị.
@@ -3622,7 +3610,6 @@
 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/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/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; mục Nhóm&gt; Thương hiệu
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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
@@ -3630,7 +3617,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Hóa đơn tăng cho khách hàng.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{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;"
 DocType: Account,Parent Account,Tài khoản cha mẹ
@@ -3646,7 +3633,7 @@
 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 +219,"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 +222,"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/erpnext/erpnext/config/accounts.py +50,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
@@ -3681,7 +3668,7 @@
 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}.
+apps/erpnext/erpnext/accounts/party.py +234,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ý
 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
@@ -3689,22 +3676,22 @@
 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ơ
 DocType: Payment Gateway Account,Payment URL Message,Thanh toán URL nhắn
-apps/erpnext/erpnext/config/accounts.py +204,"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/config/accounts.py +212,"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 +242,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 +69,Total Unpaid,Tổng số chưa được thanh toán
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,Giờ không phải là lập hoá đơn
-apps/erpnext/erpnext/stock/get_item_details.py +135,"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/stock/get_item_details.py +134,"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/public/js/setup_wizard.js +178,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 +109,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ế
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,Chất liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,Chất liệu để Nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,Tiêu thụ đặc biệt Invoice
 DocType: Expense Claim,Employees Email Id,Nhân viên Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Attendance đánh dấu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Nợ ngắn hạn
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,Nợ ngắn hạn
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
@@ -3725,17 +3712,16 @@
 DocType: Item Attribute,Numeric Values,Giá trị Số
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,Logo đính kèm
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Hãy Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Ngăn chặn các ứng dụng của bộ phận nghỉ.
 apps/erpnext/erpnext/config/stock.py +201,Analytics,phân tích
 apps/erpnext/erpnext/templates/pages/cart.html +51,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/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Không mặc định Địa chỉ Template được tìm thấy. Hãy tạo ra một cái mới từ Setup&gt; In ấn và xây dựng thương hiệu&gt; Địa chỉ Mẫu.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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ổ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,Vốn Cổ
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
 DocType: Payment Gateway Account,Payment Gateway Account,Tài khoản của Cổng thanh toán
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Sau khi hoàn thành thanh toán chuyển hướng người dùng đến trang lựa chọn.
@@ -3747,17 +3733,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,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}
 ,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 +408,"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 +413,"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 +13,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 +409, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (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 +599,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,Hóa đơn nguyên vật liệu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref ngày
@@ -3765,6 +3751,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,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 +212,Account {0} does not exist,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,Tài khoản {0} không tồn tại
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 16d1ddb..80eea83 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,经销商
 DocType: Employee,Rented,租
 DocType: POS Profile,Applicable for User,适用于用户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 DocType: Purchase Order,Customer Contact,客户联系
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,新建假期申请
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,显示变体
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（负债）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
 DocType: Designation,Designation,指派
@@ -64,7 +63,7 @@
 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 +642,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},新{0}：#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 DocType: Payment Request,Payment Request,付钱请求
@@ -102,7 +101,7 @@
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,对账
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目标类型
 DocType: BOM,Total Cost,总成本
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活动日志：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
@@ -156,7 +155,7 @@
 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,库存费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,库存费用
 DocType: Newsletter,Email Sent?,邮件已发送？
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Production Order Operation,Show Time Logs,显示的时间记录
@@ -164,12 +163,12 @@
 DocType: Delivery Note,Installation Status,安装状态
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,品目{0}必须是采购品目
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: BOM Replace Tool,New BOM,新建物料清单
@@ -208,11 +207,11 @@
 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 +79,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
@@ -221,7 +220,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,从融资净现金
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
 ,Contact Name,联系人姓名
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
@@ -235,8 +234,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
@@ -248,8 +247,8 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -264,7 +263,7 @@
 DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建议
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”，为预算启动季节性。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
@@ -283,7 +282,7 @@
 DocType: Item,Synced With Hub,与Hub同步
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
@@ -294,10 +293,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,请选择年份和月份
@@ -308,12 +307,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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 +254,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
@@ -335,9 +334,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,品目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
-,Schedule Date,计划任务日期
+DocType: Depreciation Schedule,Schedule Date,计划任务日期
 DocType: Packed Item,Packed Item,盒装产品
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,采购业务的默认设置。
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,采购业务的默认设置。
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活动费用为员工{0}对活动类型 -  {1}
 apps/erpnext/erpnext/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,货币兑换
@@ -386,13 +385,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
-DocType: Material Request Item,Required Date,所需时间
+DocType: Request for Quotation Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,总数量
@@ -416,17 +415,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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 +308,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 +378,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
@@ -446,7 +445,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,品目{0}不是采购品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,品目{0}不是采购品目
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -457,7 +456,7 @@
 DocType: Production Plan Item,Pending Qty,待定数量
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
@@ -467,13 +466,13 @@
 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 +126,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 +230,Financial / accounting year.,财务/会计年度。
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Warranty Claim,Resolution,决议
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},交货：{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,应付帐款
@@ -481,7 +480,7 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,销售退货
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
@@ -490,7 +489,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,创建库存记录所依赖的逻辑仓库。
@@ -500,7 +499,7 @@
 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/config/accounts.py +70,Masters,大师
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,更新银行交易日期
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,更新银行交易日期
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0}，仓库{1}，提交时间{2}{3}，凭证类型{4}，凭证编号{5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,时间跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
@@ -518,19 +517,18 @@
 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,默认成本核算率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,维护计划
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在库存净变动
 DocType: Employee,Passport Number,护照号码
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,经理
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,相同的品目已输入多次
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,销售人员目标
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,请设置一个假期名单无论是员工还是公司
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -538,7 +536,7 @@
 DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,项目平衡
 DocType: Sales Invoice,Packing List,包装清单
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,购买给供应商的订单。
+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,已消耗
@@ -572,7 +570,7 @@
 DocType: Hub Settings,Seller City,卖家城市
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -609,14 +607,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
 DocType: Item Group,Website Specifications,网站规格
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一个在你的地址模板错误{0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,新建账户
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,新建账户
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -656,17 +654,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日记帐分录{0}和订单{1}关联，请确认它是不是本发票的预付款。
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",要根据党的筛选，选择党第一类型
@@ -674,7 +672,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,我的发票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Supplier Quotation,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
@@ -686,7 +684,7 @@
 DocType: Item,Website Warehouse,网站仓库
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 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 +267,C-Form records,C-表记录
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-表记录
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,客户和供应商
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,来自客户的支持记录。
@@ -710,7 +708,7 @@
 DocType: Quotation Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,开支
@@ -747,14 +745,14 @@
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Item Attribute,Item Attribute Values,品目属性值
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看订阅
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,货币汇率大师
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,货币汇率大师
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,销售合作伙伴和地区
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM{0}处于非活动状态
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,转到车
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
@@ -773,7 +771,7 @@
 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 +524,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
@@ -783,10 +781,10 @@
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,你的品牌
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
-DocType: Journal Entry Account,Purchase Invoice,购买发票
+DocType: Asset,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,开幕日期和截止日期应在同一会计年度
@@ -796,16 +794,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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 +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 DocType: Job Opening,Publish on website,发布在网站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,向客户发货。
 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,间接收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,对于转让项目选择
 DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
@@ -819,14 +817,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
 ,Employee Holiday Attendance,员工假日出勤
 DocType: Opportunity,Walk In,主动上门
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,库存条目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,库存条目
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,我的购物车
@@ -836,7 +834,7 @@
 DocType: Holiday List,Holiday List Name,假期列表名称
 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 +180,Qty for {0},{0}数量
+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 +80,Leave Allocation Tool,假期调配工具
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
@@ -849,7 +847,7 @@
 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 +547,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
@@ -864,20 +862,20 @@
 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 +69,Selling Amount,销售金额
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,时间日志
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,时间日志
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客户不与公司匹配
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,销售费用
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
@@ -894,7 +892,7 @@
 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 +18,Quotations received from Suppliers.,从供应商收到的报价。
+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,平均年龄
@@ -903,7 +901,7 @@
 DocType: Company,Default Currency,默认货币
 DocType: Contact,Enter designation of this Contact,输入联系人的职务
 DocType: Expense Claim,From Employee,来自员工
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,关键绩效区
@@ -911,7 +909,7 @@
 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 +130,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,贡献％
@@ -920,7 +918,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,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.,选择时间记录然后提交来创建一个新的销售发票。
@@ -928,14 +926,14 @@
 DocType: Salary Slip,Deductions,扣款列表
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此时日志批量一直标榜。
 DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打开会计平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,没有申请内容
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,没有申请内容
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理人员
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,活动的考勤表类型
@@ -946,18 +944,18 @@
 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/utilities/doctype/contact/contact.py +67,Please set Email ID,请设置电子邮件ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,请设置电子邮件ID
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +171,{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/config/buying.py +33,Supplier database.,供应商数据库。
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',成本中心：品目代码‘
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,税项及其他扣款。
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
@@ -985,18 +983,18 @@
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Contact,User ID,用户ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,查看总帐
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,留存收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,品目说明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是否周期性
@@ -1004,7 +1002,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,临时开通
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
@@ -1019,8 +1017,8 @@
 ,Accounts Payable Summary,应付帐款摘要
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 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 +165,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
@@ -1028,7 +1026,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,账户头{0}已创建
 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,总体上实现
@@ -1036,12 +1034,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
@@ -1051,17 +1049,17 @@
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,品目税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,送货单{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
 apps/erpnext/erpnext/controllers/selling_controller.py +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},生产订单状态为{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,对供应商
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,即将离任的总
@@ -1071,10 +1069,10 @@
 DocType: Item,Website Item Groups,网站物件组
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,序列号{0}已多次输入
-DocType: Journal Entry,Journal Entry,日记帐分录
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
@@ -1107,7 +1105,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
 DocType: Project,Start and End Dates,开始和结束日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,操作不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,平均折扣
@@ -1118,10 +1116,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 DocType: Payment Request,Transaction Currency,交易货币
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},来自{0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},来自{0} | {1} {2}
 DocType: BOM Operation,Operation Description,操作说明
 DocType: Item,Will also apply to variants,会同时应用于变体
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,活动
@@ -1135,8 +1133,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,生产订单已创建库存条目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},最大值：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
@@ -1144,8 +1142,8 @@
 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 +472,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1166,11 +1164,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,税收规则进行的交易。
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,我们购买这些物件
 DocType: Address,Billing,账单
@@ -1183,8 +1181,8 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,装箱单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,装箱单
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,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.,未添加地址。
@@ -1202,7 +1200,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,项目变体
 DocType: Company,Services,服务
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),总计（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
@@ -1211,10 +1209,10 @@
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,从投资现金流
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,货运及转运费
 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 +86,Transfer Materials for Manufacture,转移制造材料
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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}没有找到，这是需要预订会计分录（费用）。请注明项目价格对买入价格表。
@@ -1223,7 +1221,7 @@
 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.,请从科目表创建新帐户。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,维护访问
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,维护访问
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 DocType: Time Log Batch Detail,Time Log Batch Detail,时间日志批量详情
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
@@ -1237,7 +1235,6 @@
 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 +196,Brand master.,主要品牌
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1265,7 +1262,7 @@
 DocType: Quality Inspection Reading,Reading 4,阅读4
 apps/erpnext/erpnext/config/hr.py +131,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,库存负债
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,库存负债
 DocType: Purchase Receipt,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
@@ -1274,7 +1271,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,停止生日提醒
@@ -1284,26 +1281,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0}查看
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,现金净变动
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},数量不能超过{0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,主要的供应商类型。
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,汇率不能为0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Purchase Invoice,Reference Document,参考文献
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％帐单
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
@@ -1325,7 +1322,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,应付账款净额变化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,请验证您的电子邮件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,用日记账更新银行付款时间
+apps/erpnext/erpnext/config/accounts.py +137,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.,没有一个项目无论在数量或价值的任何变化。
@@ -1344,7 +1341,7 @@
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,请选择商品代码
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,请选择商品代码
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少停薪留职扣款（LWP）
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
@@ -1354,15 +1351,15 @@
 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,市场营销开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,市场营销开支
 ,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,此品目的一件。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},在行无需仓库{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
@@ -1379,8 +1376,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}有库存量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,查找发票到匹配
@@ -1391,21 +1388,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,购物车启用
 DocType: Job Applicant,Applicant for a Job,求职申请
 DocType: Production Plan Material Request,Production Plan Material Request,生产计划申请材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,暂无生产订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,暂无生产订单
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1413,26 +1410,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,地址
+apps/erpnext/erpnext/hooks.py +91,Addresses,地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,估价
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,项目是不允许有生产订单。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,项目是不允许有生产订单。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,时间日志制造。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,时间日志中的任务。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,称呼
@@ -1465,7 +1462,7 @@
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 DocType: Stock Settings,Allowance Percent,限额百分比
 DocType: SMS Settings,Message Parameter,消息参数
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,财务成本中心的树。
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从购买收据获取品目
 DocType: Serial No,Creation Date,创建日期
@@ -1497,41 +1494,41 @@
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,产品或服务
 DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
 ,Serial No Status,序列号状态
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,品目表不能为空
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：设置{1}的周期性，从和到日期\
 之间差必须大于或等于{2}"
 DocType: Pricing Rule,Selling,销售
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,关税与税项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,参考日期请输入
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,支付网关帐户未配置
 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: Production Order,Material Request Item,物料申请品目
+DocType: Request for Quotation Item,Material Request Item,物料申请品目
 apps/erpnext/erpnext/config/stock.py +85,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,红
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,删除所有交易本公司
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,投资
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,投资
 DocType: Issue,Resolution Details,详细解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,验收标准
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,请输入在上表请求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,请输入在上表请求材料
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: Item Group,Show In Website,在网站上显示
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,组
@@ -1559,7 +1556,7 @@
 ,Maintenance Schedules,维护计划
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
@@ -1573,23 +1570,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,单位
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,请注明公司
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,报销
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,报销
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（开标+总计）
@@ -1598,29 +1594,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
 DocType: Salary Slip,Deduction,扣款
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 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 +137,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,请先输入生产项目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,计算的银行对账单余额
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,报价
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,扣款
@@ -1632,8 +1628,8 @@
 ,SO Qty,销售订单数量
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
+DocType: Request for Quotation,Manufacturing Manager,生产经理
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +71,Shipments,发货
 DocType: Purchase Order Item,To be delivered to customer,要传送给客户
@@ -1641,12 +1637,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
-DocType: Pricing Rule,Supplier,供应商
+DocType: Asset,Supplier,供应商
 DocType: C-Form,Quarter,季
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,杂项开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,用户{0}已禁用
@@ -1655,7 +1651,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},品目{1}必须有{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},销售订单为品目{0}的必须项
@@ -1668,8 +1664,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,新建成本中心
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",转到相应的组（通常是基金&gt;流动负债&gt;税和关税的来源，并创建一个新帐户（类型为“税”点击添加子），并做提税率。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
@@ -1685,7 +1680,7 @@
 DocType: Quotation Item,Stock Balance,库存余额
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,时间日志创建：
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,时间日志创建：
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Employee,Blood Group,血型
@@ -1703,13 +1698,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,借记是必需的
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 DocType: Offer Letter Term,Offer Term,要约期限
 DocType: Quality Inspection,Quality Manager,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,请选择Incharge人的名字
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,请选择Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,报价函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
@@ -1717,22 +1712,22 @@
 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 +103,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
 DocType: Production Order Operation,Completed Qty,已完成数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}.,品目{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 +123,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,用户和权限
@@ -1741,10 +1736,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,序列号{0}未找到
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,序列号{0}未找到
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,您的客户
 DocType: Leave Block List Date,Block Date,禁离日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,现在申请
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,现在申请
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,银行结算摘要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",创建和管理每日，每周和每月的电子邮件摘要。
@@ -1768,7 +1763,7 @@
 DocType: Employee,Employment Details,就职信息
 DocType: Employee,New Workplace,新建工作地点
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,设置为关闭
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},没有条码为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},没有条码为{0}的品目
 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,在页面顶部显示幻灯片
@@ -1786,10 +1781,10 @@
 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 +608,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,转印材料
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},项{0}必须在销售物料{1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,请设置保存后复发
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -1803,7 +1798,7 @@
 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: Process Payroll,Create Salary Slip,建立工资单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),资金来源（负债）
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,雇员
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,导入电子邮件发件人
@@ -1817,9 +1812,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,医药
@@ -1836,25 +1831,25 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,应收账款净额变化
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},无效的参考{0} {1}
 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})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,快速日记帐分录
 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 +206,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
@@ -1863,7 +1858,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,创建以下生产订单：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,创建以下生产订单：
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,时事通讯录
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Authorization Rule,Authorized Value,授权值
@@ -1881,10 +1876,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}关闭
 DocType: Email Digest,How frequently?,多经常？
 DocType: Purchase Receipt,Get Current Stock,获取当前库存
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常是基金的流动资产应用&gt;&gt;银行账户，并创建一个新帐户（点击添加子）类型的“银行”
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,马克现在
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,目的
@@ -1938,12 +1932,12 @@
 9. 税费应用于：你可以在这个部分指定此税费仅应用于评估(即不影响总计)， 或者仅应用于总计(即不会应用到单个品目)，或者两者。
 10. 添加或扣除： 添加还是扣除此税费。"
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
-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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Journal Entry,Credit Note,贷项通知单
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},完成数量不能超过{0}操作{1}
 DocType: Features Setup,Quality,质量
@@ -1967,9 +1961,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,默认采购价格表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
@@ -1996,7 +1990,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/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}也必须包括
@@ -2007,7 +2001,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,关键责任区
@@ -2029,16 +2023,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,品目供应商
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,管理客户群组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,新建成本中心名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 DocType: Appraisal,HR User,HR用户
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/config/support.py +7,Issues,问题
+apps/erpnext/erpnext/hooks.py +90,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
@@ -2057,10 +2051,10 @@
 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 +139,Please mention no of visits required,请注明无需访问
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
@@ -2116,7 +2110,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
 ,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,暂无说明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,根帐户必须是一组
@@ -2143,7 +2137,7 @@
 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,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Payment Request,Recipient and Message,收件人和消息
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2157,7 +2151,7 @@
 DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
@@ -2180,10 +2174,10 @@
 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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,项目开始日期
@@ -2192,7 +2186,7 @@
 DocType: Installation Note Item,Against Document No,对文档编号
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},请选择{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
@@ -2220,7 +2214,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 DocType: Payment Gateway,Gateway,网关
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,请输入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,金额
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,金额
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
@@ -2234,12 +2228,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,已接收的仓库
 DocType: Bank Reconciliation Detail,Posting Date,发布日期
 DocType: Item,Valuation Method,估值方法
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,马克半天
 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 +410,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,创业投资
@@ -2271,13 +2265,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,物料申请{0}已创建
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,条款或合同模板。
 DocType: Purchase Invoice,Address and Contact,地址和联系方式
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
 DocType: Employee,Feedback,反馈
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Item,Reorder level based on Warehouse,根据仓库订货点水平
 DocType: Activity Cost,Billing Rate,结算利率
@@ -2291,12 +2285,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,从投资净现金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,root帐号不能被删除
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,管理地址
-DocType: Pricing Rule,Item Code,品目编号
+DocType: Asset,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
 DocType: Journal Entry,User Remark,用户备注
@@ -2342,24 +2335,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,制作订单不能上调：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,制作订单不能上调：
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
 DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,银行透支账户
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,期初余额权益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,期初余额权益
 DocType: Appraisal,Appraisal,评估
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
@@ -2368,7 +2361,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
@@ -2409,7 +2402,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
 DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
 DocType: Item Group,Check this if you want to show in website,要显示在网站上，请勾选此项。
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,银行和支付
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,银行和支付
 ,Welcome to ERPNext,欢迎使用ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,凭证详情编号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,导致报价
@@ -2417,17 +2410,17 @@
 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 +199,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,采购订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,叶子度假
 DocType: Sales Order,Not Billed,未开票
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,已为账单批次化
@@ -2445,13 +2438,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
 ,Payment Period Based On Invoice Date,已经提交。
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}没有货币汇率
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Account,Payable,支付
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),债务人（{0}）
-DocType: Project,Margin,利润
+DocType: Pricing Rule,Margin,利润
 DocType: Salary Slip,Arrear Amount,欠款金额
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,毛利％
@@ -2472,7 +2465,7 @@
 DocType: Payment Request,Email To,通过电子邮件发送给
 DocType: Lead,Lead Owner,线索所有者
 DocType: Bin,Requested Quantity,要求的数量
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,仓库是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,仓库是必需的
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Time Log,Will be updated when billed.,出账被会更新。
@@ -2480,7 +2473,7 @@
 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 +115,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 +84,{0}% Delivered,{0}％交付
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
@@ -2500,7 +2493,7 @@
 DocType: Manufacturer,Manufacturers used in Items,在项目中使用制造商
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,创建新的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,创建新的
 DocType: Buying Settings,Purchase Order Required,购货订单要求
 ,Item-wise Sales History,品目特定的销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
@@ -2513,7 +2506,7 @@
 ,Stock Ledger,库存总帐
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},价格：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工资单扣款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,请先选择一个组节点。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,请先选择一个组节点。
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},目的必须是一个{0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",删除客户，供应商，销售伙伴和铅的参考，因为它是你的公司地址
@@ -2535,13 +2528,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替换工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,展会税分手
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +289,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',如果贵司涉及生产活动，将启动品目的“是否生产”属性
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,发票发布日期
@@ -2556,7 +2549,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',请输入“预产期”
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",注意：如果付款没有任何参考，请手动创建一个日记账分录。
@@ -2570,7 +2563,7 @@
 DocType: Hub Settings,Publish Availability,发布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2580,7 +2573,7 @@
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
@@ -2591,7 +2584,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,请确认重新输入公司名称
@@ -2604,7 +2597,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,实习生
@@ -2612,7 +2605,7 @@
 DocType: Stock Entry,From BOM,从BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',请点击“生成表”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',请点击“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
@@ -2620,14 +2613,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
 DocType: Hub Settings,Access Token,访问令牌
 DocType: Sales Invoice Item,Serial No,序列号
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,请输入您的详细维护性第一
-DocType: Item,Is Fixed Asset Item,是否固定资产项目
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,请输入您的详细维护性第一
 DocType: Purchase Invoice,Print Language,打印语言
 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",如果你的打印格式很长，这个功能可以被用来分割打印多个页面，每个页面上的都会有页眉和页脚。
@@ -2644,7 +2636,7 @@
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2660,13 +2652,13 @@
 DocType: Quotation,Maintenance Manager,维护经理
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,总不能为零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
-DocType: C-Form,Amended From,修订源
+DocType: Asset,Amended From,修订源
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,顺延
@@ -2680,20 +2672,20 @@
 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/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,匹配付款与发票
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,匹配付款与发票
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,加入购物车
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,分组基于
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,启用/禁用货币。
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,启用/禁用货币。
 DocType: Production Planning Tool,Get Material Request,获取材质要求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,邮政费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,邮政费用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Quality Inspection,Item Serial No,品目序列号
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,总现
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,会计报表
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,会计报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
@@ -2712,13 +2704,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起点的销售终端（POS）
 apps/erpnext/erpnext/config/support.py +32,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,客户群组
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},品目{0}必须指定开支账户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: Item,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,在净资产收益变化
 DocType: Serial No,AMC Expiry Date,AMC到期时间
@@ -2728,12 +2720,12 @@
 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,客户群组名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
 DocType: C-Form,C-Form,C-表
@@ -2745,18 +2737,17 @@
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,广告
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},错误：{0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 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 +52,All Products or Services.,所有的产品或服务。
 DocType: Supplier Quotation,Supplier Address,供应商地址
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
+apps/erpnext/erpnext/config/accounts.py +259,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,金融服务
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
@@ -2767,10 +2758,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,转让
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
@@ -2792,18 +2783,18 @@
 DocType: Journal Entry,Write Off Based On,核销基于
 DocType: Features Setup,POS View,POS机查看
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,一个序列号的安装记录
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,请指定一个
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,时间日志已帐单
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,科目{0}不能为组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),临时溢利/（亏损）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},请设置在公司默认值{0} {1}
@@ -2813,12 +2804,11 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请设置通过设置编号系列考勤&gt;编号系列
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,获取从产品捆绑项目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Features Setup,Sales Discounts,销售折扣
@@ -2832,39 +2822,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,订购次数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML或横幅，将显示在产品列表的顶部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定用来计算运费金额的条件
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,添加子项
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,开度值
 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,销售佣金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娱乐费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娱乐费用
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,假期申请。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,法律费用
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律费用
 DocType: Sales Invoice,Posting Time,发布时间
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,电话费
 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.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},没有序列号为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},没有序列号为{0}的品目
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打开通知
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接开支
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,直接开支
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0}在“通知\电子邮件地址”无效的电子邮件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
@@ -2881,7 +2871,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额（通过时间日志）
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,我们卖这些物件
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供应商编号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量应大于0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
@@ -2896,7 +2886,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,原料不能和主项相同
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,薪资模板大师。
@@ -2912,7 +2902,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
@@ -2927,13 +2917,13 @@
 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,债权人
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,债权人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,品目特定的税项详情
 ,Item-wise Price List Rate,品目特定的价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,规则增加运输成本。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
@@ -2953,15 +2943,14 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Hub Settings,Name Token,名称令牌
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0}不允许销售发票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,请输入缺省的计量单位
-DocType: Project,Project Name,项目名称
+DocType: Request for Quotation 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,品目批号
@@ -2998,7 +2987,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",公司是强制性的，因为它是你的公司地址
 DocType: Item Attribute,From Range,从范围
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,品目{0}因忽略，因为它不是库存品目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
 DocType: Company,Domain,领域
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,工作
@@ -3010,6 +2999,7 @@
 DocType: Time Log,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低停薪留职的收入（LWP）
@@ -3044,7 +3034,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,临时账户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
@@ -3052,22 +3042,22 @@
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
 DocType: Project Task,Pending Review,待审核
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,点击这里要
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,点击这里付款
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客户ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,马克缺席
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,到时间必须大于从时间
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,销售订单{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,添加的项目
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,添加的项目
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存，因为他存在变体
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,仓库{0}不存在
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,所选项目不能有批次
@@ -3093,7 +3083,7 @@
 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,下一页联系
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,设置网关帐户。
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定资产
 ,Cash Flow,现金周转
@@ -3107,7 +3097,7 @@
 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 +132,Please find attached {0} #{1},随函附上{0}＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},随函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,银行对账单余额按总帐
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
@@ -3123,19 +3113,18 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,请从指定/至范围
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,销售业务的默认设置。
 DocType: BOM Replace Tool,Current BOM,当前BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列号
 apps/erpnext/erpnext/config/support.py +43,Warranty,保证
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,组节点
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,更新成品
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
@@ -3165,7 +3154,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里，你可以保持身高，体重，过敏，医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Purchase Invoice,In Words,大写金额
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,今天是{0}的生日！
 DocType: Production Planning Tool,Material Request For Warehouse,物料申请仓库
@@ -3179,7 +3168,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
@@ -3190,7 +3179,7 @@
 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 +782,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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}已收到过
@@ -3198,14 +3187,13 @@
 DocType: Customer,Sales Team Details,销售团队详情
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},无效的{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,没有以下仓库的会计分录
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文档。
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Expense Claim Detail,Expense Date,报销日期
@@ -3223,10 +3211,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,总帐
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看信息
 DocType: Item Attribute Value,Attribute Value,属性值
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",邮件地址{0}已存在
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",邮件地址{0}已存在
 ,Itemwise Recommended Reorder Level,品目特定的推荐重订购级别
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,请选择{0}第一
 DocType: Features Setup,To get Item Group in details table,为了让项目组在详细信息表
@@ -3262,23 +3250,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
 DocType: Stock Entry Detail,Actual Qty (at source/target),实际数量（源/目标）
 DocType: Item Customer Detail,Ref Code,参考代码
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
 DocType: Payment Gateway,Payment Gateway,支付网关
 DocType: HR Settings,Payroll Settings,薪资设置
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +22,Place Order,下订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,根本不能有一个父成本中心
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,选择品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,仓库是强制性的
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,议决
@@ -3296,7 +3284,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
@@ -3304,14 +3292,14 @@
 DocType: Purchase Invoice,Submit on creation,提交关于创建
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生产订单{0}必须提交
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,我的订单
@@ -3332,10 +3320,10 @@
 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,在发送前，请填写留言
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,简介销售点的
+apps/erpnext/erpnext/config/accounts.py +258,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}已结算
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,无担保贷款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,数金额金额
@@ -3347,7 +3335,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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 +141,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
@@ -3360,12 +3348,12 @@
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,品目{0}不存在
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
@@ -3374,7 +3362,7 @@
 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},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,账户头
@@ -3387,7 +3375,7 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,库存资产
@@ -3401,15 +3389,15 @@
 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 +576,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,重复上月的日
@@ -3430,7 +3418,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
@@ -3442,11 +3430,11 @@
 ,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 +91,Please enter default currency in Company Master,请在公司主输入默认货币
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},税收规范冲突{0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,新建账户名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,顾客服务
@@ -3458,9 +3446,9 @@
 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 +72,Item {0} must be a stock Item,品目{0}必须是库存品目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,业务会计的默认设置。
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,业务会计的默认设置。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,品目{0}必须是销售品目
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
 DocType: Sales Order,Printing Details,印刷详情
@@ -3468,7 +3456,7 @@
 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,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
@@ -3491,7 +3479,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,对账/盘点成功
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,物件的存储位置。
@@ -3502,7 +3490,7 @@
 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 +508,Posting date and posting time is mandatory,发布日期和发布时间是必需的
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,采购业务的税项模板。
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,采购业务的税项模板。
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
@@ -3512,10 +3500,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,没有使用付款工具的权限
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,变化
@@ -3534,13 +3522,13 @@
 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 +559,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,批次
@@ -3554,7 +3542,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,销售人员
 DocType: Sales Invoice,Cold Calling,冷推销
 DocType: SMS Parameter,SMS Parameter,短信参数
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,预算和成本中心
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,预算和成本中心
 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.,创建规则，根据属性值来限制交易。
@@ -3587,7 +3575,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
@@ -3595,7 +3582,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,父帐户
@@ -3611,7 +3598,7 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 DocType: Address,Office,办公室
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
@@ -3646,7 +3633,7 @@
 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}。
+apps/erpnext/erpnext/accounts/party.py +234,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,月度工资记录
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
@@ -3654,22 +3641,22 @@
 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简介
 DocType: Payment Gateway Account,Payment URL Message,付款URL信息
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金额不能大于杰出金额
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,总未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,时间日志是不计费
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,请手动输入对优惠券
 DocType: SMS Settings,Static Parameters,静态参数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,品目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,材料到供应商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,消费税发票
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
 DocType: Employee Attendance Tool,Marked Attendance,显着的出席
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,流动负债
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,流动负债
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,实际数量是必须项
@@ -3690,17 +3677,16 @@
 DocType: Item Attribute,Numeric Values,数字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,附加标志
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,股本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包装重量详情
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
@@ -3712,17 +3698,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,请在上表中输入销售订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,参考日期
@@ -3730,6 +3716,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index ff837ce..fc47284 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,零售商
 DocType: Employee,Rented,租
 DocType: POS Profile,Applicable for User,適用於用戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,請安裝員工在人力資源命名系統&gt; HR設置
 DocType: Purchase Order,Customer Contact,客戶聯繫
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
@@ -47,14 +46,14 @@
 ,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/projects/doctype/project/project.py +44,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,新假期申請
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,Quantity,數量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),借款（負債）
 DocType: Employee Education,Year of Passing,路過的一年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
 DocType: Designation,Designation,指定
@@ -64,7 +63,7 @@
 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 +642,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
@@ -81,7 +80,7 @@
 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 +131,New {0}: #{1},新{0}：＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
@@ -102,7 +101,7 @@
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,取得項目來源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
@@ -114,7 +113,7 @@
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,股票報告
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,庫存報告
 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,稅收類型
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標在
 DocType: BOM,Total Cost,總成本
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動日誌：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,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/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
@@ -156,7 +155,7 @@
 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,庫存費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,庫存費用
 DocType: Newsletter,Email Sent?,郵件發送？
 DocType: Journal Entry,Contra Entry,魂斗羅進入
 DocType: Production Order Operation,Show Time Logs,顯示的時間記錄
@@ -164,13 +163,13 @@
 DocType: Delivery Note,Installation Status,安裝狀態
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +140,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"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 +533,"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 +170,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
 DocType: BOM Replace Tool,New BOM,新的物料清單
@@ -209,11 +208,11 @@
 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 +79,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {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/manufacturing/doctype/production_order/production_order.py +156,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 +24,Please enter Company,請輸入公司名稱
@@ -222,7 +221,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,從融資淨現金
 DocType: Lead,Address & Contact,地址及聯繫方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
 DocType: Newsletter List,Total Subscribers,用戶總數
 ,Contact Name,聯繫人姓名
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
@@ -236,8 +235,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,銀行條目
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
@@ -249,8 +248,8 @@
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}
@@ -265,7 +264,7 @@
 DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建議
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,在此地域設定跨群組項目間的預算。您還可以通過設定分配來包含季節性。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},請輸入父帳戶組倉庫{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},請輸入父帳戶組倉庫{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手機號碼
@@ -284,7 +283,7 @@
 DocType: Item,Synced With Hub,同步轂
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
@@ -295,10 +294,10 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +87,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/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{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 +73,Please select month and year,請選擇年份和月份
@@ -309,12 +308,12 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
 apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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}管理分批，不能使用\
 庫存調整，而是使用庫存分錄。"
@@ -337,9 +336,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
-,Schedule Date,排定日期
+DocType: Depreciation Schedule,Schedule Date,排定日期
 DocType: Packed Item,Packed Item,盒裝產品
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,採購交易的預設設定。
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,採購交易的預設設定。
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活動費用為員工{0}對活動類型 -  {1}
 apps/erpnext/erpnext/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,外幣兌換
@@ -388,13 +387,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
-DocType: Material Request Item,Required Date,所需時間
+DocType: Request for Quotation Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,總數量
@@ -418,17 +417,17 @@
 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 +212,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,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/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +378,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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 +454,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,序列號保修到期
@@ -448,7 +447,7 @@
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,項目{0}不購買產品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,項目{0}不購買產品
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
@@ -459,7 +458,7 @@
 DocType: Production Plan Item,Pending Qty,待定數量
 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 +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,佣金總計
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
@@ -471,13 +470,13 @@
 要使用這種分佈分配預算，在**成本中心**設置這個**月**分佈"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +230,Financial / accounting year.,財務／會計年度。
+apps/erpnext/erpnext/config/accounts.py +238,Financial / accounting year.,財務／會計年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
 DocType: Warranty Claim,Resolution,決議
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},交貨：{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,應付帳款
@@ -485,7 +484,7 @@
 DocType: Job Applicant,Resume Attachment,簡歷附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,銷貨退回
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,銷貨退回
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,工資組成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
@@ -494,7 +493,7 @@
 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/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,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.,對這些庫存分錄帳進行的邏輯倉庫。
@@ -503,8 +502,8 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,生產訂單是強制性
 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/config/accounts.py +70,Masters,大師
-apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,更新銀行交易日期
+apps/erpnext/erpnext/config/accounts.py +70,Masters,資料主檔
+apps/erpnext/erpnext/config/accounts.py +135,Update Bank Transaction Dates,更新銀行交易日期
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤（ {6}）的項目{0}在倉庫{1}在{2} {3} {4} {5}
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,時間跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
@@ -522,19 +521,18 @@
 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,默認成本核算率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,維護計劃
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在庫存淨變動
 DocType: Employee,Passport Number,護照號碼
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,經理
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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,銷售人員目標
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,請設置一個假期名單無論是員工還是公司
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 DocType: Selling Settings,Customer Naming By,客戶命名由
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
@@ -542,7 +540,7 @@
 DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,項目平衡
 DocType: Sales Invoice,Packing List,包裝清單
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,購買給供應商的訂單。
+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,消費
@@ -576,7 +574,7 @@
 DocType: Hub Settings,Seller City,賣家市
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,項目已變種。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
@@ -613,14 +611,14 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
 DocType: Item Group,Website Specifications,網站規格
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,新帳號
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account,新帳號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
 apps/erpnext/erpnext/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 +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/crm.py +84,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.
@@ -668,17 +666,17 @@
 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 +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1}，檢查它是否應該被拉到作為提前在此發票。
+apps/erpnext/erpnext/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Maintenance Expenses,Office維護費用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,未選擇價格列表
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,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",要根據黨的篩選，選擇黨第一類型
@@ -686,7 +684,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +666,My Invoices,我的發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,My Invoices,我的發票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
@@ -698,7 +696,7 @@
 DocType: Item,Website Warehouse,網站倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
 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 +267,C-Form records,C-往績紀錄
+apps/erpnext/erpnext/config/accounts.py +275,C-Form records,C-往績紀錄
 apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,客戶和供應商
 DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
@@ -722,7 +720,7 @@
 DocType: Quotation Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,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,開支
@@ -759,14 +757,14 @@
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看訂閱
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,貨幣匯率的主人。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,貨幣匯率的主人。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +436,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,轉到車
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
@@ -785,7 +783,7 @@
 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 +524,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
@@ -795,10 +793,10 @@
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,品牌
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
-DocType: Journal Entry Account,Purchase Invoice,採購發票
+DocType: Asset,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,開幕日期和截止日期應在同一會計年度
@@ -808,16 +806,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"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 +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
 DocType: Job Opening,Publish on website,發布在網站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,發貨給客戶。
 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,間接收入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,Select Item for Transfer,對於轉讓項目選擇
 DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
@@ -831,14 +829,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
 ,Employee Holiday Attendance,員工假日出勤
 DocType: Opportunity,Walk In,走在
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,Stock條目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,Stock條目
 DocType: Item,Inspection Criteria,檢驗標準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,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/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +5,My Cart,我的購物車
@@ -848,7 +846,7 @@
 DocType: Holiday List,Holiday List Name,假日列表名稱
 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 +180,Qty for {0},數量為{0}
+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 +80,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
@@ -861,7 +859,7 @@
 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 +547,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
@@ -876,20 +874,20 @@
 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 +69,Selling Amount,銷售金額
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,時間日誌
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,時間日誌
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客戶不與公司匹配
 apps/erpnext/erpnext/config/stock.py +191,"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 +181,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,銷售費用
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
@@ -906,7 +904,7 @@
 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 +18,Quotations received from Suppliers.,從供應商收到的報價。
+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,平均年齡
@@ -915,7 +913,7 @@
 DocType: Company,Default Currency,預設貨幣
 DocType: Contact,Enter designation of this Contact,輸入該聯繫人指定
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,關鍵績效區
@@ -923,7 +921,7 @@
 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 +130,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,貢獻％
@@ -932,7 +930,7 @@
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,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.,選擇時間日誌並提交以建立一個新的銷售發票。
@@ -940,14 +938,14 @@
 DocType: Salary Slip,Deductions,扣除
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此時日誌批量一直標榜。
 DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,產能規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,產能規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,無需求
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,無需求
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理
 apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,活動的考勤表類型
@@ -958,18 +956,18 @@
 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;類型的節點上創建
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,請設定電子郵件ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,請設定電子郵件ID
 DocType: Item,UOMs,計量單位
 apps/erpnext/erpnext/stock/utils.py +171,{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/config/buying.py +33,Supplier database.,供應商數據庫。
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
 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 +209,"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 +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,稅務及其他薪金中扣除。
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
@@ -997,18 +995,18 @@
 DocType: Maintenance Visit Purpose,Work Done,工作完成
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
 DocType: Contact,User ID,使用者 ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,查看總帳
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,查看總帳
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"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 +412,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,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,留存收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,項目說明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是經常性
@@ -1016,7 +1014,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,臨時開通
 ,Employee Leave Balance,員工休假餘額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
@@ -1031,8 +1029,8 @@
 ,Accounts Payable Summary,應付帳款摘要
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 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 +165,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,銷售訂單{0}無效
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",對不起，企業不能合併
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
@@ -1040,7 +1038,7 @@
 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/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,帳戶頭{0}創建
 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,實現總計
@@ -1048,12 +1046,12 @@
 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 +493,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,您的產品或服務
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Warehouse,Warehouse Contact Info,倉庫聯繫方式
@@ -1063,17 +1061,17 @@
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +142,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
 DocType: Hub Settings,Seller Website,賣家網站
 apps/erpnext/erpnext/controllers/selling_controller.py +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},生產訂單狀態為{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,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 +329,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,For Supplier,對供應商
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,出貨總計
@@ -1083,10 +1081,10 @@
 DocType: Item,Website Item Groups,網站項目群組
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,序號{0}多次輸入
-DocType: Journal Entry,Journal Entry,日記帳分錄
+DocType: Depreciation Schedule,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 +433,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
@@ -1119,7 +1117,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
 DocType: Project,Start and End Dates,開始和結束日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,作業不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,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,平均折扣
@@ -1130,10 +1128,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},從{0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},從{0} | {1} {2}
 DocType: BOM Operation,Operation Description,操作說明
 DocType: Item,Will also apply to variants,也將適用於變種
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,不能更改財政年度開始日期和財政年度結束日期，一旦會計年度被保存。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,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,競賽
@@ -1147,8 +1145,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Max: {0},最大數量：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +539,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,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
@@ -1156,8 +1154,8 @@
 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 +472,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,不能大於100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依賴於無薪休假
@@ -1178,11 +1176,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +44,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 +167,Tax Rule for transactions.,稅收規則進行的交易。
+apps/erpnext/erpnext/config/accounts.py +175,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,我們買這個項目
 DocType: Address,Billing,計費
@@ -1195,8 +1193,8 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,庫存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,包裝單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,辦公室租金
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,包裝單
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,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.,尚未新增地址。
@@ -1214,7 +1212,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,項目變體
 DocType: Company,Services,服務
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),總計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),總計（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
@@ -1223,10 +1221,10 @@
 DocType: Employee External Work History,Total Experience,總經驗
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,包裝單（ S）已取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,從投資現金流
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,貨運代理費
 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 +86,Transfer Materials for Manufacture,轉移製造材料
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,轉移製造材料
 DocType: Pricing Rule,For Price List,對於價格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"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}沒有找到，這是需要預訂會計分錄（費用）。請註明項目價格對買入價格表。
@@ -1235,7 +1233,7 @@
 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.,請從科目表建立新帳戶。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,維護訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,Maintenance Visit,維護訪問
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
 DocType: Time Log Batch Detail,Time Log Batch Detail,時間日誌批次詳情
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
@@ -1249,7 +1247,6 @@
 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 +196,Brand master.,品牌主檔。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1277,7 +1274,7 @@
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +131,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,現貨負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,現貨負債
 DocType: Purchase Receipt,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯繫手機號碼
 ,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
@@ -1286,7 +1283,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
 apps/erpnext/erpnext/config/selling.py +210,Other Reports,其他報告
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,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 +180,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,停止生日提醒
@@ -1296,26 +1293,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0}查看
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,現金淨變動
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},數量必須不超過{0}
+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/report/trial_balance/trial_balance.py +40,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 +38,Supplier Type master.,供應商類型高手。
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,轉化率不能為0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 DocType: Purchase Invoice,Reference Document,參考文獻
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{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 +203,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％已開立帳單
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{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/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
@@ -1337,7 +1334,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,應付賬款淨額變化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,請驗證您的電子郵件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
-apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+apps/erpnext/erpnext/config/accounts.py +137,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.,沒有一個項目無論在數量或價值的任何變化。
@@ -1356,7 +1353,7 @@
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,請選擇商品代碼
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,請選擇商品代碼
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),減少扣除停薪留職（LWP）
 DocType: Territory,Territory Manager,區域經理
 DocType: Packed Item,To Warehouse (Optional),倉庫（可選）
@@ -1366,15 +1363,15 @@
 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,市場推廣開支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +53,Single unit of an Item.,該產品的一個單元。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',時間日誌批次{0}必須是'提交'狀態
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Warehouse required at Row No {0},在第{0}行需要倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
@@ -1391,8 +1388,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,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 +216,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}還有庫存
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,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,查找發票到匹配
@@ -1403,21 +1400,21 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,購物車啟用
 DocType: Job Applicant,Applicant for a Job,申請人作業
 DocType: Production Plan Material Request,Production Plan Material Request,生產計劃申請材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,沒有創建生產訂單
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,沒有創建生產訂單
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,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 +145,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,主頁
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1425,26 +1422,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,地址
+apps/erpnext/erpnext/hooks.py +91,Addresses,地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/config/hr.py +141,Appraisals,估價
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,製造時間日誌
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
 apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,任務時間日誌。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,招呼
@@ -1477,7 +1474,7 @@
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
 DocType: Stock Settings,Allowance Percent,津貼百分比
 DocType: SMS Settings,Message Parameter,訊息參數
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,財務成本中心的樹。
+apps/erpnext/erpnext/config/accounts.py +200,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
 DocType: Serial No,Creation Date,創建日期
@@ -1509,41 +1506,41 @@
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,產品或服務
 DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0}已新增
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,項目表不能為空
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：設置{1}的週期性，從和到日期\
 之間差必須大於或等於{2}"
 DocType: Pricing Rule,Selling,銷售
 DocType: Employee,Salary Information,薪資資訊
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +277,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,關稅和稅款
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,支付網關帳戶未配置
 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: Production Order,Material Request Item,物料需求項目
+DocType: Request for Quotation Item,Material Request Item,物料需求項目
 apps/erpnext/erpnext/config/stock.py +85,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,紅
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開放狀態的生產訂單
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,刪除所有交易本公司
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,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,投資
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,請輸入在上表請求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,請輸入在上表請求材料
 DocType: Item Attribute,Attribute Name,屬性名稱
 DocType: Item Group,Show In Website,顯示在網站
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,組
@@ -1571,7 +1568,7 @@
 ,Maintenance Schedules,保養時間表
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule Condition,Shipping Amount,航運量
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
@@ -1585,23 +1582,22 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
 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 +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
 DocType: HR Settings,HR Settings,人力資源設置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,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 +234,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,實際總計
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,請註明公司
+apps/erpnext/erpnext/stock/get_item_details.py +123,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 +42,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,報銷
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,報銷
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（開標+總計）
@@ -1610,29 +1606,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,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/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 +249,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 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 +137,Please enter Production Item first,請先輸入生產項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,請先輸入生產項目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,計算的銀行對賬單餘額
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
 DocType: Quotation,Maintenance User,維護用戶
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,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 +151,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,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,扣除
@@ -1644,8 +1640,8 @@
 ,SO Qty,SO數量
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +178,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
+DocType: Request for Quotation,Manufacturing Manager,生產經理
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +154,Split Delivery Note into packages.,拆分送貨單成數個包裝。
 apps/erpnext/erpnext/hooks.py +71,Shipments,發貨
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
@@ -1653,12 +1649,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
-DocType: Pricing Rule,Supplier,供應商
+DocType: Asset,Supplier,供應商
 DocType: C-Form,Quarter,季
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雜項開支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
-apps/erpnext/erpnext/controllers/accounts_controller.py +350,"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 +363,"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 +139,User {0} is disabled,用戶{0}被禁用
@@ -1667,7 +1663,7 @@
 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 +175,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},所需的{0}項目銷售訂單
@@ -1680,8 +1676,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,新的成本中心
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的組（通常是基金&gt;流動負債&gt;稅和關稅的來源，並創建一個新帳戶（類型為“稅”點擊添加子），並做提稅率。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,新的成本中心
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
@@ -1697,7 +1692,7 @@
 DocType: Quotation Item,Stock Balance,庫存餘額
 apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,時間日誌建立於：
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,時間日誌建立於：
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Employee,Blood Group,血型
@@ -1715,13 +1710,13 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Debit To is required,借方是必填項
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
 DocType: Offer Letter Term,Offer Term,要約期限
 DocType: Quality Inspection,Quality Manager,質量經理
 DocType: Job Applicant,Job Opening,開放職位
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,請選擇Incharge人的名字
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,Please select Incharge Person's name,請選擇Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,報價函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,產生物料需求（MRP）和生產訂單。
@@ -1729,22 +1724,22 @@
 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 +103,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
 DocType: Production Order Operation,Completed Qty,完成數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/stock/get_item_details.py +272,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}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
 DocType: Opportunity,Lost Reason,失落的原因
-apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
+apps/erpnext/erpnext/config/accounts.py +131,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,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 +300,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 +303,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,用戶和權限
@@ -1753,10 +1748,10 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,序列號{0}未找到
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,序列號{0}未找到
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,您的客戶
 DocType: Leave Block List Date,Block Date,封鎖日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,現在申請
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,現在申請
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,銀行結算摘要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
@@ -1780,7 +1775,7 @@
 DocType: Employee,Employment Details,就業資訊
 DocType: Employee,New Workplace,新工作空間
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,設置為關閉
-apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},沒有條碼{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},沒有條碼{0}的品項
 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,顯示幻燈片在頁面頂部
@@ -1798,10 +1793,10 @@
 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 +608,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,Transfer Material,轉印材料
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},項{0}必須在銷售物料{1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
-apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,請設置保存後復發
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -1815,7 +1810,7 @@
 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: Process Payroll,Create Salary Slip,建立工資單
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金來源（負債）
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,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,僱員
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,輸入電子郵件從
@@ -1829,9 +1824,9 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},項目{0}需要採購訂單號
-apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},項目{0}需要採購訂單號
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,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,製藥
@@ -1848,26 +1843,26 @@
 DocType: Upload Attendance,Attendance To Date,出席會議日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Please specify Company to proceed,請註明公司以處理
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,應收賬款淨額變化
 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 +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無效的參考{0} {1}
 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})不能大於計劃數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +210,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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 +449,Quick Journal Entry,快速日記帳分錄
 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 +206,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目建立獨立的生產訂單。
@@ -1876,7 +1871,7 @@
 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/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,創建以下生產訂單：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,創建以下生產訂單：
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,時事通訊錄
 DocType: Delivery Note,Transporter Name,貨運公司名稱
 DocType: Authorization Rule,Authorized Value,授權值
@@ -1893,11 +1888,10 @@
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}關閉
 DocType: Email Digest,How frequently?,多久？
-DocType: Purchase Receipt,Get Current Stock,獲取當前庫存
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的組（通常是基金的流動資產應用&gt;&gt;銀行賬戶，並創建一個新帳戶（點擊添加子）類型的“銀行”
+DocType: Purchase Receipt,Get Current Stock,取得當前庫存資料
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清單樹狀圖
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,馬克現在
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,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,目的
@@ -1958,13 +1952,13 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
  10。添加或扣除：無論你是想增加或扣除的稅。"
-DocType: Purchase Receipt Item,Recd Quantity,RECD數量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
+DocType: Purchase Receipt Item,Recd Quantity,到貨數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+apps/erpnext/erpnext/config/accounts.py +270,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
 DocType: Journal Entry,Credit Note,信用票據
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},完成數量不能超過{0}操作{1}
 DocType: Features Setup,Quality,品質
@@ -1988,9 +1982,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,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,預設採購價格表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
@@ -2017,7 +2011,7 @@
 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 +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工資表
 apps/erpnext/erpnext/accounts/doctype/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}也必須包括
@@ -2028,7 +2022,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,關鍵責任區
@@ -2050,16 +2044,16 @@
 apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +47,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
 apps/erpnext/erpnext/config/crm.py +92,Manage Customer Group Tree.,管理客戶群組樹。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,新的成本中心名稱
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-apps/erpnext/erpnext/config/support.py +7,Issues,問題
+apps/erpnext/erpnext/hooks.py +90,Issues,問題
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
 DocType: Sales Invoice,Debit To,借方
 DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
@@ -2078,10 +2072,10 @@
 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 +139,Please mention no of visits required,請註明無需訪問
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+apps/erpnext/erpnext/config/accounts.py +222,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
@@ -2149,7 +2143,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
 ,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,暫無產品說明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,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 +83,Root Account must be a group,根帳戶必須是一組
@@ -2176,7 +2170,7 @@
 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,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 DocType: Payment Request,Recipient and Message,收件人和消息
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
@@ -2190,7 +2184,7 @@
 DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
@@ -2213,10 +2207,10 @@
 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",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
-apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,尚未選擇價格表之貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +158,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,專案開始日期
@@ -2225,7 +2219,7 @@
 DocType: Installation Note Item,Against Document No,對文件編號
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},請選擇{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
@@ -2253,7 +2247,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認
 DocType: Payment Gateway,Gateway,網關
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,請輸入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +141,Amt,AMT
+apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
@@ -2267,12 +2261,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
 DocType: Item,Valuation Method,估值方法
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,馬克半天
 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 +410,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,創業投資
@@ -2304,13 +2298,13 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,{0}物料需求已建立
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,{0}物料需求已建立
 apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,模板條款或合同。
 DocType: Purchase Invoice,Address and Contact,地址和聯繫方式
 DocType: Supplier,Last Day of the Next Month,下個月的最後一天
 DocType: Employee,Feedback,反饋
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
 DocType: Activity Cost,Billing Rate,結算利率
@@ -2324,12 +2318,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1}被取消或關閉
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,從投資淨現金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,root帳號不能被刪除
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},參考＃ {0}於{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,管理地址
-DocType: Pricing Rule,Item Code,產品編號
+DocType: Asset,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
 DocType: Journal Entry,User Remark,用戶備註
@@ -2354,7 +2347,7 @@
 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 +135,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,添加了一些樣本記錄
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,增加了一些樣本記錄
 apps/erpnext/erpnext/config/hr.py +247,Leave Management,離開管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
 DocType: Sales Order,Fully Delivered,完全交付
@@ -2375,24 +2368,24 @@
 apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,序列號和批次
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,製作訂單不能上調：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,製作訂單不能上調：
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 ,Qty to Receive,未到貨量
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
 DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
 DocType: Global Defaults,Disable In Words,禁用詞
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,銀行透支戶口
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,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,期初餘額權益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,期初餘額權益
 DocType: Appraisal,Appraisal,評價
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
@@ -2401,7 +2394,7 @@
 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 +199,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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,發送訊息
@@ -2442,7 +2435,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
 DocType: Payment Gateway Account,Default Payment Request Message,默認的付款請求消息
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
-apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,銀行和支付
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,銀行和支付
 ,Welcome to ERPNext,歡迎來到ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,憑單詳細人數
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,導致報價
@@ -2450,17 +2443,17 @@
 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 +199,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,採購訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +137,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 +139,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/config/hr.py +55,Leaves and Holiday,葉子度假
 DocType: Sales Order,Not Billed,不發單
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +115,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,批量計費
@@ -2478,13 +2471,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
 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/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
 DocType: Journal Entry,Stock Entry,存貨分錄
 DocType: Account,Payable,支付
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),債務人（{0}）
-DocType: Project,Margin,餘量
+DocType: Pricing Rule,Margin,餘量
 DocType: Salary Slip,Arrear Amount,欠款金額
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客戶
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,毛利％
@@ -2505,7 +2498,7 @@
 DocType: Payment Request,Email To,發送電子郵件給
 DocType: Lead,Lead Owner,鉛所有者
 DocType: Bin,Requested Quantity,要求的數量
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,倉庫是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,倉庫是必需的
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Time Log,Will be updated when billed.,計費時將被更新。
@@ -2513,7 +2506,7 @@
 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 +115,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 +84,{0}% Delivered,{0}％交付
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 DocType: Territory,Territory Targets,境內目標
@@ -2533,7 +2526,7 @@
 DocType: Manufacturer,Manufacturers used in Items,在項目中使用製造商
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,新建立
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,新建立
 DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2546,7 +2539,7 @@
 ,Stock Ledger,庫存總帳
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},價格：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,首先選擇一組節點。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,Select a group node first.,首先選擇一組節點。
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},目的必須是一個{0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",刪除客戶，供應商，銷售夥伴和鉛的參考，因為它是你的公司地址
@@ -2568,13 +2561,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
 DocType: Task,depends_on,depends_on
 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 +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,展會稅分手
-apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/accounts/party.py +289,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',如果您涉及製造活動。啟動項目「製造的」
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,發票發布日期
@@ -2589,7 +2582,7 @@
 apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',請輸入「預定交付日」
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,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.",注：如果付款不反對任何參考製作，手工製作日記條目。
@@ -2603,7 +2596,7 @@
 DocType: Hub Settings,Publish Availability,發布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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 +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2613,7 +2606,7 @@
 DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,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 +12,Template,模板
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
@@ -2624,7 +2617,7 @@
 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 +378,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 +383,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/doctype/company/company.js +44,Please re-type company name to confirm,請確認重新輸入公司名稱
@@ -2637,7 +2630,7 @@
 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 +375,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,實習生
@@ -2645,7 +2638,7 @@
 DocType: Stock Entry,From BOM,從BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Please click on 'Generate Schedule',請點擊“生成表”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',請點擊“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
 apps/erpnext/erpnext/config/stock.py +186,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
@@ -2653,14 +2646,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
 DocType: Hub Settings,Access Token,存取 Token
 DocType: Sales Invoice Item,Serial No,序列號
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,請先輸入維護細節
-DocType: Item,Is Fixed Asset Item,是固定資產項目
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,請先輸入維護細節
 DocType: Purchase Invoice,Print Language,打印語言
 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",如果你有很長的列印格式，這個功能可以被用來分割要列印多個頁面，每個頁面上的所有頁眉和頁腳的頁
@@ -2677,7 +2669,7 @@
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
@@ -2693,13 +2685,13 @@
 DocType: Quotation,Maintenance Manager,維護經理
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總計不能為零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
-DocType: C-Form,Amended From,從修訂
+DocType: Asset,Amended From,從修訂
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +484,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,發揚
@@ -2713,20 +2705,20 @@
 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/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
-apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,匹配付款與發票
+apps/erpnext/erpnext/config/accounts.py +141,Match Payments with Invoices,匹配付款與發票
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,添加到購物車
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
-apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,啟用／禁用的貨幣。
+apps/erpnext/erpnext/config/accounts.py +243,Enable / disable currencies.,啟用／禁用的貨幣。
 DocType: Production Planning Tool,Get Material Request,獲取材質要求
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵政費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,郵政費用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Quality Inspection,Item Serial No,產品序列號
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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 +56,Total Present,總現
-apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,會計報表
+apps/erpnext/erpnext/config/accounts.py +97,Accounting Statements,會計報表
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,小時
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
@@ -2746,13 +2738,13 @@
 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 +346,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起點的銷售終端（POS）
 apps/erpnext/erpnext/config/support.py +32,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,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: Item,Website Description,網站簡介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,在淨資產收益變化
 DocType: Serial No,AMC Expiry Date,AMC到期時間
@@ -2762,12 +2754,12 @@
 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,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Item,Attributes,屬性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: C-Form,C-Form,C-表
@@ -2779,18 +2771,17 @@
 DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Payment Tool,Make Journal Entry,使日記帳分錄
 DocType: Leave Allocation,New Leaves Allocated,新的排假
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+apps/erpnext/erpnext/controllers/trends.py +265,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 +343,Commercial,商業
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},錯誤：{0}&gt; {1}
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 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 +52,All Products or Services.,所有的產品或服務。
 DocType: Supplier Quotation,Supplier Address,供應商地址
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
-apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
+apps/erpnext/erpnext/config/accounts.py +259,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,金融服務
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
@@ -2801,10 +2792,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,轉讓
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
@@ -2826,18 +2817,18 @@
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 DocType: Features Setup,POS View,POS機查看
 apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,對於一個序列號安裝記錄
-apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
 DocType: Offer Letter,Awaiting Response,正在等待回應
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,時間日誌已計費
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,帳戶{0}不能為集團
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,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 +35,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,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 +278,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0}
@@ -2847,12 +2838,11 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請設置通過設置編號系列考勤&gt;編號系列
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,Get Items from Product Bundle,從產品包取得項目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,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 +122,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +123,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 +64,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
 DocType: Features Setup,Sales Discounts,銷售折扣
@@ -2866,39 +2856,39 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,訂購數量
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定條件來計算運費金額
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,新增子項目
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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_balance/stock_balance.py +47,Opening Value,開度值
 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,銷售佣金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,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/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娛樂費用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娛樂費用
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +60,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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,法律費用
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律費用
 DocType: Sales Invoice,Posting Time,登錄時間
 DocType: Sales Order,% Amount 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 +132,Telephone Expenses,電話費
 DocType: Sales Partner,Logo,標誌
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
-apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},沒有序號{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},沒有序號{0}的品項
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打開通知
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接費用
-apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,直接費用
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",在“通知\電子郵件地址”中，{0}是無效的電子郵件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅費
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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 +50,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
@@ -2915,7 +2905,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額（經由時間日誌）
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供應商編號
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量應大於0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
 DocType: Sales Partner,Contact Desc,聯繫倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
@@ -2930,7 +2920,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,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 +71,Raw material cannot be same as main Item,原料不能同主品相
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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/config/hr.py +110,Salary template master.,薪資套版主檔。
@@ -2946,7 +2936,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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 +44,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
@@ -2961,13 +2951,13 @@
 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,債權人
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,債權人
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/stock.py +97,Rules for adding shipping costs.,增加運輸成本的規則。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
@@ -2988,15 +2978,14 @@
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +13,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 +456,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +330,{0} against Sales Invoice {1},{0}針對銷售發票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,請輸入預設的計量單位
-DocType: Project,Project Name,專案名稱
+DocType: Request for Quotation 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
@@ -3024,7 +3013,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
 DocType: Sales Invoice,End Date,結束日期
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,證券交易
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
 DocType: Employee,Internal Work History,內部工作經歷
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
@@ -3033,7 +3022,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",公司是強制性的，因為它是你的公司地址
 DocType: Item Attribute,From Range,從範圍
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,項{0}忽略，因為它不是一個股票項目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
 DocType: Company,Domain,網域
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,工作
@@ -3045,6 +3034,7 @@
 DocType: Time Log,Additional Cost,額外費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,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/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職（LWP）
@@ -3079,7 +3069,7 @@
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,臨時帳戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
@@ -3093,16 +3083,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,馬克缺席
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,到時間必須大於從時間
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,銷售訂單{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,新增項目從
-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/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,新增項目從
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
 ,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,倉庫{0}不存在
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,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,所選項目不能批
@@ -3128,7 +3118,7 @@
 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,下一頁聯繫
-apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,設置網關帳戶。
+apps/erpnext/erpnext/config/accounts.py +253,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
 ,Cash Flow,現金周轉
@@ -3142,7 +3132,7 @@
 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 +132,Please find attached {0} #{1},隨函附上{0}＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},隨函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
@@ -3158,19 +3148,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;領地
 apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,銷售交易的預設設定。
 DocType: BOM Replace Tool,Current BOM,當前BOM表
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列號
 apps/erpnext/erpnext/config/support.py +43,Warranty,保證
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,組節點
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,更新成品
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購買
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,已支付的款項
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
@@ -3200,7 +3189,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
 DocType: Leave Block List,Applies to Company,適用於公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
 DocType: Purchase Invoice,In Words,大寫
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,今天是{0}的生日！
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫材料需求
@@ -3214,7 +3203,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
@@ -3225,7 +3214,7 @@
 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 +782,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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}
@@ -3233,14 +3222,13 @@
 DocType: Customer,Sales Team Details,銷售團隊詳細
 DocType: Expense Claim,Total Claimed Amount,總索賠額
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},無效的{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請設置命名為系列{0}通過設置&gt;設置&gt;命名系列
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,首先保存文檔。
 DocType: Account,Chargeable,收費
 DocType: Company,Change Abbreviation,更改縮寫
 DocType: Expense Claim Detail,Expense Date,犧牲日期
@@ -3249,7 +3237,7 @@
 DocType: Company,Warn,警告
 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 Order,Raw Materials Supplied,提供供應商原物料
 DocType: Purchase Invoice,Recurring Print Format,經常列印格式
 DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
@@ -3258,10 +3246,10 @@
 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/stock/doctype/warehouse/warehouse.js +12,General Ledger,總帳
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
 DocType: Item Attribute Value,Attribute Value,屬性值
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的，且已經存在於 {0}
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的，且已經存在於 {0}
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,請先選擇{0}
 DocType: Features Setup,To get Item Group in details table,取得詳細表格裡的項目群組
@@ -3297,23 +3285,23 @@
 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 +153,Maintenance Schedule {0} exists against {0},維護時間表{0}針對存在{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Maintenance Schedule {0} exists against {0},維護時間表{0}針對存在{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),實際的數量（於 來源/目標）
 DocType: Item Customer Detail,Ref Code,參考代碼
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,員工記錄。
 DocType: Payment Gateway,Payment Gateway,支付網關
 DocType: HR Settings,Payroll Settings,薪資設置
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
+apps/erpnext/erpnext/config/accounts.py +143,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +22,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-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,倉庫是強制性的
 DocType: Supplier,Address and Contacts,地址和聯繫方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,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,議決
@@ -3331,7 +3319,7 @@
 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/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
@@ -3339,14 +3327,14 @@
 DocType: Purchase Invoice,Submit on creation,提交關於創建
 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 +420,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生產訂單{0}必須提交
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +174,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 +313,My Orders,我的訂單
@@ -3367,22 +3355,22 @@
 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,在發送前，請填寫留言
-apps/erpnext/erpnext/config/accounts.py +250,Point-of-Sale Profile,簡介銷售點的
+apps/erpnext/erpnext/config/accounts.py +258,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}已結算
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,無抵押貸款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
-DocType: Purchase Receipt Item,Received and Accepted,收到並接受
+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 +272,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 +141,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
+apps/erpnext/erpnext/controllers/status_updater.py +143,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/public/js/setup_wizard.js +234,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
@@ -3395,12 +3383,12 @@
 DocType: Employee,Date of Issue,發行日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}：從{0}給 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,項：{0}不存在於系統中
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,項：{0}不存在於系統中
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Payment Reconciliation,From Invoice Date,從發票日期
@@ -3409,7 +3397,7 @@
 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 +351,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'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,帳戶頭
@@ -3422,7 +3410,7 @@
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},生日提醒{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,庫存資產
@@ -3436,15 +3424,15 @@
 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 +576,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動／任務。
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,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,在月內的一天重複
@@ -3465,7 +3453,7 @@
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果串聯設定並且序列號沒有在交易中提到，然後自動序列號將在此基礎上創建的系列。如果你總是想明確提到序號為這個項目。留空。"
@@ -3477,11 +3465,11 @@
 ,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 +91,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,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/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},稅收規範衝突{0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,新帳號名稱
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,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,顧客服務
@@ -3493,9 +3481,9 @@
 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 +72,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
-apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,會計交易的預設設定。
+apps/erpnext/erpnext/config/accounts.py +233,Default settings for accounting transactions.,會計交易的預設設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
 DocType: Sales Order,Printing Details,印刷詳情
@@ -3503,7 +3491,7 @@
 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,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,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折扣
@@ -3526,7 +3514,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批發
 DocType: Issue,First Responded On,首先作出回應
 DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +81,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 +115,Successfully Reconciled,不甘心成功
 DocType: Production Order,Planned End Date,計劃的結束日期
 apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,項目的存儲位置。
@@ -3537,7 +3525,7 @@
 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 +508,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
-apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,稅務模板購買交易。
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
@@ -3547,10 +3535,10 @@
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,沒有權限使用支付工具
-apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,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 +455,Change,更改
@@ -3569,13 +3557,13 @@
 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 +559,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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 +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
+apps/erpnext/erpnext/controllers/buying_controller.py +61,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: Batch,Batch,批量
@@ -3589,7 +3577,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,銷售人員
 DocType: Sales Invoice,Cold Calling,自薦
 DocType: SMS Parameter,SMS Parameter,短信參數
-apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,預算和成本中心
+apps/erpnext/erpnext/config/accounts.py +192,Budget and Cost Center,預算和成本中心
 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.,創建規則來限制基於價值的交易。
@@ -3622,7 +3610,6 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,產品編號&gt;項目組&gt;品牌
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
@@ -3630,7 +3617,7 @@
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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/crm/doctype/newsletter_list/newsletter_list.py +42,{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,父帳戶
@@ -3646,7 +3633,7 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 DocType: Address,Office,辦公室
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
@@ -3681,7 +3668,7 @@
 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}。
+apps/erpnext/erpnext/accounts/party.py +234,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,月薪註冊
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
@@ -3689,22 +3676,22 @@
 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簡介
 DocType: Payment Gateway Account,Payment URL Message,付款URL訊息
-apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
+apps/erpnext/erpnext/config/accounts.py +212,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金額不能大於傑出金額
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,總未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,時間日誌是不計費
-apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
+apps/erpnext/erpnext/stock/get_item_details.py +134,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,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 +109,Please enter the Against Vouchers manually,請手動輸入對優惠券
 DocType: SMS Settings,Static Parameters,靜態參數
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,Material to Supplier,材料到供應商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,消費稅發票
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,流動負債
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,流動負債
 apps/erpnext/erpnext/config/crm.py +127,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 +59,Actual Qty is mandatory,實際數量是強制性
@@ -3725,17 +3712,16 @@
 DocType: Item Attribute,Numeric Values,數字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,附加標誌
 DocType: Customer,Commission Rate,佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +210,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部門封鎖請假申請。
 apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,無缺省地址模板中。請創建設置&gt;打印和品牌&gt;地址模板一個新的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,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,股本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
 DocType: Payment Gateway Account,Payment Gateway Account,支付網關賬戶
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
@@ -3747,17 +3733,17 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +13,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 +409, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
 apps/erpnext/erpnext/config/manufacturing.py +33,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,參考日期
@@ -3765,6 +3751,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/erpnext/utilities/__init__.py b/erpnext/utilities/__init__.py
index 1b2e52a..bba21e6 100644
--- a/erpnext/utilities/__init__.py
+++ b/erpnext/utilities/__init__.py
@@ -14,3 +14,20 @@
 				f.fieldtype = "Text Editor"
 				dt.save()
 				break
+
+def get_site_info(site_info):
+	# called via hook
+	company = frappe.db.get_single_value('Global Defaults', 'default_company')
+	domain = None
+
+	if not company:
+		company = frappe.db.sql('select name from `tabCompany` order by creation asc')
+		company = company[0][0] if company else None
+
+	if company:
+		domain = frappe.db.get_value('Company', company, 'domain')
+
+	return {
+		'company': company,
+		'domain': domain
+	}
diff --git a/erpnext/utilities/address_and_contact.py b/erpnext/utilities/address_and_contact.py
index d175db6..324f679 100644
--- a/erpnext/utilities/address_and_contact.py
+++ b/erpnext/utilities/address_and_contact.py
@@ -8,13 +8,13 @@
 	"""Loads address list and contact list in `__onload`"""
 	from erpnext.utilities.doctype.address.address import get_address_display
 
-	doc.get("__onload").addr_list = [a.update({"display": get_address_display(a)}) \
+	doc.get("__onload")["addr_list"] = [a.update({"display": get_address_display(a)}) \
 		for a in frappe.get_all("Address",
 			fields="*", filters={key: doc.name},
 			order_by="is_primary_address desc, modified desc")]
 
 	if doc.doctype != "Lead":
-		doc.get("__onload").contact_list = frappe.get_all("Contact",
+		doc.get("__onload")["contact_list"] = frappe.get_all("Contact",
 			fields="*", filters={key: doc.name},
 			order_by="is_primary_contact desc, modified desc")
 
@@ -80,7 +80,7 @@
 	meta = frappe.get_meta(doctype)
 
 	for df in meta.get_link_fields():
-		if df.options not in ("Customer", "Supplier", "Sales Partner"):
+		if df.options not in ("Customer", "Supplier", "Company", "Sales Partner"):
 			continue
 
 		if frappe.has_permission(df.options):
diff --git a/erpnext/utilities/bot.py b/erpnext/utilities/bot.py
new file mode 100644
index 0000000..23e1dd4
--- /dev/null
+++ b/erpnext/utilities/bot.py
@@ -0,0 +1,39 @@
+# Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+from __future__ import unicode_literals
+
+from frappe.utils.bot import BotParser
+
+import frappe
+from frappe import _
+
+class FindItemBot(BotParser):
+	def get_reply(self):
+		if self.startswith('where is', 'find item', 'locate'):
+			if not frappe.has_permission('Warehouse'):
+				raise frappe.PermissionError
+
+			item = '%{0}%'.format(self.strip_words(self.query, 'where is', 'find item', 'locate'))
+			items = frappe.db.sql('''select name from `tabItem` where item_code like %(txt)s
+				or item_name like %(txt)s or description like %(txt)s''', dict(txt=item))
+
+			if items:
+				out = []
+				warehouses = frappe.get_all("Warehouse")
+				for item in items:
+					found = False
+					for warehouse in warehouses:
+						qty = frappe.db.get_value("Bin", {'item_code': item[0], 'warehouse': warehouse.name}, 'actual_qty')
+						if qty:
+							out.append(_('{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2})').format(qty,
+								item[0], warehouse.name))
+							found = True
+
+					if not found:
+						out.append(_('[{0}](#Form/Item/{0}) is out of stock').format(item[0]))
+
+				return "\n\n".join(out)
+
+			else:
+				return _("Did not find any item called {0}".format(item))
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.js b/erpnext/utilities/doctype/address/address.js
index b374293..1e874c3 100644
--- a/erpnext/utilities/doctype/address/address.js
+++ b/erpnext/utilities/doctype/address/address.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'controllers/js/contact_address_common.js' %};
+{% include 'erpnext/controllers/js/contact_address_common.js' %};
 
 frappe.ui.form.on("Address", "validate", function(frm) {
 	// clear linked customer / supplier / sales partner on saving...
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 313f643..8ccf205 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -2,6 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:32", 
  "custom": 0, 
  "docstatus": 0, 
@@ -159,6 +160,31 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "county", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "County", 
+   "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": "state", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -183,30 +209,6 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "pincode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Postal Code", 
-   "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": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "country", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -232,6 +234,30 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "pincode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Postal Code", 
+   "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": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -482,7 +508,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "customer_name", 
@@ -533,7 +559,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "eval:!doc.is_your_company_address", 
    "fieldname": "supplier_name", 
@@ -637,14 +663,14 @@
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-map-marker", 
- "idx": 1, 
+ "idx": 5, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-16 16:10:26.435426", 
+ "modified": "2016-05-30 14:20:47.284751", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address", 
@@ -731,9 +757,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "customer, supplier, sales_partner, country, state", 
  "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index a94bd56..1d215cc 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -9,6 +9,7 @@
 
 from frappe.model.document import Document
 from jinja2 import TemplateSyntaxError
+from frappe.utils.user import is_website_user
 
 class Address(Document):
 	def __setup__(self):
@@ -122,11 +123,23 @@
 def get_list_context(context=None):
 	from erpnext.shopping_cart.cart import get_address_docs
 	return {
-		"title": _("My Addresses"),
-		"get_list": get_address_docs,
+		"title": _("Addresses"),
+		"get_list": get_address_list,
 		"row_template": "templates/includes/address_row.html",
+		'no_breadcrumbs': True,
 	}
+	
+def get_address_list(doctype, txt, filters, limit_start, limit_page_length=20):
+	from frappe.www.list import get_list
+	user = frappe.session.user
+	ignore_permissions = False
+	if is_website_user():
+		if not filters: filters = []
+		filters.append(("Address", "owner", "=", user))
+		ignore_permissions = True
 
+	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=ignore_permissions)
+	
 def has_website_permission(doc, ptype, user, verbose=False):
 	"""Returns true if customer or lead matches with user"""
 	customer = frappe.db.get_value("Contact", {"email_id": frappe.session.user}, "customer")
diff --git a/erpnext/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js
index 7b64b76..07d9d6f 100644
--- a/erpnext/utilities/doctype/contact/contact.js
+++ b/erpnext/utilities/doctype/contact/contact.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'controllers/js/contact_address_common.js' %};
+{% include 'erpnext/controllers/js/contact_address_common.js' %};
 
 cur_frm.email_field = "email_id";
 frappe.ui.form.on("Contact", {
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 9fef425..486b93b 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -16,6 +16,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
@@ -24,6 +25,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -39,6 +41,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "First Name", 
@@ -48,6 +51,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -57,12 +61,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "last_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Last Name", 
@@ -72,6 +77,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -81,12 +87,13 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Id", 
@@ -97,6 +104,7 @@
    "options": "Email", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,12 +120,14 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -134,6 +144,7 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
@@ -142,6 +153,33 @@
    "options": "Passive\nOpen\nReplied", 
    "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": 1, 
+   "collapsible": 0, 
+   "fieldname": "phone", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -153,19 +191,20 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "phone", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach Image", 
+   "hidden": 1, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Phone", 
+   "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "contact_no", 
-   "oldfieldtype": "Data", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -181,6 +220,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
@@ -189,6 +229,7 @@
    "options": "icon-pushpin", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -204,6 +245,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "User Id", 
@@ -213,6 +255,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -222,13 +265,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
@@ -239,6 +283,7 @@
    "options": "Customer", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -248,13 +293,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
@@ -262,6 +308,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -277,6 +324,7 @@
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "length": 0, 
@@ -284,6 +332,7 @@
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -294,13 +343,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
@@ -309,6 +359,7 @@
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -318,13 +369,14 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "depends_on": "", 
    "fieldname": "supplier_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
@@ -332,6 +384,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,6 +401,7 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
@@ -356,6 +410,7 @@
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -373,6 +428,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Primary Contact", 
@@ -382,6 +438,7 @@
    "oldfieldtype": "Select", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -397,6 +454,7 @@
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
@@ -405,6 +463,7 @@
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -420,6 +479,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
@@ -429,6 +489,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -445,6 +506,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Department", 
@@ -452,6 +514,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -468,6 +531,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Designation", 
@@ -475,6 +539,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -490,6 +555,7 @@
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unsubscribed", 
@@ -497,6 +563,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -509,13 +576,14 @@
  "hide_toolbar": 0, 
  "icon": "icon-user", 
  "idx": 1, 
+ "image_field": "image", 
  "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": "2016-04-06 05:39:47.125816", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Contact", 
@@ -764,5 +832,7 @@
   }
  ], 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
index dff05bc..a687880 100644
--- a/erpnext/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr
+from frappe.utils import cstr, has_gravatar
 from frappe import _
 
 from erpnext.controllers.status_updater import StatusUpdater
@@ -24,6 +24,8 @@
 		self.set_status()
 		self.validate_primary_contact()
 		self.set_user()
+		if self.email_id:
+			self.image = has_gravatar(self.email_id)
 
 	def set_user(self):
 		if not self.user and self.email_id:
@@ -92,3 +94,13 @@
 		"contact_department": contact.get("department")
 	}
 	return out
+
+def update_contact(doc, method):
+	'''Update contact when user is updated, if contact is found. Called via hooks'''
+	contact_name = frappe.db.get_value("Contact", {"email_id": doc.name})
+	if contact_name:
+		contact = frappe.get_doc("Contact", contact_name)
+		for key in ("first_name", "last_name", "phone"):
+			if doc.get(key):
+				contact.set(key, doc.get(key))
+		contact.save(ignore_permissions=True)
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index d088f59..3cc79ef 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -107,6 +107,24 @@
 						frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
 							.format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))
 
+	def get_link_filters(self, for_doctype):
+		if hasattr(self, "prev_link_mapper") and self.prev_link_mapper.get(for_doctype):
+			fieldname = self.prev_link_mapper[for_doctype]["fieldname"]
+			
+			values = filter(None, tuple([item.as_dict()[fieldname] for item in self.items]))
+
+			if values:
+				ret = {
+					for_doctype : {
+						"filters": [[for_doctype, "name", "in", values]]
+					}
+				}
+			else:
+				ret = None
+		else:
+			ret = None
+		
+		return ret
 
 def delete_events(ref_type, ref_name):
 	frappe.delete_doc("Event", frappe.db.sql_list("""select name from `tabEvent`
diff --git a/erpnext/crm/doctype/newsletter/__init__.py b/erpnext/utilities/web_form/__init__.py
similarity index 100%
copy from erpnext/crm/doctype/newsletter/__init__.py
copy to erpnext/utilities/web_form/__init__.py
diff --git a/erpnext/accounts/doctype/payment_tool/__init__.py b/erpnext/utilities/web_form/addresses/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_tool/__init__.py
copy to erpnext/utilities/web_form/addresses/__init__.py
diff --git a/erpnext/utilities/web_form/addresses/addresses.js b/erpnext/utilities/web_form/addresses/addresses.js
new file mode 100644
index 0000000..699703c
--- /dev/null
+++ b/erpnext/utilities/web_form/addresses/addresses.js
@@ -0,0 +1,3 @@
+frappe.ready(function() {
+	// bind events here
+})
\ No newline at end of file
diff --git a/erpnext/utilities/web_form/addresses/addresses.json b/erpnext/utilities/web_form/addresses/addresses.json
new file mode 100644
index 0000000..50fe6e9
--- /dev/null
+++ b/erpnext/utilities/web_form/addresses/addresses.json
@@ -0,0 +1,133 @@
+{
+ "allow_comments": 0, 
+ "allow_delete": 0, 
+ "allow_edit": 1, 
+ "allow_multiple": 1, 
+ "creation": "2016-06-24 15:50:33.196990", 
+ "doc_type": "Address", 
+ "docstatus": 0, 
+ "doctype": "Web Form", 
+ "idx": 0, 
+ "is_standard": 1, 
+ "login_required": 1, 
+ "modified": "2016-06-24 16:11:28.802353", 
+ "modified_by": "Administrator", 
+ "module": "Utilities", 
+ "name": "addresses", 
+ "owner": "Administrator", 
+ "published": 1, 
+ "route": "address", 
+ "success_url": "/addresses", 
+ "title": "Address", 
+ "web_form_fields": [
+  {
+   "description": "", 
+   "fieldname": "address_title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Address Title", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "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
+  }, 
+  {
+   "fieldname": "address_line1", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Address Line 1", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "address_line2", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Address Line 2", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "city", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "City/Town", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldname": "state", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "State", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "pincode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Postal Code", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "country", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Country", 
+   "options": "Country", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Email Id", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "fieldname": "phone", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "label": "Phone", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
+   "default": "0", 
+   "description": "", 
+   "fieldname": "is_primary_address", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Preferred Billing Address", 
+   "read_only": 0, 
+   "reqd": 0
+  }, 
+  {
+   "default": "0", 
+   "description": "", 
+   "fieldname": "is_shipping_address", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "label": "Preferred Shipping Address", 
+   "read_only": 0, 
+   "reqd": 0
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/utilities/web_form/addresses/addresses.py b/erpnext/utilities/web_form/addresses/addresses.py
new file mode 100644
index 0000000..2334f8b
--- /dev/null
+++ b/erpnext/utilities/web_form/addresses/addresses.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def get_context(context):
+	# do your magic here
+	pass